From 66770b6c031b2f36494b05ba4ff97b17174de727 Mon Sep 17 00:00:00 2001
From: DESKTOP-C76OEIA\DELL <yvan.ni@yolipai.com>
Date: Tue, 11 Feb 2020 15:24:00 +0800
Subject: [PATCH] 1.帮拆成功的跳转的参数传递，  2.导航小球的三个按钮的文字显示修改

---
 pages/user/assistance/assistance.js         |  2 +-
 pages/user/assistance/assistance_success.js | 20 +++++++++++---------
 pages/user/assistance/friend_assistance.js  | 20 +++++++++++++-------
 pages/user/assistance/task_assistance.wxml  |  6 +++---
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index a51d30e..2b95357 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -81,7 +81,7 @@ Page({
       }
       return ut.null_promise();
     }).then(res => {
-      if (res.data.code == 0)
+      if ( res && res.data &&res.data.code == 0)
         th.setData({
           s_num: res.data.data.countAll
         })
diff --git a/pages/user/assistance/assistance_success.js b/pages/user/assistance/assistance_success.js
index f09db9a..8ffd0dd 100644
--- a/pages/user/assistance/assistance_success.js
+++ b/pages/user/assistance/assistance_success.js
@@ -18,23 +18,25 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-     //var helpid=options.helpid;
-     var helpid=23;
+     var helpid=options.helpid;
      this.init(helpid);
+     var nav_b = this.selectComponent("#nav_b"); //组件的id
+     nav_b.set_name("助力", "/pages/user/assistance/assistance");
+
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function (e) {
-	
+
   },
 
   // ----初始化----
-  init:function(helpid) { 	
+  init:function(helpid) {
     var user_id = getApp().globalData.user_id;
     var store_id = os.stoid;
 	var th=this;
-	
+
 	//链式调用接口,先获取活动,在获取参与活动的人数
     getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
       data: {
@@ -49,10 +51,10 @@ Page({
 					storeId: store_id,
 					helpId: helpid
 				 }
-			})	
+			})
 		}
 		return  ut.null_promise();
-				
+
     }).then(res=>{
 		if(res.data.code==0){
 			 th.setData({s_num:res.data.data.countAll});
@@ -70,6 +72,6 @@ Page({
   },
 
   cklie_button:function(){
-	  getApp().goto("/pages/user/assistance/assistance") 
+	  getApp().goto("/pages/user/assistance/assistance")
   }
-})
\ No newline at end of file
+})
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 42711a4..4658f13 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -21,6 +21,7 @@ Page({
 		userId: 0, //任务用户的ID
 		s_num: 0, //分享的人数
 		taskId:0, //活动从表ID
+		helpId:0,
 	},
 
 	/**
@@ -28,17 +29,21 @@ Page({
 	 */
 	onLoad: function(options) {
 		var th = this;
-   
+
+		var nav_b = th.selectComponent("#nav_b"); //组件的id
+		nav_b.set_name("助力", "/pages/user/assistance/assistance");
+
+
 		if (options.tasking) this.data.tasking = options.tasking;
 		if (options.userId) this.data.userId = options.userId;
 		//任务是不是为空
 		if (this.data.tasking == 0 || this.data.tasking == undefined) {
-      this.data.tasking = decodeURIComponent(options.scene);		
+      this.data.tasking = decodeURIComponent(options.scene);
 		}
-     
+
     if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
       0) {
-     
+
       getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
         data: {
           taskingId: th.data.tasking,
@@ -48,6 +53,7 @@ Page({
         if (res.data.code == 0) {
           th.data.userId = res.data.data.userId;
           th.data.taskId = res.data.data.taskId;
+          th.data.helpId=res.data.data.helpFormId;
           //获取活动的时间
           return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
             data: {
@@ -72,7 +78,7 @@ Page({
         }
         return ut.null_promise();
       }).then(res => {
-        if (res.data.code == 0) {
+        if (res && res.data && res.data.code == 0) {
           th.setData({
             s_num: res.data.data.countAll
           });
@@ -85,7 +91,7 @@ Page({
 	//  跳转到助力成功页
 	participate_activity: function() {
 		wx.navigateTo({
-			url: '/pages/user/assistance/assistance_success',
+			url: '/pages/user/assistance/assistance_success?helpid='+this.data.helpId,
 		})
 	},
 
@@ -126,7 +132,7 @@ Page({
 	//点击关闭礼盒
 	clike_none: function() {
 		this.setData({is_show: 0});
-		getApp().goto("/pages/user/assistance/assistance_success");
+		getApp().goto("/pages/user/assistance/assistance_success?helpid="+this.data.helpId);
 	},
 	//导航球
 	close: function() {
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 46ed20b..18c87eb 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -56,9 +56,9 @@
    立即兑换
   </view>
   
-<!--  <view class="task_clike fs40 t-c flex-center" bindtap="test">-->
-<!--   测试专用帮被人拆-->
-<!--  </view>-->
+ <view class="task_clike fs40 t-c flex-center" bindtap="test">
+  测试专用帮被人拆
+ </view>
 
 </view>
 <!-- 底部列表 -->
--
libgit2 0.21.4