Merge remote-tracking branch 'origin/master'

src/pages/storeEntry/detail.vue

@@ -180,6 +180,7 @@
               </view>
               <view class="nr">
                 <view class="left">
+                  <scroll-view scroll-y="true" class="scroll-Y">
                     <template v-for="(item, index) in shopCategoryTree" :key="index">
                       <view
                         class="name"
@@ -189,8 +190,10 @@
                         {{ 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
@@ -220,6 +223,7 @@
                         </view>
                       </view>
                     </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;