Merge remote-tracking branch 'origin/master'

src/pages/storeEntry/detail.vue

@@ -166,7 +166,7 @@
             <wd-button type="error" width="80%" class="submitBTN" @tap="submitData">提交</wd-button>
           </wd-cell-group>
           <wd-popup
-          :safe-area-inset-bottom="true"
+            :safe-area-inset-bottom="true"
             v-model="show"
             position="bottom"
             custom-style="height:500px;overflow:auto;"
@@ -180,46 +180,50 @@
               </view>
               <view class="nr">
                 <view class="left">
-                  <template v-for="(item, index) in shopCategoryTree" :key="index">
-                    <view
-                      class="name"
-                      @tap="setActiveCategory(index)"
-                      :class="{ active: categoryActiveIndex == index }"
-                    >
-                      {{ item.name }}
-                    </view>
-                  </template>
-                </view>
-                <view class="right">
-                  <template v-for="(item, index) in shopCategoryTree" :key="index">
-                    <view class="item" v-show="categoryActiveIndex == index">
+                  <scroll-view scroll-y="true" class="scroll-Y">
+                    <template v-for="(item, index) in shopCategoryTree" :key="index">
                       <view
-                        v-for="item1 in shopCategoryTree[index].children"
-                        :key="item1.areaId"
-                        class="miniitem"
+                        class="name"
+                        @tap="setActiveCategory(index)"
+                        :class="{ active: categoryActiveIndex == index }"
                       >
-                        <view class="hname">
-                          {{ item1.name }}
-                        </view>
-                        <view class="hnr">
-                          <template v-for="sitem in item1.children" :key="sitem.areaId">
-                            <wd-tag
-                              class="tagstyle"
-                              :class="{
-                                active: choosedShopInfo.some(
-                                  (item) => item.areaId === sitem.areaId,
-                                ),
-                              }"
-                              round
-                              @tap="chooseShopType(sitem.areaId, sitem.name)"
-                            >
-                              {{ sitem.name }}
-                            </wd-tag>
-                          </template>
+                        {{ item.name }}
+                      </view>
+                    </template>
+                  </scroll-view>
+                </view>
+                <view class="right">
+                  <scroll-view scroll-y="true" class="scroll-Y">
+                    <template v-for="(item, index) in shopCategoryTree" :key="index">
+                      <view class="item" v-show="categoryActiveIndex == index">
+                        <view
+                          v-for="item1 in shopCategoryTree[index].children"
+                          :key="item1.areaId"
+                          class="miniitem"
+                        >
+                          <view class="hname">
+                            {{ item1.name }}
+                          </view>
+                          <view class="hnr">
+                            <template v-for="sitem in item1.children" :key="sitem.areaId">
+                              <wd-tag
+                                class="tagstyle"
+                                :class="{
+                                  active: choosedShopInfo.some(
+                                    (item) => item.areaId === sitem.areaId,
+                                  ),
+                                }"
+                                round
+                                @tap="chooseShopType(sitem.areaId, sitem.name)"
+                              >
+                                {{ sitem.name }}
+                              </wd-tag>
+                            </template>
+                          </view>
                         </view>
                       </view>
-                    </view>
-                  </template>
+                    </template>
+                  </scroll-view>
                 </view>
               </view>
             </view>
@@ -725,7 +729,6 @@ async function changeLocation() {
           location: `${res.latitude},${res.longitude}`,
         },
         success: function (res) {
-          // console.log('逆地理编码：' + JSON.stringify(res));
           console.log('进入成功回调');
           console.log(res.data.status);
           if (res.data.status === 0) {
@@ -799,11 +802,13 @@ page {
 
 .hcontent {
   height: 100%;
+  display: flex;
+  flex-direction: column;
 
   .flex1 {
     padding: 10px;
     display: flex;
-    position: fixed;
+
     width: 100%;
     justify-content: space-between;
     box-sizing: border-box;
@@ -813,15 +818,19 @@ page {
   }
 
   .nr {
-    padding-top: 42px;
+    padding-top: 0px;
     display: flex;
+    flex: 1;
+    overflow: hidden;
 
     .left {
       background: rgb(244, 244, 244);
       width: 28%;
       height: 100%;
-      position: fixed;
-
+      overflow-y: hidden;
+      .scroll-Y {
+        height: 100%;
+      }
       .name {
         text-align: left;
         padding-left: 20rpx;
@@ -837,10 +846,16 @@ page {
     .right {
       background: #fff;
       width: 72%;
-      position: fixed;
+
       left: 28%;
       height: 100%;
-      overflow-y: auto;
+      overflow-y: hidden;
+      padding: 0 5px 5px 5px;
+      box-sizing: border-box;
+
+      .scroll-Y {
+        height: 100%;
+      }
 
       .item {
         height: auto;