Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 6c6b6f19 2388345c
Showing 6 changed files with 75 additions and 63 deletions
pages/giftpack/birthdaygift/birthdaygift.wxml
pages/giftpack/evaluategift/evaluategift.wxml
pages/giftpack/festival/festival.wxml
pages/user/assistance/assistance.js
pages/user/assistance/assistance.wxml
pages/user/assistance/giftpacklist.js
@@ -9,7 +9,7 @@
           <text>______</text>
         </view>
         <view class="top_box_text">
-          <text>新人专享\n你的美丽我来缔造</text>
+          <text>生日专享\n你的美丽我来缔造</text>
         </view>
         <view class="top_box_text">
           <text>______</text>
@@ -41,7 +41,7 @@
                 <text>{{item.fromName}}</text>
               </block>
               <block wx:if="{{item.lbType==3}}">
-                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                <text>{{"生日可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
               </block>
               <view class="num flex-level-right fs26">
                 <view>数量：</view>
@@ -67,7 +67,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享优惠券</text>
+            <text>生日专享优惠券</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -99,8 +99,8 @@
               </block>
               <block wx:else>
                 <view class="top_card_counte ">{{item.sum+"元券"}}</view>
-                <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
               </block>
+              <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
             </view>
           </view>
         </block>
@@ -121,7 +121,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享福利</text>
+            <text>生日专享福利</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -172,7 +172,7 @@
       </view>
     </block>
     <block wx:else>
-    <view class="foot_button_buy'}}" bindtap="GetReceive">
+      <view class="foot_button_buy'}}" bindtap="GetReceive">
         <text>一键全部领取</text>
       </view>
     </block>
@@ -9,7 +9,7 @@
           <text>______</text>
         </view>
         <view class="top_box_text">
-          <text>新人专享\n你的美丽我来缔造</text>
+          <text>评价专享\n你的美丽我来缔造</text>
         </view>
         <view class="top_box_text">
           <text>______</text>
@@ -41,7 +41,7 @@
                 <text>{{item.fromName}}</text>
               </block>
               <block wx:if="{{item.lbType==3}}">
-                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                <text>{{"评价可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
               </block>
               <view class="num flex-level-right fs26">
                 <view>数量：</view>
@@ -67,7 +67,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享优惠券</text>
+            <text>评价专享优惠券</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -94,13 +94,13 @@
                   <view class="top_card_tite_a">分类限定</view>
                 </block>
               </view>
-                <block wx:if="{{item.isPack!=null}}">
+              <block wx:if="{{item.isPack!=null}}">
                 <view class="top_card_counte">包邮券</view>
               </block>
-              <block>
-              <view class="top_card_counte ">{{item.sum+"元券"}}</view>
-              <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
+              <block wx:else>
+                <view class="top_card_counte ">{{item.sum+"元券"}}</view>
               </block>
+              <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
             </view>
           </view>
         </block>
@@ -121,7 +121,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享福利</text>
+            <text>评价专享福利</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -9,7 +9,7 @@
           <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
         </view>
         <view class="top_box_text">
-          <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享\n你的美丽我来缔造</text>
+          <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">节日专享\n你的美丽我来缔造</text>
         </view>
         <view class="top_box_text">
           <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
@@ -41,7 +41,7 @@
                 <text>{{item.fromName}}</text>
               </block>
               <block wx:if="{{item.lbType==3}}">
-                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                <text>{{"节日可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
               </block>
               <view class="num flex-level-right fs26" style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
                 <view>数量：</view>
@@ -67,7 +67,7 @@
             <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
           </view>
           <view class="top_box_text ">
-            <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享优惠券</text>
+            <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">节日专享优惠券</text>
           </view>
           <view class="top_box_text ">
             <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
@@ -94,7 +94,12 @@
                   <view class="top_card_tite_a">分类限定</view>
                 </block>
               </view>
-              <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+              <block wx:if="{{item.isPack!=null}}">
+                <view class="top_card_counte">包邮券</view>
+              </block>
+              <block wx:else>
+                <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+              </block>
               <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
             </view>
           </view>
@@ -116,7 +121,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享福利</text>
+            <text>节日专享福利</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -168,14 +168,15 @@ Page({
   // 领取礼包
   get_libao: function(e) {
-    var libao_id = e.currentTarget.dataset.libaoid;
+    var help_id = e.currentTarget.dataset.help_id;//活动id
     var taskId = e.currentTarget.dataset.taskid;//任务id
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId);
+    var id = e.currentTarget.dataset.id;//用于跳到礼包详情一键全部领取用的任务id
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId+"&id="+id);
   },
   //查看礼包id
-  select_libao: function() {
-    var orderSn = e.currentTarget.dataset.orderSn; //订单号
+  select_libao: function(e) {
+    var orderSn = e.currentTarget.dataset.ordersn; //订单号
     getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
   }
@@ -16,7 +16,7 @@
       </view>
       <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
         <view>活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
-      
+
       </view>
       <view class="flex-center" bindtap="go_task">
         <view class="flex-center take">
@@ -43,24 +43,24 @@
       <!-- 我的任务 -->
       <view wx:if="{{switch_head==0}}" class="white">
         <view class="items">
-        <view class="tesk_list">
-          <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
-            <view class="flex-center width">
-              <view class="ellipsis-1">{{item.helpTaskName}}</view>
-            </view>
+          <view class="tesk_list">
+            <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
+              <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-taskId="{{item.id}}">领取礼包</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>
+              <!-- 已完成的颜色nostate -->
+              <view class="flex-center width state" wx:if="{{item.status==1}}">
+                <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}" data-id="{{item.id}}">领取礼包</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>
+            </view>
           </view>
           <!-- 加载更多 -->
           <block wx:if="{{is_show_more==0}}">
@@ -22,7 +22,6 @@ Page({
     actTitle: '',
     getUrl: '',
     wareCard: [],
-    orderSn: "", //订单编号
     lbId: "",
     code: "", //核销码
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
@@ -31,31 +30,33 @@ Page({
     is_sub: 0, //判断是否重复提交
     is_libao: 0, //0轮播查看活动   1领取礼包 2.查看礼包详情
     held_id: "", //活动id
-    taskId: "", //任务id
+    taskId: "", //任务id用于查找礼包详情
     orderSn: "", //订单号
-    is_type:"",//类型 0.轮播过来的 1.领取礼包过来的  2.查看礼包过来的
-    is_head:0,//数据是否加载完成
-    giftBagId:"",//礼包id
+    is_type: "", //类型 0.轮播过来的 1.领取礼包过来的  2.查看礼包过来的
+    is_head: 0, //数据是否加载完成
+    giftBagId: "", //礼包id
+    id: "", //一键领取的时候使用
   },
   onLoad: function(options) {
     var th = this;
     if (options.is_libao == 0) {
       th.setData({
-        held_id: options.help_id, 
-        taskId: options.taskId, 
-        is_type:0
+        held_id: options.help_id,
+        taskId: options.taskId,
+        is_type: 0
       })
       th.help();
     }
     if (options.is_libao == 1) {
       th.setData({
-        giftBagId: options.libao_id,
+        held_id: options.help_id,
+        taskId: options.taskId,
         is_type: 1,
-        taskId: options.taskId
+        id: options.id
       })
-      th.GetBuyGiftList();
+      th.help();
     }
-    if (options.order_sn) {
+    if (options.orderSn) {
       th.setData({
         orderSn: options.orderSn,
         is_type: 2
@@ -84,16 +85,19 @@ Page({
         th.setData({
           giftImage: th.data.iurl + res.data.data.lbUrl,
           giftTitle: res.data.data.giftTitle,
-          is_head:1
+          is_head: 1
         })
         if (res.data.data.giftRemark == '') {
           th.setData({
             giftRemark: '暂无详情......'
           })
         } else {
-          th.setData({
-            giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
-          })
+          if (res.data.data.giftRemark != null && res.data.data.giftRemark != undefined && res.data.data.giftRemark != '') {
+            th.setData({
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+            })
+          }
+
         }
         th.setData({
@@ -137,16 +141,18 @@ Page({
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
             giftTitle: res.data.data.giftTitle,
-            is_head:1
+            is_head: 1
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
               giftRemark: '暂无详情......'
             })
           } else {
-            th.setData({
-              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
-            })
+            if (res.data.data.giftRemark != null && res.data.data.giftRemark != undefined && res.data.data.giftRemark != '') {
+              th.setData({
+                giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+              })
+            }
           }
           //---获取日期的时间戳---
@@ -202,9 +208,9 @@ Page({
         is_sub: 1
       })
       var json = {
-        "actId": th.data.taskId, //活动Id
+        "actId": th.data.id, //活动Id
         "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "giftBagId": th.data.giftBagId, //礼包Id
+        "giftBagId": 1, //礼包Id
         "storeId": a.stoid, //商家Id
         "userId": d.user_id //用户ID
       };
@@ -247,7 +253,7 @@ Page({
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
             giftTitle: res.data.data.giftTitle,
-            is_head:1
+            is_head: 1
           })
           if (res.data.data.giftRemark == '') {