Kaynağa Gözat

前端页面更新

liuyao 1 yıl önce
ebeveyn
işleme
584c4f2a4c

+ 3 - 3
components/dkbase/dk-popup/dk-popup.wxml

@@ -1,6 +1,6 @@
 <wxs src='../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <!-- 弹窗 编辑/新建-->
-<van-popup show="{{show}}" position="bottom" bind:close="onClosePopup" custom-class="dk-popup" z-index="100">
+<van-popup show="{{show}}" position="bottom" bind:close="onClosePopup" custom-class="dk-popup" z-index="99">
   <!--标题-->
   <view class="special-topic" wx:if="{{type=='sale'}}">
     <!-- 图片 -->
@@ -50,7 +50,7 @@
     <!--内容-->
     <view wx:for="{{contentObj}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
-      <van-field wx:if="{{item.type=='str'}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" auto-focus="{{true}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='str'}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
       </van-field>
       <!--下拉-->
@@ -88,7 +88,7 @@
       </van-field>
  
       <!--箱片-->
-      <van-field   wx:if="{{item.type=='packageBox' && !!form['flgSubUnit'] }}"  required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" auto-focus="{{true}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" catchtap="openPackageBox" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}"   errorMessage="{{item.errMsg}}">
+      <van-field   wx:if="{{item.type=='packageBox' && !!form['flgSubUnit'] }}"  required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" catchtap="openPackageBox" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}"   errorMessage="{{item.errMsg}}">
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
       </van-field>
 

+ 1 - 0
components/dkbusiness/dk-single-dropdown-item/dk-single-dropdown-item.wxml

@@ -1,6 +1,7 @@
 <!-- 弹窗 -->
 
 <van-popup show="{{show}}" position="right" z-index="100" custom-style="overflow-x:hidden;width: 75%;height:100%;z-index:100;" bind:close="onClose">
+
   <van-sticky scroll-top="0">
     <van-search custom-class="search-class" shape="round" model:value="{{ condition }}" input-class="background:#c8c8c8;" placeholder="搜索" bind:change="onChange_input" bind:blur="blur_input" />
     <view class="choose_label">

+ 1 - 1
package-accounts-manage/pages/funds-transfer/detail/detail.wxml

@@ -20,6 +20,6 @@
   </view>
 </view> -->
 <!-- 编辑  -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 1 - 1
package-accounts-manage/pages/other-expenditure-orders/detail/detail.wxml

@@ -19,7 +19,7 @@ objTitle ="supName" objSubTitle="contactPhone" cardList="{{cardList}}" contentOb
   </view>
 </view> -->
 <!-- 编辑  -->
-<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 

+ 1 - 1
package-basic-data/pages/product-file/product-types/product-types.wxml

@@ -14,7 +14,7 @@
 
 <!-- 列表 --> 
 <dk-tree-form  bind:clickName="clickName"   treeList="{{tableData}}" idKey="catId"   nameKey="catName" parentIdKey="parentId" itemListKey="children" id="treeSelect" isLastClickFlag="{{true}}" ></dk-tree-form>
- 
+
 
 
  

+ 1 - 1
package-inventory/pages/inventory-check/detail/detail.wxml

@@ -18,7 +18,7 @@ bind:delItem="setGoods" bind:setGoods="setGoods"  iconCol="imagesUrl"lossReasonF
   </view>
 </view> -->
 <!-- 编辑  -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
  

+ 2 - 2
package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -9,9 +9,9 @@
   </dk-dropdown-menu>
 </van-sticky>
 
-<view style="height:100%;" wx:if="{{tableData.length>0}}">
+<view wx:if="{{tableData.length>0}}">
   <!--出库商品 列表 走库存-->
-  <view style="height:calc({{windowHeight+'px'}} - 05rpx);overflow: scroll;">
+  <view style="height:calc({{windowHeight+'px'}} - 05rpx);">
     <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100'>
       <view wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
         <view class="main-foot" style="border-radius:15rpx;" data-item="{{item}}" catch:tap="toDetail">

+ 0 - 3
package-inventory/pages/other-warehousing/other-warehousing.js

@@ -279,7 +279,6 @@ Page({
         }
 
     },
-
     /**
     * @desc : 给表单赋值
     * @date : 2024/2/1 15:49
@@ -638,7 +637,6 @@ Page({
         prevPage.setData({
             refreshByAdd: true
         })
-
         //购物车跳转来的
         if (this.data.formType == Constants.formType.shopping) {
 
@@ -650,5 +648,4 @@ Page({
         }
     }
 
-
 })

+ 1 - 1
package-inventory/pages/outbound-processing/detail/detail.wxml

@@ -8,7 +8,7 @@
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号 -->
-<view wx:if="{{flgEdit}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view wx:if="{{flgEdit}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 

+ 1 - 2
package-inventory/pages/warehousing-processing/detail/detail.js

@@ -730,7 +730,6 @@ Page({
             })
         }
     },
-
     /**
      * @desc : (编辑)
      * @date : 2024/2/1 15:49
@@ -788,6 +787,6 @@ Page({
             })
         }
 
-    },
+    }
 
 })

+ 1 - 1
package-purchase/pages/pur-receipt/detail/detail.wxml

@@ -66,6 +66,6 @@ saleStaffAndOrgFlag="{{false}}"
   </view>
 </view> -->
 <!-- 编辑  -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toDetail">
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toDetail">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 1 - 1
package-purchase/pages/pur-refund/detail/detail.wxml

@@ -66,6 +66,6 @@ saleStaffAndOrgFlag="{{false}}"
   </view>
 </view> -->
 <!-- 编辑  -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toDetail">
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toDetail">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 1 - 1
package-purchase/pages/purchase-receipt/detail/detail.wxml

@@ -60,6 +60,6 @@
 </view>
   -->
 <!-- 编辑  -->
-<view wx:if="{{itemData.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" data-item="{{itemData}}" bindtap="toEdit">
+<view wx:if="{{itemData.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" data-item="{{itemData}}" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class" />
 </view>

+ 1 - 1
package-purchase/pages/purchase-return/detail/detail.wxml

@@ -54,7 +54,7 @@
 </view> -->
 
 <!-- 编辑  -->
-<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" data-item="{{item}}"  bindtap="toDetail">
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" data-item="{{item}}"  bindtap="toDetail">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 

+ 1 - 1
package-sales/pages/order-billing/detail/detail.wxml

@@ -111,7 +111,7 @@
   </view>
 </view> -->
 <!-- 编辑  -->
-<view wx:if="{{formMode =='other'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view wx:if="{{formMode =='other'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 98;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class" />
 </view>
 <!--  保存 -->

+ 30 - 0
pages/home-page/home-page.js

@@ -65,6 +65,36 @@ Page({
     funcViewHeight: 0,
     funcViewWidth: 0,
     freeVersionFlag: true,
+    bottomCardList: [
+      {
+        title: '精准管理',
+        imageUrl: 'pur-icon.png',
+        content: '助力企业腾飞,共创企业辉煌',
+        dataUrl: '/package-basic-data/pages/func-buy/add/add',
+        buttonTitle: '立即升级',
+        buttonColor: '#1989fa'
+      },
+      {
+        smallButtonList: [{
+          title: '分享不停歇',
+          imageUrl: 'fin-icon.png',
+          content: '云币数量涨不停',
+          dataUrl: '',
+          buttonTitle: '立即分享',
+          buttonColor: '#ECD1A7',
+          background: 'linear-gradient(223.67deg, #FFFFFF -15.06%, #FFF5E2 100%)'
+        },
+        {
+          title: '分享不停歇',
+          imageUrl: 'ivt-icon.png',
+          content: '云币数量涨不停',
+          dataUrl: '',
+          buttonTitle: '立即分享',
+          buttonColor: '#CE9965',
+          background: 'linear-gradient(225.36deg, #FFFFFF -10.7%, #F2D1AC 100%)'
+        }]
+      }
+    ]
   },
   /**
   * @desc : 切换公司

+ 26 - 49
pages/home-page/home-page.wxml

@@ -78,62 +78,39 @@
   <view wx:if="{{advertisementList && advertisementList.length == 0}}" style="margin-top: 10rpx;"></view>
   <!-- 标准版 -->
   <view class="func" wx:if="{{freeVersionFlag}}" style="height: 410rpx;">
-    <view style="display:flex; ">
-      <view style=" width: 50%;height: 370rpx;border-radius: 19rpx;background: linear-gradient(200.98deg, #FFFFFF -13.39%, #A1CDFF 100%);  ">
-        <view class="card-title-std" style="position: relative;">
-          <view style="margin-left:15rpx;margin-top:35rpx;color:#3785E5;font-size: 18px;font-weight: 600;justify-content: flex-start; width: 100%;">精准管理</view>
-          <view style="position: absolute; top: 190rpx;left: 220rpx;    ">
-            <image src="{{imageUrl  + 'pur-icon.png'}} " class="card-bottom-image" />
+    <view class="card-view">
+      <view class="childer-card-view" wx:for="{{bottomCardList}}" wx:for-index="index" wx:for-item="item">
+        <view class="ch-card-content" wx:if="{{item && !item.smallButtonList}}">
+          <view class="card-background-img">
+            <image src="{{imageUrl  + item.imageUrl}} " class="card-bottom-image" />
           </view>
-        </view>
-        <view style="margin-left:15rpx;margin-top:35px;color:#3785E5;font-size: 11px; ">助力企业腾飞,共创企业辉煌</view>
-        <view style="width: 100%;height: 60rpx;"></view>
-        <!-- 卡片底部 -->
-        <view class="card-bottom-std" >
-          <view class="card-bottom-button-std" style="background: #1989fa;" bindtap="toAppStd" data-flg="{{false}}" data-url="{{'/package-basic-data/pages/func-buy/add/add'}}">
-            <view style="margin-left: 15rpx; color:#fefeff;font-size: 13px;">立即升级</view>
-            <van-icon style="padding-left: 14rpx;" name="arrow" size="2.2vw" color="{{'#fefeff'}}" />
-          </view>
-        </view>
-      </view>
-      <!-- 分享 -->
-      <view style="margin-left: 15rpx;width: 50%;  margin-top: -10rpx;  ">
-        <view style="height: 170rpx;border-radius: 19rpx;width: 100;background: linear-gradient(223.67deg, #FFFFFF -15.06%, #FFF5E2 100%);">
-          <view class="card-title-std" style="position: relative;">
-            <view style="margin-left:15rpx;padding-top:15rpx;color:#A5814A;font-size: 16px;font-weight: 600;justify-content: flex-start; width: 100%;">分享不停歇</view>
-            <view style="position: absolute; top: 40rpx;left: 220rpx;    ">
-              <image src="{{imageUrl  + 'fin-icon.png'}} " class="card-bottom-image" />
-            </view>
-          </view>
-          <view style="margin-left:15rpx; color:#A5814A;font-size: 11px; ">云币数量涨不停</view>
-
-          <!-- 卡片底部 -->
-          <view class="card-bottom-std">
-            <view class="card-bottom-button-std" style="background: #ECD1A7;width: 55%;height: 55rpx;" bindtap="toAppStd" data-flg="{{true}}" data-url="{{''}}">
-              <view style="margin-left: 15rpx; color:#fefeff;font-size: 12px;">立即分享</view>
-              <van-icon style="padding-left: 14rpx;" name="arrow" size="2.2vw" color="{{'#fefeff'}}" />
+          <view class="content-view" bindtap="toAppStd" data-flg="{{false}}" data-url="{{item.dataUrl}}">
+            <view class="title-text">{{item.title}}</view>
+            <view class="content-text">{{item.content}}</view>
+            <view class="card-bottom-std">
+              <view class="card-bottom-button-std" style="background: {{item.buttonColor}};width: 55%;height: 55rpx;" >
+                <view style="margin-left: 15rpx; color:#fefeff;font-size: 12px;">{{item.buttonTitle}}</view>
+                <van-icon style="padding-left: 14rpx;" name="arrow" size="2.2vw" color="{{'#fefeff'}}" />
+              </view>
             </view>
           </view>
         </view>
-        <view style="height: 170rpx;border-radius: 19rpx;width: 100;background:linear-gradient(225.36deg, #FFFFFF -10.7%, #F2D1AC 100%);margin-top: -10rpx;">
-          <view class="card-title-std" style="position: relative;">
-            <view style="margin-left:15rpx;padding-top:15rpx;color:#CE9965;font-size: 16px;font-weight: 600;justify-content: flex-start; width: 100%;">分享不停歇</view>
-            <view style="position: absolute; top: 30rpx;left: 220rpx;    ">
-              <image src="{{imageUrl  + 'ivt-icon.png'}} " class="card-bottom-image" />
-            </view>
-          </view>
-          <view style="margin-left:15rpx; color:#CE9965;font-size: 11px; ">云币数量涨不停</view>
-
-          <!-- 卡片底部 -->
-          <view class="card-bottom-std">
-            <view class="card-bottom-button-std" style="background: #CE9965;height: 55rpx;" bindtap="toAppStd" data-flg="{{true}}" data-url="{{''}}">
-              <view style="margin-left: 15rpx; color:#fefeff;font-size: 12px;">立即分享</view>
-              <van-icon style="padding-left: 14rpx;" name="arrow" size="2.2vw" color="{{'#fefeff'}}" />
-            </view>
+        <view wx:if="{{item && item.smallButtonList && item.smallButtonList.length > 0}}"   class="small-button-view">
+          <view class="sm-content-view" wx:for="{{item.smallButtonList}}" wx:for-index="index_" wx:for-item="item_" style="background: {{item_.background}};" bindtap="toAppStd" data-flg="{{true}}" data-url="{{item_.dataUrl}}">
+              <view class="card-background-img">
+                <image src="{{imageUrl  + item_.imageUrl}} " class="card-bottom-image" />
+              </view>
+              <view class="title-text">{{item_.title}}</view>
+              <view class="content-text">{{item_.content}}</view>
+              <view class="card-bottom-std">
+                <view class="card-bottom-button-std" style="background: {{item_.buttonColor}};width: 55%;height: 55rpx;">
+                  <view style="margin-left: 15rpx; color:#fefeff;font-size: 12px;">{{item_.buttonTitle}}</view>
+                  <van-icon style="padding-left: 14rpx;" name="arrow" size="2.2vw" color="{{'#fefeff'}}" />
+                </view>
+              </view>
           </view>
         </view>
       </view>
-
     </view>
   </view>
 

+ 98 - 0
pages/home-page/home-page.wxss

@@ -412,4 +412,102 @@ image {
   position: absolute;
   left: 15rpx;
   top: 1rpx;
+}
+
+/* 标准版首页底部样式 */
+.card-view{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.ch-card-content .content-view{
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+
+.content-view .title-text{
+  margin-left:15rpx;
+  margin-top:35rpx;
+  color:#3785E5;
+  font-size: 18px;
+  font-weight: 600;
+  justify-content: flex-start;
+  width: 100%;
+}
+
+.childer-card-view{
+  width: 50%;
+  height: 90%;
+}
+
+.ch-card-content{
+  width: 100%;
+  height: 100%;
+  position: relative;
+  border-radius: 15rpx;
+  background: linear-gradient(200.98deg, #FFFFFF -13.39%, #A1CDFF 100%);
+}
+
+.ch-card-content .content-text{
+  width: 90%;
+  margin-left:15rpx;
+  word-wrap:break-word;
+  word-break:normal; 
+  color:#3785E5;
+  font-size: 11px;
+}
+
+.card-background-img{
+  position: absolute;
+  z-index: 10;
+  right: 25rpx;
+  bottom: 25rpx;
+}
+
+.sm-card-conetent{
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.small-button-view{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  margin-left: 15rpx;
+}
+.sm-content-view{
+  width: 100%;
+  height: 48%;
+  border-radius: 15rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  position: relative;
+}
+.sm-content-view .card-background-img{
+  bottom: 0;
+  right: 0;
+}
+.sm-content-view .title-text{
+  margin-left:15rpx;
+  padding-top:10rpx;
+  color:#A5814A;
+  font-size: 16px;
+  font-weight: 600;
+  justify-items: flex-start;
+  width: 100%;
+}
+
+.sm-content-view .content-text{
+  margin-left:15rpx; 
+  color:#A5814A;
+  font-size: 11px;
 }

+ 5 - 7
pages/shopping/shopping.wxml

@@ -47,7 +47,7 @@
 
 <view class="main-good-class" style="height:100%;background-color:#FFFFFF;">
   <!-- 商品编码的列表 -->
-  <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' class="goods-class" style="height:calc({{windowHeight+'px'}} - 295rpx);overflow: scroll;" lower-threshold='100'  wx:if="{{active == 0}}" >
+  <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' class="goods-class" style="height:calc({{windowHeight+'px'}} - 295rpx);" lower-threshold='100'  wx:if="{{active == 0}}" >
       <view wx:for="{{tableData}}" wx:key="index" catch:tap="openAddItemInfo" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
         <view class="main-foot" style="border-radius:15rpx;">
           <view>
@@ -131,9 +131,9 @@
         </view>
       </view>
       <view style="height:200rpx"></view>
-    </scroll-view>
+  </scroll-view>
   <!--已选列表-->
-  <view wx:if="{{active == 1}}" class="goods-selected-class">
+  <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' class="goods-class" style="height:calc({{windowHeight+'px'}} - 295rpx);" lower-threshold='100'  wx:if="{{active == 1}}" >
     <view class="goods-class" style="height:calc({{windowHeight+'px'}} - 295rpx);overflow: scroll;"></view>
     <van-cell-group custom-class="width-80">
   
@@ -173,16 +173,14 @@
         </van-swipe-cell>
       </view>
     </van-cell-group>
-
-
     <view style="height:300rpx;"></view>
-  </view>
+  </scroll-view>
 </view>
 
 
 
 <van-sidebar activeKey="{{sideKey}}" bindchange="changeSidebar" custom-class="{{active == 0 ? 'left-class' : 'right-class'}}">
-  <view wx:if="{{active != 1}}" style="height:calc({{windowHeight+'px'}} - {{active == 1 ? '270rpx' :'370rpx' }});overflow: scroll;">
+  <view wx:if="{{active != 1}}" style="height:calc({{windowHeight+'px'}} - {{active == 1 ? '270rpx' :'370rpx' }});">
     <van-sidebar-item class="sidebar" wx:key="index" custom-class="{{sideKey - 1 == index? 'sidebar-item-before': (sideKey + 1 == index?'sidebar-item-next':'sidebar-item')}}" title="{{item.brandName}}" data-id="{{item.brandId}}" wx:for="{{typeList}}" />
   </view>
 </van-sidebar>