Commit 2b6ff5983093450698618c249657e4d0b912e1e8
1 parent
e7b6c7e7
地址门店排版
Showing
3 changed files
with
19 additions
and
16 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -2652,7 +2652,11 @@ Page({ | @@ -2652,7 +2652,11 @@ Page({ | ||
| 2652 | }, | 2652 | }, |
| 2653 | // 选择门店 | 2653 | // 选择门店 |
| 2654 | choice_store:function(){ | 2654 | choice_store:function(){ |
| 2655 | - this.setData({store:1}) | 2655 | + this.setData({ |
| 2656 | + store:1, | ||
| 2657 | + openSpecModal: !1, | ||
| 2658 | + openSpecModal_pt: !1 | ||
| 2659 | + }) | ||
| 2656 | }, | 2660 | }, |
| 2657 | //关闭选择门店 | 2661 | //关闭选择门店 |
| 2658 | close_popup:function(){ | 2662 | close_popup:function(){ |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -305,7 +305,7 @@ | @@ -305,7 +305,7 @@ | ||
| 305 | <view class="address_frame"> | 305 | <view class="address_frame"> |
| 306 | <view class="flex-vertical-between "> | 306 | <view class="flex-vertical-between "> |
| 307 | <view class="flex"> | 307 | <view class="flex"> |
| 308 | - <image class="stores-img" src="../../../images/stores.png"></image> | 308 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
| 309 | <view class="fs28"> 选择附近门店</view> | 309 | <view class="fs28"> 选择附近门店</view> |
| 310 | </view> | 310 | </view> |
| 311 | <view class="red_bb fs32" bindtap="choice_store"> | 311 | <view class="red_bb fs32" bindtap="choice_store"> |
| @@ -760,22 +760,22 @@ | @@ -760,22 +760,22 @@ | ||
| 760 | <view class="spec-goods-price" wx:else><text class="fs20">¥</text>{{prom_price}}</view> | 760 | <view class="spec-goods-price" wx:else><text class="fs20">¥</text>{{prom_price}}</view> |
| 761 | 761 | ||
| 762 | </view> | 762 | </view> |
| 763 | - <view class="fs32 xc-ash flex ai_end"> | ||
| 764 | - <view>库存:</view> | ||
| 765 | - <view class="xc-store-count">{{data.store_count}} | ||
| 766 | - </view> | ||
| 767 | - </view> | ||
| 768 | - <!-- <block wx:if="{{prom_type==0}}"> | 763 | + |
| 764 | + <block wx:if="{{prom_type==0}}"> | ||
| 765 | + <view class="flex"> | ||
| 769 | <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view> | 766 | <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view> |
| 770 | <view class="spec-goods-stock">可售:{{sele_g.store_count}}</view> | 767 | <view class="spec-goods-stock">可售:{{sele_g.store_count}}</view> |
| 771 | - <view class="spec-goods-stock">已选:{{sku_g[0].gg}}</view> | ||
| 772 | - </block> --> | ||
| 773 | - <!-- <block wx:if="{{prom_type==1}}"> | 768 | + |
| 769 | + </view> | ||
| 770 | + </block> | ||
| 771 | + <block wx:if="{{prom_type==1}}"> | ||
| 772 | + <view class="flex"> | ||
| 774 | <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售:{{prom_act.buy_num+prom_act.virtual}}</view> | 773 | <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售:{{prom_act.buy_num+prom_act.virtual}}</view> |
| 775 | <view class="spec-goods-stock" wx:else >已售:{{prom_act.buy_num}}</view> | 774 | <view class="spec-goods-stock" wx:else >已售:{{prom_act.buy_num}}</view> |
| 776 | <view class="spec-goods-stock">可售:{{prom_act.goods_num-prom_act.buy_num}}</view> | 775 | <view class="spec-goods-stock">可售:{{prom_act.goods_num-prom_act.buy_num}}</view> |
| 777 | - <view class="spec-goods-stock">已选:{{sku_g[0].gg}}</view> | ||
| 778 | - </block> --> | 776 | + |
| 777 | + </view> | ||
| 778 | + </block> | ||
| 779 | </view> | 779 | </view> |
| 780 | <view class="flex-space-between address ai_end xc-width "> | 780 | <view class="flex-space-between address ai_end xc-width "> |
| 781 | <view class="flex ai_end"> | 781 | <view class="flex ai_end"> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -562,6 +562,7 @@ border-radius: 0 56rpx 55rpx 0; | @@ -562,6 +562,7 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 562 | margin-top: 3rpx; | 562 | margin-top: 3rpx; |
| 563 | font-size: 24rpx; | 563 | font-size: 24rpx; |
| 564 | color: #999999; | 564 | color: #999999; |
| 565 | + margin-right: 15rpx; | ||
| 565 | } | 566 | } |
| 566 | 567 | ||
| 567 | .spec-name { | 568 | .spec-name { |
| @@ -2440,9 +2441,7 @@ height: 20rpx; | @@ -2440,9 +2441,7 @@ height: 20rpx; | ||
| 2440 | .xc-val-money{ | 2441 | .xc-val-money{ |
| 2441 | height:80rpx; | 2442 | height:80rpx; |
| 2442 | } | 2443 | } |
| 2443 | -.xc-store-count{ | ||
| 2444 | -height: 40rpx; | ||
| 2445 | -} | 2444 | + |
| 2446 | .xc-distance-bottom{ | 2445 | .xc-distance-bottom{ |
| 2447 | margin-bottom: 40rpx; | 2446 | margin-bottom: 40rpx; |
| 2448 | } | 2447 | } |