diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index 496b5ff..e76398f 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -411,17 +411,20 @@
/*一个3列*/
.zs_goods_wai_san {
- width: 236rpx;
+ /* width: 236rpx; */
+ width: 242rpx;
/* display: flex;
margin-left: 10rpx;
float: left; */
/* margin-bottom: 8rpx; */
background-color: white;
overflow: hidden;
+ box-sizing: border-box;
}
.zs_goods_san {
- width: 236rpx;
+ /* width: 236rpx; */
+ width: 242rpx;
}
.zs_goods_3l {
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 d80dc0a..457eb3b 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -268,13 +268,14 @@ 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){
+ await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+ }).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`, {
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 7ff56ae..e62310d 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -398,13 +398,14 @@ 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){
+ await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+ }).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`, {
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index b68a64c..26eaba4 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -410,12 +410,14 @@ 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){
+ await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+ }).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: {
@@ -5519,6 +5521,7 @@ Page({
var prom = null;
var gg = to.get_b_now();
getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => {
+ debugger
if (res.data.code == 0) {
prom = res.data.data;
let min_value = 0
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 54c48b4..5780298 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -561,7 +561,7 @@
使用优惠券
- ¥ {{formData.coupon_price}}元
-
+
优惠活动
- ¥ {{filters.toFix(formData.cut_price,2)}}元
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index cb1b64e..d5e11c0 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -272,13 +272,14 @@ 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){
+ await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+ }).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`, {
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index e517ac3..abd9018 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -225,13 +225,14 @@ 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){
+ await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+ }).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`, {