wxd / MShopWeApp

Commit 82e21a3d98d9530d5baa4e1047eb7bfcdb348698

Authored by 后端研发-苏明海
2 parents 50cb1f68 aa90b8a0

Merge branch 'dev' into 'test' 

商品详情的显示可出库数

See merge request !361
Inline Side-by-side
Showing 1 changed file with 19 additions and 15 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @82e21a3
... ... @@ -627,6 +627,7 @@ Page({
627 627  
628 628 //获取统一条形码,普通商品和优惠促销的商品
629 629 if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 4 || ee.data.data.prom_type == 5){
  630 +
630 631 //获取门店
631 632 ee.get_sto();
632 633 ee.get_sku(o.stoid, t.data.data.sku, gid);
... ... @@ -1552,6 +1553,7 @@ Page({
1552 1553 }).then(res => {
1553 1554 var e = res;
1554 1555 if (e.data.code == 0) {
  1556 +
1555 1557 //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
1556 1558 if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){
1557 1559 th.setData({
... ... @@ -1577,10 +1579,14 @@ Page({
1577 1579 th.setData({all_pick_list:e.data.data.pageData});
1578 1580  
1579 1581 //--获取线下库存,而且不是新的门店规则,同时不能是活动--
1580   - if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){
1581   - th.deal_pickup_dline(e);
  1582 + if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){
  1583 + setTimeout(function(){
  1584 + th.deal_pickup_dline(e);
  1585 + },500)
1582 1586 }else{
1583   - th.deal_pickup(e); //--普通门店排版--
  1587 + setTimeout(function(){
  1588 + th.deal_pickup(e); //--普通门店排版--
  1589 + },500)
1584 1590 }
1585 1591 }
1586 1592 })
... ... @@ -1728,7 +1734,7 @@ Page({
1728 1734  
1729 1735 },
1730 1736 //------------处理线下门店库存--------
1731   - async deal_pickup_dline(e){
  1737 + deal_pickup_dline(e){
1732 1738 var pkno=[],th=this;
1733 1739 if(this.data.def_pick_store){
1734 1740 pkno.push(this.data.def_pick_store.pickup_no);
... ... @@ -1744,18 +1750,17 @@ Page({
1744 1750 var is_find_def_store=0;
1745 1751  
1746 1752 var lock=[];
1747   - //先读取门店的lock
1748   - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
  1753 + //先读取门店的lock,采用链式写法，少用await
  1754 + getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
1749 1755 data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id}
1750 1756 }).then(res=>{
1751 1757 if(res.data.code==0 && res.data.data.total>0){
1752 1758 lock=res.data.data.pageData
1753 1759 }
1754   - })
1755   -
1756   - //---通过接口获取门店的线下库存信息--
1757   - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
1758   - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}
  1760 + //---通过接口获取门店的线下库存信息--
  1761 + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
  1762 + data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}
  1763 + })
1759 1764 }).then(res=>{
1760 1765 if(res.data.code==0){
1761 1766 if(res.data.data.pageData){
... ... @@ -1767,7 +1772,7 @@ Page({
1767 1772 //线下的门店小心
1768 1773 var n_item=plist[ii];
1769 1774 if(n_item.StorageNo==o_plist[kk].pickup_no){
1770   -
  1775 +
1771 1776 //拿到锁库的数量
1772 1777 var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);
1773 1778 //可出库数大于预出库库存的数量，可以判断为有库存
... ... @@ -1775,7 +1780,7 @@ Page({
1775 1780 o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;
1776 1781 new_list.push(o_plist[kk]);
1777 1782 //如果找到默认门店
1778   - if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){
  1783 + if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){
1779 1784 def_pick_store.CanOutQty=n_item.CanOutQty-lock_num;
1780 1785 th.setData({def_pick_store:def_pick_store})
1781 1786 is_find_def_store=1;
... ... @@ -1803,8 +1808,7 @@ Page({
1803 1808 }else{
1804 1809 th.setData({def_pick_store:null,all_sto:null,only_pk:null})
1805 1810 }
1806   - })
1807   -
  1811 + })
1808 1812 },
1809 1813  
1810 1814 find_lock_num(pick_id,lock){
... ...