调整版本更新，修复鉴权显示bug，调整商品认证页面样式错误

App.vue

@@ -26,16 +26,16 @@
 				// 获取系统版本号
 				getVersions({
 					platform: plus.os.name,
-					version: plus.runtime.versionCode
+					version	: plus.runtime.versionCode
 				}).then(res => {
 					if(res.update){
 						uni.showModal({
 							title: "更新提示",  
 							content: res.note || '版本更新信息',
 							confirmText: "更新",
-							success: (res) => {
+							success: modalRes => {
-								if (res.confirm) {  
+								if (modalRes.confirm) {  
-									if (plus.os.name=="Android") {
+									if (plus.os.name == "Android") {
 									    plus.runtime.openURL(res.info.download);
 									} else{
 										uni.showToast({
@@ -43,8 +43,8 @@
 											icon : 'none'
 										})
 									}
-								}  
+								}
-							}  
+							}
 						})
 					}
 				}).catch(err => {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "链商星球",
     "appid" : "__UNI__1F65101",
     "description" : "安徽星煌，链商星球商家工具",
-    "versionName" : "1.1.3",
+    "versionName" : "1.1.4",
-    "versionCode" : 113,
+    "versionCode" : 114,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/goods/add.vue

@@ -226,7 +226,7 @@
 		},
 		computed:{
 			percentTotal(){
-				return this.percent * this.skus_price
+				return (this.percent * this.skus_price).toFixed(2)
 			}
 		},
 		beforeRouteLeave(to, from, next){

pages/goods/confirmOrder.vue

@@ -122,7 +122,7 @@
 				params: {}, // 上个页面携带过来的参数
 				remark: '', // 备注
 				order_no: '', // 下单成功的id
-				selectTypeId: '2', // 微信支付2 E币支付1
+				selectTypeId: '2', // 微信支付2 支付宝支付3
 				coupon_price: '' // 代驾券显示金额，提货券显示什么呢
 			};
 		},
@@ -192,105 +192,45 @@
 				apiUrl(data).then(res => {
 					// 微信支付
 					if (this.selectTypeId === '2') {
-						if (typeof res === 'string') {
+						let payInfo = JSON.parse(res)
-							let payInfo = JSON.parse(res)
+						uni.requestPayment({
-							uni.requestPayment({
+							provider: "wxpay",
-								provider: "wxpay",
+							orderInfo: payInfo,
-								orderInfo: payInfo,
+							success: res => {
-								success: res => {
-									uni.showToast({
-										title: '支付成功',
-										duration: 3000,
-										mask: true,
-										icon: 'none'
-									})
-									setTimeout(() => {
-										uni.reLaunch({
-											url: '/pages/goods/payStatus?success=true'
-										})
-										this.canPay = true
-									}, 3000);
-								},
-								fail: (err) => {
-									console.log(err.errMsg)
-									uni.showToast({
-										title: '支付被取消',
-										duration: 3000,
-										mask: true,
-										icon: 'none'
-									})
-									// setTimeout(() => {
-									// 	uni.navigateTo({
-									// 		url: '/pages/goods/payStatus?success=false'
-									// 	})
-									// 	this.canPay = true
-									// }, 3000);
-								}
-							})
-						} else {
-							uni.showToast({
-								title: '创建订单成功',
-								duration: 3000,
-								mask: true,
-								icon: 'none'
-							})
-							setTimeout(() => {
-								this.canPay = true
 								uni.reLaunch({
 									url: '/pages/goods/payStatus?success=true'
 								})
-							}, 3000);
+								this.canPay = true
-						}
+							},
+							fail: (err) => {
+								uni.showToast({
+									title: '支付被取消',
+									mask: true,
+									icon: 'none'
+								})
+							}
+						})
 					}
 					// 支付宝支付
 					else if (this.selectTypeId === '3') {
-						if (typeof res === 'string') {
+						uni.requestPayment({
-							uni.requestPayment({
+							provider: "alipay",
-								provider: "alipay",
+							orderInfo: res,
-								orderInfo: res,
+							success: res => {
-								success: res => {
+								uni.reLaunch({
-									uni.showToast({
-										title: '支付成功',
-										duration: 3000,
-										mask: true,
-										icon: 'none'
-									})
-									setTimeout(() => {
-										uni.reLaunch({
-											url: '/pages/goods/payStatus?success=true'
-										})
-										this.canPay = true
-									}, 3000);
-								},
-								fail: (err) => {
-									uni.showToast({
-										title: '支付被取消',
-										duration: 3000,
-										mask: true,
-										icon: 'none'
-									})
-									setTimeout(() => {
-										uni.navigateTo({
-											url: '/pages/goods/payStatus?success=false'
-										})
-										this.canPay = true
-									}, 3000);
-								}
-							})
-						} else {
-							uni.showToast({
-								title: '创建订单成功',
-								duration: 3000,
-								mask: true,
-								icon: 'none'
-							})
-							setTimeout(() => {
-								this.canPay = true
-								uni.navigateTo({
 									url: '/pages/goods/payStatus?success=true'
 								})
-							}, 3000);
+								this.canPay = true
-						}
+							},
+							fail: (err) => {
+								uni.showToast({
+									title: '支付被取消',
+									duration: 3000,
+									mask: true,
+									icon: 'none'
+								})
+							}
+						})
 					}
 				}).catch(err => {
 					uni.showToast({

pages/wallet/extract.vue

@@ -10,7 +10,6 @@
 		<!-- 		<view class="frozen" @click="withdrawDetail">提现记录</view> -->
 			</view>
 		</view>
-
 		<view class="withdrawing-content">
 			<view class="item">
 				<view style="flex: 1;">
@@ -24,7 +23,6 @@
 		</view>
 		<view class="total" v-if="total">≈ ￥{{total.toFixed(2)}} </view>
 		<view class="btn" @click="actions">提现至现金红包</view>
-		<view class="des">提现至红包，可在红包中提现到银行卡 手续费: 无</view>
 	</view>
 </template>