资产，bug修复、优化

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>结算流水</span>
+        <p style="font-size: 18px">结算流水</p>
       </div>
       <el-table v-loading="loading" :height="tableHeight" :data="assetList">
         <el-table-column label="ID" align="center" prop="Id"/>
@@ -32,8 +32,8 @@
     name: "asset",
     data() {
       return {
-        fullHeight: '',
-        tableHeight: null,
+        fullHeight: 0,
+        tableHeight: 0,
         loading: true, // 遮罩层
         ids: [], // 选中数组
         total: 0, // 总条数
@@ -57,9 +57,9 @@
       })
     },
     watch: {
-      fullHeight(val, oldval) {
-        console.log(val)
-        this.tableHeight = val - 130
+      fullHeight(val) {
+        let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
+        this.tableHeight = val - formHeight - 120;
       }
     },
     methods: {
@@ -110,20 +110,5 @@
   };
 </script>
 <style scoped>
-  .app-container {
-    height: 100%;
-  }
-
-  .box-card {
-    height: 100%;
-  }
 
-  .box-card /deep/ .el-card__body {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-table {
-    height: calc(100% - 120px);
-  }
 </style>

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

@@ -2,7 +2,11 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>账户管理</span>
+        <el-row :span="24" type="flex" align="middle" justify="space-between">
+          <el-col :span="20">
+            <p style="font-size: 18px;">账户管理</p>
+          </el-col>
+          <el-col :span="4">
             <el-button
               style='float:right'
               :disabled="isAddbank"
@@ -12,6 +16,8 @@
               @click="handleAdd"
             >新增
             </el-button>
+          </el-col>
+        </el-row>
       </div>
 
       <el-table v-loading="loading" :height="tableHeight" :data="bankcardList"
@@ -138,8 +144,8 @@
     name: "bankcard",
     data() {
       return {
-        fullHeight: '',
-        tableHeight: null,
+        fullHeight: 0,
+        tableHeight: 0,
         state: [
           // {label: "支付宝", value: 2},
           {label: "银行卡", value: 1},
@@ -204,7 +210,7 @@
 
     },
     watch: {
-      fullHeight(val, oldval) {
+      fullHeight(val) {
         this.tableHeight = val
       }
     },
@@ -335,20 +341,5 @@
   };
 </script>
 <style scoped>
-  .app-container {
-    height: 100%;
-  }
 
-  .box-card {
-    height: 100%;
-  }
-
-  .box-card /deep/ .el-card__body {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-table {
-    height: calc(100% - 120px);
-  }
 </style>

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

@@ -2,8 +2,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>结算对账</span>
-
+        <p style="font-size: 18px; float:left;">结算对账</p>
       </div>
       <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
 
@@ -312,21 +311,6 @@
     } //methods结束
   };
 </script>
-<style scoped>
-  .app-container {
-    height: 100%;
-  }
-
-  .box-card {
-    height: 100%;
-  }
+<style scoped lang="scss" type="text/stylus">
 
-  .box-card /deep/ .el-card__body {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-table {
-    height: calc(100% - 120px);
-  }
 </style>

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

@@ -3,7 +3,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>商户提现</span>
+        <p style="font-size: 18px; float:left;">提现申请</p>
       </div>
       <el-row>
         <el-col :span="24" class="card-box">
@@ -276,26 +276,9 @@
     } //methods结束
   };
 </script>
-<style scoped>
-  .app-container {
-    height: 100%;
-  }
-
-  .box-card {
-    height: 100%;
-  }
-
-  .box-card /deep/ .el-card__body {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-table {
-    height: calc(100% - 120px);
-  }
-
+<style scoped lang="scss" type="text/stylus">
   .ruleFormshop {
     width: 500px;
-    margin: 0 0 0 180px;
+    margin: 20px 0 0 120px;
   }
 </style>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>提现记录</span>
+        <p style="font-size: 18px; float:left;">提现记录</p>
       </div>
       <el-table v-loading="loading" :data="withdrawlogList" :height="tableHeight">
         <el-table-column label="提现流水单号" align="center" prop="ReflectSn"/>
@@ -45,8 +45,8 @@
     data() {
       return {
         sellerId: 0,
-        fullHeight: '',
-        tableHeight: null,
+        fullHeight: 0,
+        tableHeight: 0,
         // 遮罩层
         loading: true,
         // 选中数组
@@ -89,8 +89,9 @@
       })
     },
     watch: {
-      fullHeight(val, oldval) {
-        this.tableHeight = val - 130;
+      fullHeight(val) {
+        let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
+        this.tableHeight = val - formHeight - 120;
       }
     },
     methods: {
@@ -166,21 +167,6 @@
     } //methods结束
   };
 </script>
-<style scoped>
-  .app-container {
-    height: 100%;
-  }
-
-  .box-card {
-    height: 100%;
-  }
+<style scoped lang="scss" type="text/stylus">
 
-  .box-card /deep/ .el-card__body {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-table {
-    height: calc(100% - 120px);
-  }
 </style>

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

@@ -2,8 +2,13 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>运费模板</span>
-
+        <el-form :inline="true" class="queryFormInline">
+          <el-row :span="24" type="flex" align="middle" justify="space-between">
+            <el-col :span="20">
+              <p style="font-size: 18px; float:left;">运费模板</p>
+            </el-col>
+            <el-col :span="4">
+              <div style="float: right">
                 <el-button
                   style="float:right;margin-left: 10px;"
                   type="danger"
@@ -13,15 +18,6 @@
                   @click="handleDelete"
                 >删除
                 </el-button>
-<!--        <el-button-->
-<!--          style="float:right;"-->
-<!--          type="success"-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--        >修改-->
-<!--        </el-button>-->
                 <el-button
                   style="float:right;margin-left: 20px;"
                   type="primary"
@@ -31,6 +27,10 @@
                 >新增
                 </el-button>
               </div>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
 
       <el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
@@ -83,8 +83,8 @@
     name: "freight",
     data() {
       return {
-        fullHeight: '',
-        tableHeight: null,
+        fullHeight: 0,
+        tableHeight: 0,
         // 遮罩层
         loading: true,
         // 选中数组
@@ -139,8 +139,9 @@
 
     },
     watch: {
-      fullHeight(val, oldval) {
-        this.tableHeight = val - 130
+      fullHeight(val) {
+        let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
+        this.tableHeight = val - formHeight - 120;
       }
     },
     methods: {
@@ -322,21 +323,6 @@
     } //methods结束
   };
 </script>
-<style scoped>
-  .app-container {
-    height: 100%;
-  }
-
-  .box-card {
-    height: 100%;
-  }
-
-  .box-card /deep/ .el-card__body {
-    height: 100%;
-    overflow: hidden;
-  }
+<style scoped lang="scss" type="text/stylus">
 
-  .el-table {
-    height: calc(100% - 120px);
-  }
 </style>