助力活动代码调整

iceling
1 parent 6ba16ffa
Showing 10 changed files with 168 additions and 166 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.json
pages/user/assistance/assistance.wxml
pages/user/assistance/assistance_success.json
pages/user/assistance/friend_assistance.json
pages/user/assistance/friend_assistance.wxml
pages/user/assistance/giftpacklist.js
pages/user/assistance/giftpacklist.json
pages/user/assistance/giftpacklist.wxml
pages/user/assistance/giftpacklist.wxss
@@ -6,7 +6,9 @@ var t = getApp(),
   ut = i,
   s = require("../../../utils/common.js");
 var regeneratorRuntime = require('../../../utils/runtime.js');
-var oo = t.globalData.setting,os=oo, ut= require("../../../utils/util.js");
+var oo = t.globalData.setting,
+  os = oo,
+  ut = require("../../../utils/util.js");
 Page({
  
   /**
@@ -22,10 +24,10 @@ Page({
     cur_page: 1, //页码
     page_num: 5, //每页多少个
     is_show_more: 0, //是否加载更多
-    help_id:"",//助力活动的id
-    timer:"",//任务列表的定时器
-	  s_num:"",//多少人已经领取任务
-    page:1,//我的任务的当前页
+    help_id: "", //助力活动的id
+    timer: "", //任务列表的定时器
+    s_num: "", //多少人已经领取任务
+    page: 1, //我的任务的当前页
   },
  
   /**
@@ -36,79 +38,85 @@ Page({
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
     // 助力活动
-    this.assistance();
+    th.assistance();
   },
  
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
- 
+
   },
   // 助力活动
-   assistance() {
-    var th=this;
+  assistance() {
+    var th = this;
     var user_id = getApp().globalData.user_id;
     var store_id = os.stoid;
-   
     getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
+      isShowLoading: true,
       data: {
         storeId: store_id,
         userId: user_id
       }
     }).then(res => {
       if (res.data.code == 0) {
-        var help_data=res.data.data;
-        th.setData({ zl_act:help_data, help_id:help_data.id });  
-        if (th.data.help_id != "" && th.data.help_id!=null) {
-           //我的任务
+        var help_data = res.data.data;
+        help_data.remark = help_data.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"');
+        th.setData({
+          zl_act: help_data,
+          help_id: help_data.id
+        });
+        if (th.data.help_id != "" && th.data.help_id != null) {
+          //我的任务
           th.get_list();
-         }
-       
-		return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
-		    data: {
-		      helpId: help_data.id, storeId: store_id
-		    }
-		  })
-
+        }
+        return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
+          isShowLoading: true,
+          data: {
+            helpId: help_data.id,
+            storeId: store_id
+          }
+        })
       }
-	  return ut.null_promise();	   
-    }).then(res=>{
-		if(res.data.code==0)
-	     	th.setData({s_num:res.data.data.countAll})
-	})
-	
-	
+      return ut.null_promise();
+    }).then(res => {
+      if (res.data.code == 0)
+        th.setData({
+          s_num: res.data.data.countAll
+        })
+    })
+
+
   },
  
   //--点击获取用户任务列表--会员的任务列表
-  get_list:function() {
-  
+  get_list: function() {
+
     var th = this;
-    var page=th.data.page;
-    var help_id=this.data.help_id;
+    var page = th.data.page;
+    var help_id = this.data.help_id;
     t.request.get("/api/weshop/marketing/help/help/user/page", {
+      isShowLoading: true,
       data: {
-        userId:getApp().globalData.user_id,
+        userId: getApp().globalData.user_id,
         storeId: os.stoid,
         helpId: help_id,
         page: page,
-        pageSize:5
+        pageSize: 5
       },
       success: function(res) {
         clearTimeout(th.data.timer);
-        
-        if (!th.data.is_load) 
-        th.setData({
-          is_load: 1
-        })
-     
-      
+
+        if (!th.data.is_load)
+          th.setData({
+            is_load: 1
+          })
+
         if (res.data.code == 0) {
-         
+
           var list = th.data.zl_user_list;
           //连接数组	
-          list = list.concat(res.data.data.pageData); 
+          list = list.concat(res.data.data.pageData);
           th.setData({
             zl_user_list: list,
             is_load: 1,
@@ -117,20 +125,19 @@ Page({
             th.setData({
               is_show_more: 1
             })
-          }else{
+          } else {
             var page = th.data.page + 1;
             th.setData({
               is_show_more: 0,
               page: page
             })
           }
-         
         } else {
-        
-          getApp().showWarning("暂无更多内容",0);
+
+          getApp().showWarning("暂无更多内容", 0);
           th.setData({
             is_show_more: 1,
-             page: page
+            page: page
           })
         }
  
@@ -140,11 +147,11 @@ Page({
  
   //-----跳转到领取礼包的页面------
   go_task: function() {
-   
-    var help_id=this.data.help_id;
-    getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id);
+    var th = this;
+    var help_id = th.data.help_id;
+    getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id);
   },
-  switch_head: function (e) {
+  switch_head: function(e) {
     var th = this;
     var index = e.currentTarget.dataset.index; //获取当前选择的是任务还是活动说明
     var switch_head = th.data.switch_head; //0任务，1活动说明
@@ -156,22 +163,22 @@ Page({
   },
  
   //关闭导航
-  close: function () {
+  close: function() {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
   },
+
   // 领取礼包
-  get_libao:function(e){
-    var libao_id=e.currentTarget.dataset.libaoid;
-    var completeid= e.currentTarget.dataset.completeid;
-    
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);    
+  get_libao: function(e) {
+    var libao_id = e.currentTarget.dataset.libaoid;
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
   },
+
   //查看礼包id
-  select_libao:function(){
-    var libao_id = e.currentTarget.dataset.libaoid;
-    var ordersn = e.currentTarget.dataset.orderid;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 0 + "&ordersn=" + ordersn );    
+  select_libao: function() {
+    var orderSn = e.currentTarget.dataset.orderSn;//订单号
+    getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
   }
+
 })
 \ No newline at end of file
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
@@ -8,7 +8,7 @@
       <view class="flex-center">
         <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
       </view>
-      <view class="flex-center fs32"> 
+      <view class="flex-center fs32">
         <view class="excitation">机会总是留给最有行动力的人</view>
       </view>
       <view class="flex-center">
@@ -48,31 +48,30 @@
             <view class="flex-center width">
               <view class="ellipsis-1">{{item.helpTaskName}}</view>
             </view>
-           
+
             <!-- 已完成的颜色nostate -->
             <view class="flex-center width state" wx:if="{{item.status==1}}">
-              <view class="ellipsis-1"bindtap="get_libao"data-libaoid="{{item.helpListGiftBagId}}"
-              data-completeid="{{item.id}}" >领取礼包</view>
+              <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包</view>
+            </view>
+            <view class="flex-center width state" wx:if="{{item.status==0}}">
+              <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
+            </view>
+            <view class="flex-center width state" wx:if="{{item.status==2}}">
+              <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
             </view>
-			<view class="flex-center width state" wx:if="{{item.status==0}}">
-			  <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
-			</view>
-			<view class="flex-center width state" wx:if="{{item.status==2}}">
-			  <view class="ellipsis-1" bindtap="select_libao" data-orderid="{{item.ordersn}}" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</view>
-			</view>
-			
-			
+
+
           </view>
           <!-- 加载更多 -->
-           <block wx:if="{{is_show_more==0}}">
-          <view class="fs28 flex-center">
-            <view class="line"></view>
-            <view class="load" bindtap="get_list">点击加载更多</view>
-            <view class="line"></view>
-          </view>
-             </block>
+          <block wx:if="{{is_show_more==0}}">
+            <view class="fs28 flex-center">
+              <view class="line"></view>
+              <view class="load" bindtap="get_list">点击加载更多</view>
+              <view class="line"></view>
+            </view>
+          </block>
         </view>
-      
+
  
         <view class="fs30" style="margin-top: 30rpx;">
           <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}">
@@ -93,11 +92,14 @@
       <view wx:if="{{switch_head}}" class="white">
         <view class="items">
           <view class="content fs28 padding">
-            <!-- <view>{{zl_act.remark}}</view> -->
-            <rich-text nodes="{{zl_act.remark}}"></rich-text>
+            <block wx:if="{{zl_act.remark!=''}}">
+              <rich-text nodes="{{zl_act.remark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
+            </block>
+            <block wx:else>
+              <view>暂无活动说明</view>
+            </block>
           </view>
         </view>
-
       </view>
  
     </view>
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
       "warn": "/components/long_warn/long_warn",
       "my_confirm": "/components/my_confirm/my_confirm",
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
 <wxs module="filter" src="c_filter.wxs"></wxs>
 <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
   <view class="flex-vertical user_assis">
-    <image class="circle user_img" src="{{user.head_pic}}"></image>
+    <image class="circle user_img" src="{{user.head_pic}}" lazy-load="true"></image>
    <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view>
   </view>
   <view  class="caption_title white fs32 t-c">
@@ -9,7 +9,7 @@
   </view>
   <!-- 礼包图片 -->
 <view class="t-c">
-<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png">
+<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png" lazy-load="true">
 </image>
 </view>
     <view class="flex jc-center">
@@ -10,7 +10,6 @@ Page({
     url: a.url, //接口网址
     iurl: a.imghost, //图片前缀网址
     isBuy: 0,
-    getGiftID: '', //礼包id
     giftImage: '',
     giftTitle: '',
     giftDate: '',
@@ -29,39 +28,47 @@ Page({
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
     is_lb: 0, //是否有礼包
     receiveState: 0, //0未领取  1已领取
-    completeid: "",
     is_sub: 0, //判断是否重复提交
     is_libao: 0, //0轮播查看活动   1领取礼包 2.查看礼包详情
     held_id: "", //活动id
     taskId: "", //任务id
     orderSn: "", //订单号
+    is_type:"",//类型 0.轮播过来的 1.领取礼包过来的  2.查看礼包过来的
+    is_head:0,//数据是否加载完成
+    giftBagId:"",//礼包id
   },
   onLoad: function(options) {
     var th = this;
     if (options.is_libao == 0) {
       th.setData({
-        held_id: options.help_id, //options.help_id
-        taskId: options.taskId, //options.libao_id
+        held_id: options.help_id, 
+        taskId: options.taskId, 
+        is_type:0
       })
       th.help();
     }
     if (options.is_libao == 1) {
       th.setData({
-        taskId: options.libao_id,
-        held_id: options.held_id
+        giftBagId: options.libao_id,
+        is_type: 1
       })
       th.GetBuyGiftList();
     }
     if (options.order_sn) {
       th.setData({
-        orderSn: options.orderSn
+        orderSn: options.orderSn,
+        is_type: 2
       })
       th.GetMyGiftList();
     }
-    th.close();
   },
   onShow: function() {
-
+    var th = this;
+    var is_read = th.data.is_read;
+    if (is_read){
+      var nav_b = th.selectComponent("#nav_b"); //组件的id
+      nav_b.set_name("助力", "/pages/user/assistance/assistance");
+    }
   },
   //助力活动查看礼包详情调用
   help: function(e) {
@@ -78,7 +85,8 @@ Page({
       if (res.data.code == 0) {
         th.setData({
           giftImage: th.data.iurl + res.data.data.lbUrl,
-          giftTitle: res.data.data.giftTitle
+          giftTitle: res.data.data.giftTitle,
+          is_head:1
         })
         if (res.data.data.giftRemark == '') {
           th.setData({
@@ -90,22 +98,7 @@ Page({
           })
         }
  
-        // //---获取日期的时间戳---
-        // var t_endtime = res.data.data.endTime;
-        // t_endtime = t_endtime.replace(/-/g, '/');
-        // var t_date = new Date(t_endtime) / 1000;
-        // var t_now = ut.gettimestamp();
-
-        // if (res.data.data.goodsUseState) th.setData({
-        //   c_state: 1
-        // })
-        // else if (t_date <= t_now)
-        //   th.setData({
-        //     c_state: 2
-        //   })
-
         th.setData({
-          giftDate: res.data.data.endTime,
           giftPosPrice: res.data.data.giftPosPrice,
           giftQty: res.data.data.giftQty,
           giftIntegral: res.data.data.payIntegral,
@@ -145,7 +138,8 @@ Page({
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            is_head:1
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
@@ -210,9 +204,9 @@ Page({
         is_sub: 1
       })
       var json = {
-        "actId": th.data.completeid, //活动Id
+        "actId": th.data.held_id, //活动Id
         "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "giftBagId": th.data.giftID, //礼包Id
+        "giftBagId": th.data.giftBagId, //礼包Id
         "storeId": a.stoid, //商家Id
         "userId": d.user_id //用户ID
       };
@@ -248,13 +242,14 @@ Page({
       data: {
         "storeId": a.stoid, //商家ID
         "userId": d.user_id, //用户ID
-        "giftBagId": th.taskId
+        "giftBagId": th.giftBagId
       },
       success: function(res) {
         if (res.data.code == 0) {
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            is_head:1
           })
           if (res.data.data.giftRemark == '') {
  
@@ -267,7 +262,6 @@ Page({
             })
           }
           _this2.setData({
-            giftDate: res.data.data.endTime,
             giftPosPrice: res.data.data.giftPosPrice,
             giftQty: res.data.data.giftQty,
             giftIntegral: res.data.data.payIntegral,
@@ -345,6 +339,5 @@ Page({
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
-    nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy");
   }
 });
 \ No newline at end of file
 {
-  "navigationBarTitleText": "助力详情",
+  "navigationBarTitleText": "礼包详情",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
-<view class="box data-v-3a5b7e36">
+<view wx:if="{{is_head}}" class="box data-v-3a5b7e36" bindtap="close">
   <view class="box_top data-v-3a5b7e36">
     <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="giftImage"></image>
   </view>
@@ -6,7 +6,7 @@
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
-    <view wx:if="{{giftDate}}" class="top_time data-v-3a5b7e36">
+    <view wx:if="{{giftDate!=''}}" class="top_time data-v-3a5b7e36">
       <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
     </view>
     <view class="top_price data-v-3a5b7e36">
@@ -65,27 +65,30 @@
           <view class="box_ware_item_qty data-v-3a5b7e36">
             <text class="data-v-3a5b7e36 ellipsis-1">{{"数量:"+item.num}}</text>
           </view>
-          <view class="box_ware_code data-v-3a5b7e36">
-            <block wx:if="{{c_state==0}}">
-              <block wx:if="{{item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
+          <!-- 已完成方可显示 -->
+          <block wx:if="{{is_type==2}}">
+            <view class="box_ware_code data-v-3a5b7e36">
+              <block wx:if="{{c_state==0}}">
+                <block wx:if="{{item.lbType==1}}">
+                  <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
+                </block>
               </block>
-            </block>
-            <block wx:else>
-              <block wx:if="{{isBuy==0&item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
+              <block wx:else>
+                <block wx:if="{{isBuy==0&item.lbType==1}}">
+                  <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
+                </block>
               </block>
-            </block>
-            <block wx:if="{{item.lbType==2}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
-            </block>
-            <block wx:if="{{item.lbType==3}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
-            </block>
-            <block wx:if="{{item.lbType>3}}">
-              <text class="data-v-3a5b7e36">奖励已发放</text>
-            </block>
-          </view>
+              <block wx:if="{{item.lbType==2}}">
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
+              </block>
+              <block wx:if="{{item.lbType==3}}">
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
+              </block>
+              <block wx:if="{{item.lbType>3}}">
+                <text class="data-v-3a5b7e36">奖励已发放</text>
+              </block>
+            </view>
+          </block>
         </view>
       </view>
     </block>
@@ -99,21 +102,14 @@
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
-  <block wx:if="{{isBuy==0}}">
-    <view class="foot_button data-v-3a5b7e36">
-      <block wx:if="{{true}}">
-        <block wx:if="{{receiveState}}">
-          <view class="foot_button_buy data-v-3a5b7e36 overdue">
-            <text class="data-v-3a5b7e36">已领取</text>
-          </view>
-        </block>
-        <block wx:else>
-          <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive">
-            <text class="data-v-3a5b7e36">一键全部领取</text>
-          </view>
-        </block>
+  <view class="foot_button data-v-3a5b7e36">
+    <block wx:if="{{is_type!=0}}">
+      <block wx:if="{{is_type==1}}">
+        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive">
+          <text class="data-v-3a5b7e36">一键全部领取</text>
+        </view>
       </block>
-      <block wx:else>
+      <block wx:if="{{is_type==2}}">
         <block wx:if="{{is_lb!=1}}">
           <view class="foot_button_buy data-v-3a5b7e36 overdue">
             <text class="data-v-3a5b7e36">无核销商品</text>
@@ -131,8 +127,13 @@
           </view>
         </block>
       </block>
-    </view>
-  </block>
+    </block>
+    <block wx:else>
+      <view class="foot_button_buy data-v-3a5b7e36" bindtap="goto" data-url="/pages/index/index/index">
+        <text class="data-v-3a5b7e36">回到首页</text>
+      </view>
+    </block>
+  </view>
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
@@ -140,4 +141,4 @@
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b wx:if="{{is_head}}" id="nav_b"></nav_b>
 \ No newline at end of file
- @charset "UTF-8";
+@charset "UTF-8";
  
 /* Author XGQ
  * 2019-12-12
@@ -96,6 +96,7 @@
   border: 2rpx solid #999;
   width: 120rpx;
   height: 120rpx;
+  /* background-color: rgba(153, 153, 153, 0.664); */
 }
  
 .box_ware_item.data-v-3a5b7e36 {
@@ -239,6 +240,7 @@ page.data-v-3a5b7e36 {
 .foot_box_remark.data-v-3a5b7e36 .img {
   line-height: 0;
 }
-.overdue.data-v-3a5b7e36{
-  background-color: rgb(153,153,153);
-}
 \ No newline at end of file
+
+.overdue.data-v-3a5b7e36 {
+  background-color: rgb(153, 153, 153);
+}