wxd / MShopWeApp

Commit 126031bde87a57f4cea7cefd0e6834bb04b29c6a

Authored by abson
2 parents 1a452603 6dc65d68

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

Inline Side-by-side
Showing 5 changed files with 190 additions and 94 deletions
... ... @@ -671,24 +671,30 @@ App({
671 671  
672 672 //清空登录时候缓存的值
673 673 onHide: function () {
674   - if(!this.globalData.no_clear) {
675   - this.globalData.is_test = 0;
676   - this.globalData.guide_id = null; //导购清空
677   - this.globalData.first_leader = null; //分享的会员清空
678   - this.globalData.wuliu = null; //关闭要把物流清空
679   - this.globalData.room_id = null; //关闭要把房间号关闭
680   - this.globalData.room_goods_id = null; //关闭要把物流清空
681   - this.globalData.config2 = null; //清除config2的缓存
682   - this.globalData.config = null; //清除config的缓存
683   - this.globalData.gr_index = 0; //商品分组的序列
684   - this.globalData.pk_store = null;
685   - this.globalData.wxapp_buy_obj = null;
686   - this.globalData.dis_buy_obj = null; //等级卡的购买记录
687   - this.globalData.storeFooter = null; //底部的导航
688   - this.globalData.full_screen = null; //全屏
689   - }else{
690   - this.globalData.no_clear=0;
691   - }
  674 + var th=this;
  675 + setTimeout(function () {
  676 + console.log("app onhide");
  677 + console.log(th.globalData.no_clear);
  678 + if(!th.globalData.no_clear) {
  679 + th.globalData.is_test = 0;
  680 + th.globalData.guide_id = null; //导购清空
  681 + th.globalData.first_leader = null; //分享的会员清空
  682 + th.globalData.wuliu = null; //关闭要把物流清空
  683 + th.globalData.room_id = null; //关闭要把房间号关闭
  684 + th.globalData.room_goods_id = null; //关闭要把物流清空
  685 + th.globalData.config2 = null; //清除config2的缓存
  686 + th.globalData.config = null; //清除config的缓存
  687 + th.globalData.gr_index = 0; //商品分组的序列
  688 + th.globalData.pk_store = null;
  689 + th.globalData.wxapp_buy_obj = null;
  690 + th.globalData.dis_buy_obj = null; //等级卡的购买记录
  691 + th.globalData.storeFooter = null; //底部的导航
  692 + th.globalData.full_screen = null; //全屏
  693 + }else{
  694 + th.globalData.no_clear=0;
  695 + }
  696 + },600)
  697 +
692 698 },
693 699  
694 700 clear_word: function (word) {
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @126031b
... ... @@ -211,6 +211,8 @@ Page({
211 211 prom_r_null: 0,
212 212  
213 213 hiddenCS: true, //控制客服操作菜单显示和控制
  214 +
  215 + openSpecModal_flash_normal: 0,
214 216 },
215 217  
216 218 //------初始化加载----------
... ... @@ -281,14 +283,15 @@ Page({
281 283 }
282 284 })
283 285 }
  286 +
284 287 var c_guide_id=t.c_guide_id;
285 288 if(c_guide_id){
286 289 th.data.c_guide_id=c_guide_id;
287 290 }
288 291  
289   - getApp().getConfig(function(e) {
290   - ee.setData({sto_sele_name_1:e.store_name})
291   - })
  292 + getApp().getConfig(function(e) {
  293 + ee.setData({sto_sele_name_1:e.store_name})
  294 + })
292 295  
293 296 //----获取系统参数-----
294 297 getApp().getConfig2(function (e) {
... ... @@ -453,12 +456,13 @@ Page({
453 456  
454 457 });
455 458  
456   - },
  459 +
  460 + },
457 461  
458 462  
459 463 onReady() {
460   -
461   - setTimeout(()=>{
  464 + // 用于控制保障服务折叠图标的显示
  465 + setTimeout(() => {
462 466 wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
463 467  
464 468 if(res.length != 0) {
... ... @@ -922,7 +926,7 @@ Page({
922 926 newd['prom_price'] = this.data.prom_price;
923 927 };
924 928  
925   - if(this.data.prom_act.is_shop_buy) {
  929 + if(this.data.prom_act.is_shop_buy&& this.data.prom_r_null == 1) {
926 930 newd['prom_type'] = 0;
927 931 newd['prom_price'] = this.data.data.shop_price;
928 932 };
... ... @@ -1037,11 +1041,9 @@ Page({
1037 1041 var th = this;
1038 1042  
1039 1043 // if(this.data.prom_act.is_shop_buy && this.data.options.prom_type != 1) {
1040   - // if(th.data.is_normal) {
1041 1044  
1042   - if(t<=0) return false;
1043   - th.setData({goodsInputNum:t});
1044   - // } else {
  1045 + if(t == 0) return false;
  1046 + // th.setData({goodsInputNum:t});
1045 1047  
1046 1048 if(this.data.options.prom_type == 1 && !this.data.openSpecModal_flash_normal) {
1047 1049  
... ... @@ -1050,7 +1052,7 @@ Page({
1050 1052  
1051 1053 //--判断商品是否超出限购--
1052 1054 // if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
1053   - if(!th.data.prom_act.is_shop_buy) {
  1055 + // if(!th.data.prom_act.is_shop_buy) {
1054 1056  
1055 1057 if (th.data.sele_g.viplimited > 0) {
1056 1058 var gd_buy_num = th.data.sele_g.buy_num;
... ... @@ -1065,9 +1067,9 @@ Page({
1065 1067 th.setData({goodsInputNum: num})
1066 1068 return false;
1067 1069 }
1068   - }
  1070 + };
1069 1071  
1070   - };
  1072 + // };
1071 1073  
1072 1074  
1073 1075 //如果是普通购买的情况下
... ... @@ -1105,7 +1107,7 @@ Page({
1105 1107 return false;
1106 1108 }
1107 1109 }
1108   - var e = th.data.sele_g.store_count;
  1110 + var e = th.data.sele_g.goods_num;
1109 1111 var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4
1110 1112 if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) {
1111 1113 if (!th.data.def_pick_store) {
... ... @@ -3123,7 +3125,7 @@ Page({
3123 3125 isshow: 1,
3124 3126 });
3125 3127 // this.get_sku(os.stoid, this.data.data, gid);
3126   - // this.get_sto();
  3128 + this.get_sto();
3127 3129 // this.check_is_youhui(gid, 1);
3128 3130 this.data.is_normal = 1;
3129 3131 },
... ... @@ -3155,20 +3157,19 @@ Page({
3155 3157 if (!user_id) user_id = 0;
3156 3158  
3157 3159 if (prom_type == 1 && prom_id == 0) {
3158   - // this.setData({
3159   - // prom_type: 0, isshow: 1,
3160   - // });
3161   -
3162   - // //获取门店
3163   - // this.get_sto();
3164   - // this.get_sku(o.stoid, this.data.data, gid);
3165   - // this.check_has_flash();
3166   - // this.data.is_normal = 1;
3167   - // this.check_is_youhui(gid, 1);
3168   - // return false;
  3160 + this.setData({
  3161 + prom_type: 0, isshow: 1,
  3162 + });
  3163 +
  3164 + //获取门店
  3165 + this.get_sto();
  3166 + // this.get_sku(o.stoid, this.data.data, gid);
  3167 + this.check_has_flash();
  3168 + this.data.is_normal = 1;
  3169 + // this.check_is_youhui(gid, 1);
  3170 + return false;
3169 3171 }
3170 3172  
3171   - //if (prom_type != 3 && prom_type!=0){
3172 3173 //---判断秒杀----
3173 3174 if (prom_type == 1 && prom_id > 0) {
3174 3175 //-------判断活动是否抢光---------
... ... @@ -3362,51 +3363,81 @@ Page({
3362 3363  
3363 3364 //-------------获取购买数量的总函数----------------
3364 3365 get_buy_num: function (gd, func) {
3365   -
3366   - var th = this,
3367   - user_id = getApp().globalData.user_id;
3368   -
3369   -
  3366 + // var map = this.data.g_buy_num,
  3367 + var th = this,
  3368 + user_id = getApp().globalData.user_id;
  3369 + if (user_id == null) {
  3370 + // map.set(gd.goods_id, 0);
  3371 + th.setData({
  3372 + // g_buy_num: map,
  3373 + prom_buy_num: 0,
  3374 + });
  3375 + "function" == typeof func && func();
  3376 + return false;
  3377 + }
  3378 +
  3379 + // if (map.has(gd.goods_id)) {
  3380 + // "function" == typeof func && func();
  3381 + // } else {
3370 3382 //----获取商品购买数----
3371 3383 getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
3372 3384 data: {
3373 3385 store_id: os.stoid,
3374 3386 user_id: user_id,
3375   - goods_id: this.data.gid,
  3387 + goods_id: gd.goods_id
3376 3388 },
3377 3389 success: function (t) {
3378 3390 if (t.data.code == 0) {
3379   - var g_buy_num = t.data.data.goodsbuynum;
  3391 + // var g_buy_num = t.data.data.goodsbuynum;
3380 3392  
3381   - // 如果是秒杀的时候
  3393 + //如果是秒杀的时候
3382 3394 // if (th.data.prom_type == 0 && gd.prom_type == 1) {
3383 3395 // gd.prom_type = 0;
3384 3396 // }
3385   -
3386   - //----获取活动购买数----
3387   - getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
3388   - data: {
3389   - store_id: os.stoid,
3390   - user_id: user_id,
3391   - goods_id: th.data.gid,
3392   - prom_type: th.data.prom_type,
3393   - prom_id: th.data.prom_id
3394   - },
3395   - //-----获取-----
3396   - success: function (tt) {
3397   - if (tt.data.code == 0) {
3398   - th.setData({
3399   - prom_buy_num: tt.data.data.goodsbuynum,
3400   - });
3401   - "function" == typeof func && func();
3402   - }
3403   - }
3404   - });
3405   -
3406   -
  3397 + // //如果全场优惠，商品做了秒杀
  3398 + // if (th.data.prom_type == 3 && gd.prom_type == 1) {
  3399 + // gd.prom_type = 0;
  3400 + // }
  3401 + // //如果全场阶梯优惠，商品做了秒杀
  3402 + // if (th.data.prom_type == 10 && gd.prom_type == 1) {
  3403 + // gd.prom_type = 0;
  3404 + // }
  3405 +
  3406 +
  3407 + if (th.data.prom_type == 1) {
  3408 + //----获取活动购买数----
  3409 + getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
  3410 + data: {
  3411 + store_id: os.stoid,
  3412 + user_id: user_id,
  3413 + goods_id: th.data.options.goods_id,
  3414 + prom_type: th.data.options.prom_type,
  3415 + prom_id: th.data.options.prom_id
  3416 + },
  3417 + //-----获取-----
  3418 + success: function (tt) {
  3419 + if (tt.data.code == 0) {
  3420 + // map.set(gd.goods_id, g_buy_num);
  3421 + th.setData({
  3422 + // g_buy_num: map,
  3423 + prom_buy_num: tt.data.data.goodsbuynum,
  3424 + goodsbuynum: t.data.data.goodsbuynum,
  3425 + });
  3426 + "function" == typeof func && func();
  3427 + }
  3428 + }
  3429 + });
  3430 + } else {
  3431 + // map.set(gd.goods_id, g_buy_num);
  3432 + // th.setData({
  3433 + // g_buy_num: map
  3434 + // });
  3435 + "function" == typeof func && func();
  3436 + };
3407 3437 }
3408   - },
  3438 + }
3409 3439 });
  3440 + // }
3410 3441 },
3411 3442  
3412 3443  
... ... @@ -4034,6 +4065,7 @@ Page({
4034 4065  
4035 4066  
4036 4067  
  4068 +
4037 4069  
4038 4070  
4039 4071  
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @126031b
... ... @@ -90,8 +90,7 @@
90 90 </view>
91 91  
92 92  
93   - <!-- <block> -->
94   -
  93 + <block>
95 94 <view class="goods-price rel">
96 95 <view class="co-red" style="overflow: hidden">
97 96 <view class="market-price" style="overflow: hidden"></view>
... ... @@ -99,22 +98,50 @@
99 98  
100 99 <view>
101 100 <!-- 秒杀价 -->
102   - <!-- <view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view> -->
103   - <!-- 手店价 -->
104 101 <view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view>
  102 + <!-- 手店价 -->
105 103 <view class="co-red" wx:else><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
  104 + <!-- <view class="word-line fs20 xc-qtunit-price">
  105 + 零售价￥{{filters.toFix(data.market_price,2)}}
  106 + </view> -->
106 107 <view class="goods-title">
107 108 <view class="goods-name elli">{{data.goods_name}}</view>
108 109 </view>
109 110 </view>
110 111  
111   - <view class="goods-num">
  112 +
  113 + <block wx:if="{{prom_type==1}}">
  114 + <view class="goods-num">
  115 + <block wx:if="prom_st>0">
  116 + <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
  117 +
  118 + <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
  119 + <view class="stock" wx:else>限购:不限</view>
  120 +
  121 + <block wx:if="{{prom_st==0}}">
  122 + <view class="sales">已购:0件</view>
  123 + </block>
  124 +
  125 + <block wx:else>
  126 + <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
  127 + </block>
  128 + </block>
  129 + <block wx:else>
  130 + <view class="stock">总数量：{{prom_act.goods_num}}件</view>
  131 + <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
  132 + <view class="stock" wx:else>限购:不限</view>
  133 + <view class="sales">已购:{{prom_act.buy_num}}件</view>
  134 + </block>
  135 + </view>
  136 + </block>
  137 +
  138 + <view class="goods-num" wx:else>
112 139 <view class="sales">销量：{{data.sales_sum}}</view>
113 140 <view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
114 141 </view>
115 142  
116 143 </view>
117   - <!-- </block> -->
  144 + </block>
118 145  
119 146  
120 147  
... ... @@ -187,6 +214,8 @@
187 214 </view>
188 215 </view>
189 216  
  217 +
  218 +
190 219  
191 220 <!-- 保障服务 -->
192 221 <view class="bz_view flex bdt16 ai_c" wx:if="{{store_config.service_bz}}">
... ... @@ -561,7 +590,7 @@
561 590 <!-- is_shop_buy支持以原价购买 -->
562 591 <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
563 592 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
564   - <view class="buy-btn cart-btn lanse">即将开始</view>
  593 + <view class="buy-btn cart-btn lanse f1">即将开始</view>
565 594 </block>
566 595 <block wx:else>
567 596 <view class="buy-btn cart-btn cart-btn-lg lanse set_width f1">即将开始</view>
... ...
pages/cart/cart2/c_filter.wxs
  View file @126031b
... ... @@ -45,7 +45,7 @@ var filters = {
45 45 if (ind == 2) return "指定品类";
46 46 if (ind == 11) return "指定用途";
47 47 if (ind == 12) return "指定分类1";
48   - if (ind == 13) return "全场通用";
  48 + if (ind == 13) return "自定义";
49 49 if (ind == 20) return "指定单品";
50 50 return "";
51 51 },
... ...
pages/index/index/index.js
  View file @126031b
... ... @@ -382,19 +382,46 @@ Page({
382 382 flash_data.forEach(function (val, ind) {
383 383  
384 384 if(val.user_price) val.price=val.user_price;
385   - if (val.start_time > nt) flash_data[ind].status = 0;
386   - else if (val.end_time > nt) flash_data[ind].status = 1;
387   - if (val.buy_num >= val.goods_num) flash_data[ind].status = 2;
  385 + if (val.start_time > nt) {
  386 + flash_data[ind].status = 0;
  387 + } else if (val.end_time > nt) {
  388 + flash_data[ind].status = 1;
  389 + }
  390 +
  391 + if (val.buy_num >= val.goods_num){
  392 + flash_data[ind].status = 2;
  393 + }
388 394 });
389 395  
390   - var arr = new Array();
391   - //--三个三个一组---
392   - for (var i = 0; i < flash_data.length; i += 3) {
393   - arr.push(flash_data.slice(i, i + 3));
  396 + var promisies = [];
  397 + for (const key in flash_data) {
  398 + if (Object.hasOwnProperty.call(flash_data, key)) {
  399 + const val = flash_data[key];
  400 + promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
  401 + os.stoid + "/1/" + val.id,
  402 + {}
  403 + ).then(res => {
  404 + if (res.data.code == 0) {
  405 + if (res.data.data <= 0) flash_data[key].status = 2;
  406 + };
  407 + });
  408 + }
394 409 }
395   - th.setData({
396   - saleGoods: arr
  410 +
  411 + Promise.all(promisies).then((values) => {
  412 + var arr = new Array();
  413 + //--三个三个一组---
  414 + for (var i = 0; i < flash_data.length; i += 3) {
  415 + arr.push(flash_data.slice(i, i + 3));
  416 + }
  417 +
  418 + th.setData({
  419 + saleGoods: arr
  420 + });
397 421 });
  422 +
  423 +
  424 +
398 425 }
399 426 });
400 427  
... ... @@ -1179,6 +1206,8 @@ Page({
1179 1206 var url=e.currentTarget.dataset.url;
1180 1207 getApp().goto(url);
1181 1208 },
  1209 +
  1210 +
1182 1211  
1183 1212  
1184 1213  
... ...