Commit faa5af0b5718de495482ed54fd2f7e40b9e01ea9
1 parent
b7761fca
oa
Showing
7 changed files
with
47 additions
and
37 deletions
components/diy_goodsGroup/diy_goodsGroup.wxss
| @@ -411,17 +411,20 @@ | @@ -411,17 +411,20 @@ | ||
| 411 | /*一个3列*/ | 411 | /*一个3列*/ |
| 412 | 412 | ||
| 413 | .zs_goods_wai_san { | 413 | .zs_goods_wai_san { |
| 414 | - width: 236rpx; | 414 | + /* width: 236rpx; */ |
| 415 | + width: 242rpx; | ||
| 415 | /* display: flex; | 416 | /* display: flex; |
| 416 | margin-left: 10rpx; | 417 | margin-left: 10rpx; |
| 417 | float: left; */ | 418 | float: left; */ |
| 418 | /* margin-bottom: 8rpx; */ | 419 | /* margin-bottom: 8rpx; */ |
| 419 | background-color: white; | 420 | background-color: white; |
| 420 | overflow: hidden; | 421 | overflow: hidden; |
| 422 | + box-sizing: border-box; | ||
| 421 | } | 423 | } |
| 422 | 424 | ||
| 423 | .zs_goods_san { | 425 | .zs_goods_san { |
| 424 | - width: 236rpx; | 426 | + /* width: 236rpx; */ |
| 427 | + width: 242rpx; | ||
| 425 | } | 428 | } |
| 426 | 429 | ||
| 427 | .zs_goods_3l { | 430 | .zs_goods_3l { |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| @@ -268,13 +268,14 @@ Page({ | @@ -268,13 +268,14 @@ Page({ | ||
| 268 | }, | 268 | }, |
| 269 | //计算商品预存款请求方法------------------------------------ | 269 | //计算商品预存款请求方法------------------------------------ |
| 270 | async getGoodsAdvancesum(storageid, listform, cartList) { | 270 | async getGoodsAdvancesum(storageid, listform, cartList) { |
| 271 | - | ||
| 272 | - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{ | ||
| 273 | - }).then(res=>{ | ||
| 274 | - if(res.data.code==0){ | ||
| 275 | - getApp().globalData.config = res.data.data | ||
| 276 | - } | ||
| 277 | - }) | 271 | + if(!getApp().globalData.config){ |
| 272 | + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{ | ||
| 273 | + }).then(res=>{ | ||
| 274 | + if(res.data.code==0){ | ||
| 275 | + getApp().globalData.config = res.data.data | ||
| 276 | + } | ||
| 277 | + }) | ||
| 278 | + } | ||
| 278 | if(!getApp().globalData.config) return false; | 279 | if(!getApp().globalData.config) return false; |
| 279 | 280 | ||
| 280 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | 281 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { |
packageC/pages/presell/cart/cart2_pre.js
| @@ -398,13 +398,14 @@ Page({ | @@ -398,13 +398,14 @@ Page({ | ||
| 398 | }, | 398 | }, |
| 399 | //计算商品预存款请求方法------------------------------------ | 399 | //计算商品预存款请求方法------------------------------------ |
| 400 | async getGoodsAdvancesum(storageid, listform, cartList) { | 400 | async getGoodsAdvancesum(storageid, listform, cartList) { |
| 401 | - | ||
| 402 | - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{ | ||
| 403 | - }).then(res=>{ | ||
| 404 | - if(res.data.code==0){ | ||
| 405 | - getApp().globalData.config = res.data.data | ||
| 406 | - } | ||
| 407 | - }) | 401 | + if(!getApp().globalData.config){ |
| 402 | + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{ | ||
| 403 | + }).then(res=>{ | ||
| 404 | + if(res.data.code==0){ | ||
| 405 | + getApp().globalData.config = res.data.data | ||
| 406 | + } | ||
| 407 | + }) | ||
| 408 | + } | ||
| 408 | if(!getApp().globalData.config) return false; | 409 | if(!getApp().globalData.config) return false; |
| 409 | 410 | ||
| 410 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | 411 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { |
packageE/pages/cart/cart2/cart2.js
| @@ -410,12 +410,14 @@ Page({ | @@ -410,12 +410,14 @@ Page({ | ||
| 410 | 410 | ||
| 411 | //计算商品预存款请求方法------------------------------------ | 411 | //计算商品预存款请求方法------------------------------------ |
| 412 | async getGoodsAdvancesum(storageid, listform, cartList) { | 412 | async getGoodsAdvancesum(storageid, listform, cartList) { |
| 413 | - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{ | ||
| 414 | - }).then(res=>{ | ||
| 415 | - if(res.data.code==0){ | ||
| 416 | - getApp().globalData.config = res.data.data | ||
| 417 | - } | ||
| 418 | - }) | 413 | + if(!getApp().globalData.config){ |
| 414 | + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{ | ||
| 415 | + }).then(res=>{ | ||
| 416 | + if(res.data.code==0){ | ||
| 417 | + getApp().globalData.config = res.data.data | ||
| 418 | + } | ||
| 419 | + }) | ||
| 420 | + } | ||
| 419 | if(!getApp().globalData.config) return false; | 421 | if(!getApp().globalData.config) return false; |
| 420 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | 422 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { |
| 421 | data: { | 423 | data: { |
| @@ -5519,6 +5521,7 @@ Page({ | @@ -5519,6 +5521,7 @@ Page({ | ||
| 5519 | var prom = null; | 5521 | var prom = null; |
| 5520 | var gg = to.get_b_now(); | 5522 | var gg = to.get_b_now(); |
| 5521 | getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => { | 5523 | getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => { |
| 5524 | + debugger | ||
| 5522 | if (res.data.code == 0) { | 5525 | if (res.data.code == 0) { |
| 5523 | prom = res.data.data; | 5526 | prom = res.data.data; |
| 5524 | let min_value = 0 | 5527 | let min_value = 0 |
packageE/pages/cart/cart2/cart2.wxml
| @@ -561,7 +561,7 @@ | @@ -561,7 +561,7 @@ | ||
| 561 | <view>使用优惠券</view> | 561 | <view>使用优惠券</view> |
| 562 | <view class="co-red">- ¥ {{formData.coupon_price}}元</view> | 562 | <view class="co-red">- ¥ {{formData.coupon_price}}元</view> |
| 563 | </view> | 563 | </view> |
| 564 | - <!-- 优惠活动优惠金额 --> | 564 | + <!-- 优惠活动优惠金额 --> |
| 565 | <view class="item" wx:if="{{formData.cut_price>0}}"> | 565 | <view class="item" wx:if="{{formData.cut_price>0}}"> |
| 566 | <view>优惠活动</view> | 566 | <view>优惠活动</view> |
| 567 | <view class="co-red">- ¥ {{filters.toFix(formData.cut_price,2)}}元</view> | 567 | <view class="co-red">- ¥ {{filters.toFix(formData.cut_price,2)}}元</view> |
pages/cart/cart2_inte/cart2_inte.js
| @@ -272,13 +272,14 @@ Page({ | @@ -272,13 +272,14 @@ Page({ | ||
| 272 | }, | 272 | }, |
| 273 | //计算商品预存款请求方法------------------------------------ | 273 | //计算商品预存款请求方法------------------------------------ |
| 274 | async getGoodsAdvancesum(storageid, listform, cartList) { | 274 | async getGoodsAdvancesum(storageid, listform, cartList) { |
| 275 | - | ||
| 276 | - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{ | ||
| 277 | - }).then(res=>{ | ||
| 278 | - if(res.data.code==0){ | ||
| 279 | - getApp().globalData.config = res.data.data | ||
| 280 | - } | ||
| 281 | - }) | 275 | + if(!getApp().globalData.config){ |
| 276 | + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{ | ||
| 277 | + }).then(res=>{ | ||
| 278 | + if(res.data.code==0){ | ||
| 279 | + getApp().globalData.config = res.data.data | ||
| 280 | + } | ||
| 281 | + }) | ||
| 282 | + } | ||
| 282 | if(!getApp().globalData.config) return false; | 283 | if(!getApp().globalData.config) return false; |
| 283 | 284 | ||
| 284 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | 285 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { |
pages/cart/cart2_pt/cart2_pt.js
| @@ -225,13 +225,14 @@ Page({ | @@ -225,13 +225,14 @@ Page({ | ||
| 225 | }, | 225 | }, |
| 226 | //计算商品预存款请求方法------------------------------------ | 226 | //计算商品预存款请求方法------------------------------------ |
| 227 | async getGoodsAdvancesum(storageid, listform, cartList) { | 227 | async getGoodsAdvancesum(storageid, listform, cartList) { |
| 228 | - | ||
| 229 | - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{ | ||
| 230 | - }).then(res=>{ | ||
| 231 | - if(res.data.code==0){ | ||
| 232 | - getApp().globalData.config = res.data.data | ||
| 233 | - } | ||
| 234 | - }) | 228 | + if(!getApp().globalData.config){ |
| 229 | + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{ | ||
| 230 | + }).then(res=>{ | ||
| 231 | + if(res.data.code==0){ | ||
| 232 | + getApp().globalData.config = res.data.data | ||
| 233 | + } | ||
| 234 | + }) | ||
| 235 | + } | ||
| 235 | if(!getApp().globalData.config) return false; | 236 | if(!getApp().globalData.config) return false; |
| 236 | 237 | ||
| 237 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | 238 | let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { |