修改bug

components/changeLanguage/changeLanguage.vue

@@ -19,23 +19,23 @@
 			return {
 				languageList: [
 					{
-						name:'English',
+						name:'English',//英语
 						key : "en"
 					},
 					{
-						name : 'Arabic',
+						name : 'العربية',//阿拉伯语
 						key : "ar"
 					},
 					{
-						name : 'French',
+						name : 'français',//法国
 						key : 'fr'
 					},
 					{
-						name : 'Spanish',
+						name : 'español',//西班牙语
 						key : 'es'
 					},
 					{
-						name : 'Russian',
+						name : 'Русский язык',//俄罗斯
 						key : 'ru'
 					}
 				],

config.js

@@ -6,17 +6,16 @@ import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
 const config = {
 	dev : {
-		// baseUrl : 'https://school-admin.xzaiyp.top',
-		baseUrl : 'https://uav-api.xzaiyp.top/uav-api',
+		baseUrl : 'http://h5.xzaiyp.top/uav-api',
 	},
 	prod : {
-		baseUrl : 'https://school-admin.xzaiyp.top/school-api',
+		baseUrl : 'https://uav-api.xzaiyp.top/uav-api',
 	}
 }
 
@@ -36,7 +35,25 @@ const defaultConfig = {
 			//桶的名字
 			bucket: 'zhuoqiu-image',
 			endpoint:'oss-cn-guangzhou.aliyuncs.com',
-		}
+		},
+		// url : 'https://dianpin-img.xzaiyp.top/',
+		// config : {
+		// 	//桶的地址
+		// 	region: 'oss-cn-guangzhou',
+		// 	//id
+		// 	accessKeyId:'LTAI5tMan18fjJPUtr3Aim2W',
+		// 	//密钥
+		// 	accessKeySecret:'lhALqqgYijc115wY8c1KfTYkbSnq5I',
+		// 	//桶的名字
+		// 	bucket: 'mangoimageapplet',
+		// 	endpoint:'oss-cn-shenzhen.aliyuncs.com',
+		// },
+		// oss:
+		//     accessKey: LTAI5tMan18fjJPUtr3Aim2W
+		//     secretKey: lhALqqgYijc115wY8c1KfTYkbSnq5I
+		//     endpoint: oss-cn-shenzhen.aliyuncs.com
+		//     bucketName: mangoimageapplet
+		//     staticDomain: https://dianpin-img.xzaiyp.top
 	},
 }
 

locale/en.js

@@ -109,7 +109,7 @@ export default {
 			"withdrawal-account": "Withdrawal account",
 			"min-withdrawal": "Minimum withdrawal amount 1",
 			"payment-password": "Payment password",
-			"payment_passwrod-placeholder": "Please enter payment password",
+			"payment_password-placeholder": "Please enter payment password",
 			"confirm": "Confirm",
 			"creditLimit" : "The minimum withdrawal should be greater than 0",
 			"insufficientBalance" : "The withdrawal amount is greater than the account balance"

pages/purse/purse.vue

@@ -14,8 +14,8 @@
 		
 		<view class="purse-input content">
 			<view class="title">{{ $t('page.purse.recharge-address') }}</view>
-			<view class="text">{{ userInfo.moneyAddress }}</view>
-			<view @click="copy(userInfo.moneyAddress)" class="btn">{{ $t('page.purse.copy') }}</view>
+			<view class="text">{{ addressInfo[$store.state.key[$i18n.locale]] }}</view>
+			<view @click="copy(addressInfo[$store.state.key[$i18n.locale]])" class="btn">{{ $t('page.purse.copy') }}</view>
 		</view>
 		
 		<view class="purse-input content">
@@ -79,12 +79,14 @@
 				},
 				serverList : [],
 				showService : false,
-				userInfo : {}
+				userInfo : {},
+				addressInfo : {}
 			}
 		},
 		onShow() {
 			this.getUserInfo()
 			this.forgetPass()
+			this.getPayUrl()
 		},
 		methods: {
 			// leftClick() {
@@ -99,6 +101,14 @@
 			// 	}
 			// },
 			
+			getPayUrl(){
+				this.request('getPayUrl').then(res => {
+					if(res.code == 200){
+						this.addressInfo = res.result
+					}
+				})
+			},
+			
 			uploadImage(){
 				let self = this
 				this.$Oss.ossUploadImage({
@@ -197,7 +207,7 @@
 		background-size: 100%;
 		background-repeat: no-repeat;
 		background: #f6f6f6;
-		padding-bottom: 150rpx;
+		padding-bottom: 300px;
 
 		.content {
 			width: 96%;

pages/starting/starting.vue

@@ -127,6 +127,7 @@
 <style lang="scss" scoped>
 	.starting {
 		height: 100vh;
+		padding-bottom: 300px;
 
 		.bg {
 			border-bottom-left-radius: 60% 60rpx;

pages/withdraw/withdraw.vue

@@ -31,7 +31,7 @@
 		</view>
 		<view class="box content">
 			<view class="title info">{{ $t('page.withdraw.payment-password') }}</view>
-			<input v-model="form.payPass" type="number" :placeholder="$t('page.withdraw.payment_passwrod-placeholder')"/>
+			<input v-model="form.payPass" type="number" :placeholder="$t('page.withdraw.payment_password-placeholder')"/>
 		</view>
 		
 		<!-- <view class="withdraw-amount content">

store/index.js

@@ -16,7 +16,7 @@ const store = new Vuex.Store({
 			'es' : 'keySpanish',	//西班牙
 			'fr' : 'keyF',	//法语
 			'ru' : 'keyE'	//俄语
-		}
+		},
 	},
 	mutations: {
 		getUnit(state){

utils/shop.js

@@ -73,10 +73,12 @@ export default {
 	getImage : { url : '/index/getImage' , method : 'GET' },
 	//获取Unit
 	getUnit : { url : '/index/getUnit' , method : 'GET' },
-	//获取Unit
+	//获取首页中间的banner
 	getImageIndex : { url : '/index/getImageIndex' , method : 'GET' },
-	//获取Unit
+	//获取活动背景图
 	getAppScroll : { url : '/index/getAppScroll' , method : 'GET' },
-	//获取Unit
+	//新版本-获取商品随机图片
 	getRandomImage : { url : '/index/getRandomImage' , method : 'GET' },
+	//获取平台充值地址
+	getPayUrl : { url : '/index/getPayUrl' , method : 'GET' },
 }