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

WXD-SEASON\season
2 parents d314ac41 ae010287
Showing 2 changed files with 214 additions and 25 deletions
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
@@ -7,6 +7,7 @@ var ut = require(&quot;../../../../../utils/util.js&quot;);
 var com = require("../public/buy_com.js");
 const i = require("../../../../../utils/util.js");
+
 Page({
     data: {
         url: a.url, //接口网址
@@ -77,11 +78,13 @@ Page({
         is_receive:0,
         screenWidth: 0,
         monthgiftbag:{},
+        scene:"",
     },
     onLoad: function (options) {
         var th = this;
-
+        console.log('分享参数---');
+        console.log(options);
         this.setData({
             params: options,
         })
@@ -110,24 +113,33 @@ Page({
         let monthgiftbag=wx.getStorageSync('monthgiftbag')
         let monthgiftba_defpick=wx.getStorageSync('monthgiftba_defpick')
-
         var now = ut.gettimestamp();
         var isStart=0;
         // var str = res.data.data.starTime;
-        var start = monthgiftbag.begindate;
+        // if (start < now) isStart = 1;
         // 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
+        // if (options && options.id) {
+        //   this.getList()
+        // }
+        // if (monthgiftbag) {       
+        //   var start = monthgiftbag.begindate;
+        //   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,
+        // this.setData({
+          // isStart,
+          // monthgiftbag,
+          // sele_g:monthgiftbag,
           // def_pick_store:monthgiftba_defpick
-        })
-
+        // })
+          let scene = wx.getLaunchOptionsSync().scene;
+          if (scene==1154) {
+            this.setData({
+              scene
+            })
+            this.getList2()
+          }
     },
     init() {
         let options = this.data?.params; // this.data == null ? undefined:this.data.params
@@ -197,6 +209,151 @@ Page({
         // }
     },
+    logTab(){
+      wx.navigateTo({
+        url: '/packageE/pages/togoin/togoin',
+      })
+    },
+    getList: function (e) {
+      var th = this;
+      getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
+        isShowLoading: true,
+        data: {
+          store_id: a.stoid, //商家ID
+          user_id: d.user_id, //用户ID
+          page: 1,
+          pageSize: 10,
+          is_end:0,
+          timetype:1,
+          id:th.data.params.id
+        },
+        success: function (res) {
+          if (res.data.code == 0) {
+            th.data.curpage++;
+            // var arr1 = th.data.wareCard;
+            var arr2 = res.data.data.pageData;
+            for (let j = 0; j < arr2.length; j++) {
+                // arr2[j].starTime1=Date.parse(new Date(arr2[j].begindate.replace(/-/g, "/")))/1000
+                arr2[j].starTime1=arr2[j].begindate
+                arr2[j].starTime=i.formatTime(arr2[j].begindate, "yyyy-MM-dd hh:mm:ss");
+                arr2[j].endTime=i.formatTime(arr2[j].enddate, "yyyy-MM-dd hh:mm:ss");
+                arr2[j].giftPosPrice=arr2[j].oldPrice
+                arr2[j].payMoney=arr2[j].lbPrice
+                arr2[j].payIntegral=arr2[j].exchangeIntegral
+                arr2[j].giftQty=arr2[j].buynum
+                arr2[j].cover_img=arr2[j].imageurl
+                arr2[j].giftTitle=arr2[j].act_name
+                arr2[j].virtualsales=arr2[j].virtualSales
+                arr2[j].lbnum=arr2[j].lbNum
+            }
+            if(arr2.length>0){
+              var monthgiftbag =arr2[0];
+              var ismore = 0;
+              // if (arr3.length == res.data.data.total) ismore = 1
+              var isStart=0;
+              if (monthgiftbag) {       
+                var start = monthgiftbag.begindate;
+                let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+                monthgiftbag.remark=remark
+                var now = ut.gettimestamp();
+                if (start < now) isStart = 1;
+              }
+
+
+              th.setData({
+                isStart,
+                monthgiftbag: monthgiftbag,
+                sele_g: monthgiftbag,
+              })
+              th.init()
+            }else{
+              wx.showModal({
+                title: '提示',
+                content:'会员身份不符，暂时无法参与',
+                showCancel:false,
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    wx.reLaunch({
+                      url: '/pages/index/index/index'
+                    })
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                  }
+                }
+              })
+              
+              // th.setData({
+              //   qx_msg:'活动对象未符合，不能参与'
+              // })
+            }
+          } else {
+            getApp().my_warnning("获取活动失败", 0, th);
+          }
+        }
+      })
+  
+    },
+    getList2: function (e) {
+      var th = this;
+      getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
+        isShowLoading: true,
+        data: {
+          store_id: a.stoid, //商家ID
+          // user_id: d.user_id, //用户ID
+          page: 1,
+          pageSize: 10,
+          is_end:0,
+          timetype:1,
+          id:th.data.params.id
+        },
+        success: function (res) {
+          if (res.data.code == 0) {
+            th.data.curpage++;
+            // var arr1 = th.data.wareCard;
+            var arr2 = res.data.data.pageData;
+            for (let j = 0; j < arr2.length; j++) {
+                // arr2[j].starTime1=Date.parse(new Date(arr2[j].begindate.replace(/-/g, "/")))/1000
+                arr2[j].starTime1=arr2[j].begindate
+                arr2[j].starTime=i.formatTime(arr2[j].begindate, "yyyy-MM-dd hh:mm:ss");
+                arr2[j].endTime=i.formatTime(arr2[j].enddate, "yyyy-MM-dd hh:mm:ss");
+                arr2[j].giftPosPrice=arr2[j].oldPrice
+                arr2[j].payMoney=arr2[j].lbPrice
+                arr2[j].payIntegral=arr2[j].exchangeIntegral
+                arr2[j].giftQty=arr2[j].buynum
+                arr2[j].cover_img=arr2[j].imageurl
+                arr2[j].giftTitle=arr2[j].act_name
+                arr2[j].virtualsales=arr2[j].virtualSales
+                arr2[j].lbnum=arr2[j].lbNum
+            }
+            if(arr2.length>0){
+              var monthgiftbag =arr2[0];
+              var ismore = 0;
+              // if (arr3.length == res.data.data.total) ismore = 1
+              var isStart=0;
+              if (monthgiftbag) {       
+                var start = monthgiftbag.begindate;
+                let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+                monthgiftbag.remark=remark
+                var now = ut.gettimestamp();
+                if (start < now) isStart = 1;
+              }
+
+
+              th.setData({
+                isStart,
+                monthgiftbag: monthgiftbag,
+                sele_g: monthgiftbag,
+              })
+              th.init()
+            }
+          } else {
+            getApp().my_warnning("获取活动失败", 0, th);
+          }
+        }
+      })
+  
+    },
     onShow: function () {
         var th=this;
@@ -210,7 +367,7 @@ Page({
                 getApp().goto('/packageE/pages/togoin/togoin');
                 return false;
             }
-            this.init();
+            this.getList();
         })
         setTimeout(()=>{
@@ -231,6 +388,19 @@ Page({
     GetBuyPrice: function (e) {
         var that = this.data;
         var th = this;
+        let scene =this.data.scene;
+        if (scene==1154) {
+          wx.navigateTo({
+            url: '/packageE/pages/togoin/togoin',
+          })
+          return
+        }
+
+        if (!d || !d.user_id ) {
+            getApp().my_warnning("请先登录", 0, th);
+            return false;
+        
+        }
         //如果还没有开始的话
         if (th.data.isStart != 1) {
             getApp().my_warnning("活动还没有开始", 0, th);
@@ -266,6 +436,18 @@ Page({
     GetBuyIntegral: function (e) {
         var that = this.data;
         var th = this;
+        let scene =this.data.scene;
+        if (scene==1154) {
+          wx.navigateTo({
+            url: '/packageE/pages/togoin/togoin',
+          })
+          return
+        }
+        if (!d || !d.user_id ) {
+            getApp().my_warnning("请先登录", 0, th);
+            return false;
+        
+        }
         //如果还没有开始的话
         if (th.data.isStart != 1) {
@@ -675,7 +857,7 @@ Page({
     onShareTimeline() {
         getApp().globalData.no_clear = 1;
-        var pagePath = "&isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader=" + this.data.getUserID;
+        var pagePath = "&isBuy=1" + "&id=" + this.data.options.id + "&first_leader=" + this.data.getUserID;
         var user_id = getApp().globalData.user_id;
         if (!user_id) user_id = 0;
@@ -62,8 +62,8 @@
     </view>
-    <view class="top_foot data-v-3a5b7e36">
-      <view class="top_foot_price data-v-3a5b7e36 no_line_x">
+    <view class="top_foot data-v-3a5b7e36" wx:if="{{monthgiftbag.oldPrice}}">
+      <view class="top_foot_price data-v-3a5b7e36 no_line_x" >
         <text class="data-v-3a5b7e36"> {{monthgiftbag.oldPrice?'零售价：':''}}{{monthgiftbag.oldPrice+"元"}}</text>
       </view>
       <!-- <view class="top_foot_qty data-v-3a5b7e36">
@@ -150,11 +150,11 @@
 		<view class="foot_empty data-v-3a5b7e36"></view>
 	<block wx:if="{{flag != 1}}">
-		<block wx:if="{{isBuy==1 && monthgiftbag.giftTitle}}">
+		<block wx:if="{{getUserID && monthgiftbag.giftTitle}}">
 		  <block wx:if="{{isStart==1}}">
 		    <view class="foot_button data-v-3a5b7e36">
 		      <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral>0}}">
-		        <view class="foot_button_left data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
+		        <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_left data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
 		          <text class="data-v-3a5b7e36  ">立即购买</text>
 		        </view>
 		        <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
@@ -162,12 +162,12 @@
 		        </view>
 		      </block>
 		      <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral<=0}}">
-		        <view class="foot_button_buy data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
+		        <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_buy data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
 		          <text class="data-v-3a5b7e36">立即购买</text>
 		        </view>
 		      </block>
 		      <block wx:if="{{monthgiftbag.lbPrice<=0 && monthgiftbag.payIntegral>0}}">
-		         <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
+		         <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
 		            <text class="data-v-3a5b7e36">立即兑换</text>
 		         </view>
 		      </block>
@@ -190,11 +190,18 @@
 		  </block>
 		</block>
-		<block wx:if="{{isBuy==0}}">
+    <block wx:else>
+      <view class="foot_button data-v-3a5b7e36">
+		        <view style="{{ 'background:#b9b5b5'}}" class="foot_button_left data-v-3a5b7e36 " catchtap="logTab" data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" >
+		          <text class="data-v-3a5b7e36  ">请先登录</text>
+		        </view>
+		    </view>
+    </block>
+		<!-- <block wx:if="{{isBuy==0}}">
 		  <view class="foot_button data-v-3a5b7e36">
 		    <block wx:if="{{is_lb!=1}}">
-		      <view class="foot_button_buy data-v-3a5b7e36 overdue">
-		        <text class="data-v-3a5b7e36">无核销商品</text>
+		      <view class="foot_button_buy data-v-3a5b7e36 overdue"  wx:if="{{!getUserID && scene==1154}}">
+		        <text class="data-v-3a5b7e36">请先登录</text>
 		      </view>
 		    </block>
 		    <block wx:else>
@@ -212,7 +219,7 @@
 		      </view>
 		    </block>
 		  </view>
-		</block>
+		</block> -->
 	</block>
 </view>