From 94e8400c649c7deb5d2e66a64c804a97dc8daf88 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 18 Sep 2019 14:49:01 +0800
Subject: [PATCH] 门店地址排版

---
 pages/goods/goodsInfo/goodsInfo.js   | 22 ++++++++++++++++++++--
 pages/goods/goodsInfo/goodsInfo.wxml | 37 ++++++++++++++++++++++++++++++++++---
 pages/goods/goodsInfo/goodsInfo.wxss | 41 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b121061..8fd3dd5 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -206,7 +206,10 @@ Page({
     iszaning: 0,
 
     store:0,//选择更多
-    index:1
+    index:1,
+    more_store:0,//选择门店
+    sort_store:0,//门店分类
+    choice_sort_store:0,//选择分类门店
   },
 
   //------初始化加载----------
@@ -2653,5 +2656,20 @@ Page({
  //关闭选择门店
 close_popup:function(){
   this.setData({ store: 0})
-}
+},
+//选择更多门店
+  more_store:function(){
+    this.setData({ sort_store: 1 });
+  },
+  sort_store:function() {
+   
+  },
+  // 返回按钮
+  returns:function(){
+    this.setData({ sort_store: 0,choice_sort_store:0});
+  },
+  // 选择分类门店
+  choice_sort_store:function(){
+    this.setData({ sort_store: 0, choice_sort_store:1 });
+    }
 });
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 98cd138..33388e3 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1016,14 +1016,16 @@
 <block wx:if="{{store==1}}">
   <view class="mongolia-layer" bindtap="close_popup"></view>
   <view class="popup-frame">
+  <block  wx:if="{{sort_store==0}}">
+  <!-- 头部 标题 -->
      <view class="popup-top flex-space-between">
-       <text class="fs32 nearby_store">附近的门店</text>
+       <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':'门店分类'}}</text>
         <view>
            <view>
               <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
            </view>
-           <view class="felx choose_more">
-              <text class="fs22 red-co">选择更多门店</text>
+           <view class="felx choose_more" bindtap="more_store">
+              <text class="fs22 red-co">{{choice_sort_store==0?'选择更多门店':'返回'}}</text>
              <view class="bg_rights"></view>
            </view>
           </view>
@@ -1067,6 +1069,35 @@
          </view>
        </view>
        </view>
+       
+        </block>
+       <block wx:else>
+         <view class="popup-top flex-space-between">
+       <text class="fs32 nearby_store">门店分类选择</text>
+        <view>
+           <view>
+              <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
+           </view>
+           <view class="felx choose_mores" bindtap="returns">
+              <text class="fs22 red-co">返回</text>
+           </view>
+          </view>
+       </view>
+       <view class="sort_store_list"> 
+
+          <view class="sort-store-frame">
+          <view class="sort-store flex-vertical-between" bindtap="choice_sort_store">
+          <view class="fs28">
+          泉州开源广场
+          </view>
+          <view class="black_rights-frame">
+          <view class="black_rights"></view>
+          </view>
+           </view> 
+          </view>
+
+       </view>
+       </block>
   </view>
 </block>  
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 64e9900..c0fae3b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -370,7 +370,7 @@ image {
 .cart-btn {
     font-size: 28rpx;
     color: #fff;
-    line-height: 60rpx;
+    line-height: 70rpx;
     margin-top:16rpx;
 
 }
@@ -2318,12 +2318,19 @@ height: 70%;
     position: absolute;
     right: 30rpx;
     top: -10rpx;
+    height: 25rpx;
+
 }
 .choose_more{
   margin-top: 30rpx;
   margin-right: 20rpx;
 
 }
+.choose_mores{
+  margin-top: 30rpx;
+  margin-right: 15rpx;
+
+}
 .store-list{
   width: 95%;
   height: 72%;
@@ -2398,4 +2405,34 @@ line-height: 30rpx;
    width: 95%;
      border-top: 3rpx solid #eee;
      margin: auto;
- }
\ No newline at end of file
+ }
+ /* 门店分类列表 */
+.sort_store_list{
+  height: 82%;
+  overflow: hidden;
+  overflow-y: scroll;
+  width: 95%;
+  margin: auto;
+}
+.sort_store_list .sort-store-frame{
+  width: 100%;
+height: 100rpx;
+line-height:100rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.sort_store_list .sort-store-frame .sort-store{
+  width: 94.5%;
+  margin: auto;
+}
+.black_rights-frame{
+width: 50%；
+}
+.black_rights-frame .black_rights{
+  border-top: 3rpx solid;
+border-right: 3rpx solid;
+transform: rotate(45deg);
+display: inline-block;
+width: 20rpx;
+height: 20rpx;
+}
\ No newline at end of file
--
libgit2 0.21.4