现金投票、商品现金购买修改

pages/activity/activityDetail.vue

@@ -127,6 +127,11 @@
 
 			this.getActivitySetting();
 		},
+		onShow(){
+			if(this.vuex_isInterval){
+				this.queryOrder();
+			}
+		},
 		computed: {
 			content() {
 				return decodeURIComponent(this.activity.content)
@@ -404,7 +409,8 @@
 					// uni.navigateTo({
 					// 	url: `/pages/webview/payOrder?url=${res.data.data.qrCodeUrl}&orderId=${res.data.data.id}`
 					// })
-					this.queryOrder(res.data.data.id)
+					this.$u.vuex('vuex_orderId', res.data.data.id);
+					this.$u.vuex('vuex_isInterval', true);
 					window.location.href = res.data.data.qrCodeUrl
 				} else {
 					this.$refs.toast.error(res.data.msg)
@@ -412,14 +418,17 @@
 				this.$refs.votePopup.hideVote();
 			},
 			//查询订单状态
-			queryOrder(orderId){
+			queryOrder(){
+				
 				let params = {
-					id: orderId
+					id: this.vuex_orderId
 				}
-				this.interval = setInterval(() => {
-				  let res = this.$api.order.orderDetail(params)
+				this.interval = setInterval(async() => {
+				  let res = await this.$api.order.orderDetail(params)
 				  if(res.data.success && res.data.data.payStatus === '付款成功'){
 					  this.voteSuccess();
+					  this.$u.vuex('vuex_isInterval', false);
+					  this.$u.vuex('vuex_orderId', 0);
 					  clearInterval(this.interval)
 				  }
 				}, 1500)

pages/shop/detail.vue

@@ -90,7 +90,7 @@
 				<view>
 					<button class="cu-btn round text-white bg-base"
 						style="width: 180upx;height: 80upx;margin-right: 10upx;" @click="confirmTips">兑换</button>
-					<button @click="exchangeShow=false" class="cu-btn round line-gray"
+					<button @click="cancel" class="cu-btn round line-gray"
 						style="width: 180upx;height: 80upx;z-index: 99;">取消</button>
 				</view>
 			</view>
@@ -179,6 +179,9 @@
 			this.confirmStyle.color = this.vuex_theme.bgColor;
 		},
 		onShow() {
+			if(this.vuex_isInterval){
+				this.queryOrder();
+			}
 			uni.$on('ADDRESS',(res)=>{
 				this.address=res
 			})
@@ -298,7 +301,8 @@
 							// uni.navigateTo({
 							// 	url: `/pages/webview/payOrder?url=${res.data.data.qrCodeUrl}&orderId=${res.data.data.id}`
 							// })
-							this.queryOrder(res.data.data.id)
+							this.$u.vuex('vuex_orderId', res.data.data.id);
+							this.$u.vuex('vuex_isInterval', true);
 							window.location.href = res.data.data.qrCodeUrl
 						}
 						
@@ -308,18 +312,24 @@
 				})
 			},
 			//查询订单状态
-			queryOrder(orderId){
+			queryOrder(){
 				let params = {
-					id: orderId
+					id: this.vuex_orderId
 				}
-				this.interval = setInterval(() => {
-				  let res = this.$api.order.orderDetail(params)
+				this.interval = setInterval(async() => {
+				  let res = await this.$api.order.orderDetail(params)
 				  if(res.data.success && res.data.data.payStatus === '付款成功'){
-					  that.$refs.exchangeSuccess.showSuccess(that.detail.imgUrl);
+					  this.$refs.exchangeSuccess.showSuccess(this.detail.imgUrl);
+					  this.$u.vuex('vuex_isInterval', false);
+					  this.$u.vuex('vuex_orderId', 0);
 					  clearInterval(this.interval)
 				  }
 				}, 1500)
 			},
+			cancel(){
+				this.exchangeShow = false;
+				this.resetData();
+			},
 			pufaPointChange(e) {
 				this.exChangeData.point = e.value
 			},

store/index.js

@@ -17,7 +17,7 @@ try {
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
 let saveStateKeys = ['vuex_audit', 'vuex_userId', 'vuex_phone', 'vuex_skin',
-	'vuex_theme', 'vuex_active_setting', 'vuex_isCMCC'
+	'vuex_theme', 'vuex_active_setting', 'vuex_isCMCC' , 'vuex_isInterval' , 'vuex_orderId'
 ];
 
 // 保存变量到本地存储中
@@ -46,6 +46,8 @@ const store = new Vuex.Store({
 		vuex_theme: lifeData.vuex_theme ? lifeData.vuex_theme : config.themeRed.theme,
 		vuex_active_setting: lifeData.vuex_active_setting ? lifeData.vuex_active_setting : {},
 		vuex_isCMCC: lifeData.vuex_isCMCC ? lifeData.vuex_isCMCC : false,
+		vuex_isInterval: lifeData.vuex_isInterval ? lifeData.vuex_isInterval : false,
+		vuex_orderId: lifeData.vuex_orderId ? lifeData.vuex_orderId : 0,
 	},
 
 	mutations: {