滚动样式修改

.env.development

@@ -2,10 +2,10 @@
 ENV = 'development'
 
 # 正式环境
-#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
+VUE_APP_BASE_API = 'http://pop.jxhh.com/api/v1'
 
 # 测试环境
-VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
+#VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
 #VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
 
 # 文档模块 直接调用 sys开放接口

src/App.vue

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-export default  {
-  name:  'App'
-}
+  export default {
+    name: 'App'
+  }
 </script>
 
 <style lang="scss" type="text/stylus">
@@ -30,10 +30,10 @@ export default  {
   /* ---------  自定义class全局统一样式  ---------- */
   .app-container {
     height: 100%;
-
+    overflow: auto;
     .box-card {
-      height: 100%;
-      overflow: hidden;
+      /* height: 100%; */
+      /* overflow: hidden; */
     }
   }
 
@@ -54,4 +54,4 @@ export default  {
     }
   }
   /* --- end --- element组件样式重置  --  end ----- */
-</style>
+</style>
\ No newline at end of file

src/views/system/asset/settlementbill/index.vue

@@ -28,7 +28,7 @@
 
         </el-form>
       </div>
-      <el-table :data="withdrawlogList" :height="tableHeight">
+      <el-table :data="withdrawlogList">
         <el-table-column label="序号" align="center" width="55">
           <template slot-scope="scope">
             <span>{{ scope.$index + 1 }}</span>

src/views/system/freight/freight_list/index.vue

@@ -32,7 +32,7 @@
         </el-form>
       </div>
 
-      <el-table :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
+      <el-table :data="freightList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="ID" align="center" prop="id"/>
         <el-table-column label="模板名称" align="center" prop="name"/>

src/views/system/messageCenter/msgtemplate.vue

@@ -48,7 +48,6 @@
         <el-table
           ref="msgTableCon"
           :data="msgTableList"
-          :height="msgConHeight"
           style="width: 100%"
           :header-cell-style="{
             background: '#F9F9FA',
@@ -349,13 +348,13 @@ export default {
 
 <style scoped>
 .app-container >>> .el-card {
-  height: 100%;
-  overflow: hidden;
+  /* height: 100%; */
+  /* overflow: hidden; */
 }
 
 .app-container >>> .el-card .el-card__body {
-  height: 100%;
-  overflow: hidden;
+  /* height: 100%; */
+  /* overflow: hidden; */
 }
 
 .msg-table-con {

src/views/system/order/index.vue

@@ -1153,20 +1153,20 @@
 
 <style scoped>
 .box-cardone{
-  height: 100%;
+  /* height: 100%; */
 }
   ::v-deep  .el-range-editor.el-input__inner {
     width: 100%;
   }
 
   ::v-deep  .el-card__body {
-    height: calc(100% - 50px);
+    /* height: calc(100% - 50px); */
     /* overflow: auto; */
   }
 
   .overMain {
-    height: 729px;
-    overflow: auto;
+    /* height: 729px; */
+    /* overflow: auto; */
     padding-top: 15px;
   }
 

src/views/system/retreat/address.vue

@@ -16,7 +16,7 @@
 
         </el-form>
       </div>
-      <el-table v-loading="loading" :data="addressList" :height="tableHeight">
+      <el-table v-loading="loading" :data="addressList">
         <el-table-column label="序号" prop="id" align="center"></el-table-column>
         <el-table-column label="售后地址" prop="address" align="center">
           <template slot-scope="scope">

src/views/system/retreat/retreat/index.vue

@@ -503,12 +503,12 @@
 
 <style scoped>
   .card-spe-con {
-    height: 100%;
+    /* height: 100%; */
     /*overflow: auto;*/
   }
   .card-spe-con ::v-deep  .el-card__body {
-    height: calc(100% - 40px);
-    overflow: hidden;
+    /* height: calc(100% - 40px); */
+    /* overflow: hidden; */
   }
   /*::v-deep  .el-dialog__body {*/
   /*  height: 100%;*/

src/views/system/settings/commodityExpress.vue

@@ -13,7 +13,7 @@
         >
       </div>
 
-      <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+      <el-table :data="tableData"  style="width: 100%">
         <el-table-column
           prop="logistics_company_name"
           label="快递公司"

src/views/system/settings/commodityGroup.vue

@@ -13,7 +13,7 @@
         >
       </div>
       <!-- 分组表格 -->
-      <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+      <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="id" label="分组ID" width="180">
         </el-table-column>
         <el-table-column prop="name" label="分组名称" width="180">

src/views/system/shop/brand.vue

@@ -45,7 +45,7 @@
           </el-row>
         </el-form>
       </div>
-      <el-table :data="brandList" :height="tableHeight">
+      <el-table :data="brandList" >
         <el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column>
         <el-table-column label="品牌经营类型" prop="brand_type" align="center">
           <template slot-scope="scope">

src/views/system/supplier/suppliers.vue

@@ -15,7 +15,6 @@
       <!-- 分组表格 -->
       <el-table
         :data="tableData"
-        :height="tableHeight"
         stripe
         style="width: 100%"
       >
@@ -502,6 +501,7 @@ export default {
         if (res.code == 1) {
           this.total = res.data.count;
           this.tableData = res.data.list;
+
         }
       });
     },

src/views/system/warehouse/index.vue

@@ -68,7 +68,6 @@
       <!-- 表格 -->
       <el-table
         :data="tableData"
-        :height="tableHeight"
         stripe
         style="width: 100%"
       >