Commit 94e8400c649c7deb5d2e66a64c804a97dc8daf88
1 parent
776c3648
门店地址排版
Showing
3 changed files
with
93 additions
and
7 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -206,7 +206,10 @@ Page({ | @@ -206,7 +206,10 @@ Page({ | ||
206 | iszaning: 0, | 206 | iszaning: 0, |
207 | 207 | ||
208 | store:0,//选择更多 | 208 | store:0,//选择更多 |
209 | - index:1 | 209 | + index:1, |
210 | + more_store:0,//选择门店 | ||
211 | + sort_store:0,//门店分类 | ||
212 | + choice_sort_store:0,//选择分类门店 | ||
210 | }, | 213 | }, |
211 | 214 | ||
212 | //------初始化加载---------- | 215 | //------初始化加载---------- |
@@ -2653,5 +2656,20 @@ Page({ | @@ -2653,5 +2656,20 @@ Page({ | ||
2653 | //关闭选择门店 | 2656 | //关闭选择门店 |
2654 | close_popup:function(){ | 2657 | close_popup:function(){ |
2655 | this.setData({ store: 0}) | 2658 | this.setData({ store: 0}) |
2656 | -} | 2659 | +}, |
2660 | +//选择更多门店 | ||
2661 | + more_store:function(){ | ||
2662 | + this.setData({ sort_store: 1 }); | ||
2663 | + }, | ||
2664 | + sort_store:function() { | ||
2665 | + | ||
2666 | + }, | ||
2667 | + // 返回按钮 | ||
2668 | + returns:function(){ | ||
2669 | + this.setData({ sort_store: 0,choice_sort_store:0}); | ||
2670 | + }, | ||
2671 | + // 选择分类门店 | ||
2672 | + choice_sort_store:function(){ | ||
2673 | + this.setData({ sort_store: 0, choice_sort_store:1 }); | ||
2674 | + } | ||
2657 | }); | 2675 | }); |
2658 | \ No newline at end of file | 2676 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.wxml
@@ -1016,14 +1016,16 @@ | @@ -1016,14 +1016,16 @@ | ||
1016 | <block wx:if="{{store==1}}"> | 1016 | <block wx:if="{{store==1}}"> |
1017 | <view class="mongolia-layer" bindtap="close_popup"></view> | 1017 | <view class="mongolia-layer" bindtap="close_popup"></view> |
1018 | <view class="popup-frame"> | 1018 | <view class="popup-frame"> |
1019 | + <block wx:if="{{sort_store==0}}"> | ||
1020 | + <!-- 头部 标题 --> | ||
1019 | <view class="popup-top flex-space-between"> | 1021 | <view class="popup-top flex-space-between"> |
1020 | - <text class="fs32 nearby_store">附近的门店</text> | 1022 | + <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':'门店分类'}}</text> |
1021 | <view> | 1023 | <view> |
1022 | <view> | 1024 | <view> |
1023 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 1025 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
1024 | </view> | 1026 | </view> |
1025 | - <view class="felx choose_more"> | ||
1026 | - <text class="fs22 red-co">选择更多门店</text> | 1027 | + <view class="felx choose_more" bindtap="more_store"> |
1028 | + <text class="fs22 red-co">{{choice_sort_store==0?'选择更多门店':'返回'}}</text> | ||
1027 | <view class="bg_rights"></view> | 1029 | <view class="bg_rights"></view> |
1028 | </view> | 1030 | </view> |
1029 | </view> | 1031 | </view> |
@@ -1067,6 +1069,35 @@ | @@ -1067,6 +1069,35 @@ | ||
1067 | </view> | 1069 | </view> |
1068 | </view> | 1070 | </view> |
1069 | </view> | 1071 | </view> |
1072 | + | ||
1073 | + </block> | ||
1074 | + <block wx:else> | ||
1075 | + <view class="popup-top flex-space-between"> | ||
1076 | + <text class="fs32 nearby_store">门店分类选择</text> | ||
1077 | + <view> | ||
1078 | + <view> | ||
1079 | + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
1080 | + </view> | ||
1081 | + <view class="felx choose_mores" bindtap="returns"> | ||
1082 | + <text class="fs22 red-co">返回</text> | ||
1083 | + </view> | ||
1084 | + </view> | ||
1085 | + </view> | ||
1086 | + <view class="sort_store_list"> | ||
1087 | + | ||
1088 | + <view class="sort-store-frame"> | ||
1089 | + <view class="sort-store flex-vertical-between" bindtap="choice_sort_store"> | ||
1090 | + <view class="fs28"> | ||
1091 | + 泉州开源广场 | ||
1092 | + </view> | ||
1093 | + <view class="black_rights-frame"> | ||
1094 | + <view class="black_rights"></view> | ||
1095 | + </view> | ||
1096 | + </view> | ||
1097 | + </view> | ||
1098 | + | ||
1099 | + </view> | ||
1100 | + </block> | ||
1070 | </view> | 1101 | </view> |
1071 | </block> | 1102 | </block> |
1072 | 1103 |
pages/goods/goodsInfo/goodsInfo.wxss
@@ -370,7 +370,7 @@ image { | @@ -370,7 +370,7 @@ image { | ||
370 | .cart-btn { | 370 | .cart-btn { |
371 | font-size: 28rpx; | 371 | font-size: 28rpx; |
372 | color: #fff; | 372 | color: #fff; |
373 | - line-height: 60rpx; | 373 | + line-height: 70rpx; |
374 | margin-top:16rpx; | 374 | margin-top:16rpx; |
375 | 375 | ||
376 | } | 376 | } |
@@ -2318,12 +2318,19 @@ height: 70%; | @@ -2318,12 +2318,19 @@ height: 70%; | ||
2318 | position: absolute; | 2318 | position: absolute; |
2319 | right: 30rpx; | 2319 | right: 30rpx; |
2320 | top: -10rpx; | 2320 | top: -10rpx; |
2321 | + height: 25rpx; | ||
2322 | + | ||
2321 | } | 2323 | } |
2322 | .choose_more{ | 2324 | .choose_more{ |
2323 | margin-top: 30rpx; | 2325 | margin-top: 30rpx; |
2324 | margin-right: 20rpx; | 2326 | margin-right: 20rpx; |
2325 | 2327 | ||
2326 | } | 2328 | } |
2329 | +.choose_mores{ | ||
2330 | + margin-top: 30rpx; | ||
2331 | + margin-right: 15rpx; | ||
2332 | + | ||
2333 | +} | ||
2327 | .store-list{ | 2334 | .store-list{ |
2328 | width: 95%; | 2335 | width: 95%; |
2329 | height: 72%; | 2336 | height: 72%; |
@@ -2398,4 +2405,34 @@ line-height: 30rpx; | @@ -2398,4 +2405,34 @@ line-height: 30rpx; | ||
2398 | width: 95%; | 2405 | width: 95%; |
2399 | border-top: 3rpx solid #eee; | 2406 | border-top: 3rpx solid #eee; |
2400 | margin: auto; | 2407 | margin: auto; |
2401 | - } | ||
2402 | \ No newline at end of file | 2408 | \ No newline at end of file |
2409 | + } | ||
2410 | + /* 门店分类列表 */ | ||
2411 | +.sort_store_list{ | ||
2412 | + height: 82%; | ||
2413 | + overflow: hidden; | ||
2414 | + overflow-y: scroll; | ||
2415 | + width: 95%; | ||
2416 | + margin: auto; | ||
2417 | +} | ||
2418 | +.sort_store_list .sort-store-frame{ | ||
2419 | + width: 100%; | ||
2420 | +height: 100rpx; | ||
2421 | +line-height:100rpx; | ||
2422 | +border-bottom: 1rpx solid #eee; | ||
2423 | + | ||
2424 | +} | ||
2425 | +.sort_store_list .sort-store-frame .sort-store{ | ||
2426 | + width: 94.5%; | ||
2427 | + margin: auto; | ||
2428 | +} | ||
2429 | +.black_rights-frame{ | ||
2430 | +width: 50%; | ||
2431 | +} | ||
2432 | +.black_rights-frame .black_rights{ | ||
2433 | + border-top: 3rpx solid; | ||
2434 | +border-right: 3rpx solid; | ||
2435 | +transform: rotate(45deg); | ||
2436 | +display: inline-block; | ||
2437 | +width: 20rpx; | ||
2438 | +height: 20rpx; | ||
2439 | +} | ||
2403 | \ No newline at end of file | 2440 | \ No newline at end of file |