商品详情和购物车，确认订单页面的一些bug优化

yvan.ni
1 parent d79dd8a8
Showing 3 changed files with 34 additions and 43 deletions
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
@@ -186,6 +186,7 @@ Page({
     can_use_ord_prom: {},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom: {},
+    
     sameCityExp_off: 0, //未达到起送价
     sameCityExp_info: '',//未达到起送价提示信息
     first_entry: 0,//进入次数，如果是第一次进入，进行判断是否进行优惠券是否直接使用
@@ -1001,6 +1002,8 @@ Page({
       var new_arr = [];
       for (var ir = 0; ir < carr.length; ir++) {
+        carr[ir].collocationList = null;
+
         var c_ok = 1;
         if (old_prom && (carr[ir].prom_type != old_prom.prom_type || carr[ir].prom_id != old_prom.prom_id)) {
           c_ok = 0;
@@ -1075,11 +1078,6 @@ Page({
           }
         }
-
-
-        if (is_change) {
-          carr[iv].collocationList = null;
-        }
       }
       //-- 对商品的多促销进行判断 ---2024-2-1--
       if (dug_cx_arr.length) {
@@ -497,7 +497,6 @@ Page({
       th.setData({
         requestData: [],
         all_num: 0,
-        is_load: 1,
         is_edit: 0,
         checkAllToggle:0
       }),wx.stopPullDownRefresh();
@@ -1085,7 +1084,7 @@ Page({
                 }
               })
             }
-            if (msNum && (msNum >= prom.buy_limit)) {
+            if (msNum && (msNum >= prom.buy_limit && prom.buy_limit>0)) {
               console.log('秒杀限购')
               th.disInvalid({
                 ...item,
@@ -2102,7 +2101,7 @@ Page({
   //判断多门店，优惠促销次数的控制
   async multiple_stores_pro(pitems, item) {
-    if(!this.data.requestData || !this.data.requestData[pitems])  return false
+    if(!this.data.requestData || !this.data.requestData[pitems] || !this.data.requestData[pitems].goods)  return false
     let a = this.data.requestData[pitems].goods[item];
     let th = this
@@ -2317,7 +2316,7 @@ Page({
     //   return false;
     // }
-    var txt0 = "requestData[" + pitems + "].show_can_cx";
+    var txt0 = "requestData[" + pitems + "].show_can_cx1";
     e.setData({
       [txt0]: {},
     });
@@ -2348,6 +2347,7 @@ Page({
           title: the_res.msg,
           icon: 'none',
         });
+        th.clear_clicking();
       }
     })
@@ -2624,7 +2624,6 @@ Page({
                     [txt]: prom_goodsbuynum
                   });
-
               }
           }
           if (item[c].prom_type == 10) {
@@ -2702,11 +2701,6 @@ Page({
-
-
-
-
-
         //总的价格,把组合商品的价格拿出来
         var zh_calc_res = zh_calc.calculate_zh(car, a, th);
         console.log('.组合价-----------')
@@ -3812,6 +3806,7 @@ Page({
               var et= {"prom_type":i_arr[j].prom_type,"prom_id":i_arr[j].prom_id,"goods_id":i_arr[j].goods_id};
               glist.push(et);
             }
+            
             ab = 1;
             //-- 获取促销活动是不是有参与 --
@@ -4278,7 +4273,6 @@ Page({
           var ky=val.goods_id + "-"+val.prom_type + "-"+val.prom_id;
           var obj = map_limit.get(ky);
           if (obj){
-            obj.g_num+=val.goods_num;
             continue;
           }
           var promgoodsbuynum =val.promgoodsbuynum || 0;
@@ -4293,8 +4287,7 @@ Page({
         //try {
         for (var ind in ddata) {
           var val = ddata[ind];
-          var num = map.get(val.goods_id + "");
-
+  
           var ky=val.goods_id + "-"+val.prom_type + "-"+val.prom_id;
           var ky2=val.prom_type + "-"+val.prom_id;
@@ -4313,7 +4306,7 @@ Page({
           if (val.prom_type == 1 || val.prom_type == 2) {
             var s_num=num;
-            if(th.data.sales_rules> 1) s_num=buyed;
+            //if(th.data.sales_rules> 1) s_num=buyed;
             if (s_num > val.store_count) {
               isok = 0;
               gname = val.goods_name;
@@ -4328,7 +4321,7 @@ Page({
               break;
             }
-            if(cur_buyed && buyed.g_num > val.goods_num - val.buy_num && val.goods_num) {
+            if(cur_buyed && cur_buyed.g_num > val.goods_num - val.buy_num && val.goods_num) {
               isok = 0;
               gname = val.goods_name;
               err="超出活动库存";
@@ -5095,9 +5095,9 @@ Page({
                           if (em.data.data <= 0) ee.setData({
                             prom_r_null: 1
                           });
-                          //拿取价格并且判断时间--
-                          getApp().request.get("/api/weshop/teamlist/get/" +
-                            os.stoid + "/" + prom_id, {
+                          //拿取价格并且判断时间,并判断会员的身分--
+                          getApp().request.get("/api/weshop/teamlist/getUser/" +
+                            os.stoid + "/" + prom_id+"/"+getApp().globalData.user_id, {
                               success: async function (t) {
                                 if (t.data.code != 0) {
                                   ee.get_normal(gid);
@@ -5140,27 +5140,27 @@ Page({
                                 }
                                 //判断拼团的---会员身份--
-                                await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
-                                  data: {
-                                    store_id: os.stoid,
-                                    is_end: 0,
-                                    is_show: 1,
-                                    user_id: getApp().globalData.user_id,
-                                    pageSize: 1000
-                                  }
-                                }).then(res => {
-                                  let pd_list = res.data.data.pageData;
-                                  if (res.data.code == 0 && pd_list.length > 0) {
-                                    flag = pd_list.some(pd => {
-                                      return pd.goods_id == gid
-                                    })
-                                  }
-                                })
-                                if (!flag) {
-                                  ee.get_normal(gid);
-                                  return false;
+                                // await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
+                                //   data: {
+                                //     store_id: os.stoid,
+                                //     is_end: 0,
+                                //     is_show: 1,
+                                //     user_id: getApp().globalData.user_id,
+                                //     pageSize: 1000
+                                //   }
+                                // }).then(res => {
+                                //   let pd_list = res.data.data.pageData;
+                                //   if (res.data.code == 0 && pd_list.length > 0) {
+                                //     flag = pd_list.some(pd => {
+                                //       return pd.goods_id == gid
+                                //     })
+                                //   }
+                                // })
+                                // if (!flag) {
+                                //   ee.get_normal(gid);
+                                //   return false;
+                                // }
-                                }
                                 //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
                                 await getApp().request.promiseGet("/api/weshop/order/page", {
                                   data: {