7.8(优化

components/yk-authpup/yk-authpup.vue

@@ -82,7 +82,6 @@
 				})
 			},
 			open() {
-				console.log('openopenopenopenopenopen');
 				this.requestPermissions(this.permissionID);
 			},
 			close(type) {
@@ -98,7 +97,7 @@
 				let _this = this;
 				// #ifdef APP-PLUS
 				//判断安卓与ios设备
-				console.log(888888,plus.os.name);
+				// console.log(888888,plus.os.name);
 				if (plus.os.name == 'Android') {
 					let _permissionID = 'android.permission.' + permissionID;
 					plus.android.checkPermission(_permissionID,
@@ -126,7 +125,7 @@
 									_this.showPopup = false
 								}, 0)
 							})
-							console.log(e,'kkkkk')
+							// console.log(e,'kkkkk')
 							if (e.granted.length > 0) {
 								//当前查询权限已授权，此时可以通知页面执行接下来的操作
 								_this.$emit('changeAuth');

manifest.json

@@ -2,8 +2,8 @@
     "name" : "滴友之家",
     "appid" : "__UNI__F2BE74F",
     "description" : "",
-    "versionName" : "1.4.8",
+    "versionName" : "1.5.0",
-    "versionCode" : 148,
+    "versionCode" : 150,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/driver/mine/every_day_card/every_day_card.vue

@@ -522,33 +522,29 @@
 				} else if (this.topUpType == 'zfb') {
 					prepay(this.payData).then(res => {
 						paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-							if (res.channel.serviceReady) {
+							uni.showToast({
-								uni.showToast({
+								icon: 'success',
-									icon: 'success',
+								title: '支付成功'
-									title: '支付成功'
+							})
-								})
+							this.topUpTypeShow = false
-								this.topUpTypeShow = false
+							uni.hideLoading()
-								uni.hideLoading()
+							this.$refs.paging.refresh();
-								this.$refs.paging.refresh();
+						}).catch(err => {
-							}
-						})
-					}).catch(err => {
 						uni.navigateTo({
 							url: `/pages/serve/coupons/payresult?resultType=err`
 						})
 					})
+					})
 				} else {
 					prepay(this.payData).then(res => {
 						wxpayPaymentFn(res.data.jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.showToast({
-								uni.showToast({
+								icon: 'success',
-									icon: 'success',
+								title: '支付成功'
-									title: '支付成功'
+							})
-								})
+							this.topUpTypeShow = false
-								this.topUpTypeShow = false
+							uni.hideLoading()
-								uni.hideLoading()
+							this.$refs.paging.refresh();
-								this.$refs.paging.refresh();
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/serve/coupons/payresult?resultType=err`

pages/driver/mine/my_activity/my_activity.vue

@@ -221,11 +221,9 @@
 						paycardAPI(this.payData).then(res => {
 							this.topUpTypeShow = false
 							paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=1`
@@ -237,11 +235,9 @@
 						frontPayPayrental(this.payData).then(res => {
 							this.topUpTypeShow = false
 							paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=2`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=2`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=2`
@@ -253,11 +249,9 @@
 						frontPayCarSell(this.payData).then(res => {
 							this.topUpTypeShow = false
 							paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=3`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=3`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=3`
@@ -270,11 +264,9 @@
 						paycardAPI(this.payData).then(res => {
 							this.topUpTypeShow = false
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=1`
@@ -286,11 +278,9 @@
 						frontPayPayrental(this.payData).then(res => {
 							this.topUpTypeShow = false
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=2`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=2`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=2`
@@ -302,11 +292,9 @@
 						frontPayCarSell(this.payData).then(res => {
 							this.topUpTypeShow = false
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=3`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=3`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=3`

pages/driver/mine/my_order/buyCars/buy_cars_order.vue

@@ -218,11 +218,9 @@
 						frontPayCarSell(this.payData).then(res => {
 							this.topUpTypeShow = false
 							paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=3`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=3`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err&type=buyCar&paymentType=3`
@@ -235,11 +233,9 @@
 					frontPayCarSell(this.payData).then(res => {
 						this.topUpTypeShow = false
 						wxpayPaymentFn(res.data.jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=3`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=3`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err&type=buyCar&paymentType=3`

pages/driver/mine/my_order/buyCars/buy_cars_particulars.vue

@@ -208,11 +208,9 @@
 					frontPayCarSell(payData).then(res => {
 						this.topUpTypeShow = false
 						paymentFn(payData.payType, res.data.alipayRequest).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err`
@@ -224,11 +222,9 @@
 					frontPayCarSell(payData).then(res => {
 						this.topUpTypeShow = false
 						wxpayPaymentFn(res.data.jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err`

pages/driver/mine/my_order/rentCars/rent_order.vue

@@ -254,11 +254,9 @@
 					frontPayPayrental(this.payData).then(res => {
 						this.topUpTypeShow = false
 						paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=2`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=2`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err&type=buyCar&paymentType=2`
@@ -269,23 +267,15 @@
 					frontPayPayrental(this.payData).then(res => {
 						this.topUpTypeShow = false
 						wxpayPaymentFn(res.data.jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=2`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar&paymentType=2`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err&type=buyCar&paymentType=2`
 							})
 						})
 					})
-					return
-					uni.showToast({
-						title: '目前不支持微信支付',
-						duration: 2000,
-						icon: 'none'
-					});
 				}
 			},
 			//类型

pages/driver/mine/my_order/rentCars/rent_particulars.vue

@@ -166,11 +166,9 @@
 					frontPayPayrental(payData).then(res => {
 						this.topUpTypeShow = false
 						paymentFn(payData.payType, res.data.alipayRequest).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err`
@@ -182,11 +180,9 @@
 					frontPayPayrental(payData).then(res => {
 						this.topUpTypeShow = false
 						wxpayPaymentFn(res.data.jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.navigateTo({
-								uni.navigateTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.navigateTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err`

pages/driver/mine/my_order/serveOrder/serve_order.vue

@@ -433,11 +433,9 @@
 							frontPayintegral(this.payData).then(res => {
 								this.topUpTypeShow = false
 								paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-									if (res.channel.serviceReady) {
+									uni.navigateTo({
-										uni.navigateTo({
+										url: `/pages/driver/serve/coupons/payresult?resultType=res`
-											url: `/pages/driver/serve/coupons/payresult?resultType=res`
+									})
-										})
-									}
 								}).catch(err => {
 									uni.navigateTo({
 										url: `/pages/driver/serve/coupons/payresult?resultType=err`
@@ -448,11 +446,9 @@
 							paycardAPI(this.payData).then(res => {
 								this.topUpTypeShow = false
 								paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-									if (res.channel.serviceReady) {
+									uni.navigateTo({
-										uni.navigateTo({
+										url: `/pages/driver/serve/coupons/payresult?resultType=res`
-											url: `/pages/driver/serve/coupons/payresult?resultType=res`
+									})
-										})
-									}
 								}).catch(err => {
 									uni.navigateTo({
 										url: `/pages/driver/serve/coupons/payresult?resultType=err`
@@ -467,11 +463,9 @@
 						frontPayintegral(this.payData).then(res => {
 							this.topUpTypeShow = false
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err`
@@ -482,11 +476,9 @@
 						paycardAPI(this.payData).then(res => {
 							this.topUpTypeShow = false
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								uni.navigateTo({
-									uni.navigateTo({
+									url: `/pages/driver/serve/coupons/payresult?resultType=res`
-										url: `/pages/driver/serve/coupons/payresult?resultType=res`
+								})
-									})
-								}
 							}).catch(err => {
 								uni.navigateTo({
 									url: `/pages/driver/serve/coupons/payresult?resultType=err`

pages/driver/serve/coupons/cou_order.vue

@@ -259,11 +259,9 @@
 					paycardAPI(this.orderInfo).then(res => {
 						this.topUpTypeShow = false
 						paymentFn(this.orderInfo.payType, res.data.alipayRequest).then(res => {
-							if (res.channel.serviceReady) {
+							uni.redirectTo({
-								uni.redirectTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.redirectTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=1`
@@ -274,11 +272,9 @@
 					paycardAPI(this.orderInfo).then(res => {
 						this.topUpTypeShow = false
 						wxpayPaymentFn(res.data.jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.redirectTo({
-								uni.redirectTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res&paymentType=1`
+							})
-								})
-							}
 						}).catch(err => {
 							uni.redirectTo({
 								url: `/pages/driver/serve/coupons/payresult?resultType=err&paymentType=1`

pages/driver/serve/repair/realname.vue

@@ -144,6 +144,13 @@
 			},
 			//传图片
 			getImage() {
+				uni.showToast({
+					title: "如需上传图片,需要授权访问相册权限,如果您拒绝开启,将无法使用上述功能",
+					icon: 'none',
+					duration: 8000,
+					mask: true,
+					position: 'top'
+				});
 				this.$util.uploadImageOne({
 					count: 9,
 					sizeType: ['compressed'],

pages/driver/showroom/confirmOrder/confirmOrder.vue

@@ -590,9 +590,7 @@
 						frontPayPayrental(this.payData).then(res => {
 							this.topUpTypeShow = false
 							paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-								if (res.channel.serviceReady) {
+								this.navPayOkFn()
-									this.navPayOkFn()
-								}
 							}).catch(err => {
 								this.navPayOnFn()
 							})
@@ -601,9 +599,7 @@
 						frontPayCarSell(this.payData).then(res => {
 							this.topUpTypeShow = false
 							paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
-								if (res.channel.serviceReady) {
+								this.navPayOkFn()
-									this.navPayOkFn()
-								}
 							}).catch(err => {
 								this.navPayOnFn()
 							})
@@ -612,12 +608,9 @@
 				}else{
 					if (this.orderType == 2) {
 						frontPayPayrental(this.payData).then(res => {
-							console.log(res.data.jsConfig);
 							this.topUpTypeShow = false
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								this.navPayOkFn()
-									this.navPayOkFn()
-								}
 							}).catch(err => {
 								this.navPayOnFn()
 							})
@@ -627,9 +620,7 @@
 							this.topUpTypeShow = false
 							console.log(res.data.jsConfig);
 							wxpayPaymentFn(res.data.jsConfig).then(res => {
-								if (res.channel.serviceReady) {
+								this.navPayOkFn()
-									this.navPayOkFn()
-								}
 							}).catch(err => {
 								this.navPayOnFn()
 							})

pages/driver/welfare/rightsInterests/confirm_order.vue

@@ -211,11 +211,9 @@
 					frontPayintegral(this.orderInfo).then(res => {
 						this.topUpTypeShow = false
 						paymentFn(this.orderInfo.payType, res.data.alipayRequest).then(res => {
-							if (res.channel.serviceReady) {
+							uni.redirectTo({
-								uni.redirectTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res`
+							})
-								})
-							}
 						}).catch(err => {
 							console.log(err);
 							uni.redirectTo({
@@ -228,11 +226,9 @@
 						this.topUpTypeShow = false
 						let jsConfig = res.data.jsConfig
 						wxpayPaymentFn(jsConfig).then(res => {
-							if (res.channel.serviceReady) {
+							uni.redirectTo({
-								uni.redirectTo({
+								url: `/pages/driver/serve/coupons/payresult?resultType=res`
-									url: `/pages/driver/serve/coupons/payresult?resultType=res`
+							})
-								})
-							}
 						}).catch(err => {
 							console.log(err);
 							uni.redirectTo({

utils/index.js

@@ -37,7 +37,7 @@ export function getLocationFn() {
 		type: 'gcj02',
 		geocode: true,
 		success: res => {
-			console.log('定位', res);
+			// console.log('定位', res);
 			let city = res.address.city.replace('市', '');
 			uni.setStorageSync('current_city', city)
 			store.dispatch('SetCity', city)