修改bug

config.js

@@ -6,7 +6,7 @@ import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置

locale/ar.js

@@ -183,7 +183,9 @@ export default {
 			"pay": "دفع فوراً",
 			"confirm_pay": "هل أنت متأكد من الدفع؟",
 			"ok": "تأكيد",
-			"no": "إلغاء"
+			"no": "إلغاء",
+			"total" : "المبلغ الإجمالي",
+			"BalancePayment" : "الرصيد بعد الدفع",
 		},
 		"prizeDraw": {
 			"title": "المطابقة",

locale/en.js

@@ -173,6 +173,7 @@ export default {
 			"payment" : "payment",
 			"Speedip": "Speedip",
 			"Total_Amount": "Need to recharge",
+			"total" : "Total amount",
 			"Profit": "Commission",
 			"no-Order": "No Order",
 			"take-stroll": "Take a Stroll",
@@ -184,6 +185,7 @@ export default {
 			"confirm_pay": "Do you confirm payment?",
 			"ok": "Confirm",
 			"no": "Cancel",
+			"BalancePayment" : "Balance after payment",
 		},
 		"prizeDraw" : {
 			"title" : "Matching",

locale/es.js

@@ -183,7 +183,9 @@ export default {
 			"pay": "Pago inmediato",
 			"confirm_pay": "¿Confirma el pago?",
 			"ok": "Confirmar",
-			"no": "Cancelar"
+			"no": "Cancelar",
+			"total" : "Importe Total",
+			"BalancePayment" : "Saldo después de pago",
 		},
 		"prizeDraw": {
 			"title": "Coincidencia",

locale/fr.js

@@ -183,7 +183,9 @@ export default {
 			"pay": "Paiement immédiat",
 			"confirm_pay": "Confirmez-vous le paiement ?",
 			"ok": "Confirmer",
-			"no": "Annuler"
+			"no": "Annuler",
+			"total" : "Montant Total",
+			"BalancePayment" : "Équilibre après paiement",
 		},
 		"prizeDraw": {
 			"title": "Correspondance",

locale/ru.js

@@ -183,7 +183,9 @@ export default {
 			"pay": "Незамедлительная оплата",
 			"confirm_pay": "Вы подтверждаете оплату?",
 			"ok": "Подтвердить",
-			"no": "Отмена"
+			"no": "Отмена",
+			"total" : "Общая сумма",
+			"BalancePayment" : "Остаток после оплаты",
 		},
 		"prizeDraw": {
 			"title": "Совпадение",

pages/order/order.vue

@@ -53,6 +53,47 @@
 							<view class="title">
 								{{ item.subTitle }}
 							</view>
+							<!-- <view class="con">
+								<view>
+									{{ $t('page.order.Total_Amount') }}
+								</view>
+								<view>
+									{{ userInfo.orderMoney - item.price }} {{ $store.state.unit }}
+								</view>
+								<view v-else>
+									{{ item.price }} {{ $store.state.unit }}
+								</view>
+							</view> -->
+							
+							<!-- <template 
+							v-if="item.state == 0 && userInfo.money < item.price">
+								<view class="con">
+									<view>
+										{{ $t('page.order.total') }}
+									</view>
+									<view>
+										{{ item.price }} {{ $store.state.unit }}
+									</view>
+								</view>
+								<view class="con">
+									<view>
+										{{ $t('page.order.Total_Amount') }}
+									</view>
+									<view>
+										{{ item.price }} {{ $store.state.unit }}
+									</view>
+								</view>
+								<view class="con">
+									<view>
+										{{ $t('page.order.BalancePayment') }}
+									</view>
+									<view>
+										{{ (userInfo.money - item.price).toFixed(2) }} {{ $store.state.unit }}
+									</view>
+								</view>
+							</template> -->
+							
+							<!-- 商品价格 -->
 							<view class="con">
 								<view>
 									{{ $t('page.order.Total_Amount') }}
@@ -61,6 +102,20 @@
 									{{ item.price }} {{ $store.state.unit }}
 								</view>
 							</view>
+							
+							<!-- 支付后剩余钱包金额 -->
+							<view class="con"
+							style="font-size: 24rpx;"
+							v-if="item.state == 0 && userInfo.money < item.price">
+								<view>
+									{{ $t('page.order.BalancePayment') }}
+								</view>
+								<view>
+									{{ (userInfo.money - item.price).toFixed(2) }} {{ $store.state.unit }}
+								</view>
+							</view>
+							
+							<!-- 商品佣金 -->
 							<view class="con" style="color: #b00;font-size: 26rpx;">
 								<view>
 									{{ $t('page.order.Profit') }}
@@ -84,7 +139,7 @@
 						<!-- <view class="btn">
 							{{ $t('page.order.Submit_New') }}
 						</view> -->
-						<view class="btn" v-if="item.state == 2">
+						<view class="btn" v-if="item.state == 1">
 							{{ $t('page.order.complete') }}
 						</view>
 					</view>
@@ -141,11 +196,11 @@
 					{
 						name: this.$t('page.order.class_3')
 					},
-					{
-						name: this.$t('page.order.class_4')
-					},
+					// {
+					// 	name: this.$t('page.order.class_4')
+					// },
 				],
-
+				userInfo : {},
 				productList: [],
 				currentIndex: 0, //当前选择的标签index
 				queryParams: {
@@ -160,11 +215,25 @@
 		},
 		onShow() {
 			this.getOrderList();
+			this.getUserInfo();
 			this.currentIndex = localStorage.getItem('orderIndex') ?
 				parseInt(localStorage.getItem('orderIndex')) : 0
 			localStorage.removeItem('orderIndex')
+			
+			// setInterval(() => {
+			// 	// 调用请求
+			// 	this.loadData()
+			// }, 3000)
 		},
 		methods: {
+			//获取用户信息
+			getUserInfo() {
+				this.request('userInfo').then(res => {
+					if (res.code == 200) {
+						this.userInfo = res.result.userInfo
+					}
+				})
+			},
 			getOrderList() { //获取订单列表
 				this.loading = true
 				let data = {

pages/purse/purse.vue

@@ -48,7 +48,8 @@
 				<view>5. When you encounter any problems, be sure to contact our online customer service in time to help you solve them.</view>
 			</view> -->
 			<view class="steps-content">
-				 {{ $t('page.purse.steps-content') }}
+				{{ $t('page.purse.steps-content') }}
+				<!-- <u-parse :content="$t('page.purse.steps-content')"></u-parse> -->
 			</view>
 		</view>
 		
@@ -147,9 +148,19 @@
 				this.form.moneyAddress = this.userInfo.moneyAddress;
 				this.request('recharge2',{},this.form).then(res => {
 					if(res.code == 200){
-						uni.$u.toast(this.$t('page.purse.success'))
+						// uni.$u.toast(this.$t('page.purse.success'))
+						
+						uni.showModal({
+						    title: this.$t('page.purse.success'),
+						    success: (res) => {
+						        if (res.confirm) {
+						        } else if (res.cancel) {
+						        }
+								this.revealServiceList()
+						    }
+						});
+
 						this.cleanForm()
-						this.revealServiceList()
 						this.getUserInfo()		//刷新用户信息(更新用户余额)
 					}
 				})

pages/starting/starting.vue

@@ -16,9 +16,12 @@
 
 			<view class="todoy-info">
 				<view class="todoy-info-main">
+					
+					<!-- v-if="userInfo.isOpen == 'Y' && userInfo.orderNum == userInfo.encourageNum + 1" -->
 					<!-- <view class="today-info-l">
 						<view class="today-income">{{ $t('page.starting.today-income') }}</view>
 						<div class="money">
+							-
 							<text class="number">{{ userInfo.belece }}</text>
 							<text class="unit">{{ $store.state.unit }}</text>
 						</div>
@@ -91,7 +94,6 @@
 					}
 				})
 				
-				
 			},
 			
 			//获取用户信息