Commit df554a7c9c32cc0a8cb02909083939d6aa5c448c
Merge branch 'dev' into 'test'
Dev See merge request !357
Showing
4 changed files
with
18 additions
and
11 deletions
pages/cart/cart2/cart2.wxml
| ... | ... | @@ -376,7 +376,7 @@ |
| 376 | 376 | <block>{{item.Sum}}元优惠券</block> |
| 377 | 377 | </view> |
| 378 | 378 | <view class="coupon-time"> |
| 379 | - {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view> | |
| 379 | + {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view> | |
| 380 | 380 | </view> |
| 381 | 381 | </view> |
| 382 | 382 | <!-- <view wx:if="{{item.Obtain>0}}" class="code-img" bindtap="show_quan" data-ind="{{index}}" data-now="{{filter.format_time(now)}}"> | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -946,7 +946,7 @@ Page({ |
| 946 | 946 | //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ |
| 947 | 947 | if(o.prom_type!=1 && o.prom_type!=6){ |
| 948 | 948 | var conf=th.data.bconfig; |
| 949 | - if(conf.switch_list){ | |
| 949 | + if (conf.switch_list && getApp().globalData.userInfo['card_field']){ | |
| 950 | 950 | var s_list=JSON.parse(conf.switch_list); |
| 951 | 951 | var now=ut.gettimestamp(); |
| 952 | 952 | var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/'); |
| ... | ... | @@ -1695,7 +1695,8 @@ Page({ |
| 1695 | 1695 | } |
| 1696 | 1696 | for(var i in e.data.data.pageData){ |
| 1697 | 1697 | var item=e.data.data.pageData[i]; |
| 1698 | - pkno.push(item.pickup_no); | |
| 1698 | + if(pkno.indexOf(item.pickup_no)<0) | |
| 1699 | + pkno.push(item.pickup_no); | |
| 1699 | 1700 | } |
| 1700 | 1701 | var pkno_str=pkno.join(","); |
| 1701 | 1702 | var o_plist=e.data.data.pageData; |
| ... | ... | @@ -1718,7 +1719,8 @@ Page({ |
| 1718 | 1719 | }).then(res=>{ |
| 1719 | 1720 | if(res.data.code==0){ |
| 1720 | 1721 | if(res.data.data.pageData){ |
| 1721 | - var plist=res.data.data.pageData; | |
| 1722 | + var plist=res.data.data.pageData; | |
| 1723 | + var def_pick_store=th.data.def_pick_store; | |
| 1722 | 1724 | //以原来的数组为外循环，保证距离的顺序 |
| 1723 | 1725 | for(var kk in o_plist){ |
| 1724 | 1726 | for(var ii in plist){ |
| ... | ... | @@ -1733,11 +1735,13 @@ Page({ |
| 1733 | 1735 | o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num |
| 1734 | 1736 | new_list.push(o_plist[kk]); |
| 1735 | 1737 | //如果找到默认门店 |
| 1736 | - if(th.data.def_pick_store && n_item.StorageNo==th.data.def_pick_store.pickup_no){ | |
| 1737 | - th.data.def_pick_store.CanOutQty=n_item.CanOutQty; | |
| 1738 | - is_find_def_store=1; | |
| 1738 | + if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){ | |
| 1739 | + def_pick_store.CanOutQty=n_item.CanOutQty; | |
| 1740 | + th.setData({def_pick_store:def_pick_store}) | |
| 1741 | + is_find_def_store=1; | |
| 1739 | 1742 | } |
| 1740 | 1743 | } |
| 1744 | + break; | |
| 1741 | 1745 | } |
| 1742 | 1746 | } |
| 1743 | 1747 | } |
| ... | ... | @@ -3445,6 +3449,7 @@ Page({ |
| 3445 | 3449 | var goodsinfo=th.data.sele_g; |
| 3446 | 3450 | var erpwareid=goodsinfo.erpwareid; |
| 3447 | 3451 | var plist=null; |
| 3452 | + var lock=0; | |
| 3448 | 3453 | |
| 3449 | 3454 | //---如果是活动的时候--- |
| 3450 | 3455 | if(th.data.prom_type==1 || th.data.prom_type==6){ |
| ... | ... | @@ -3484,7 +3489,7 @@ Page({ |
| 3484 | 3489 | }) |
| 3485 | 3490 | |
| 3486 | 3491 | if(plist && plist.CanOutQty-lock>0){ |
| 3487 | - func() | |
| 3492 | + func() | |
| 3488 | 3493 | return false; |
| 3489 | 3494 | } |
| 3490 | 3495 | getApp().my_warnning(item.pickup_name+"库存不足！", 0, th); | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -868,7 +868,8 @@ |
| 868 | 868 | <block wx:if="{{prom_type==0}}"> |
| 869 | 869 | <view class="flex"> |
| 870 | 870 | <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view> |
| 871 | - <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view> | |
| 871 | + <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view> | |
| 872 | + <view class="spec-goods-stock" wx:else>可售：{{sele_g.store_count}}</view> | |
| 872 | 873 | |
| 873 | 874 | </view> |
| 874 | 875 | </block> | ... | ... |
pages/index/index/index.js
| ... | ... | @@ -149,7 +149,8 @@ Page({ |
| 149 | 149 | data: { |
| 150 | 150 | store_id: os.stoid, |
| 151 | 151 | pageSize: 5, |
| 152 | - is_show: 1 | |
| 152 | + is_show: 1, | |
| 153 | + level:1 | |
| 153 | 154 | } |
| 154 | 155 | }).then(res => { |
| 155 | 156 | if (res.data.data) { |
| ... | ... | @@ -181,7 +182,7 @@ Page({ |
| 181 | 182 | //读取全局是否有弄自定义模板 |
| 182 | 183 | await api.get_template_fir(o.stoid).then(res => { |
| 183 | 184 | var data = res.data.data; |
| 184 | - if (data.length > 0) { | |
| 185 | + if (data && data.length > 0) { | |
| 185 | 186 | var temp_data = data[0]; |
| 186 | 187 | var t_arr = JSON.parse(temp_data.json_str); |
| 187 | 188 | th.setData({ | ... | ... |