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

WXD-SEASON\season
2 parents 6536d2b5 6d937f4a
Showing 4 changed files with 28 additions and 8 deletions
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
@@ -331,6 +331,7 @@ Page({
     var url = e.currentTarget.dataset.url;
     var index=e.currentTarget.dataset.index
     console.log(url);
+    wx.setStorageSync('monthgiftba_defpick', th.data.def_pick_store)
     wx.setStorageSync('monthgiftbag', th.data.wareCard[index])
     getApp().goto(url);
@@ -50,18 +50,21 @@
 						<text class="ellipsis-1">{{"零售价：￥"+items.giftPosPrice}}</text>
 					</view>
           <block wx:if="{{items.is_show}}">
-              <view wx:if="{{ now < items.starTime1 }}" class="content_ware_time">
+            <view wx:if="{{ now < items.starTime1 }}" class="content_ware_time">
               <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
             </view>
             <view wx:else class="content_ware_time">
               <text class="ellipsis-1">{{"活动结束时间："+items.endTime}}</text>
             </view>
           </block>
+          <view wx:else class="content_ware_time">
+              <text class="ellipsis-1">{{"活动结束时间："+items.endTime}}</text>
+            </view>
 				</view>
 			</view>
 			<view class="content_box_button">
 				<view class="box_button_remark">
-					<text>{{"已售:"+items.giftQty+"件"}}</text>
+					<text>{{"已售:"+(items.giftQty+items.virtualSales)+"件"}}</text>
 				</view>
 				<block wx:if="{{now > items.starTime1}}">
 					<view class="flex-vertical">
@@ -97,7 +97,7 @@ Page({
                 is_retail_price: json_d.is_retail_price || 0
             });
         })
-
+        // com.get_sto(th,os)
         //获取用户设备信息，屏幕宽度
         wx.getSystemInfo({
             success: res => {
@@ -108,6 +108,7 @@ Page({
         });
         let monthgiftbag=wx.getStorageSync('monthgiftbag')
+        let monthgiftba_defpick=wx.getStorageSync('monthgiftba_defpick')
         var now = ut.gettimestamp();
         var isStart=0;
@@ -115,10 +116,15 @@ Page({
         var start = monthgiftbag.begindate;
         // start = start / 1000;
         if (start < now) isStart = 1;
+
+        let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+        monthgiftbag.remark=remark
+
         this.setData({
           isStart,
           monthgiftbag,
-          sele_g:monthgiftbag
+          sele_g:monthgiftbag,
+          // def_pick_store:monthgiftba_defpick
         })
     },
@@ -166,8 +172,18 @@ Page({
             })
         }
         th.close();
-
-
+        
+        //-- 检测一下有没有门店 --
+        th.check_guide(function (){
+          com.wait_for_store_config(th);
+          com.set_user_mo_store(th, os, function () {
+              if (th.data.sele_g.pickup_list && th.data.def_pick_store) {
+                  com.check_def_pk(th);
+              }
+          });
+          com.get_sto(th, os);
+      })
+        // this.GetBuyGiftList();
         // if (this.data.flag == 1) {
         //     this.getZxlbDetails();
         // } else {
@@ -399,13 +399,13 @@ Page({
                         giftTitle: res.data.data.lbTitle,
                         default_color: res.data.data.bgcolor
                     })
-                    if (!res.data.data.giftRemark) {
+                    if (!res.data.data.lbIntro) {
                         _this2.setData({
                             giftRemark: '暂无详情......'
                         })
                     } else {
                         _this2.setData({
-                            giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+                            giftRemark: res.data.data.lbIntro.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
                         })
                     }