diff --git a/components/prizeDraw/prizeDraw.vue b/components/prizeDraw/prizeDraw.vue index 0714d84..7e72ef4 100644 --- a/components/prizeDraw/prizeDraw.vue +++ b/components/prizeDraw/prizeDraw.vue @@ -20,14 +20,14 @@ {{ $t('page.prizeDraw.recharge') }}
{{ orderInfo.price }} - {{ $t('page.prizeDraw.unit') }} + {{ $store.state.unit }}
{{ $t('page.prizeDraw.commission') }}
- {{ orderInfo.giveMoney + $t('page.prizeDraw.unit') }} + {{ orderInfo.giveMoney + $store.state.unit }}
@@ -110,10 +110,16 @@ min-height: 150rpx; .img-box { - width: 25%; + display: flex; + align-items: center; + width: 150rpx; + height: 150rpx; margin-right: 2%; - + overflow: hidden; + border-radius: 10rpx; + image { + border-radius: 10rpx; width: 100%; } } diff --git a/config.js b/config.js new file mode 100644 index 0000000..53979d3 --- /dev/null +++ b/config.js @@ -0,0 +1,46 @@ + +import Vue from 'vue' +import { deepMergeObject } from '@/utils/base.js' +import uView from '@/uni_modules/uview-ui' + +Vue.use(uView) + +// 当前环境 +const type = 'dev' + + +// 环境配置 +const config = { + dev : { + // baseUrl : 'https://school-admin.xzaiyp.top', + baseUrl : 'https://uav-api.xzaiyp.top/uav-api', + }, + prod : { + baseUrl : 'https://school-admin.xzaiyp.top/school-api', + } +} + + +// 默认配置 +const defaultConfig = { + mapKey : '', + aliOss : { + url : 'https://tennis-oss.xzaiyp.top/', + config : { + //桶的地址 + region: 'oss-cn-guangzhou', + //id + accessKeyId:'LTAI5tNycA46YTwm383dRvMV', + //密钥 + accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', + //桶的名字 + bucket: 'zhuoqiu-image', + endpoint:'oss-cn-guangzhou.aliyuncs.com', + } + }, +} + +Vue.prototype.$api = 'http://124.71.12.219:8085/' +Vue.prototype.$config = deepMergeObject(defaultConfig, config[type]) + +export default Vue.prototype.$config \ No newline at end of file diff --git a/locale/ar.js b/locale/ar.js index ff04772..f4e5959 100644 --- a/locale/ar.js +++ b/locale/ar.js @@ -68,7 +68,6 @@ export default { }, "starting": { "balance": "الرصيد الحالي", - "unit": "USD", "today-income": "إيرادات اليوم", "completed": "تم الحجز!", "auto-match": "التطابق التلقائي", @@ -91,7 +90,6 @@ export default { }, "purse": { "balance": "الرصيد", - "unit": "USD", "recharge-address": "عنوان إعادة الشحن", "copy": "نسخ", "recharge-amount": "مبلغ إعادة الشحن", @@ -101,11 +99,13 @@ export default { "steps": "الخطوات", "copySuccess": "نسخ نجاح", "success": "إعادة الشحن بنجاح", - "recharge-amount-placeholder": "الرجاء إدخال مبلغ الإعادة شحن" + "recharge-amount-placeholder": "الرجاء إدخال مبلغ الإعادة شحن", + "money-empty": "رجاءا إدخال مبلغ التعبئة", + "image-empty": "رجاءا قم بتحميل الصور", + "address-empty": "رجاءا إضافة عنوان التعبئة" }, "withdraw": { "balance": "الرصيد", - "unit": "USD", "withdrawal-account": "حساب السحب", "min-withdrawal": "حد أدنى السحب 1", "payment-password": "كلمة مرور الدفع", @@ -157,7 +157,8 @@ export default { "login-now": "تسجيل الدخول الآن" }, "order": { - "Submit_New": "إرسال جديد", + "complete": "كامل", + "payment": "“دفع” (dafaʿ)", "Speedip": "Speedip", "Total_Amount": "المبلغ الكلي", "Profit": "الربح", @@ -178,8 +179,7 @@ export default { "commission": "عمولة", "time": "وقت", "number": "رقم", - "submit": "إرسال", - "unit": "USD" + "submit": "إرسال" } } } \ No newline at end of file diff --git a/locale/en.js b/locale/en.js index 861ef87..9c51197 100644 --- a/locale/en.js +++ b/locale/en.js @@ -68,7 +68,6 @@ export default { }, "starting": { "balance": "Current balance", - "unit": "USD", "today-income": "Today Income", "completed": "Booking completed!", "auto-match": "Auto-match", @@ -91,7 +90,6 @@ export default { }, "purse": { "balance": "Balance", - "unit": "USD", "recharge-address": "Recharge address", "copy": "copy", "recharge-amount": "Recharge amount", @@ -101,11 +99,13 @@ export default { "steps": "The steps", "copySuccess" : "Copy success", "success" : "Recharge successfully", - "recharge-amount-placeholder" : "Please enter recharge amout" + "recharge-amount-placeholder" : "Please enter recharge amout", + "money-empty" : "Please fill in the recharge amount", + "image-empty" : "Please upload pictures", + "address-empty" : "Please add the recharge address" }, "withdraw": { "balance": "Balance", - "unit": "USD", "withdrawal-account": "Withdrawal account", "min-withdrawal": "Minimum withdrawal amount 1", "payment-password": "Payment password", @@ -157,7 +157,8 @@ export default { "login-now": "Lonin Now" }, "order": { - "Submit_New": "Submit", + "complete": "complete", + "payment" : "payment", "Speedip": "Speedip", "Total_Amount": "Need to recharge", "Profit": "Commission", @@ -178,8 +179,7 @@ export default { "commission" : "Commission", "time" : "Time", "number" : "Number", - "submit" : "Submit", - "unit" : "USD" + "submit" : "Submit" } } } \ No newline at end of file diff --git a/locale/en不知道什么的英语.js b/locale/en不知道什么的英语.js index d1f5b98..284ab48 100644 --- a/locale/en不知道什么的英语.js +++ b/locale/en不知道什么的英语.js @@ -121,7 +121,6 @@ export default { "purse": { "recharge": "recharge", "account": "Account AmountUS", - "unit": "USDT", "deposit-now": "Deposit Now", "security-pin": "Security PIN", "success": "recharge successfully", @@ -132,7 +131,6 @@ export default { "withdraw": { "title": "withdraw", "account": "Account AmountUS", - "unit": "USDT", "withdraw-amount": "Withdraw Amount", "withdraw-descript": "Withdraw will be transferred to cryptocurrency wallet", "withdrawal-all": "Withdrawal All", diff --git a/locale/es.js b/locale/es.js index 6d7eaff..18ca51a 100644 --- a/locale/es.js +++ b/locale/es.js @@ -68,7 +68,6 @@ export default { }, "starting": { "balance": "Saldo actual", - "unit": "USD", "today-income": "Ingresos de hoy", "completed": "¡Reserva completada!", "auto-match": "Auto-match", @@ -91,7 +90,6 @@ export default { }, "purse": { "balance": "Saldo", - "unit": "USD", "recharge-address": "Dirección de recarga", "copy": "copiar", "recharge-amount": "Cantidad de recarga", @@ -101,11 +99,13 @@ export default { "steps": "Los pasos", "copySuccess": "Copia exitosa", "success": "Recarga realizada exitosamente", - "recharge-amount-placeholder": "Por favor, ingrese el monto de recarga" + "recharge-amount-placeholder": "Por favor, ingrese el monto de recarga", + "money-empty": "Por favor, llene el monto de recarga", + "image-empty": "Por favor, sube imágenes", + "address-empty": "Por favor, agrega la dirección de recarga" }, "withdraw": { "balance": "Saldo", - "unit": "USD", "withdrawal-account": "Cuenta de retiro", "min-withdrawal": "Cantidad mínima de retiro 1", "payment-password": "Contraseña de pago", @@ -157,7 +157,8 @@ export default { "login-now": "Iniciar sesión ahora" }, "order": { - "Submit_New": "enviar", + "complete": "completo", + "payment": "pagar", "Speedip": "Speedip", "Total_Amount": "Necesidad de recarga", "Profit": "Comisión", @@ -178,8 +179,7 @@ export default { "commission": "Comisión", "time": "Tiempo", "number": "Número", - "submit": "Enviar", - "unit": "USD" + "submit": "Enviar" } } } \ No newline at end of file diff --git a/locale/fr.js b/locale/fr.js index 37f7cac..1d08923 100644 --- a/locale/fr.js +++ b/locale/fr.js @@ -68,7 +68,6 @@ export default { }, "starting": { "balance": "Solde actuel", - "unit": "USD", "today-income": "Revenus d'aujourd'hui", "completed": "Réservation complétée!", "auto-match": "Auto-match", @@ -91,7 +90,6 @@ export default { }, "purse": { "balance": "Solde", - "unit": "USD", "recharge-address": "Adresse de recharge", "copy": "copier", "recharge-amount": "Montant de recharge", @@ -101,11 +99,13 @@ export default { "steps": "Les étapes", "copySuccess": "Copie réussie", "success": "Recharge réussie", - "recharge-amount-placeholder": "Veuillez entrer le montant de recharge" + "recharge-amount-placeholder": "Veuillez entrer le montant de recharge", + "money-empty": "Veuillez indiquer le montant de recharge", + "image-empty": "Veuillez télécharger des images", + "address-empty": "Veuillez ajouter l'adresse de recharge" }, "withdraw": { "balance": "Solde", - "unit": "USD", "withdrawal-account": "Compte de retrait", "min-withdrawal": "Montant minimum de retrait 1", "payment-password": "Mot de passe de paiement", @@ -157,7 +157,8 @@ export default { "login-now": "Connexion maintenant" }, "order": { - "Submit_New": "Soumettre nouveau", + "complete": "complète", + "payment": "payer", "Speedip": "Speedip", "Total_Amount": "Montant total", "Profit": "Bénéfice", @@ -178,8 +179,7 @@ export default { "commission": "Commission", "time": "Temps", "number": "Numéro", - "submit": "Soumettre", - "unit": "USD" + "submit": "Soumettre" } } } \ No newline at end of file diff --git a/locale/ru.js b/locale/ru.js index a889815..375a23b 100644 --- a/locale/ru.js +++ b/locale/ru.js @@ -68,7 +68,6 @@ export default { }, "starting": { "balance": "Текучий баланс", - "unit": "USD", "today-income": "Сегодняшний доход", "completed": "Бронирование завершено!", "auto-match": "Автоматический сопоставление", @@ -91,7 +90,6 @@ export default { }, "purse": { "balance": "Баланс", - "unit": "USD", "recharge-address": "Адрес пополнения", "copy": "копировать", "recharge-amount": "Сумма пополнения", @@ -101,11 +99,13 @@ export default { "steps": "Шаги", "copySuccess": "Копирование успешно", "success": "Пополнение успешно", - "recharge-amount-placeholder": "Пожалуйста, введите сумма пополнения" + "recharge-amount-placeholder": "Пожалуйста, введите сумма пополнения", + "money-empty": "Пожалуйста, введите сумма пополнения", + "image-empty": "Пожалуйста, загрузите картинки", + "address-empty": "Пожалуйста, добавьте адрес пополнения" }, "withdraw": { "balance": "Баланс", - "unit": "USD", "withdrawal-account": "Счет вывода", "min-withdrawal": "Минимальная сумма вывода 1", "payment-password": "Пароль платежа", @@ -157,7 +157,8 @@ export default { "login-now": "Войти сейчас" }, "order": { - "Submit_New": "Отправить новый", + "complete": "полный", + "payment": "платить", "Speedip": "Скорость IP", "Total_Amount": "Общая сумма", "Profit": "Прибыль", @@ -178,8 +179,7 @@ export default { "commission": "Комиссия", "time": "Время", "number": "Номер", - "submit": "Отправить", - "unit": "USD" + "submit": "Отправить" } } } \ No newline at end of file diff --git a/main.js b/main.js index 08ecb76..9a60016 100644 --- a/main.js +++ b/main.js @@ -5,27 +5,20 @@ import App from './App' import i18n from './locale/index.js' import Vue from 'vue' import './uni.promisify.adaptor' +import 'config.js' Vue.config.productionTip = false App.mpType = 'app' - import request from './utils/request' - -Vue.prototype.$api = 'http://124.71.12.219:8085/' Vue.prototype.request = request - import store from './store/index.js' -import uView from '@/uni_modules/uview-ui' -Vue.use(uView) - import './plugin' import 'interceptor/interceptor.js' import sTabbar from '@/components/base/tabBar.vue' - Vue.component("sTabbar", sTabbar) //后端返回数据格式过滤 diff --git a/package.json b/package.json index 576cd87..b7ede9a 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "author": "", "license": "ISC", "dependencies": { + "ali-oss": "^6.21.0", "dayjs": "^1.11.12", "vue-seamless-scroll": "^1.1.23", "vuex": "^3.6.2" diff --git a/pages/order/order.vue b/pages/order/order.vue index 1f9a1f9..14d1530 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -76,10 +76,16 @@ - + + {{ $t('page.order.payment') }} + + + + + + {{ $t('page.order.complete') }} @@ -312,7 +318,7 @@ .buttom { display: flex; justify-content: flex-end; - + .btn { padding: 10rpx 20rpx; margin: 0 20rpx; diff --git a/pages/purse/purse.vue b/pages/purse/purse.vue index 366fd94..5e036bc 100644 --- a/pages/purse/purse.vue +++ b/pages/purse/purse.vue @@ -7,7 +7,7 @@ {{ $t('page.purse.balance') }} - {{ $t('page.purse.unit') }} + {{ $store.state.unit }} {{ money }} @@ -101,9 +101,9 @@ uploadImage(){ let self = this - uni.chooseImage({ + this.$Oss.ossUploadImage({ success(res) { - self.form.image = res.tempFilePaths[0] + self.form.image = res } }) }, @@ -121,6 +121,16 @@ //充值 recharge(){ this.$play() + let { money , image } = this.form + if(!money.trim()){ + return uni.showToast({ icon: 'none' , title : this.$t('page.purse.money-empty') }) + } + if(!image.trim()){ + return uni.showToast({ icon: 'none' , title : this.$t('page.purse.image-empty') }) + } + if(!this.userInfo.moneyAddress){ + return uni.showToast({ icon: 'none' , title : this.$t('page.purse.address-empty') }) + } this.form.moneyAddress = this.userInfo.moneyAddress; this.request('recharge2',{},this.form).then(res => { if(res.code == 200){ @@ -187,6 +197,7 @@ background-size: 100%; background-repeat: no-repeat; background: #f6f6f6; + padding-bottom: 150rpx; .content { width: 96%; diff --git a/pages/runningWater/runningWater.vue b/pages/runningWater/runningWater.vue index 1c9329e..784553b 100644 --- a/pages/runningWater/runningWater.vue +++ b/pages/runningWater/runningWater.vue @@ -52,10 +52,10 @@ import navbar from '@/components/base/m-navbar.vue' name : 'all' }, { - name : 'income' + name : 'expenditure' }, { - name : 'expenditure' + name : 'income' }, ] } diff --git a/pages/starting/starting.vue b/pages/starting/starting.vue index ab612e7..b87a05d 100644 --- a/pages/starting/starting.vue +++ b/pages/starting/starting.vue @@ -10,7 +10,7 @@ {{ $t('page.starting.balance') }} {{ userInfo.money }} - {{ $t('page.starting.unit') }} + {{ $store.state.unit }} @@ -20,7 +20,7 @@ {{ $t('page.starting.today-income') }}
{{ userInfo.belece }} - {{ $t('page.starting.unit') }} + {{ $store.state.unit }}
diff --git a/pages/withdraw/withdraw.vue b/pages/withdraw/withdraw.vue index 2663b58..81c1ecd 100644 --- a/pages/withdraw/withdraw.vue +++ b/pages/withdraw/withdraw.vue @@ -6,7 +6,7 @@ {{ $t('page.center.balance') }} - {{ $t('page.withdraw.unit') }} + {{ $store.state.unit }} {{ money }} @@ -19,7 +19,7 @@ - {{ $t('page.withdraw.unit') }} + {{ $store.state.unit }} { if(res.code == 200){ - console.log(res); + state.unit = res.result[state.key[i18n.locale]] } }) }, diff --git a/utils/base.js b/utils/base.js index 69c550f..5606c7a 100644 --- a/utils/base.js +++ b/utils/base.js @@ -6,4 +6,20 @@ export function debounce(func, delay) { func.apply(this, arguments); }, delay); }; +} + +//深度对比合并两个对象，相同属性b会覆盖a +export function deepMergeObject(a, b){ + let data = JSON.parse(JSON.stringify(a)) + function mergeObject(obj1, obj2){ + for(let key in obj2){ + if(typeof obj1[key] == 'object'){ + obj1[key] = mergeObject(obj1[key], obj2[key]) + }else{ + obj1[key] = obj2[key] + } + } + return obj1 + } + return mergeObject(data, b) } \ No newline at end of file diff --git a/utils/oss-upload/common/crypto/base64.js b/utils/oss-upload/common/crypto/base64.js new file mode 100644 index 0000000..f31bb3a --- /dev/null +++ b/utils/oss-upload/common/crypto/base64.js @@ -0,0 +1,95 @@ +export const Base64 = { + _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", + encode: function(input) { + var output = ""; + var chr1, chr2, chr3, enc1, enc2, enc3, enc4; + var i = 0; + input = Base64._utf8_encode(input); + while (i < input.length) { + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + output = output + + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4); + } + return output; + }, + + decode: function(input) { + var output = ""; + var chr1, chr2, chr3; + var enc1, enc2, enc3, enc4; + var i = 0; + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + while (i < input.length) { + enc1 = this._keyStr.indexOf(input.charAt(i++)); + enc2 = this._keyStr.indexOf(input.charAt(i++)); + enc3 = this._keyStr.indexOf(input.charAt(i++)); + enc4 = this._keyStr.indexOf(input.charAt(i++)); + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; + output = output + String.fromCharCode(chr1); + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } + } + output = Base64._utf8_decode(output); + return output; + }, + + _utf8_encode: function(string) { + string = string.replace(/\r\n/g, "\n"); + var utftext = ""; + for (var n = 0; n < string.length; n++) { + var c = string.charCodeAt(n); + if (c < 128) { + utftext += String.fromCharCode(c); + } else if ((c > 127) && (c < 2048)) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } + } + return utftext; + }, + + _utf8_decode: function(utftext) { + var string = ""; + var i = 0; + var c = c1 = c2 = 0; + while (i < utftext.length) { + c = utftext.charCodeAt(i); + if (c < 128) { + string += String.fromCharCode(c); + i++; + } else if ((c > 191) && (c < 224)) { + c2 = utftext.charCodeAt(i + 1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } else { + c2 = utftext.charCodeAt(i + 1); + c3 = utftext.charCodeAt(i + 2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } + } + return string; + } +} \ No newline at end of file diff --git a/utils/oss-upload/common/crypto/crypto.js.js b/utils/oss-upload/common/crypto/crypto.js.js new file mode 100644 index 0000000..8ee30dc --- /dev/null +++ b/utils/oss-upload/common/crypto/crypto.js.js @@ -0,0 +1,117 @@ +var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +let Crypto = {}; +var util = Crypto.util = { + rotl: function(n, b) { + return (n << b) | (n >>> (32 - b)); + }, + rotr: function(n, b) { + return (n << (32 - b)) | (n >>> b); + }, + endian: function(n) { + if (n.constructor == Number) { + return util.rotl(n, 8) & 0x00FF00FF | + util.rotl(n, 24) & 0xFF00FF00; + } + for (var i = 0; i < n.length; i++) + n[i] = util.endian(n[i]); + return n; + }, + randomBytes: function(n) { + for (var bytes = []; n > 0; n--) + bytes.push(Math.floor(Math.random() * 256)); + return bytes; + }, + stringToBytes: function(str) { + var bytes = []; + for (var i = 0; i < str.length; i++) + bytes.push(str.charCodeAt(i)); + return bytes; + }, + bytesToString: function(bytes) { + var str = []; + for (var i = 0; i < bytes.length; i++) + str.push(String.fromCharCode(bytes[i])); + return str.join(""); + }, + stringToWords: function(str) { + var words = []; + for (var c = 0, b = 0; c < str.length; c++, b += 8) + words[b >>> 5] |= str.charCodeAt(c) << (24 - b % 32); + return words; + }, + bytesToWords: function(bytes) { + var words = []; + for (var i = 0, b = 0; i < bytes.length; i++, b += 8) + words[b >>> 5] |= bytes[i] << (24 - b % 32); + return words; + }, + wordsToBytes: function(words) { + var bytes = []; + for (var b = 0; b < words.length * 32; b += 8) + bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF); + return bytes; + }, + bytesToHex: function(bytes) { + var hex = []; + for (var i = 0; i < bytes.length; i++) { + hex.push((bytes[i] >>> 4).toString(16)); + hex.push((bytes[i] & 0xF).toString(16)); + } + return hex.join(""); + }, + hexToBytes: function(hex) { + var bytes = []; + for (var c = 0; c < hex.length; c += 2) + bytes.push(parseInt(hex.substr(c, 2), 16)); + return bytes; + }, + bytesToBase64: function(bytes) { + if (typeof btoa == "function") return btoa(util.bytesToString(bytes)); + var base64 = [], + overflow; + for (var i = 0; i < bytes.length; i++) { + switch (i % 3) { + case 0: + base64.push(base64map.charAt(bytes[i] >>> 2)); + overflow = (bytes[i] & 0x3) << 4; + break; + case 1: + base64.push(base64map.charAt(overflow | (bytes[i] >>> 4))); + overflow = (bytes[i] & 0xF) << 2; + break; + case 2: + base64.push(base64map.charAt(overflow | (bytes[i] >>> 6))); + base64.push(base64map.charAt(bytes[i] & 0x3F)); + overflow = -1; + } + } + if (overflow != undefined && overflow != -1) + base64.push(base64map.charAt(overflow)); + while (base64.length % 4 != 0) base64.push("="); + return base64.join(""); + }, + base64ToBytes: function(base64) { + if (typeof atob == "function") return util.stringToBytes(atob(base64)); + base64 = base64.replace(/[^A-Z0-9+\/]/ig, ""); + var bytes = []; + for (var i = 0; i < base64.length; i++) { + switch (i % 4) { + case 1: + bytes.push((base64map.indexOf(base64.charAt(i - 1)) << 2) | + (base64map.indexOf(base64.charAt(i)) >>> 4)); + break; + case 2: + bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0xF) << 4) | + (base64map.indexOf(base64.charAt(i)) >>> 2)); + break; + case 3: + bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0x3) << 6) | + (base64map.indexOf(base64.charAt(i)))); + break; + } + } + return bytes; + } +}; +Crypto.mode = {}; +export default Crypto; \ No newline at end of file diff --git a/utils/oss-upload/common/crypto/hmac.js b/utils/oss-upload/common/crypto/hmac.js new file mode 100644 index 0000000..457bec3 --- /dev/null +++ b/utils/oss-upload/common/crypto/hmac.js @@ -0,0 +1,29 @@ +import Crypto from '@/utils/oss-upload/common/crypto/crypto.js.js'; +(function() { + // Shortcut + var util = Crypto.util; + Crypto.HMAC = function(hasher, message, key, options) { + // Allow arbitrary length keys + key = key.length > hasher._blocksize * 4 ? + hasher(key, { + asBytes: true + }) : + util.stringToBytes(key); + // XOR keys with pad constants + var okey = key, + ikey = key.slice(0); + for (var i = 0; i < hasher._blocksize * 4; i++) { + okey[i] ^= 0x5C; + ikey[i] ^= 0x36; + } + var hmacbytes = hasher(util.bytesToString(okey) + + hasher(util.bytesToString(ikey) + message, { + asString: true + }), { + asBytes: true + }); + return options && options.asBytes ? hmacbytes : + options && options.asString ? util.bytesToString(hmacbytes) : + util.bytesToHex(hmacbytes); + }; +})(); \ No newline at end of file diff --git a/utils/oss-upload/common/crypto/sha1.js b/utils/oss-upload/common/crypto/sha1.js new file mode 100644 index 0000000..f03675c --- /dev/null +++ b/utils/oss-upload/common/crypto/sha1.js @@ -0,0 +1,59 @@ +import Crypto from '@/utils/oss-upload/common/crypto/crypto.js.js'; +(function() { + // Shortcut + var util = Crypto.util; + // Public API + var SHA1 = Crypto.SHA1 = function(message, options) { + var digestbytes = util.wordsToBytes(SHA1._sha1(message)); + return options && options.asBytes ? digestbytes : + options && options.asString ? util.bytesToString(digestbytes) : + util.bytesToHex(digestbytes); + }; + // The core + SHA1._sha1 = function(message) { + var m = util.stringToWords(message), + l = message.length * 8, + w = [], + H0 = 1732584193, + H1 = -271733879, + H2 = -1732584194, + H3 = 271733878, + H4 = -1009589776; + // Padding + m[l >> 5] |= 0x80 << (24 - l % 32); + m[((l + 64 >>> 9) << 4) + 15] = l; + for (var i = 0; i < m.length; i += 16) { + var a = H0, + b = H1, + c = H2, + d = H3, + e = H4; + for (var j = 0; j < 80; j++) { + if (j < 16) w[j] = m[i + j]; + else { + var n = w[j - 3] ^ w[j - 8] ^ w[j - 14] ^ w[j - 16]; + w[j] = (n << 1) | (n >>> 31); + } + var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + ( + j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 : + j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 : + j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 : + (H1 ^ H2 ^ H3) - 899497514); + H4 = H3; + H3 = H2; + H2 = (H1 << 30) | (H1 >>> 2); + H1 = H0; + H0 = t; + } + H0 += a; + H1 += b; + H2 += c; + H3 += d; + H4 += e; + } + return [H0, H1, H2, H3, H4]; + }; + + // Package private blocksize + SHA1._blocksize = 16; +})(); \ No newline at end of file diff --git a/utils/oss-upload/oss/OSSConfig.js b/utils/oss-upload/oss/OSSConfig.js new file mode 100644 index 0000000..b9fa72c --- /dev/null +++ b/utils/oss-upload/oss/OSSConfig.js @@ -0,0 +1,36 @@ +import Crypto from '@/utils/oss-upload/common/crypto/crypto.js.js'; +import '@/utils/oss-upload/common/crypto/hmac.js'; +import '@/utils/oss-upload/common/crypto/sha1.js'; +import { Base64 } from '@/utils/oss-upload/common/crypto/base64.js'; +import ossConfig from '@/config.js' + +let date = new Date() +date = date.setHours(date.getHours() + 1) +let extime = "" + new Date(date).toISOString() +let policyText = { + "expiration": extime, + "conditions": [ + ["content-length-range", 0, 1024 * 1024 * 100] // 设置上传文件的大小限制 + ] +}; +let config = { + accessid: ossConfig.aliOss.config.accessKeyId, + accesskey: ossConfig.aliOss.config.accessKeySecret, + osshost: ossConfig.aliOss.url, + policyBase64: Base64.encode(JSON.stringify(policyText)) +} + +let message = config.policyBase64; +let bytes = Crypto.HMAC(Crypto.SHA1, message, config.accesskey, { + asBytes: true +}); +let signature = Crypto.util.bytesToBase64(bytes); +let timetamp = new Date().getTime(); +let OSSConfig = { + name: 'aliyun', + host: config.osshost, + accessid: config.accessid, + signature: signature, + policyBase64: config.policyBase64, +} +export default OSSConfig; \ No newline at end of file diff --git a/utils/oss-upload/oss/index.js b/utils/oss-upload/oss/index.js new file mode 100644 index 0000000..024eb80 --- /dev/null +++ b/utils/oss-upload/oss/index.js @@ -0,0 +1,139 @@ +/** + * 阿里云OSS工具类 + */ +import OSSConfig from "@/utils/oss-upload/oss/OSSConfig.js" +//支持web端 +import { + uploadFileToOSS +} from '@/utils/oss-upload/oss/web.js' +import ossConfig from '@/config.js' + +/** + * 生成一个随机的Key + */ +function storeKey() { + let s = []; + let hexDigits = "0123456789abcdef"; + for (let i = 0; i < 36; i++) { + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); + } + s[14] = "4"; + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); + s[8] = s[13] = s[18] = s[23] = "-"; + return s.join(""); +} + +/** + * 根据当天日期在OSS端生成文件夹 + */ +function storeFolder() { + const date = new Date(); + const formatNumber = n => { + n = n.toString() + return n[1] ? n : '0' + n + } + return [date.getFullYear(), date.getMonth() + 1, date.getDate()].map(formatNumber).join('-') +} + +/** + * 阿里云OSS上传文件, 所有具体功能的工具函数均基于此 + * 注意, resolve时一定为上传成功, 返回OSS上的Key + * @param filePath 待上传文件的URI + * @param key 存储桶中的目标文件名 + * @param folder 存储桶中的目标文件夹 + */ +export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { + return new Promise((resolve, reject) => { + if (folder && folder?.length > 0) { + if (folder[0] == "/") folder = folder.slice(1, folder.length) + if (folder[folder.length - 1] != "/") folder += "/" + key = folder + key + } + const filePrefixArr = filePath.split(".") + key += `.${filePrefixArr[filePrefixArr.length - 1]}` + let config = { + url: OSSConfig.host, + name: 'file', + filePath, + formData: { + key, + policy: OSSConfig.policyBase64, + OSSAccessKeyId: OSSConfig.accessid, + success_action_status: '200', + signature: OSSConfig.signature, + }, + success(res) { + if (res.errMsg.includes("uploadFile:ok")) { + resolve(ossConfig.aliOss.url + key) + } else { + reject(res) + } + }, + fail(err) { + reject(err) + } + } + uni.uploadFile(config) + }) +} + +/** + * 阿里云OSS上传图片 + * @param {compressed, key, folder, success, fail} compressed: 是否压缩 key: 存储桶中的目标文件名 folder: 存储桶中的目标文件夹 + */ +export function ossUploadImage({ + key, + folder, + compressed = true, //是否压缩 + success, //成功时的回调 + fail //失败时的回调 +}) { + const sizeType = [compressed ? 'compressed' : 'original'] + uni.chooseImage({ + count: 1, + sizeType, + success(res) { + // #ifdef H5 + return uploadFileToOSS(res.tempFiles[0]).then(success).catch(fail) + // #endif + ossUpload(res.tempFilePaths[0], key, folder).then(success).catch(fail) + }, + fail + }) +} + +/** + * 阿里云OSS上传视频 + * @param { key, folder, sourceType, compressed, maxDuration, camera, success, fail} + * key: 存储桶中的目标文件名 folder: 存储桶中的目标文件夹 其它参数同uni.chooseVideo(mpWeixin) + */ +export function ossUploadVideo({ + key, + folder, + sourceType = ['album', 'camera'], //album 从相册选视频, camera 使用相机拍摄 + compressed = true, //是否压缩所选的视频源文件 + maxDuration = 60, //拍摄视频最长拍摄时间, 单位秒。最长支持 60 秒 + camera = 'back', //调用相机方向, 'front'、'back', 默认'back' + success, //成功时的回调 + fail //失败时的回调 +}) { + uni.chooseVideo({ + sourceType, + compressed, + maxDuration, + camera, + success(res) { + // #ifdef H5 + return uploadFileToOSS(res.tempFile).then(success).catch(fail) + // #endif + ossUpload(res.tempFilePath, key, folder).then(success).catch(fail) + }, + fail + }) +} +const OSS = { + ossUploadVideo, + ossUploadImage, + ossUpload +} +export default OSS; \ No newline at end of file diff --git a/utils/oss-upload/oss/web.js b/utils/oss-upload/oss/web.js new file mode 100644 index 0000000..dfaab6e --- /dev/null +++ b/utils/oss-upload/oss/web.js @@ -0,0 +1,63 @@ +// 此方法适用于web +import OSS from "ali-oss" +import config from '@/config.js' + +/** + * 生成一个随机的Key + */ +function storeKey() { + let s = []; + let hexDigits = "0123456789abcdef"; + for (let i = 0; i < 36; i++) { + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); + } + s[14] = "4"; + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); + s[8] = s[13] = s[18] = s[23] = "-"; + return s.join(""); +} + +/** + * 根据当天日期在OSS端生成文件夹 + */ +function storeFolder() { + const date = new Date(); + const formatNumber = n => { + n = n.toString() + return n[1] ? n : '0' + n + } + return [date.getFullYear(), date.getMonth() + 1, date.getDate()].map(formatNumber).join('-') +} + + +export function uploadFileToOSS(file) { + + uni.showLoading({ + title: '上传中...' + }); + + return new Promise((resolve,reject) => { + // 创建OSS实例 + const client = new OSS(config.aliOss.config); + + // 设置文件名和文件目录 + const suffix = '.' + file.name.split('.').pop(); + let key = storeFolder() + if(key[key.length - 1] != '/') key += '/' + const fileName = key + storeKey() + suffix; // 注意：文件名需要是唯一的 + + // 使用put接口上传文件 + client.multipartUpload(fileName, file, { + headers: { + 'Content-Disposition': 'inline', + 'Content-Type': file.type + } + }).then(res => { + uni.hideLoading(); + resolve(config.aliOss.url + res.name); + }).catch(err => { + uni.hideLoading(); + reject(err) + }) + }) +} \ No newline at end of file diff --git a/utils/request.js b/utils/request.js index 28cc715..8448203 100644 --- a/utils/request.js +++ b/utils/request.js @@ -5,9 +5,10 @@ import { import Vue from "vue"; import shop from "./shop"; + const request = axios.create({ // baseURL: 'https://admin.arcskytech.top/uav-api',//生产环境外国服务器 - baseURL: 'https://uav-api.xzaiyp.top/uav-api',//演示环境 + baseURL: Vue.prototype.$config.baseUrl,//演示环境 // baseURL: 'http://h5.xzaiyp.top/uav-api',//开发环境 // baseURL: 'http://h5.xzaiyp.top/uav-two',//开发环境