wxd / MShopWeApp

Commit a5119954fd4778bbe59ea9f31b5be80e6d3f2dc5

Authored by WXD-SEASON\season
2 parents d314ac41 ae010287

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

Inline Side-by-side
Showing 2 changed files with 214 additions and 25 deletions
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
  View file @a511995
... ... @@ -7,6 +7,7 @@ var ut = require("../../../../../utils/util.js");
7 7 var com = require("../public/buy_com.js");
8 8 const i = require("../../../../../utils/util.js");
9 9  
  10 +
10 11 Page({
11 12 data: {
12 13 url: a.url, //接口网址
... ... @@ -77,11 +78,13 @@ Page({
77 78 is_receive:0,
78 79 screenWidth: 0,
79 80 monthgiftbag:{},
  81 + scene:"",
80 82 },
81 83 onLoad: function (options) {
82 84  
83 85 var th = this;
84   -
  86 + console.log('分享参数---');
  87 + console.log(options);
85 88 this.setData({
86 89 params: options,
87 90 })
... ... @@ -110,24 +113,33 @@ Page({
110 113  
111 114 let monthgiftbag=wx.getStorageSync('monthgiftbag')
112 115 let monthgiftba_defpick=wx.getStorageSync('monthgiftba_defpick')
113   -
114 116 var now = ut.gettimestamp();
115 117 var isStart=0;
116 118 // var str = res.data.data.starTime;
117   - var start = monthgiftbag.begindate;
  119 + // if (start < now) isStart = 1;
118 120 // start = start / 1000;
119   - if (start < now) isStart = 1;
120   -
121   - let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
122   - monthgiftbag.remark=remark
  121 + // if (options && options.id) {
  122 + // this.getList()
  123 + // }
  124 + // if (monthgiftbag) {
  125 + // var start = monthgiftbag.begindate;
  126 + // let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
  127 + // monthgiftbag.remark=remark
  128 + // }
123 129  
124   - this.setData({
125   - isStart,
126   - monthgiftbag,
127   - sele_g:monthgiftbag,
  130 + // this.setData({
  131 + // isStart,
  132 + // monthgiftbag,
  133 + // sele_g:monthgiftbag,
128 134 // def_pick_store:monthgiftba_defpick
129   - })
130   -
  135 + // })
  136 +   let scene = wx.getLaunchOptionsSync().scene;
  137 + if (scene==1154) {
  138 + this.setData({
  139 + scene
  140 + })
  141 + this.getList2()
  142 + }
131 143 },
132 144 init() {
133 145 let options = this.data?.params; // this.data == null ? undefined:this.data.params
... ... @@ -197,6 +209,151 @@ Page({
197 209 // }
198 210  
199 211 },
  212 + logTab(){
  213 + wx.navigateTo({
  214 + url: '/packageE/pages/togoin/togoin',
  215 + })
  216 + },
  217 + getList: function (e) {
  218 + var th = this;
  219 + getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
  220 + isShowLoading: true,
  221 + data: {
  222 + store_id: a.stoid, //商家ID
  223 + user_id: d.user_id, //用户ID
  224 + page: 1,
  225 + pageSize: 10,
  226 + is_end:0,
  227 + timetype:1,
  228 + id:th.data.params.id
  229 + },
  230 + success: function (res) {
  231 + if (res.data.code == 0) {
  232 + th.data.curpage++;
  233 + // var arr1 = th.data.wareCard;
  234 + var arr2 = res.data.data.pageData;
  235 + for (let j = 0; j < arr2.length; j++) {
  236 + // arr2[j].starTime1=Date.parse(new Date(arr2[j].begindate.replace(/-/g, "/")))/1000
  237 + arr2[j].starTime1=arr2[j].begindate
  238 + arr2[j].starTime=i.formatTime(arr2[j].begindate, "yyyy-MM-dd hh:mm:ss");
  239 + arr2[j].endTime=i.formatTime(arr2[j].enddate, "yyyy-MM-dd hh:mm:ss");
  240 + arr2[j].giftPosPrice=arr2[j].oldPrice
  241 + arr2[j].payMoney=arr2[j].lbPrice
  242 + arr2[j].payIntegral=arr2[j].exchangeIntegral
  243 + arr2[j].giftQty=arr2[j].buynum
  244 + arr2[j].cover_img=arr2[j].imageurl
  245 + arr2[j].giftTitle=arr2[j].act_name
  246 + arr2[j].virtualsales=arr2[j].virtualSales
  247 + arr2[j].lbnum=arr2[j].lbNum
  248 + }
  249 + if(arr2.length>0){
  250 + var monthgiftbag =arr2[0];
  251 + var ismore = 0;
  252 + // if (arr3.length == res.data.data.total) ismore = 1
  253 + var isStart=0;
  254 + if (monthgiftbag) {
  255 + var start = monthgiftbag.begindate;
  256 + let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
  257 + monthgiftbag.remark=remark
  258 + var now = ut.gettimestamp();
  259 + if (start < now) isStart = 1;
  260 + }
  261 +
  262 +
  263 + th.setData({
  264 + isStart,
  265 + monthgiftbag: monthgiftbag,
  266 + sele_g: monthgiftbag,
  267 + })
  268 + th.init()
  269 + }else{
  270 + wx.showModal({
  271 + title: '提示',
  272 + content:'会员身份不符，暂时无法参与',
  273 + showCancel:false,
  274 + success (res) {
  275 + if (res.confirm) {
  276 + console.log('用户点击确定')
  277 + wx.reLaunch({
  278 + url: '/pages/index/index/index'
  279 + })
  280 + } else if (res.cancel) {
  281 + console.log('用户点击取消')
  282 + }
  283 + }
  284 + })
  285 +
  286 + // th.setData({
  287 + // qx_msg:'活动对象未符合，不能参与'
  288 + // })
  289 + }
  290 + } else {
  291 + getApp().my_warnning("获取活动失败", 0, th);
  292 + }
  293 + }
  294 + })
  295 +
  296 + },
  297 + getList2: function (e) {
  298 + var th = this;
  299 + getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
  300 + isShowLoading: true,
  301 + data: {
  302 + store_id: a.stoid, //商家ID
  303 + // user_id: d.user_id, //用户ID
  304 + page: 1,
  305 + pageSize: 10,
  306 + is_end:0,
  307 + timetype:1,
  308 + id:th.data.params.id
  309 + },
  310 + success: function (res) {
  311 + if (res.data.code == 0) {
  312 + th.data.curpage++;
  313 + // var arr1 = th.data.wareCard;
  314 + var arr2 = res.data.data.pageData;
  315 + for (let j = 0; j < arr2.length; j++) {
  316 + // arr2[j].starTime1=Date.parse(new Date(arr2[j].begindate.replace(/-/g, "/")))/1000
  317 + arr2[j].starTime1=arr2[j].begindate
  318 + arr2[j].starTime=i.formatTime(arr2[j].begindate, "yyyy-MM-dd hh:mm:ss");
  319 + arr2[j].endTime=i.formatTime(arr2[j].enddate, "yyyy-MM-dd hh:mm:ss");
  320 + arr2[j].giftPosPrice=arr2[j].oldPrice
  321 + arr2[j].payMoney=arr2[j].lbPrice
  322 + arr2[j].payIntegral=arr2[j].exchangeIntegral
  323 + arr2[j].giftQty=arr2[j].buynum
  324 + arr2[j].cover_img=arr2[j].imageurl
  325 + arr2[j].giftTitle=arr2[j].act_name
  326 + arr2[j].virtualsales=arr2[j].virtualSales
  327 + arr2[j].lbnum=arr2[j].lbNum
  328 + }
  329 + if(arr2.length>0){
  330 + var monthgiftbag =arr2[0];
  331 + var ismore = 0;
  332 + // if (arr3.length == res.data.data.total) ismore = 1
  333 + var isStart=0;
  334 + if (monthgiftbag) {
  335 + var start = monthgiftbag.begindate;
  336 + let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
  337 + monthgiftbag.remark=remark
  338 + var now = ut.gettimestamp();
  339 + if (start < now) isStart = 1;
  340 + }
  341 +
  342 +
  343 + th.setData({
  344 + isStart,
  345 + monthgiftbag: monthgiftbag,
  346 + sele_g: monthgiftbag,
  347 + })
  348 + th.init()
  349 + }
  350 + } else {
  351 + getApp().my_warnning("获取活动失败", 0, th);
  352 + }
  353 + }
  354 + })
  355 +
  356 + },
200 357  
201 358 onShow: function () {
202 359 var th=this;
... ... @@ -210,7 +367,7 @@ Page({
210 367 getApp().goto('/packageE/pages/togoin/togoin');
211 368 return false;
212 369 }
213   - this.init();
  370 + this.getList();
214 371 })
215 372  
216 373 setTimeout(()=>{
... ... @@ -231,6 +388,19 @@ Page({
231 388 GetBuyPrice: function (e) {
232 389 var that = this.data;
233 390 var th = this;
  391 + let scene =this.data.scene;
  392 + if (scene==1154) {
  393 + wx.navigateTo({
  394 + url: '/packageE/pages/togoin/togoin',
  395 + })
  396 + return
  397 + }
  398 +
  399 + if (!d || !d.user_id ) {
  400 + getApp().my_warnning("请先登录", 0, th);
  401 + return false;
  402 +
  403 + }
234 404 //如果还没有开始的话
235 405 if (th.data.isStart != 1) {
236 406 getApp().my_warnning("活动还没有开始", 0, th);
... ... @@ -266,6 +436,18 @@ Page({
266 436 GetBuyIntegral: function (e) {
267 437 var that = this.data;
268 438 var th = this;
  439 + let scene =this.data.scene;
  440 + if (scene==1154) {
  441 + wx.navigateTo({
  442 + url: '/packageE/pages/togoin/togoin',
  443 + })
  444 + return
  445 + }
  446 + if (!d || !d.user_id ) {
  447 + getApp().my_warnning("请先登录", 0, th);
  448 + return false;
  449 +
  450 + }
269 451  
270 452 //如果还没有开始的话
271 453 if (th.data.isStart != 1) {
... ... @@ -675,7 +857,7 @@ Page({
675 857 onShareTimeline() {
676 858 getApp().globalData.no_clear = 1;
677 859  
678   - var pagePath = "&isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader=" + this.data.getUserID;
  860 + var pagePath = "&isBuy=1" + "&id=" + this.data.options.id + "&first_leader=" + this.data.getUserID;
679 861 var user_id = getApp().globalData.user_id;
680 862 if (!user_id) user_id = 0;
681 863  
... ...
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
  View file @a511995
... ... @@ -62,8 +62,8 @@
62 62  
63 63  
64 64 </view>
65   - <view class="top_foot data-v-3a5b7e36">
66   - <view class="top_foot_price data-v-3a5b7e36 no_line_x">
  65 + <view class="top_foot data-v-3a5b7e36" wx:if="{{monthgiftbag.oldPrice}}">
  66 + <view class="top_foot_price data-v-3a5b7e36 no_line_x" >
67 67 <text class="data-v-3a5b7e36"> {{monthgiftbag.oldPrice?'零售价：':''}}{{monthgiftbag.oldPrice+"元"}}</text>
68 68 </view>
69 69 <!-- <view class="top_foot_qty data-v-3a5b7e36">
... ... @@ -150,11 +150,11 @@
150 150 <view class="foot_empty data-v-3a5b7e36"></view>
151 151  
152 152 <block wx:if="{{flag != 1}}">
153   - <block wx:if="{{isBuy==1 && monthgiftbag.giftTitle}}">
  153 + <block wx:if="{{getUserID && monthgiftbag.giftTitle}}">
154 154 <block wx:if="{{isStart==1}}">
155 155 <view class="foot_button data-v-3a5b7e36">
156 156 <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral>0}}">
157   - <view class="foot_button_left data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
  157 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_left data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
158 158 <text class="data-v-3a5b7e36 ">立即购买</text>
159 159 </view>
160 160 <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
... ... @@ -162,12 +162,12 @@
162 162 </view>
163 163 </block>
164 164 <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral<=0}}">
165   - <view class="foot_button_buy data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
  165 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_buy data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
166 166 <text class="data-v-3a5b7e36">立即购买</text>
167 167 </view>
168 168 </block>
169 169 <block wx:if="{{monthgiftbag.lbPrice<=0 && monthgiftbag.payIntegral>0}}">
170   - <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
  170 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
171 171 <text class="data-v-3a5b7e36">立即兑换</text>
172 172 </view>
173 173 </block>
... ... @@ -190,11 +190,18 @@
190 190 </block>
191 191  
192 192 </block>
193   - <block wx:if="{{isBuy==0}}">
  193 + <block wx:else>
  194 + <view class="foot_button data-v-3a5b7e36">
  195 + <view style="{{ 'background:#b9b5b5'}}" class="foot_button_left data-v-3a5b7e36 " catchtap="logTab" data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" >
  196 + <text class="data-v-3a5b7e36 ">请先登录</text>
  197 + </view>
  198 + </view>
  199 + </block>
  200 + <!-- <block wx:if="{{isBuy==0}}">
194 201 <view class="foot_button data-v-3a5b7e36">
195 202 <block wx:if="{{is_lb!=1}}">
196   - <view class="foot_button_buy data-v-3a5b7e36 overdue">
197   - <text class="data-v-3a5b7e36">无核销商品</text>
  203 + <view class="foot_button_buy data-v-3a5b7e36 overdue" wx:if="{{!getUserID && scene==1154}}">
  204 + <text class="data-v-3a5b7e36">请先登录</text>
198 205 </view>
199 206 </block>
200 207 <block wx:else>
... ... @@ -212,7 +219,7 @@
212 219 </view>
213 220 </block>
214 221 </view>
215   - </block>
  222 + </block> -->
216 223 </block>
217 224  
218 225 </view>
... ...