From 8af6f7440091ecab65fa46d8c2f022e1d9e54e55 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 28 Mar 2023 11:05:49 +0800
Subject: [PATCH] 预售的优化

---
 packageC/pages/presell/cart/cart2.js          |  4 ++++
 packageC/pages/presell/cart/cart2_pre.js      |  2 ++
 packageC/pages/presell/goodsInfo/goodsInfo.js | 12 ++++++++----
 pages/goods/goodsInfo/goodsInfo.js            | 15 ++++++++++++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index 5ab0e30..37a40fa 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -408,6 +408,10 @@ Page({
 
                 t.data.data.original_img = oo.imghost + t.data.data.original_img;
                 t.data.data['buynum'] = th.data.gg.goods_num;
+                t.data.data.prom_id=th.data.gg.prom_id;
+                t.data.data.prom_type=8;
+
+
                 var distr_t = 0, et = 0;
 
                 if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 7ff56ae..414cb55 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -187,6 +187,8 @@ Page({
 
         t.data.data.original_img = os.imghost + t.data.data.original_img;
         t.data.data['buynum'] = gg.goods_num;
+        t.data.data.prom_type=8;
+        t.data.data.prom_id=gg.prom_id;
 
         var distr_t = 0, et = 0;
 
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index ca083a1..c73430b 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -702,6 +702,9 @@ Page({
               title: t.data.data.goods_name,
             });
 
+            t.data.data.prom_id=  th.data.presell_id;
+            t.data.data.prom_type=  8;
+
             //-- 把商品的赋值 --
             ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
             ee.data.sele_g_id = t.data.data.goods_id;
@@ -1082,7 +1085,7 @@ Page({
       newd.goods_price = th.data.prom_price;
       newd.member_goods_price = th.data.prom_price,
         newd.prom_type = 8;
-      newd.prom_id = o.prom_id;
+      newd.prom_id = th.data.presell_id;
 
       if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
       if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
@@ -1665,11 +1668,11 @@ Page({
       is_on_sale: 1,
       pageSize: 500,
       orderField: 'gg_ordid,goods_spec,sort',
-      prom_type: 8,
+      //prom_type: 8,
     };
 
     if (tt.data.presellForm && tt.data.presellForm.id) {
-      rq_data.prom_id = tt.data.presellForm.id;
+      //rq_data.prom_id = tt.data.presellForm.id;
     }
 
     await getApp().request.promiseGet("/api/weshop/goods/page", {
@@ -4291,6 +4294,7 @@ Page({
         if (res.data.code == 0 && res.data.data) {
           var arr = res.data.data;
           presell_id = arr.presell_id;
+          th.data.presell_id=presell_id;
           th.setData({
             presellList: arr,
           })
@@ -4378,7 +4382,7 @@ Page({
 
     var userInfo = getApp().globalData.userInfo;
     // timetype: 1,
-    var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 };
+    var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,presell_id: presell_id, pageSize: 1000 };
     if (userInfo) {
       pre_data.user_id = userInfo.user_id;
     }
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 4cf94d3..d4fb6fc 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7746,7 +7746,20 @@ Page({
     var prom_id = e.currentTarget.dataset.id;
     var prom_type = e.currentTarget.dataset.prom_type;
     var goods_id = this.data.data.goods_id;
-    var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods_id + "&prom_id=" + prom_id + "&prom_type="+prom_type;
+    var url = "";
+
+    switch (parseInt(prom_type)){
+      case 1:
+      case 2:
+      case 4:
+      case 6:
+        url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods_id + "&prom_id=" + prom_id + "&prom_type="+prom_type;
+        break;
+      case 8:
+        url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + goods_id+ "&prom_id=" + prom_id;
+    }
+
+
     getApp().goto(url);
   },
 
--
libgit2 0.21.4