twt 1 month ago
parent
commit
e52c8e2930

+ 1 - 1
pages/activity/jkDetail.vue

@@ -761,7 +761,7 @@
 						 });
 						 
 						  	uni.redirectTo({
-						  		url: "../user/myOrder/activityOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
+						  		url: "../user/myOrder/activityOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'
 						  	})
 						  
 						

+ 2 - 2
pages/index/paintSure.vue

@@ -280,7 +280,7 @@
 							});
 							if (this.orderData.sheetType==5){
 								uni.redirectTo({
-									url: "../user/myOrder/paintOrderDetail?id=" +this.orderData.id
+									url: "../user/myOrder/paintOrderDetail?id=" +this.orderData.id+'&sx=1'
 								})
 							}
 						}
@@ -293,7 +293,7 @@
 						});
 						if (this.orderData.sheetType==5){
 							uni.redirectTo({
-								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
+								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id+'&sx=1'
 							})
 						}
 					}

+ 1 - 1
pages/shop/confirm.vue

@@ -248,7 +248,7 @@
 						 });
 						  if((that.orderData.sheetType==1)||(that.orderData.sheetType==2)||(that.orderData.sheetType==3)){
 						  	uni.redirectTo({
-						  		url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
+						  		url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'
 						  	})
 						  }
 						

+ 26 - 2
pages/user/myOrder/activityOrderDetail.vue

@@ -16,7 +16,9 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view> -->
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
-		
+		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
+			如果支付状态未及时更新,请点击 <span style="color: #3F90F7;">刷新</span> 
+		</view>
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
 				<image src="../../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
@@ -415,6 +417,8 @@
 				tuicauseList: [],
 				tuikuanContent: '',
 				swiperIndex:0,
+				sx:'',
+				sxNum:'',
 			}
 		},
 		//0拼团取消1拼团失败 2拼团中3拼团成功4自动成团 groupState
@@ -443,13 +447,18 @@
 					}
             	})
             }
-			
+			this.sx=opt.sx
 			
 
 		},
 		
 
 		methods: {
+			shuaxinFn(){
+				this.sxNum=1
+				this.getData();
+				//this.getTuiKuanData()
+			},
 			isShowTuiHide(){
 				this.isShowTui=false;
 			},
@@ -727,6 +736,13 @@
 								this.quanMaList.push(item.qrCode);
 							}
 						})
+					}
+					if(this.sx&&this.sxNum){
+						uni.showToast({
+							title: '刷新成功',
+							icon: 'none',
+							duration: 3000
+						});
 					}
 					this.clock()
 					console.log('可用券码--',this.quanMaList);
@@ -1658,4 +1674,12 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.detailedLineBox{
 		padding-bottom: 10rpx;
 	}
+	.shuaxin{
+		color: #333333;
+		height: 72rpx;
+		background: #FDF7EB;
+		line-height: 72rpx;
+		padding-left: 24rpx;
+		font-size: 26rpx;
+	}
 </style>

+ 26 - 3
pages/user/myOrder/mallOrderDetail.vue

@@ -16,7 +16,9 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view> -->
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
-		
+		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
+			如果支付状态未及时更新,请点击 <span style="color: #3F90F7;">刷新</span> 
+		</view>
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
 				<image src="../../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
@@ -375,6 +377,7 @@
 				tuicauseList: [],
 				tuikuanContent: '',
 				swiperIndex:0,
+				sx:'',
 			}
 		},
 		onLoad(opt) {
@@ -403,13 +406,19 @@
 						this.authorizShow=true
 					}
 				})
-			}
+			}
+			this.sx=opt.sx
 			
 
 		},
 		
 
 		methods: {
+			shuaxinFn(){
+				this.sxNum=1
+				this.getData();
+				//this.getTuiKuanData()
+			},
 			cancelOrder(){
 				this.isShowTui=true;
 			},
@@ -674,7 +683,13 @@
 							}
 						})
 					}
-					
+					if(this.sx&&this.sxNum){
+						uni.showToast({
+							title: '刷新成功',
+							icon: 'none',
+							duration: 3000
+						});
+					}
 					console.log('可用券码--',this.quanMaList);
 					
 				})
@@ -1363,4 +1378,12 @@
 			.detailedLineBox{
 				padding-bottom: 10rpx;
 			}
+			.shuaxin{
+				color: #333333;
+				height: 72rpx;
+				background: #FDF7EB;
+				line-height: 72rpx;
+				padding-left: 24rpx;
+				font-size: 26rpx;
+			}
 </style>

+ 1 - 1
pages/user/myOrder/myOrder.vue

@@ -153,7 +153,7 @@
 				}
 				else if (item.SheetType==6){
 					uni.navigateTo({
-						url: "activityOrderDetail?id=" + item.ID
+						url: "activityOrderDetail?id=" + item.ID//+'&sx=1'
 					})
 				}
 			},

+ 25 - 3
pages/user/myOrder/paintOrderDetail.vue

@@ -16,7 +16,9 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view> -->
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
-		
+		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
+			如果支付状态未及时更新,请点击 <span style="color: #3F90F7;">刷新</span> 
+		</view>
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
 				<image src="../../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
@@ -355,6 +357,7 @@
 				tuicauseList: [],
 				tuikuanContent: '',
 				swiperIndex:0,
+				sx:'',
 			}
 		},
 		onLoad(opt) {
@@ -384,11 +387,16 @@
             	})
             }
 			
-
+          this.sx=opt.sx
 		},
 		
 
 		methods: {
+			shuaxinFn(){
+				this.sxNum=1
+				this.getData();
+				//this.getTuiKuanData()
+			},
 			cancelOrder(){
 				this.isShowTui=true;
 			},
@@ -653,7 +661,13 @@
 							}
 						})
 					}
-					
+					if(this.sx&&this.sxNum){
+						uni.showToast({
+							title: '刷新成功',
+							icon: 'none',
+							duration: 3000
+						});
+					}
 					console.log('可用券码--',this.quanMaList);
 					
 				})
@@ -1349,4 +1363,12 @@
 			.detailedLineBox{
 				padding-bottom: 10rpx;
 			}
+			.shuaxin{
+				color: #333333;
+				height: 72rpx;
+				background: #FDF7EB;
+				line-height: 72rpx;
+				padding-left: 24rpx;
+				font-size: 26rpx;
+			}
 </style>