Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into cmx

pages/index/index.vue

@@ -289,6 +289,7 @@
 				},
 				showCoupon: false,
 				newMemberCoupon: {},
+				exchangestate:false
 			}
 		},
 		components: {
@@ -298,6 +299,10 @@
 			darenItem
 		},
 		onShow() {
+			// 页面返回,页面登陆的情况下检查是否显示领取优惠卷优惠券弹窗
+			if(this.exchangestate==true){
+				this.isNewmembervoucher()
+			}
             this.articleList = [];
             this.page = 0;
 			this.getArticlelist();
@@ -305,7 +310,7 @@
 		},
 		onLoad(){
 			if(this.$store.state.hasLogin){
-				this.isNewmembervoucher();
+				this.exchangestate = true
 				const user = uni.getStorageSync('user_info');
 				console.log(user)
 				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)