积分兑换

pages/activity/activity.vue

@@ -88,6 +88,7 @@
 
 		methods: {
 			goDetail(id) {
+				this.$store.commit('mutationsckshopInfo', '')
 				uni.navigateTo({
 					url: 'jkDetail?id=' + id
 				}) 

pages/integral/integral.vue

@@ -228,6 +228,7 @@
 				this.getintegralGoodsPage();
 			},
 			goDetail(id){
+				this.$store.commit('mutationsckshopInfo', '')
 				uni.navigateTo({
 					url:'integralgoodsDetail?id='+id+'&avaIntegral='+this.avaIntegral
 				})

pages/integral/integralgoodsDetail.vue

@@ -251,10 +251,19 @@
 							this.info.details = this.info.details.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block" ');
 							 this.info.details=this.info.details.replace(/\<p/gi, '<p style="display: inline-block"');
 						}
-						this.shopInfo=res.data.shopList[0];
+						if(res.data.shopList.length>0){
+							this.shopInfo=res.data.shopList[0];
+							this.$store.commit('mutationsckshopInfo', this.shopInfo)
+							this.buyShow=false;
+						}else{
+							this.$store.commit('mutationsckshopInfo', '')
+							this.shopInfo=''
+							this.buyShow=false;
+						}
+						
 						this.totalIntegral=this.goodsnum*this.info.integral
-						//this.$store.commit('mutationsckshopInfo', '')
-						this.$store.commit('mutationsckshopInfo', this.shopInfo)
+						
+					
 						//this.szShop()
 						
 				 })
@@ -316,7 +325,7 @@
 				 	key: 'jfgoodsDetail',
 				 	data: that.info,
 				 	 success: function () {
-					   uni.navigateTo({
+					   uni.redirectTo({
 				 	   	url:'integralConfirm?shopID='+that.shopInfo.shopId+'&shopName='+that.shopInfo.shopName+'&goodsnum='+that.goodsnum+'&avaIntegral='+that.avaIntegral
 				 	   })
 				 	 }