wxd / MShopWeApp

Commit 478a5451b75a0d8918e4feaa1bda43fcfa8064a0

Authored by yvan.ni
1 parent 1607bfae

再来一单的优化

Inline Side-by-side
Showing 19 changed files with 503 additions and 175 deletions
components/promate_pop/promate_pop.js
  View file @478a545
... ... @@ -73,7 +73,32 @@ Component({
73 73 else cx_prom_group[idx].sele=1;
74 74 }
75 75 this.setData({cx_prom_group})
76   - }
  76 + },
  77 +
  78 + // 促销 -> 送礼包 -> 查看详情
  79 + viewLbDetails(e) {
  80 + let id = e.currentTarget.dataset.id; // 获取礼包id
  81 + let flag = e.currentTarget.dataset.flag;
  82 + let url = '';
  83 + if (flag == 2) { // flag =1 控制跳转到专享礼包
  84 + url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
  85 + // url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
  86 + } else if (flag == 1) { // flag =1 控制跳转到专享礼包
  87 + url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
  88 + } else {
  89 + url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
  90 + };
  91 + // console.log('myurl', url);
  92 + getApp().goto(url);
  93 + },
  94 +
  95 + //显示多赠品
  96 + show_zp: function (e) {
  97 + var prom_id = e.currentTarget.dataset.prom;
  98 + var index = e.currentTarget.dataset.index;
  99 + getApp().goto("/packageD/pages/gift/gift?prom_id=" + prom_id + "&index=" + index);
  100 + },
  101 +
77 102  
78 103 }
79 104 })
80 105 \ No newline at end of file
... ...
components/promate_pop/promate_pop.wxml
  View file @478a545
... ... @@ -29,7 +29,24 @@
29 29 {{item.show_time}}
30 30 </view>
31 31 <view wx:else class="fs22" style="max-width: 430rpx; color: #b9b6b6">
32   - <text wx:for="{{item.more}}" wx:for-item="bm" class="tick pdr20" >{{bm}}</text>
  32 + <block wx:for="{{item.more}}" wx:for-item="bm">
  33 + <text wx:if="{{bm.is_fir}}" class="tick pdr20" >{{bm.text}}</text>
  34 + <view wx:if="{{bm.is_quan}}">{{bm.text}}</view>
  35 + <view wx:if="{{bm.is_gift}}" bindtap="show_zp"
  36 + data-index="0" data-prom="{{bm.prom_id}}" >{{bm.text}}</view>
  37 + <!-- 旧礼包 -->
  38 + <view wx:if="{{bm.lb_id}}"
  39 + data-id="{{bm.lb_id}}" bindtap="viewLbDetails">{{bm.text}}</view>
  40 + <!-- 专享礼包 -->
  41 + <view wx:if="{{bm.zxlb_id}}"
  42 + data-id="{{bm.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">{{bm.text}}</view>
  43 + <!-- 月礼包 -->
  44 + <view wx:if="{{bm.monthgiftbag_id}}"
  45 + data-id="{{bm.monthgiftbag_id}}" data-flag="2" bindtap="viewLbDetails">{{bm.text}}</view>
  46 +
  47 + </block>
  48 +
  49 +
33 50 </view>
34 51 </view>
35 52  
... ...
components/promate_pop/promate_pop.wxss
  View file @478a545
... ... @@ -174,7 +174,7 @@
174 174 }
175 175  
176 176 .item_pro{
177   - background-color: #fceeee;height: 170rpx; position: relative;
  177 + background-color: #fceeee;min-height: 170rpx; position: relative;padding: 10rpx 0;
178 178 }
179 179  
180 180 .item_pro~.item_pro{
... ...
packageA/pages/prom_list/prom_list.js
  View file @478a545
... ... @@ -1407,7 +1407,8 @@ Page({
1407 1407 data: {
1408 1408 store_id: os.stoid,
1409 1409 user_id: user_id,
1410   - goods_id: gd.goods_id
  1410 + goods_id: gd.goods_id,
  1411 + isnew:1
1411 1412 },
1412 1413 success: function(t) {
1413 1414 if (t.data.code == 0) {
... ... @@ -1420,7 +1421,8 @@ Page({
1420 1421 user_id: user_id,
1421 1422 goods_id: gd.goods_id,
1422 1423 prom_type: gd.prom_type,
1423   - prom_id: gd.prom_id
  1424 + prom_id: gd.prom_id,
  1425 + isnew:1
1424 1426 },
1425 1427 //-----获取-----
1426 1428 success: function(tt) {
... ...
packageA/pages/serviceCard_pd/team_show/team_show.js
  View file @478a545
... ... @@ -301,8 +301,8 @@ Page({
301 301 user_id: user_id,
302 302 goods_id: gd.goods_id,
303 303 prom_type: gd.prom_type,
304   - prom_id: gd.prom_id
305   -
  304 + prom_id: gd.prom_id,
  305 + isnew:1
306 306 },
307 307 }).then(res=>{
308 308 var buy_num_data=res.data.data;
... ...
packageB/pages/zuhegou/index/index.js
  View file @478a545
... ... @@ -2335,7 +2335,8 @@ Page({
2335 2335 user_id: user_id,
2336 2336 goods_id: gd.goods_id,
2337 2337 prom_type: 7,
2338   - prom_id: th.data.act.id
  2338 + prom_id: th.data.act.id,
  2339 + isnew:1
2339 2340 },
2340 2341 }).then(res2 => {
2341 2342 var g_buy_num = 0;
... ... @@ -2824,7 +2825,8 @@ Page({
2824 2825 user_id: user_id,
2825 2826 goods_id: item_j.goods_id,
2826 2827 prom_type: 7,
2827   - prom_id: th.data.act.id
  2828 + prom_id: th.data.act.id,
  2829 + isnew:1
2828 2830 },
2829 2831 }).then(res2 => {
2830 2832 if (res2.data.code == 0) {
... ... @@ -2900,7 +2902,8 @@ Page({
2900 2902 user_id: oo.user_id,
2901 2903 goods_id: item_j.goods_id,
2902 2904 prom_type: 7,
2903   - prom_id: th.data.act.id
  2905 + prom_id: th.data.act.id,
  2906 + isnew:1
2904 2907 },
2905 2908 }).then(res2 => {
2906 2909 if (res2.data.code == 0) {
... ...
packageB/pages/zuhegou/preindex/index.js
  View file @478a545
... ... @@ -1744,7 +1744,8 @@ Page({
1744 1744 user_id: user_id,
1745 1745 goods_id: gd.goods_id,
1746 1746 prom_type: 7,
1747   - prom_id: th.data.act.id
  1747 + prom_id: th.data.act.id,
  1748 + isnew:1
1748 1749 },
1749 1750 }).then(res2 => {
1750 1751 var g_buy_num = 0;
... ... @@ -2120,7 +2121,8 @@ Page({
2120 2121 user_id: user_id,
2121 2122 goods_id: item_j.goods_id,
2122 2123 prom_type: 7,
2123   - prom_id: th.data.act.id
  2124 + prom_id: th.data.act.id,
  2125 + isnew:1
2124 2126 },
2125 2127 }).then(res2 => {
2126 2128 if (res2.data.code == 0) {
... ... @@ -2196,7 +2198,8 @@ Page({
2196 2198 user_id: oo.user_id,
2197 2199 goods_id: item_j.goods_id,
2198 2200 prom_type: 7,
2199   - prom_id: th.data.act.id
  2201 + prom_id: th.data.act.id,
  2202 + isnew:1
2200 2203 },
2201 2204 }).then(res2 => {
2202 2205 if (res2.data.code == 0) {
... ...
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
  View file @478a545
... ... @@ -473,7 +473,8 @@ Page({
473 473 user_id: getApp().globalData.user_id,
474 474 goods_id: item1.goods_id,
475 475 prom_type: item1.prom_type,
476   - prom_id: item1.prom_id
  476 + prom_id: item1.prom_id,
  477 + isnew:1
477 478 },
478 479 }).then(res => {
479 480 var buy_num_data = res.data.data;
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @478a545
... ... @@ -4377,7 +4377,8 @@ Page({
4377 4377 data: {
4378 4378 store_id: os.stoid,
4379 4379 user_id: user_id,
4380   - goods_id: gd.goods_id
  4380 + goods_id: gd.goods_id,
  4381 + isnew:1
4381 4382 },
4382 4383 success: function (t) {
4383 4384 if (t.data.code == 0) {
... ... @@ -4396,7 +4397,8 @@ Page({
4396 4397 user_id: user_id,
4397 4398 goods_id: gd.goods_id,
4398 4399 prom_type: gd.prom_type,
4399   - prom_id: gd.prom_id
  4400 + prom_id: gd.prom_id,
  4401 + isnew:1
4400 4402 },
4401 4403 //-----获取-----
4402 4404 success: function (tt) {
... ...
packageC/pages/payForAnother/payForAnother.js
  View file @478a545
... ... @@ -446,7 +446,8 @@ Page({
446 446 user_id: getApp().globalData.user_id,
447 447 goods_id: item1.goods_id,
448 448 prom_type: item1.prom_type,
449   - prom_id: item1.prom_id
  449 + prom_id: item1.prom_id,
  450 + isnew:1
450 451 },
451 452 }).then(res => {
452 453 var buy_num_data = res.data.data;
... ...
packageC/pages/presell/cart/cart.js
  View file @478a545
... ... @@ -2658,7 +2658,8 @@ Page({
2658 2658 user_id: getApp().globalData.user_id,
2659 2659 goods_id: good.goods_id,
2660 2660 prom_type: good.prom_type,
2661   - prom_id: good.prom_id
  2661 + prom_id: good.prom_id,
  2662 + isnew:1
2662 2663 },
2663 2664 }).then(res => {
2664 2665 var buy_num_data = res.data.data;
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @478a545
... ... @@ -1095,11 +1095,11 @@ Page({
1095 1095 //---判断商品是否超出活动限购---
1096 1096 if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
1097 1097 if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
1098   - wx.showModal({
1099   - title: '提示',
1100   - content: '超出商品活动限购'
1101   - });
1102   - return false;
  1098 + wx.showModal({
  1099 + title: '提示',
  1100 + content: '超出商品活动限购'
  1101 + });
  1102 + return false;
1103 1103 }
1104 1104 }
1105 1105  
... ... @@ -2764,6 +2764,7 @@ Page({
2764 2764 store_id: os.stoid,
2765 2765 user_id: user_id,
2766 2766 goods_id: gd.goods_id,
  2767 + isnew:1
2767 2768 },
2768 2769 success: function (t) {
2769 2770 if (t.data.code == 0) {
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.js
  View file @478a545
... ... @@ -2568,6 +2568,7 @@ Page({
2568 2568 store_id: os.stoid,
2569 2569 user_id: user_id,
2570 2570 goods_id: gd.goods_id,
  2571 + isnew:1
2571 2572 },
2572 2573 success: function (t) {
2573 2574 if (t.data.code == 0) {
... ...
packageE/pages/cart/cart2/cart2.js
  View file @478a545
... ... @@ -838,7 +838,7 @@ Page({
838 838 //--- 切换的时候一定要把赠品去掉 ---
839 839 if(is_change){
840 840  
841   - carr=this.data.cartlist_y;
  841 + carr=JSON.parse(JSON.stringify(this.data.cartlist_y));
842 842 //-- 剔除赠品的数据，等到确定活动是优惠促销的时候，在显示赠品, 赠品直接删除 --
843 843 var new_arr=[];
844 844 for (var ir = 0; ir < carr.length; ir++) {
... ... @@ -903,7 +903,8 @@ Page({
903 903 user_id: getApp().globalData.user_id,
904 904 goods_id: item1.goods_id,
905 905 prom_type: item1.prom_type,
906   - prom_id: item1.prom_id
  906 + prom_id: item1.prom_id,
  907 + isnew:1
907 908 },
908 909 }).then(res => {
909 910 var buy_num_data = res.data.data;
... ... @@ -4795,6 +4796,8 @@ Page({
4795 4796 'store_id': oo.stoid,
4796 4797 };
4797 4798  
  4799 +
  4800 +
4798 4801 if (getApp().globalData.skinface_id) {
4799 4802 goods.skinface_id = getApp().globalData.skinface_id;
4800 4803 }
... ... @@ -4856,6 +4859,7 @@ Page({
4856 4859 default:
4857 4860 goods.prom_type = 0;
4858 4861 goods.prom_id = 0;
  4862 +
4859 4863 }
4860 4864  
4861 4865 var txt = goods.prom_id + ',' + goods.prom_type + ',' + goods.goods_id + ',' + goods.is_gift;
... ... @@ -5098,7 +5102,7 @@ Page({
5098 5102 //如果是购物车结算，还要删除购物车
5099 5103 if (th.data.is_b_now == 0) {
5100 5104 console.log(th.data.cartlist_y);
5101   - var list = th.data.cartlist_y;
  5105 + var list =JSON.parse(JSON.stringify(th.data.cartlist_y));
5102 5106 for (var i = 0; i < list.length; i++) {
5103 5107 //删除购物车
5104 5108 a.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {});
... ... @@ -7777,7 +7781,7 @@ Page({
7777 7781  
7778 7782 if(ck_res.code==0){
7779 7783 th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type;
7780   - var goods= th.data.cartlist_y
  7784 + var goods= JSON.parse(JSON.stringify(th.data.cartlist_y))
7781 7785 //-- 此时要把购物车中的商品确定活动 --
7782 7786 for (var b=0; b<ck_prom_type.goods.length;b++){
7783 7787 //-- 开始查找 --
... ... @@ -7914,7 +7918,7 @@ Page({
7914 7918 var promgoodsbuynum = 0;
7915 7919 var rq = {
7916 7920 'store_id': os.stoid, 'user_id': getApp().globalData.user_id, 'goods_id': gid,
7917   - 'prom_type': 7, 'prom_id': pid
  7921 + 'prom_type': 7, 'prom_id': pid, isnew:1
7918 7922 };
7919 7923  
7920 7924 var res = await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {data: rq});
... ...
pages/cart/cart/cart.js
  View file @478a545
... ... @@ -2391,7 +2391,8 @@ Page({
2391 2391 user_id: user_id,
2392 2392 goods_id: goodsinfo.goods_id,
2393 2393 prom_type: goodsinfo.prom_type,
2394   - prom_id: goodsinfo.prom_id
  2394 + prom_id: goodsinfo.prom_id,
  2395 + isnew:1
2395 2396 },
2396 2397 }).then(res => {
2397 2398 var buy_num_data = res.data.data;
... ... @@ -3596,7 +3597,8 @@ Page({
3596 3597 user_id:getApp().globalData.user_id,
3597 3598 goods_id: val.goods_id,
3598 3599 prom_type: val.prom_type,
3599   - prom_id: val.prom_id
  3600 + prom_id: val.prom_id,
  3601 + isnew:1
3600 3602 },
3601 3603 }).then(res => {
3602 3604 var buy_num_data = res.data.data;
... ... @@ -4036,7 +4038,6 @@ Page({
4036 4038 continue;
4037 4039 }
4038 4040  
4039   -
4040 4041 //-- 只有在单赠品的时候，才要进行计算 --
4041 4042 await getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
4042 4043 data: {
... ... @@ -4196,6 +4197,7 @@ Page({
4196 4197 }
4197 4198 return user_pre_buynum
4198 4199 },
  4200 +
4199 4201 async all_check_prom_activity() {
4200 4202 this.data.duo_zp_num_arr = {};
4201 4203 for (var i in this.data.requestData) {
... ... @@ -4828,7 +4830,7 @@ Page({
4828 4830 'user_id': getApp().globalData.user_id,
4829 4831 'goods_id': gid,
4830 4832 'prom_type': 7,
4831   - 'prom_id': pid
  4833 + 'prom_id': pid, isnew:1
4832 4834 };
4833 4835  
4834 4836 var res = await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @478a545
... ... @@ -4983,7 +4983,7 @@ Page({
4983 4983 data: {
4984 4984 store_id: os.stoid,
4985 4985 user_id: user_id,
4986   - goods_id: gd.goods_id
  4986 + goods_id: gd.goods_id, isnew:1
4987 4987 },
4988 4988 success: function (t) {
4989 4989 if (t.data.code == 0) {
... ... @@ -5011,7 +5011,7 @@ Page({
5011 5011 user_id: user_id,
5012 5012 goods_id: gd.goods_id,
5013 5013 prom_type: gd.prom_type,
5014   - prom_id: gd.prom_id
  5014 + prom_id: gd.prom_id, isnew:1
5015 5015 },
5016 5016 //-----获取-----
5017 5017 success: function (tt) {
... ... @@ -7621,22 +7621,72 @@ Page({
7621 7621 if (!fir_act.limit_num || th.data.user_pre_buynum < fir_act.limit_num) {
7622 7622 var more_arr = [];
7623 7623 //减价
7624   - if (fir_act.money > 0) more_arr.push('减价' + fir_act.money + '元');
7625   - if (fir_act.sale > 0) more_arr.push('打' + fir_act.sale + '折');
7626   - if (fir_act.past == 1) more_arr.push('包邮');
7627   - if (fir_act.intValue > 0) more_arr.push('送' + fir_act.intValue + '积分');
7628   - if (fir_act.couponId > 0) more_arr.push('送' + fir_act.couponMoney + '元优惠券');
  7624 + if (fir_act.money > 0){
  7625 +
  7626 + more_arr.push({
  7627 + text:'减价' + fir_act.money + '元',
  7628 + is_fir:1
  7629 + });
  7630 + }
  7631 + if (fir_act.sale > 0) {
  7632 + more_arr.push({
  7633 + text:'打' + fir_act.sale + '折',
  7634 + is_fir:1
  7635 + });
  7636 + }
  7637 + if (fir_act.past == 1) {
  7638 + more_arr.push({
  7639 + text:'包邮',
  7640 + is_fir:1
  7641 + });
  7642 + }
  7643 + if (fir_act.intValue > 0){
  7644 + more_arr.push({
  7645 + text:'送' + fir_act.intValue + '积分',
  7646 + is_fir:1
  7647 + });
  7648 + }
  7649 + if (fir_act.couponId > 0) {
  7650 + more_arr.push({
  7651 + text:'送' + fir_act.couponMoney + '元优惠券',
  7652 + is_quan:1
  7653 + });
  7654 + }
  7655 +
7629 7656 if (fir_act.gift_id) {
7630   - var is_more_gf = fir_act.gift_id.split(',')
7631   - if (is_more_gf.length > 1) {
7632   - more_arr.push('送赠品');
7633   - } else {
7634   - more_arr.push('送' + fir_act.goods_name + ' x' + fir_act.zp_num);
7635   - }
  7657 + var is_more_gf = fir_act.gift_id.split(',')
  7658 + if (is_more_gf.length > 1) {
  7659 + more_arr.push({
  7660 + text:'送赠品',
  7661 + is_gift:1,
  7662 + prom_id:fir_act.prom_id
  7663 + });
  7664 + } else {
  7665 + more_arr.push({
  7666 + text:'送' + fir_act.goods_name + ' x' + fir_act.zp_num,
  7667 + is_gift:1,
  7668 + prom_id:fir_act.prom_id
  7669 + });
  7670 + }
  7671 + }
  7672 + if (fir_act.lb_id){
  7673 + more_arr.push({
  7674 + text:'送' + fir_act.lbtitle,
  7675 + lb_id:fir_act.lb_id
  7676 + });
  7677 + }
  7678 + if (fir_act.zxlb_id){
  7679 + more_arr.push({
  7680 + text:'送' + fir_act.zxlbtitle,
  7681 + zxlb_id:fir_act.zxlb_id
  7682 + });
  7683 + }
  7684 + if (fir_act.monthgiftbag_id){
  7685 + more_arr.push({
  7686 + text:'送' + fir_act.monthgiftbag_title,
  7687 + monthgiftbag_id:fir_act.monthgiftbag_id
  7688 + });
7636 7689 }
7637   - if (fir_act.lb_id) more_arr.push('送' + fir_act.lbtitle);
7638   - if (fir_act.zxlb_id) more_arr.push('送' + fir_act.zxlbtitle);
7639   - if (fir_act.monthgiftbag_id) more_arr.push('送' + fir_act.monthgiftbag_title);
7640 7690  
7641 7691 //-- 开始组装数据 --
7642 7692 th.add_cx_prom_group({
... ...
pages/team/team_show/team_show.js
  View file @478a545
... ... @@ -303,7 +303,7 @@ Page({
303 303 user_id: user_id,
304 304 goods_id: gd.goods_id,
305 305 prom_type: gd.prom_type,
306   - prom_id: gd.prom_id
  306 + prom_id: gd.prom_id, isnew:1
307 307  
308 308 },
309 309 }).then(res=>{
... ...
pages/user/order_list/order_list.js
  View file @478a545
... ... @@ -637,6 +637,7 @@ Page({
637 637 })
638 638 return res.data
639 639 },
  640 +
640 641 /*----------跳转支付-----------*/
641 642 async jumpToCart4(t) {
642 643  
... ... @@ -708,6 +709,7 @@ Page({
708 709 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => {
709 710 gg = res.data.data;
710 711 })
  712 +
711 713 var limit = gg.viplimited;
712 714 var store_count = gg.store_count;
713 715 good.erpwareid = gg.erpwareid;
... ... @@ -773,9 +775,9 @@ Page({
773 775 th.setData({ paying: 0 });
774 776 return false;
775 777 }
776   - //增加组合购次数判断
777   -
778   - let userbuynum = await th.getUserBuyPromNum(good.prom_id)
  778 +
  779 + //增加组合购次数判断
  780 + let userbuynum = await th.getUserBuyPromNum(good.prom_id,1)
779 781  
780 782 if (zh_buy_info.buy_limit !=0 && zh_buy_info && userbuynum >= zh_buy_info.buy_limit) {
781 783 var content = gg.goods_name + '超出组合购限购次数,请取消订单';
... ... @@ -812,7 +814,6 @@ Page({
812 814 }
813 815 }
814 816 }
815   -
816 817 //如果是预售的时候，
817 818 if (good.prom_type == 8) {
818 819 await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum", {
... ... @@ -860,64 +861,23 @@ Page({
860 861 }
861 862  
862 863 //如果优惠促销和搭配购的时候
863   - if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) {
  864 + if ((good.prom_type == 3 || good.prom_type == 5 || good.prom_type == 10) && good.is_gift != 1 && good.is_collocation != 1) {
864 865 var p_ok = 1, is_g_prom = 0;
865   - //因为有全场优惠活动，商品参加的活动还未开始
866   - var url = "/api/weshop/activitylist/getGoodActInfo";
867   - var req_data = {
868   - store_id: os.stoid, goodsidlist: good.goods_id, is_detail: 1, user_id: user_id
869   - };
870   - await getApp().request.promiseGet(url, { data: req_data }).then(async function (res) {
871   - if (res.data.code == 0 && res.data.data && res.data.data.length) {
872   - for (let i in res.data.data) {
873   - let item = res.data.data[i];
874   - if (item.prom_type == 3 || item.prom_type==5) {
875   - is_g_prom = 1; break;
876   - }
877   - }
878   - }
879   - })
880   -
881   - if (is_g_prom) {
882   -
883   - // await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
884   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
885   -
  866 + //只读优化促销和阶梯促销
  867 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + good.goods_id+"/0/"+user_id, {}).then(res => {
886 868 if (res.data.code == 0) {
887 869 var r_data = res.data.data;
888 870 if (!r_data.collocationPromList && good.prom_type == 5) {
889   -
890   - var content = good.goods_name + '未找到活动,请取消订单重新购买';
891   - th.toast(content)
892   - p_ok = 0;
  871 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  872 + th.toast(content)
  873 + p_ok = 0;
893 874 }
894 875 if (!r_data.promGoodsLists && good.prom_type == 3) {
895   -
896 876 var content = good.goods_name + '未找到活动,请取消订单重新购买';
897 877 th.toast(content);
898 878 p_ok = 0;
899 879 }
900   - } else {
901   -
902   - var content = good.goods_name + '未找到活动,请取消订单重新购买'
903   - th.toast(content);
904   - p_ok = 0;
905   - }
906   - })
907   - } else {
908   - //只读优化促销和阶梯促销
909   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
910   - if (res.data.code == 0) {
911   - var r_data = res.data.data;
912   - if (!r_data.collocationPromList && good.prom_type == 5) {
913   -
914   - var content = good.goods_name + '未找到活动,请取消订单重新购买';
915   - th.toast(content)
916   -
917   - p_ok = 0;
918   - }
919   - if (!r_data.promGoodsLists && good.prom_type == 3) {
920   -
  880 + if (!r_data.ladderLists && good.prom_type == 10) {
921 881 var content = good.goods_name + '未找到活动,请取消订单重新购买';
922 882 th.toast(content);
923 883 p_ok = 0;
... ... @@ -929,92 +889,225 @@ Page({
929 889 p_ok = 0;
930 890 }
931 891 })
932   -
933   - }
934 892 if (!p_ok) {
935 893 th.setData({ paying: 0 });
936 894 return false;
937 895 }
938 896 }
939 897  
940   - //商品的普通购买 ，不要进行判断
941   - if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8)
  898 + //-- 商品的普通购买 ，不要进行判断 --
  899 + if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8 || good.prom_type == 9)
942 900 && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) {
943 901  
944 902 } else {
945   - if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4)
946   - && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
947   - var prom = null;
948   - //---如果是活动的时候---
949   - var prom = null, th = this;
950   - if (gg.prom_type == 1) {
951   - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => {
952   - if (res.data.code == 0) {
953   - prom = res.data.data;
954   - prom.price = prom.user_price;
955   - }
956   - })
957   - }
958 903  
959   - if (gg.prom_type == 2) {
960   - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => {
961   - if (res.data.code == 0) {
962   - prom = res.data.data;
963   - prom.price = prom.price;
  904 + //因为商品的prom_type=0,所以商品的实际活动要重新获取
  905 + var url = '/api/weshop/activitylist/listGoodActInfo2New';
  906 + var req_d = {
  907 + "store_id": os.stoid,
  908 + "goods_id": good.goods_id,
  909 + "user_id": user_id,
  910 + }
  911 + await getApp().request.promiseGet(url, {
  912 + data: req_d
  913 + }).then(res => {
  914 + if (res.data.code == 0 && res.data.data) {
  915 + var arr = res.data.data;
  916 + //-- 预热也要计算 --
  917 + var arr2 = arr.filter(function (e) {
  918 + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
  919 + })
  920 + if (arr2.length == 1) {
  921 + gg.prom_type=arr2[0].prom_type;
  922 + gg.prom_id=arr2[0].act_id;
964 923 }
965   - })
966 924 }
  925 + })
967 926  
968 927  
969   - if (gg.prom_type == 6) {
970   - await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
971   - if (res.data.code == 0) {
972   - prom = res.data.data;
973   - }
974   - })
975   - }
  928 + if ((gg.prom_type == 1 || gg.prom_type == 2 || gg.prom_type == 4 || gg.prom_type == 6 || gg.prom_type == 8 || gg.prom_type == 9)
  929 + && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
  930 + var prom = null;
  931 + //---如果是活动的时候---
  932 + var prom = null, th = this;
  933 + if (gg.prom_type == 1) {
  934 + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => {
  935 + if (res.data.code == 0) {
  936 + prom = res.data.data;
  937 + prom.price = prom.user_price;
  938 + }
  939 + })
  940 + }
  941 + if (gg.prom_type == 2) {
  942 + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => {
  943 + if (res.data.code == 0) {
  944 + prom = res.data.data;
  945 + prom.price = prom.price;
  946 + }
  947 + })
  948 + }
  949 + if (gg.prom_type == 6) {
  950 + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
  951 + if (res.data.code == 0) {
  952 + prom = res.data.data;
  953 + }
  954 + })
  955 + }
  956 + if (gg.prom_type == 4) {
  957 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
  958 + data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
  959 + }).then(res => {
  960 + if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
  961 + prom = res.data.data.pageData[0];
  962 + }
  963 + })
  964 + }
  965 + if (prom) {
  966 + var t_now = ut.gettimestamp();
  967 + if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
976 968  
977   - if (gg.prom_type == 4) {
978   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
979   - data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
980   - }).then(res => {
981   - if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
982   - prom = res.data.data.pageData[0];
  969 + var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
  970 + th.toast(content);
  971 + th.setData({ paying: 0 });
  972 + return false;
983 973 }
984   - })
985   - }
986   -
987   - if (prom) {
988   - var t_now = ut.gettimestamp();
989   - if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
  974 + }
990 975  
  976 + //-- 幸运购的时候 --
  977 + if(gg.prom_type==8 || gg.prom_type==9){
991 978 var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
992 979 th.toast(content);
993 980 th.setData({ paying: 0 });
994 981 return false;
995 982 }
996   - }
  983 +
997 984 }
998 985 else {
999   - if (!good.is_gift && good.prom_type != 3) {
1000   - var t_ok = 1;
1001   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
1002   - if (res.data.code == 0) {
1003   - var r_data = res.data.data;
1004   - //-- 参加了全局的优惠活动 --
1005   - if (r_data.promGoodsLists) {
1006   - var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
1007   - th.toast(content);
1008   - t_ok = 0;
1009   - }
1010   - }
1011   - })
  986 +
  987 + //-- 如果是普通购买的时候，此时计算的一定是商品的prom_type==0了, （组合购在普通购买的时候，就不判断了，因为组合购本身就可以普通购买）---
  988 + if(!good.is_collocation && !good.is_gift && good.is_pd_normal!=2 && gg.prom_type!=7 ){
  989 +
  990 + var promgoodsbuynum0=0;
  991 + //---要获得商品，该用户买了多少件,同步应用---
  992 + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
  993 + data: {
  994 + store_id: os.stoid,
  995 + user_id: user_id,
  996 + goods_id: good.goods_id,
  997 + prom_type: gg.prom_type,
  998 + prom_id: gg.prom_id
  999 + },
  1000 + }).then(res => {
  1001 + var buy_num_data = res.data.data;
  1002 + if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
  1003 + })
  1004 +
  1005 + var t_ok = 1;
  1006 + if(good.prom_type != gg.prom_type && good.prom_id != gg.prom_id){
  1007 + //如果商品有单独的活动的是偶
  1008 + switch (gg.prom_type){
  1009 + case 5:
  1010 + case 10:
  1011 + var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
  1012 + th.toast(content);
  1013 + t_ok = 0;
  1014 + break;
  1015 + //-- 优惠促销是有限购的 --
  1016 + case 3:
  1017 + var prom=null;
  1018 + var yh_check=1;
  1019 + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
  1020 + if (res.data.code == 0) { prom = res.data.data; }
  1021 + })
  1022 + if (prom && prom.limit_num) {
  1023 + var limit_num = prom.limit_num;
  1024 + var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
  1025 + if (limit_num>0 && user_pre_buynum >= limit_num) {
  1026 + yh_check=0;
  1027 + }
  1028 + }
  1029 + //-- 优惠促销活动没有超出限购的话 --
  1030 + if(yh_check){
  1031 + var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
  1032 + th.toast(content);
  1033 + t_ok = 0;
  1034 + break;
  1035 + }
  1036 +
  1037 + break
  1038 + case 7:
  1039 + //获取组合购活动
  1040 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + gg.prom_id + "/" + getApp().globalData.userInfo.user_id;
  1041 + let zh_buy_info=null
  1042 + await getApp().request.promiseGet(url, {}).then(res => {
  1043 + if (res.data.code == 0 && res.data.data) {
  1044 + zh_buy_info = res.data.data
  1045 + }
  1046 + })
  1047 + //判断活动超出限购
  1048 + var is_act_ok=1;
  1049 + let userbuynum = await th.getUserBuyPromNum(gg.prom_id)
  1050 + if (zh_buy_info.buy_limit !=0 && zh_buy_info && userbuynum >= zh_buy_info.buy_limit) {
  1051 + is_act_ok=0;
  1052 + }
  1053 +
  1054 + //判断活动商品超出限购，在从表
  1055 + var url1 = "/api/weshop/prom/zhbuyGoods/page";
  1056 + var req_data = {
  1057 + page: 1,
  1058 + pageSize: 1,
  1059 + store_id: os.stoid,
  1060 + zh_id: gg.prom_id,
  1061 + goods_id: gg.goods_id
  1062 + }
  1063 + await getApp().request.promiseGet(url1, {
  1064 + data: req_data
  1065 + }).then(res => {
  1066 + if (ut.ajax_ok(res)) {
  1067 + var gdlist = res.data.data.pageData[0];
  1068 + gg.buyqty = gdlist.buyqty;
  1069 + }
  1070 + })
  1071 + var num = gg['buyqty'];
  1072 + //---- 要计算商品的限购 -----
  1073 + if (gg['buyqty'] > 0) {
  1074 + if (gg.goods_num + promgoodsbuynum0 > gg['buyqty']) {
  1075 + is_act_ok=0;
  1076 + }
  1077 + }
  1078 + if(is_act_ok){
  1079 + var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
  1080 + th.toast(content);
  1081 + t_ok = 0;
  1082 + break;
  1083 + }
  1084 + }
  1085 + }
  1086 + }
  1087 + //-- 判断活动是不是OK --
1012 1088 if (!t_ok) {
1013   - th.setData({ paying: 0 }); return false;
  1089 + th.setData({ paying: 0 }); return false;
1014 1090 }
1015   - }
1016   - //-- 如果有参加线下取价 --
1017   - if (good.offline_cut > 0) wlist += encodeURIComponent(gg.erpwareid) + ",";
  1091 +
  1092 + // if (!good.is_gift && good.prom_type != 3) {
  1093 + // var t_ok = 1;
  1094 + // await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
  1095 + // if (res.data.code == 0) {
  1096 + // var r_data = res.data.data;
  1097 + // //-- 参加了全局的优惠活动 --
  1098 + // if (r_data.promGoodsLists) {
  1099 + // var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
  1100 + // th.toast(content);
  1101 + // t_ok = 0;
  1102 + // }
  1103 + // }
  1104 + // })
  1105 + // if (!t_ok) {
  1106 + // th.setData({ paying: 0 }); return false;
  1107 + // }
  1108 + // }
  1109 + //-- 如果有参加线下取价 --
  1110 + if (good.offline_cut > 0) wlist += encodeURIComponent(gg.erpwareid) + ",";
1018 1111 }
1019 1112 //赠品和搭配购不判断商品金额
1020 1113 var isok = 1;
... ... @@ -1047,11 +1140,10 @@ Page({
1047 1140 ob = obj;
1048 1141 })
1049 1142 if (ob.code == -1) {
1050   -
1051   - var content = gg.goods_name + '门店库存不足,请取消订单';
1052   - th.toast(content);
1053   - th.setData({ paying: 0 });
1054   - return false;
  1143 + var content = gg.goods_name + '门店库存不足,请取消订单';
  1144 + th.toast(content);
  1145 + th.setData({ paying: 0 });
  1146 + return false;
1055 1147 }
1056 1148  
1057 1149 } else {
... ... @@ -1076,7 +1168,6 @@ Page({
1076 1168 }
1077 1169 })
1078 1170 }
1079   -
1080 1171 if (goodsinfo.prom_type == 2) {
1081 1172 await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => {
1082 1173 if (res.data.code == 0) {
... ... @@ -1086,7 +1177,6 @@ Page({
1086 1177 })
1087 1178 }
1088 1179  
1089   -
1090 1180 if (goodsinfo.prom_type == 6 && !good.is_pd_normal) {
1091 1181 await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => {
1092 1182 if (res.data.code == 0) {
... ... @@ -1104,7 +1194,6 @@ Page({
1104 1194 }
1105 1195 })
1106 1196 }
1107   -
1108 1197 //----------如果有活动，并且在进行中，就不计算线下库存---------------
1109 1198 if (prom) {
1110 1199 var now = ut.gettimestamp();
... ... @@ -1158,6 +1247,113 @@ Page({
1158 1247 }
1159 1248  
1160 1249 }
  1250 +
  1251 + //-- 预售和幸运购要单独计算 --
  1252 + if (goodsinfo.prom_type == 8) {
  1253 + var presell_id= goodsinfo.prom_id;
  1254 + //------获取预售主表,判断预售活动是不是到期不可以使用了----------
  1255 + var res= await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {})
  1256 + if (res.data.code == 0 && res.data.data) {
  1257 + var act_data = res.data.data;
  1258 + if (act_data.is_end) {
  1259 + wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
  1260 + return false;
  1261 + }
  1262 + if (act_data.isuse == 0) {
  1263 + wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
  1264 + return false;
  1265 + }
  1266 +
  1267 + var err_txt = "活动定金时间已经结束";
  1268 + var end_time = act_data.end_time;
  1269 + if (act_data.presell_type == 1) {
  1270 + err_txt = "活动时间已经结束";
  1271 + }
  1272 + if (end_time < ut.gettimestamp()) {
  1273 + wx.showToast({ title: err_txt, icon: 'none', duration: 3000 });
  1274 + return false;
  1275 + }
  1276 +
  1277 + if (act_data.presell_type == 0) {
  1278 + end_time = act_data.pay_enddate;
  1279 + err_txt = "活动尾款时间已经结束";
  1280 + }
  1281 + if (end_time < ut.gettimestamp()) {
  1282 + wx.showToast({ title: err_txt, icon: 'none', duration: 3000 });
  1283 + return false;
  1284 + }
  1285 + }
  1286 +
  1287 + var all_pre_goods=null;
  1288 + var userInfo = getApp().globalData.userInfo;
  1289 + var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, goods_id: goodsinfo.goods_id };
  1290 + if (userInfo) {
  1291 + pre_data.user_id = userInfo.user_id;
  1292 + }
  1293 + var rs_pre= await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
  1294 + data: pre_data,
  1295 + })
  1296 + if (rs_pre.data.code == 0 && rs_pre.data.data.pageData && rs_pre.data.data.pageData.length > 0) {
  1297 + all_pre_goods = rs_pre.data.data.pageData;
  1298 + }
  1299 +
  1300 + if(!all_pre_goods){
  1301 + wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
  1302 + return false;
  1303 + }
  1304 + var idx = all_pre_goods.findIndex(function (ele) {
  1305 + return ele.goods_id == goodsinfo.goods_id;
  1306 + })
  1307 +
  1308 + if(idx==-1){
  1309 + wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
  1310 + return false;
  1311 + }
  1312 + var pre_arr = all_pre_goods[idx];
  1313 + var prom_buy_limit = pre_arr.vip_butyqty;
  1314 +
  1315 + if (goods.goods_num > th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) {
  1316 + wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 });
  1317 + return false;
  1318 + }
  1319 + //--判断商品是否超出活动限购--
  1320 + if (promgoodsbuynum0 && prom_buy_limit > 0) {
  1321 + wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 });
  1322 + return false;
  1323 + }
  1324 +
  1325 + }
  1326 + //幸运购的时候
  1327 + if (goodsinfo.prom_type == 9 && !good.is_pt_normal) {
  1328 +
  1329 + var lk_act=null;
  1330 + //获取单个活动成团信息
  1331 + var lk_rs= await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
  1332 + data: {
  1333 + store_id: os.stoid,
  1334 + is_end: 0,
  1335 + timetype: 1,
  1336 + id: goodsinfo.prom_id,
  1337 + }
  1338 + });
  1339 +
  1340 + if(lk_rs && ut.ajax_ok(lk_rs)){
  1341 + lk_act= lk_rs.data.data.pageData[0];
  1342 + }
  1343 + if(!lk_act){
  1344 + wx.showToast({ title: "未找到活动，或者活动已结束", icon: 'none', duration: 3000 });
  1345 + th.setData({ paying: 0 });
  1346 + return false;
  1347 + }
  1348 + // 检查幸运购活动商品库存
  1349 + var lk_redis=await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/9/" + goodsinfo.prom_id,{});
  1350 + if(!lk_redis || lk_redis<goodsinfo.goods_num ){
  1351 + wx.showToast({ title: "活动商品库存不足", icon: 'none', duration: 3000 });
  1352 + th.setData({ paying: 0 });
  1353 + return false;
  1354 + }
  1355 + }
  1356 +
1161 1357 }
1162 1358  
1163 1359 //-- 要判断一下线下取价价格是不是发生改变 --
... ... @@ -2081,9 +2277,14 @@ Page({
2081 2277 }
2082 2278 },
2083 2279 //获取用户参与组合购的次数
2084   - async getUserBuyPromNum(prom_id){
  2280 + async getUserBuyPromNum(prom_id,is_buy){
2085 2281 var userInfo = getApp().globalData.userInfo;
2086   - var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
  2282 +
  2283 + var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
  2284 + if(is_buy){
  2285 + url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
  2286 + }
  2287 +
2087 2288 let res = await getApp().request.promiseGet(url, {
2088 2289 data:{}
2089 2290 });
... ... @@ -2846,10 +3047,24 @@ Page({
2846 3047 //-- 查看物流 --
2847 3048 go_wuliu:function (e) {
2848 3049 getApp().go_wuliu(e);
2849   - }
2850   -
2851   -
  3050 + },
2852 3051  
  3052 + //优惠促销用户参与次数,is_buy=1，表示只获取支付了的
  3053 + async getUserBuyPromNum_pre(prom_id,is_buy) {
  3054 + var userInfo = getApp().globalData.userInfo;
  3055 + var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
  3056 + if(is_buy){
  3057 + url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
  3058 + }
  3059 + let res = await getApp().request.promiseGet(url, {
  3060 + data: {}
  3061 + });
  3062 + let user_pre_buynum = 0
  3063 + if (res.data.code == 0 && res.data.data) {
  3064 + user_pre_buynum = res.data.data.userbuynum
  3065 + }
  3066 + return user_pre_buynum
  3067 + },
2853 3068  
2854 3069  
2855 3070 });
2856 3071 \ No newline at end of file
... ...
utils/more_cx.js
  View file @478a545
... ... @@ -565,7 +565,7 @@ module.exports = {
565 565 user_id: getApp().globalData.user_id,
566 566 goods_id: zh_goods[h].goods_id,
567 567 prom_type: 7,
568   - prom_id: item_act_map.prom_id
  568 + prom_id: item_act_map.prom_id, isnew:1
569 569 },
570 570 })
571 571 if(res.data.code==0 && res.data.data && res.data.data.promgoodsbuynum){
... ...