1 participants
-
Status changed to merged
-
mentioned in commit 9263d910b378b608a3717ace723ee676abe23454
Showing
4 changed files
pages/cart/cart/cart.js
| @@ -645,7 +645,7 @@ Page({ | @@ -645,7 +645,7 @@ Page({ | ||
| 645 | var lock=0,pick_no,plist; | 645 | var lock=0,pick_no,plist; |
| 646 | //先读取门店的lock | 646 | //先读取门店的lock |
| 647 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | 647 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ |
| 648 | - data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_id} | 648 | + data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_id,pageSize:1000} |
| 649 | }).then(res=>{ | 649 | }).then(res=>{ |
| 650 | if(res.data.code==0 && res.data.data.total>0){ | 650 | if(res.data.code==0 && res.data.data.total>0){ |
| 651 | for(var i in res.data.data.pageData) | 651 | for(var i in res.data.data.pageData) |
pages/cart/cart2/cart2.js
| @@ -1011,7 +1011,7 @@ Page({ | @@ -1011,7 +1011,7 @@ Page({ | ||
| 1011 | var lock=0,pick_no,plist,erpwareid; | 1011 | var lock=0,pick_no,plist,erpwareid; |
| 1012 | //先读取门店的lock | 1012 | //先读取门店的lock |
| 1013 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | 1013 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ |
| 1014 | - data:{store_id:os.stoid,wareId:goods_id,storageId:pick} | 1014 | + data:{store_id:os.stoid,wareId:goods_id,storageId:pick,pageSize:1000} |
| 1015 | }).then(res=>{ | 1015 | }).then(res=>{ |
| 1016 | if(res.data.code==0 && res.data.data.total>0){ | 1016 | if(res.data.code==0 && res.data.data.total>0){ |
| 1017 | for(var i in res.data.data.pageData) | 1017 | for(var i in res.data.data.pageData) |
pages/goods/goodsInfo/goodsInfo.js
| @@ -635,7 +635,7 @@ Page({ | @@ -635,7 +635,7 @@ Page({ | ||
| 635 | var lock=0,plist=null; | 635 | var lock=0,plist=null; |
| 636 | //先读取门店的lock,采用链式写法，少用await | 636 | //先读取门店的lock,采用链式写法，少用await |
| 637 | getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | 637 | getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ |
| 638 | - data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id} | 638 | + data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000} |
| 639 | }).then(res=>{ | 639 | }).then(res=>{ |
| 640 | if(res.data.code==0 && res.data.data.total>0){ | 640 | if(res.data.code==0 && res.data.data.total>0){ |
| 641 | for(var i in res.data.data.pageData) | 641 | for(var i in res.data.data.pageData) |
| @@ -953,7 +953,7 @@ Page({ | @@ -953,7 +953,7 @@ Page({ | ||
| 953 | } | 953 | } |
| 954 | //在调一次接口,读取商品的预出库的数量，lock | 954 | //在调一次接口,读取商品的预出库的数量，lock |
| 955 | getApp().request.get("/api/weshop/order/ware/lock/page",{ | 955 | getApp().request.get("/api/weshop/order/ware/lock/page",{ |
| 956 | - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id}, | 956 | + data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000}, |
| 957 | success:function(res_data){ | 957 | success:function(res_data){ |
| 958 | if(res_data.data.code==0 && res_data.data.data.total>0){ | 958 | if(res_data.data.code==0 && res_data.data.data.total>0){ |
| 959 | 959 | ||
| @@ -1513,7 +1513,7 @@ Page({ | @@ -1513,7 +1513,7 @@ Page({ | ||
| 1513 | var lock=0,plist=null; | 1513 | var lock=0,plist=null; |
| 1514 | //先读取门店的lock,采用链式写法，少用await | 1514 | //先读取门店的lock,采用链式写法，少用await |
| 1515 | getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | 1515 | getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ |
| 1516 | - data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id} | 1516 | + data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000} |
| 1517 | }).then(res=>{ | 1517 | }).then(res=>{ |
| 1518 | if(res.data.code==0 && res.data.data.total>0){ | 1518 | if(res.data.code==0 && res.data.data.total>0){ |
| 1519 | for(var i in res.data.data.pageData) | 1519 | for(var i in res.data.data.pageData) |
| @@ -1653,11 +1653,11 @@ Page({ | @@ -1653,11 +1653,11 @@ Page({ | ||
| 1653 | if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){ | 1653 | if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){ |
| 1654 | setTimeout(function(){ | 1654 | setTimeout(function(){ |
| 1655 | th.deal_pickup_dline(e); | 1655 | th.deal_pickup_dline(e); |
| 1656 | - },500) | 1656 | + },800) |
| 1657 | }else{ | 1657 | }else{ |
| 1658 | setTimeout(function(){ | 1658 | setTimeout(function(){ |
| 1659 | th.deal_pickup(e); //--普通门店排版-- | 1659 | th.deal_pickup(e); //--普通门店排版-- |
| 1660 | - },500) | 1660 | + },800) |
| 1661 | } | 1661 | } |
| 1662 | } | 1662 | } |
| 1663 | }) | 1663 | }) |
| @@ -1823,7 +1823,7 @@ Page({ | @@ -1823,7 +1823,7 @@ Page({ | ||
| 1823 | var lock=[]; | 1823 | var lock=[]; |
| 1824 | //先读取门店的lock,采用链式写法，少用await | 1824 | //先读取门店的lock,采用链式写法，少用await |
| 1825 | getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | 1825 | getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ |
| 1826 | - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id} | 1826 | + data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000} |
| 1827 | }).then(res=>{ | 1827 | }).then(res=>{ |
| 1828 | if(res.data.code==0 && res.data.data.total>0){ | 1828 | if(res.data.code==0 && res.data.data.total>0){ |
| 1829 | lock=res.data.data.pageData | 1829 | lock=res.data.data.pageData |
| @@ -3655,7 +3655,7 @@ Page({ | @@ -3655,7 +3655,7 @@ Page({ | ||
| 3655 | 3655 | ||
| 3656 | //先读取门店的lock | 3656 | //先读取门店的lock |
| 3657 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | 3657 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ |
| 3658 | - data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id} | 3658 | + data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000} |
| 3659 | }).then(res=>{ | 3659 | }).then(res=>{ |
| 3660 | if(res.data.code==0 && res.data.data.total>0){ | 3660 | if(res.data.code==0 && res.data.data.total>0){ |
| 3661 | for(var i in res.data.data.pageData ) | 3661 | for(var i in res.data.data.pageData ) |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | <view class="word-line fs20 xc-qtunit-price">零售价￥{{data.market_price}}</view> | 94 | <view class="word-line fs20 xc-qtunit-price">零售价￥{{data.market_price}}</view> |
| 95 | </view> | 95 | </view> |
| 96 | <view class="abs white xc-nanber"> | 96 | <view class="abs white xc-nanber"> |
| 97 | - <text class="fs22">已拼{{prom_act.buy_num}}份</text> | 97 | + <text class="fs22">已拼{{prom_act.buy_num}}件</text> |
| 98 | <view class="flex" style='margin-top:-34rpx'> | 98 | <view class="flex" style='margin-top:-34rpx'> |
| 99 | <view class="xc-people-img"> | 99 | <view class="xc-people-img"> |
| 100 | <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image> | 100 | <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image> |