From 98df62177dee751bbc19d3341d54c1a478be8296 Mon Sep 17 00:00:00 2001
From: yvan <yvan.ni@yolipai.com>
Date: Mon, 24 Feb 2020 16:35:20 +0800
Subject: [PATCH] 会员不相应的等级会员，权益会员帮拆之后，进入助力首页要提示，并立即参与按钮点击也要提示

---
 pages/user/assistance/assistance.js        | 8 +++++++-
 pages/user/assistance/friend_assistance.js | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index 2b95357..a988d7e 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -78,7 +78,8 @@ Page({
             storeId: store_id
           }
         })
-      }
+      }else
+			  	getApp().my_warnning("暂无此活动或您不符合商家设置的会员参与对象，无法参与！", 0, th);		
       return ut.null_promise();
     }).then(res => {
       if ( res && res.data &&res.data.code == 0)
@@ -150,6 +151,11 @@ Page({
   go_task: function() {
     var th = this;
     var help_id = th.data.help_id;
+		if (!help_id){
+			getApp().my_warnning("暂无此活动或您不符合商家设置的会员参与对象，无法参与！", 0, th);		
+			return false;
+		}
+
     getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id);
   },
   switch_head: function(e) {
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 4198bae..9c525c7 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -43,10 +43,10 @@ Page({
 
 	},
 
-	//  跳转到助力成功页
+	//  跳转到助力首页,我也要参加
 	participate_activity: function() {
 		wx.navigateTo({
-			url: '/pages/user/assistance/assistance_success?helpid='+this.data.helpId,
+			url: '/pages/user/assistance/assistance',
 		})
 	},
 
--
libgit2 0.21.4