update

pages/shopMallPage/shopType/index.vue

@@ -140,7 +140,9 @@
         <!-- </scroll-view> -->
       </view>
       <!-- :style="{ height: `calc(100vh - 95rpx)` }" -->
-      <div class="shopListBox">
+      <!-- height: calc(100% - 163px); -->
+      <div class="shopListBox"
+        :style="{ height: shopTypeList && shopTypeList.length >= 4 ? `calc(100% - 163px)` : `calc(100% - 95px)` }">
         <!--  左侧商品种类  -->
         <div class="smallShopList">
           <scroll-view class="scrollShopBox" scroll-y scroll-with-animation="true" :scroll-into-view="leftToView"
@@ -164,8 +166,7 @@
         <div class="shopDetailList" v-if="changBigTypeLoading">
           <scroll-view class="shopDetailScroll" scroll-y :scroll-top="topNum" @scroll="onVirtualScroll"
             :scroll-into-view="shopTopId" :style="{
-              height: `calc(100vh -68px - 50px - ${safeHeight}px - ${menu.top + 32 + 32 + 12 + 12 + 23 + 95
+              height: `100%`
-                }px)`,
             }">
             <div :style="{ height: totalHeight + 'px', position: 'relative' }">
               <div :id="'shopTop'"></div>
@@ -2369,7 +2370,7 @@ export default {
 
     .shopListBox {
       width: 100%;
-      height: calc(100% - 163px);
+      // height: calc(100% - 163px);
       display: flex;
 
       .smallShopList {

unpackage/dist/dev/mp-weixin/components/keyboard.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
+  "component": true,
-  "component": true
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/evaluateList/components/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
+  "usingComponents": {},
-  "usingComponents": {}
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.js

@@ -130,16 +130,19 @@ var render = function () {
     : null
   var g1 =
     _vm.showContent && g0 ? Math.ceil((_vm.shopTypeList.length - 4) / 5) : null
+  var g2 = _vm.showContent
+    ? _vm.shopTypeList && _vm.shopTypeList.length >= 4
+    : null
   var l0 =
     _vm.showContent && _vm.changBigTypeLoading
       ? _vm.__map(_vm.visibleList, function (item, i) {
           var $orig = _vm.__get_orig(item)
-          var g2 = item.IMAGE_PATH
+          var g3 = item.IMAGE_PATH
             ? item.IMAGE_PATH.split(",") &&
               item.IMAGE_PATH.split(",").length > 1
             : null
-          var g3 = item.IMAGE_PATH && g2 ? item.IMAGE_PATH.split(",") : null
+          var g4 = item.IMAGE_PATH && g3 ? item.IMAGE_PATH.split(",") : null
-          var g4 = (
+          var g5 = (
             !item.bigNumber && !item.smallNumber
               ? _vm.user.TEST_MEMBER
                 ? true
@@ -150,13 +153,13 @@ var render = function () {
             : null
           return {
             $orig: $orig,
-            g2: g2,
             g3: g3,
             g4: g4,
+            g5: g5,
           }
         })
       : null
-  var g5 =
+  var g6 =
     _vm.showContent && _vm.changBigTypeLoading
       ? !_vm.rightShopList || _vm.rightShopList.length === 0
       : null
@@ -171,8 +174,9 @@ var render = function () {
       $root: {
         g0: g0,
         g1: g1,
+        g2: g2,
         l0: l0,
-        g5: g5,
+        g6: g6,
       },
     }
   )

unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.wxss

@@ -258,7 +258,6 @@
 }
 .main .pageContent .shopListBox.data-v-36e5d840 {
   width: 100%;
-  height: calc(100% - 163px);
   display: flex;
 }
 .main .pageContent .shopListBox .smallShopList.data-v-36e5d840 {