From 923ad572ab2cc868c36124cd71a5b8e7c1610a44 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 13 Feb 2023 14:11:26 +0800
Subject: [PATCH] 预存造成的bug优化

---
 packageA/pages/goodsInfo/goodsInfo.js                     | 12 ++++++------
 packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js |  9 +++++++++
 packageC/pages/presell/cart/cart2_pre.js                  |  9 +++++++++
 packageE/pages/cart/cart2/cart2.js                        | 11 +++++++++--
 pages/cart/cart2_inte/cart2_inte.js                       |  9 +++++++++
 pages/cart/cart2_pt/cart2_pt.js                           |  9 +++++++++
 6 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 3848073..b6c19a6 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -775,16 +775,16 @@ Page({
   },
   
   onUnload: function() {
-	  for(var i = 1; i < 100; i++) {
-	    clearInterval(i);
-	  }
+	  // for(var i = 1; i < 100; i++) {
+	  //   clearInterval(i);
+	  // }
   },
 	
   onHide: function() {
     this.data.is_timer = 0;
-    for(var i = 1; i < 100; i++) {
-      clearInterval(i);
-    }
+    // for(var i = 1; i < 100; i++) {
+    //   clearInterval(i);
+    // }
   },
   //----------三个选项按钮-----------
   tabClick: function(t) {
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
index 4a2dece..a84e4fc 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -268,6 +268,15 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
+
+    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
+    }).then(res=>{
+      if(res.data.code==0){
+        getApp().globalData.config = res.data.data
+      }
+    })
+    if(!getApp().globalData.config) return false;
+
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
       data: {
         accdb: getApp().globalData.config.erpid,
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index c5d2362..1822bf5 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -398,6 +398,15 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
+
+    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
+    }).then(res=>{
+      if(res.data.code==0){
+        getApp().globalData.config = res.data.data
+      }
+    })
+    if(!getApp().globalData.config) return false;
+
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
       data: {
         accdb: getApp().globalData.config.erpid,
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 77d4065..1c84a8b 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -402,14 +402,21 @@ Page({
       }
       listform.push(obj)
     })
-    let arr = await this.getGoodsAdvancesum(keyid, listform, cartList)
+    let arr = await getApp().getGoodsAdvancesum(keyid, listform, cartList)
     // }
     wx.hideLoading()
     return arr
   },
 
   //计算商品预存款请求方法------------------------------------
-  async getGoodsAdvancesum(storageid, listform, cartList) {
+  async getGoodsAdvancesum(storageid, listform, cartList,th) {
+    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
+    }).then(res=>{
+       if(res.data.code==0){
+         getApp().globalData.config = res.data.data
+       }
+    })
+    if(!getApp().globalData.config) return false;
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
       data: {
         accdb: getApp().globalData.config.erpid,
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index fcbb5f7..dbb0d14 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -269,6 +269,15 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
+
+    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
+    }).then(res=>{
+      if(res.data.code==0){
+        getApp().globalData.config = res.data.data
+      }
+    })
+    if(!getApp().globalData.config) return false;
+
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
       data: {
         accdb: getApp().globalData.config.erpid,
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 95345e1..021ebf9 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -225,6 +225,15 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
+
+    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
+    }).then(res=>{
+      if(res.data.code==0){
+        getApp().globalData.config = res.data.data
+      }
+    })
+    if(!getApp().globalData.config) return false;
+
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
       data: {
         accdb: getApp().globalData.config.erpid,
--
libgit2 0.21.4