v1.0.2版本更新bug修复

pages/user/order/order-details.vue

@@ -51,7 +51,7 @@
 			/>
 		</view>
 		<!-- 分享弹窗 -->
-		<share-alert :orderId="orderId" v-if="isShareModal" @btnConfirm="onShareAppMessage"> </share-alert>
+		<share-alert :orderId="shopOrderId" v-if="isShareModal" @btnConfirm="onShareAppMessage"> </share-alert>
 		<!-- 提示弹窗 -->
 		<tui-modal
 			:show="modal"
@@ -206,7 +206,7 @@ export default {
 			try {
 				const userInfo = await this.$api.getStorage()
 				this.userId = userInfo.userId ? userInfo.userId : 0
-				const res = await this.OrderService.QueryOrderDetails({ shopOrderId: this.shopOrderId, orderId: this.orderId, userId: this.userId })
+				const res = await this.OrderService.QueryOrderDetails({ shopOrderId: this.shopOrderId, userId: this.userId })
 				const data = res.data
 				this.skeletonShow = true
 				this.orderInfo = data.shopOrder
@@ -243,10 +243,10 @@ export default {
 					this.handleModelEven = 1
 					break
 				case 'query':
-					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.orderId)
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.shopOrderId)
 					break
 				case 'upload':
-					this.$api.navigateTo('/pages/user/order/order-addpay?orderId=' + this.orderId)
+					this.$api.navigateTo('/pages/user/order/order-addpay?orderId=' + this.shopOrderId)
 					break
 				case 'confirm':
 					//确认收货
@@ -322,7 +322,7 @@ export default {
 			}
 			return {
 				title: '您有新的分享订单，快来查看吧~',
-				path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${this.userId}`,
+				path: `/pages/user/order/order-sharelogin?shopOrderId=${this.shopOrderId}&userId=${this.userId}`,
 				imageUrl: 'https://static.caimei365.com/app/mini-mcare/icon/icon_shareOrder@2x.png'
 			}
 		},

pages/user/order/order-list.vue

@@ -490,7 +490,7 @@ export default {
             }
             return {
                 title: '您有新的分享订单，快来查看吧~',
-                path: `/pages/user/order/order-sharelogin?orderId=${this.handleOrderId}&userId=${
+                path: `/pages/user/order/order-sharelogin?shopOrderId=${this.handleOrderId}&userId=${
                     this.listQuery.userId
                 }`,
                 imageUrl: 'https://static.caimei365.com/app/mini-mcare/icon/icon_shareOrder@2x.png'

pages/user/order/order-sharedetails.vue

@@ -61,6 +61,7 @@ export default {
 			status: '',
 			userId: '',
 			orderId: '',
+            shopOrderId: '',
 			cellPhone: '', //客服电话
 			btnStatus: 0, //按钮组件状态
 			isRequest: false, //是否加载完成渲染子组件
@@ -86,14 +87,14 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.orderId = option.orderId
+		this.shopOrderId = option.shopOrderId
 		this.userId = option.userId
 		this.initOrderDetaileData()
 	},
 	methods: {
 		initOrderDetaileData() {
 			//初始化页面数据@参数：订单ID
-			this.OrderService.QueryOrderDetails({ shopOrderId: this.orderId, userId: this.userId })
+			this.OrderService.QueryOrderDetails({ shopOrderId: this.shopOrderId, userId: this.userId })
 				.then(response => {
 					let data = response.data
 					this.status = data.order.status

pages/user/order/order-sharelogin.vue

@@ -81,7 +81,7 @@ export default {
 	},
 	onLoad(e) {
 		console.log(e)
-		this.params.shopOrderId = e.orderId
+		this.params.shopOrderId = e.shopOrderId
 		this.params.userId = e.userId
 		if (e.serviceProviderId) {
 			this.params.serviceProviderId = e.serviceProviderId
@@ -101,7 +101,7 @@ export default {
 					this.getOrderCommodityData()
 				}else if (res.code === 1) {
 					// 同为会所运营人员查看订单详情
-					this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.params.shopOrderId}`)
+					this.$api.navigateTo(`/pages/user/order/order-details?type=share&shopOrderId=${this.params.shopOrderId}`)
 				} else if (res.code === 2) {
 					// 协销查看分享订单
 					this.$api.navigateTo(
@@ -156,11 +156,7 @@ export default {
 					this.modal = true
 					this.contentModalText ='订单已申请全部退款，无需再付款！'
 				}else{
-					if (data.onlinePayFlag === 1) {// 只能线下
-						this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${orderId}`)
-					} else {
-						this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${orderId}`)
-					}
+					this.$api.navigateTo(`/pages/user/order/order-pay-list?shopOrderId=${orderId}`)
 				}
 			}catch(error){
 				this.$util.msg(error.msg, 2000)
@@ -175,7 +171,7 @@ export default {
 					break
 				case 2:
 					this.$api.navigateTo(
-						`/pages/user/order/orderShareLogin?orderId=${this.params.shopOrderId}&userId=${this.params.userId}`
+						`/pages/user/order/orderShareLogin?shopOrderId=${this.params.shopOrderId}&userId=${this.params.userId}`
 					)
 					break
 			}

pages/user/order/orderShareLogin.vue

@@ -35,7 +35,7 @@
 		},
 		onLoad(e) {
 			console.log(e)
-			this.params.shopOrderId = e.orderId
+			this.params.shopOrderId = e.shopOrderId
 			this.params.userId = e.userId
 			this.initGetCode()
 		},
@@ -57,7 +57,7 @@
 				}
 				this.OrderService.OrderShareCode(this.params).then(response =>{
 					if (response.code === 0) {//游客第一次查看订单详情
-						this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderId=${this.params.shopOrderId}&userId=${this.params.userId}`)
+						this.$api.redirectTo(`/pages/user/order/order-sharedetails?shopOrderId=${this.params.shopOrderId}&userId=${this.params.userId}`)
 					}else{
 						this.$util.msg(response.msg,2000)
 					}