立即购买优化顺序

yvan.ni
1 parent 40727adf
Showing 2 changed files with 29 additions and 150 deletions
components/promate_pop/promate_pop.wxss
pages/goods/goodsInfo/goodsInfo.js
@@ -248,6 +248,16 @@
     background-color: #d60021;
 }
-
-
 @import '../../app.wxss';
+
+.tick:before {
+    content: '';
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: -4rpx;
+    margin-right: 12rpx;
+    width: 22rpx;
+    height: 22rpx;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
+    background-size: 22rpx auto;
+}
 \ No newline at end of file
@@ -2062,150 +2062,14 @@ Page({
           });
         } else {
-
-          //-- 这一步主要是要让立即购买 走 购物车的逻辑 参与活动，如果有zh_act就强制组合购购买 --
-          if (th.data.zh_act &&
-            th.data.zh_act.zhbuyqty <= th.data.goodsInputNum && (!th.data.zh_act.zh_num || th.data.zh_act.zh_buy_num < th.data.zh_act.zh_num)) {
-            wx.hideLoading();
-
-            // if ((th.data.zh_act.buy_limit != 0 && th.data.zh_act.buy_limit <= th.data.userbuynum)) {
-            //   wx.showModal({
-            //     title: '提示',
-            //     // content: `商品${str},组合购活动，购买次数已超，将以普通商品购买？`,
-            //     content: `${th.data.data.goods_name}超出组合购限购次数，将以普通商品购买`,
-            //     success: res => {
-            //       if (res.confirm) {
-            //         console.log('用户点击确定')
-            //         //----先看会员在购物车中是否加入了该商品,立即购买的-----
-            //         getApp().request.get("/api/weshop/cart/page", {
-            //           data: {
-            //             store_id: os.stoid,
-            //             user_id: oo.user_id,
-            //             state: 1
-            //           },
-            //           success: function (res) {
-            //             //-------如果购物车中有相关的数据---------
-            //             if (res.data.code == 0 && res.data.data.total > 0) {
-            //               for (let j in res.data.data.pageData) {
-            //                 let item_j = res.data.data.pageData[j];
-            //                 var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-            //                 getApp().request.delete(url, {});
-            //               }
-            //             }
-            //             newd.state = 1;
-            //             newd.prom_type = 0;
-            //             newd.prom_id = 0
-            //             getApp().request.post("/api/weshop/cart/save", {
-            //               data: newd,
-            //               success: function (t) {
-            //                 th.closeSpecModal();
-            //                 getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
-            //               }
-            //             });
-            //           }
-            //         })
-            //       } else if (res.cancel) {
-            //
-            //         console.log('用户点击取消')
-            //       }
-            //     }
-            //   })
-            // } else {
-               //----先看会员在购物车中是否加入了该商品,立即购买的-----
-               getApp().request.get("/api/weshop/cart/page", {
-                data: {
-                  store_id: os.stoid,
-                  user_id: oo.user_id,
-                  state: 1
-                },
-                success: function (res) {
-                  //-------如果购物车中有相关的数据,先清理掉---------
-                  if (res.data.code == 0 && res.data.data.total > 0) {
-                    for (let j in res.data.data.pageData) {
-                      let item_j = res.data.data.pageData[j];
-                      var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-                      getApp().request.delete(url, {});
-                    }
-                  }
-
-                  newd.state = 1;
-                  newd.prom_type = 7;
-                  newd.prom_id = th.data.zh_act.id;
-                  getApp().request.post("/api/weshop/cart/save", {
-                    data: newd,
-                    success: function (t) {
-                      th.closeSpecModal();
-                      getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
-                    }
-                  });
-
-                }
-              })
-            //}
-
-
-            return false
-          } else {
-            //----先看会员在购物车中是否加入了该商品,立即购买的-----
-            getApp().request.get("/api/weshop/cart/page", {
-              data: {
-                store_id: os.stoid,
-                user_id: oo.user_id,
-                state: 1
-              },
-              success: function (res) {
-                //-------如果购物车中有相关的数据---------
-                if (res.data.code == 0 && res.data.data.total > 0) {
-                  for (let j in res.data.data.pageData) {
-                    let item_j = res.data.data.pageData[j];
-                    var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-                    getApp().request.delete(url, {});
-                  }
-                }
-
-              }
-            })
-
-          }
-
-          if (th.data.prom_goods && newd.prom_type != 4 && newd.prom_type != 6) {
-            var prom_d = th.data.prom_goods;
-            for (var i in prom_d) {
-              //判断活动有俩种条件，0元 1件
-              var condition_t = prom_d[i].prom_type;
-              switch (condition_t) {
-                case 0: //按钱
-                  if (newd.goods_price >= condition_t) {
-                    newd.prom_type = 3;
-                    newd.prom_id = prom_d[i].prom_id;
-                  }
-                  break
-                case 1: //按购买数量
-                  if (newd.goods_num >= condition_t) {
-                    newd.prom_type = 3;
-                    newd.prom_id = prom_d[i].prom_id;
-                  }
-                  break;
-              }
-            }
-          }
-          //如果有阶梯促销的时候
-          if (th.data.jieti_prom && (newd.prom_type == 10 || newd.prom_type == 0)) {
-            newd.prom_type = 10;
-            newd.prom_id = th.data.ladder_act_id;
-          } else {
-            //-- 优惠促销的商品，立即购买就判断了,就直接购买 --
-            if ([1, 2, 4, 6].indexOf(newd.prom_type) == -1) {
-              newd.prom_type = 0;
-              newd.id = 0;
-            }
-          }
+            newd.prom_type = 0;
+            newd.id = 0;
             newd['pick_name'] = th.data.sto_sele_name;
             newd['pick_dis'] = th.data.sto_sele_distr;
             th.buyNow(newd);
-          }
-        },
+         }
+      },
         //因为在购物车  普通商品和 优惠促销，搭配购，组合购 阶梯购是一样的
         check_is_like(e, newd, idx) {
@@ -2670,9 +2534,7 @@ Page({
           },
           openSpecModel: function (t) {
-
-
-
+        
             var th = this;
             var open_store = t.currentTarget.dataset.ind;
@@ -7615,10 +7477,17 @@ Page({
                                 if (r_data.promGoodsLists) {
                                   var fir_act = r_data.promGoodsLists[0];
+                                  var is_yh_out_limit=0;
+
+
                                   //-- 计算一下限购，满足限购数才显示  --
-                                  await this.getUserBuyPromNum_pre(fir_act.prom_id);
+                                  if (fir_act.limit_num ) {
+                                    await this.getUserBuyPromNum_pre(fir_act.prom_id);
+                                    if(th.data.user_pre_buynum < fir_act.limit_num){
+                                      is_yh_out_limit=1;
+                                    }
-                                  if (!fir_act.limit_num || th.data.user_pre_buynum < fir_act.limit_num) {
+                                  }
                                     // var more_arr = [];
                                     // //减价
                                     // if (fir_act.money > 0){
@@ -7695,10 +7564,10 @@ Page({
                                       limit: '每人' + (fir_act.limit_num ? '限参与' + fir_act.limit_num + '次' : '参与不限次'),
                                       more: more_arr,
                                       prom_type: 3,
-                                      promGoodsListsDtos:r_data.promGoodsLists
+                                      promGoodsListsDtos:r_data.promGoodsLists,
+                                      is_yh_out_limit:is_yh_out_limit
                                     });
-
-                                  }
+                                  //}
                                 }