Merge branch 'dev' into 'test'

Dev See merge request !302

Merge branch 'dev' into 'test'
Dev See merge request !302
后端研发-苏明海
2 parents a4b55991 98df6217
Showing 3 changed files with 11 additions and 7 deletions
pages/user/assistance/assistance.js
pages/user/assistance/friend_assistance.js
pages/user/index/index.wxml
@@ -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) {
@@ -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',
 		})
 	},
@@ -257,13 +257,11 @@
         <!-- </view> -->
       </view>
     </view>
-
-
+  </view>
+	
 	<!-- 显示商品 -->
 	<!-- 好物推荐 -->
 	<goods_recommend id="goods_recommend"></goods_recommend>
-
-  </view>
 </view>
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->