Browse Source

优化视觉

lushuncheng 6 years ago
parent
commit
a3d5e276c2
59 changed files with 365 additions and 250 deletions
  1. 2 2
      dist/200.html
  2. 0 1
      dist/_nuxt/33858bb63cc6418a64a7.css
  3. 0 1
      dist/_nuxt/63ab234d52848a735a48.css
  4. 0 1
      dist/_nuxt/6bca59fbc56888b3a7ac.js
  5. 0 1
      dist/_nuxt/771c4e6ada664c6ddcd2.css
  6. 0 1
      dist/_nuxt/ba37c1c3fe79a8024c6c.js
  7. 0 1
      dist/_nuxt/e662e8f9f08ce0311374.js
  8. 0 1
      dist/_nuxt/e934e064a7ac6855a28b.js
  9. 0 1
      dist/_nuxt/e9b2f58b7a5fe29c8fd0.js
  10. 0 1
      dist/_nuxt/f5c3da3b83269a7c8a82.css
  11. 2 2
      dist/index.html
  12. 2 2
      dist/login/index.html
  13. 2 2
      dist/main/404/index.html
  14. 2 2
      dist/main/artificial_order/index.html
  15. 2 2
      dist/main/artificial_orders/index.html
  16. 2 2
      dist/main/balance_change/index.html
  17. 2 2
      dist/main/cats copy/index.html
  18. 2 2
      dist/main/cats/index.html
  19. 2 2
      dist/main/cert_check/index.html
  20. 2 2
      dist/main/cert_edit/index.html
  21. 2 2
      dist/main/cert_pro/index.html
  22. 2 2
      dist/main/cloud_balance/index.html
  23. 2 2
      dist/main/cloud_developer/index.html
  24. 2 2
      dist/main/cloud_job/index.html
  25. 2 2
      dist/main/cloud_order copy/index.html
  26. 2 2
      dist/main/dev_check/index.html
  27. 2 2
      dist/main/dev_check_detail/index.html
  28. 2 2
      dist/main/dev_show/index.html
  29. 2 2
      dist/main/gongmall/index.html
  30. 2 2
      dist/main/group_list/index.html
  31. 2 2
      dist/main/index.html
  32. 2 2
      dist/main/jishuquan/index.html
  33. 2 2
      dist/main/job/index.html
  34. 2 2
      dist/main/jobs/index.html
  35. 2 2
      dist/main/orders/index.html
  36. 2 2
      dist/main/orders_detail/index.html
  37. 2 2
      dist/main/orders_frozen/index.html
  38. 2 2
      dist/main/outsource_bill/index.html
  39. 2 2
      dist/main/present_job_apply/index.html
  40. 2 2
      dist/main/publish_present/index.html
  41. 2 2
      dist/main/qingtuanbao/index.html
  42. 2 2
      dist/main/solution/index.html
  43. 2 2
      dist/main/solution_detail/index.html
  44. 2 2
      dist/main/user_bills/index.html
  45. 2 2
      dist/main/user_credit_item/index.html
  46. 2 2
      dist/main/user_credit_list/index.html
  47. 2 2
      dist/main/user_credit_setting/index.html
  48. 2 2
      dist/main/vip_manager/index.html
  49. 2 2
      dist/main/vip_order/index.html
  50. 2 2
      dist/main/vip_setting/index.html
  51. 2 2
      dist/main/wage_details/index.html
  52. 2 2
      dist/main/wage_settlement/index.html
  53. 2 2
      dist/main/wait_expend/index.html
  54. 2 2
      dist/main/withdraw/index.html
  55. 2 2
      dist/main/work_bill/index.html
  56. 48 20
      pages/main/index/orders_frozen.vue
  57. 5 1
      pages/main/index/qingtuanbao.vue
  58. 175 104
      pages/main/index/wait_expend.vue
  59. 45 24
      pages/main/index/withdraw.vue

File diff suppressed because it is too large
+ 2 - 2
dist/200.html


+ 0 - 1
dist/_nuxt/33858bb63cc6418a64a7.css

@@ -1 +0,0 @@
-.table[data-v-6bbe31dc]{height:calc(100% - 80px)}

File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/63ab234d52848a735a48.css


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/6bca59fbc56888b3a7ac.js


+ 0 - 1
dist/_nuxt/771c4e6ada664c6ddcd2.css

@@ -1 +0,0 @@
-.header[data-v-20ac0479]{margin-top:20px;margin-bottom:30px}.tab-header[data-v-20ac0479]{margin-bottom:10px}.tab-content[data-v-20ac0479]{white-space:nowrap;overflow-x:scroll;height:calc(100vh - 300px)}.order-footer[data-v-20ac0479]{margin-top:10px}

File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/ba37c1c3fe79a8024c6c.js


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/e662e8f9f08ce0311374.js


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/e934e064a7ac6855a28b.js


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/e9b2f58b7a5fe29c8fd0.js


+ 0 - 1
dist/_nuxt/f5c3da3b83269a7c8a82.css

@@ -1 +0,0 @@
-.table[data-v-0b06c350]{height:100%;height:calc(100% - 80px);line-height:1.5}.el-table[data-v-0b06c350],.table[data-v-0b06c350]{font-size:12px!important}.el-form-item[data-v-0b06c350]{margin-bottom:0}.el-form[data-v-0b06c350]:last-child{margin-bottom:22px}

File diff suppressed because it is too large
+ 2 - 2
dist/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/login/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/404/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/balance_change/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cats copy/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cats/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_edit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_pro/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_balance/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_developer/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_order copy/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_show/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/gongmall/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/group_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jishuquan/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_frozen/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/outsource_bill/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/present_job_apply/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/publish_present/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/qingtuanbao/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/solution/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/solution_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_bills/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_credit_item/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_credit_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_credit_setting/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_manager/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_setting/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wage_details/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wage_settlement/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wait_expend/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/withdraw/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/work_bill/index.html


+ 48 - 20
pages/main/index/orders_frozen.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="cloud-balance" v-if="tableData">
+  <div id="cloud-balance" class="cloud-balance" v-if="tableData">
     <section class="top">
       <!-- <h3>交易订单中心</h3> -->
       <section>
@@ -47,7 +47,7 @@
             </el-select>
           </div>
 
-          <el-button type="primary"  @click="clickSearchConfirm">筛选</el-button>
+          <el-button type="primary" @click="clickSearchConfirm">筛选</el-button>
           <el-button>导出报表</el-button>
         </div>
       </section>
@@ -65,7 +65,12 @@
         </el-table-column>
         <el-table-column prop="name" label="用户">
           <template slot-scope="scope">
-            <span class="lblue point"><a :href="scope.row.user_url" target="_blank">{{scope.row.nickname}}({{scope.row.uid}})</a></span>
+            <span class="lblue point">
+              <a
+                :href="scope.row.user_url"
+                target="_blank"
+              >{{scope.row.nickname}}({{scope.row.uid}})</a>
+            </span>
           </template>
         </el-table-column>
         <el-table-column prop="name" label="关联订单ID">
@@ -121,14 +126,16 @@
 </template>
 
 <script>
-
 export default {
   data() {
     return {
-      count:1,
-      user:'',
-      statusList:[{id:0,name:'已解冻'},{id:1,name:'冻结中'}],
-      order_no:'',
+      count: 1,
+      user: "",
+      statusList: [
+        { id: 0, name: "已解冻" },
+        { id: 1, name: "冻结中" }
+      ],
+      order_no: "",
       timeRange: "",
       arriveTime: "",
       searchId: "",
@@ -143,7 +150,7 @@ export default {
       searchCount: 0,
       waitUnfrozenCoins: 0,
       totalCoins: 0,
-      totalCount: 0,
+      totalCount: 0
     };
   },
   mounted() {
@@ -168,20 +175,20 @@ export default {
       let url = "/api/admin/order/get_frozen_coins";
       let body = { page: this.currentPage, size: this.currentPageSize };
       if (this.user) body.user = this.user;
-      if (this.orderStatus!=='') body.status = this.orderStatus;
+      if (this.orderStatus !== "") body.status = this.orderStatus;
       if (this.order_no) body.order_no = this.order_no;
-      if (this.timeRange){
-        body.start_time=this.timeRange[0]/1000;
-        body.end_time=this.timeRange[1]/1000;
+      if (this.timeRange) {
+        body.start_time = this.timeRange[0] / 1000;
+        body.end_time = this.timeRange[1] / 1000;
       }
       const res = await this.$post(url, body);
       this.tableData = res.data.list;
-      this.totalCoins=res.data.totalCoins;
-      this.totalCount=res.data.totalCount;
-      this.waitUnfrozenCount=res.data.waitUnfrozenCount;
-      this.searchCount=res.data.searchCount;
-      this.waitUnfrozenCoins=res.data.waitUnfrozenCoins;
-    },
+      this.totalCoins = res.data.totalCoins;
+      this.totalCount = res.data.totalCount;
+      this.waitUnfrozenCount = res.data.waitUnfrozenCount;
+      this.searchCount = res.data.searchCount;
+      this.waitUnfrozenCoins = res.data.waitUnfrozenCoins;
+    }
   },
   created() {
     // console.log(process.env.NODE_ENV);
@@ -189,7 +196,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .order-footer {
   position: absolute;
   bottom: 10px;
@@ -208,6 +215,8 @@ export default {
   flex-direction: column;
   justify-content: center;
   height: 160px;
+  font-size: 12px;
+  line-height: 1.5;
 }
 .selector-box {
   /* margin-top: 10px; */
@@ -268,4 +277,23 @@ export default {
   text-align: center;
   border: 1px solid rgb(229, 28, 35);
 }
+.el-table {
+  font-size: 12px !important;
+  td {
+    padding: 4px 0 !important;
+  }
+  th {
+    padding: 4px 0 !important;
+  }
+}
+.cloud-balance td,
+.cloud-balance th {
+  padding: 4px 0 !important;
+}
+.el-form-item {
+  margin-bottom: 0;
+}
+.el-form:last-child {
+  margin-bottom: 22px;
+}
 </style>

+ 5 - 1
pages/main/index/qingtuanbao.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-tabs v-model="activeTabName">
+  <el-tabs v-model="activeTabName" type="border-card">
     <el-tab-pane label="青团宝结算订单" name="first">
       <div id="cloud-job">
         <div class="title">
@@ -352,4 +352,8 @@ export default {
 .el-form:last-child {
   margin-bottom: 22px;
 }
+.el-table td,
+.el-table th {
+  padding: 4px 0;
+}
 </style>

+ 175 - 104
pages/main/index/wait_expend.vue

@@ -1,47 +1,59 @@
 <template>
   <div v-if="jobData && packageData && hireData">
-    <div class="header">云端托管:{{jobData.sumJob.totalAmount/100}}元,整包托管:{{packageData.sumPackage.totalAmount/100}}元,雇佣托管:{{hireData.sumHire.totalAmount/100 || 0}}元</div>
-    <el-tabs v-model="activeName" type="card">
+    <div
+      class="header"
+    >云端托管:{{jobData.sumJob.totalAmount/100}}元,整包托管:{{packageData.sumPackage.totalAmount/100}}元,雇佣托管:{{hireData.sumHire.totalAmount/100 || 0}}元</div>
+    <el-tabs v-model="activeName" type="border-card">
       <el-tab-pane label="云端" name="job">
-        <div class="tab-header">云端项目待支出总额{{jobData.sumJob.totalAmount/100}}元,共{{jobData.sumJob.totalNum}}笔</div>
+        <div
+          class="tab-header"
+        >云端项目待支出总额{{jobData.sumJob.totalAmount/100}}元,共{{jobData.sumJob.totalNum}}笔</div>
         <div class="tab-content">
-          <el-table :data="jobData.orders" border style="width:100%;" height="100%">
-            <el-table-column prop="product_title" label="订单名称" width="300"/>
-            <el-table-column prop="user_info.nickname" label="用户" width="150"/>
-            <el-table-column prop="real_amount_yuan" label="实际金额" width="100"/>
-            <el-table-column prop="real_amount" label="收支类型" width="100">
+          <el-table :data="jobData.orders" border :stripe="true" height="100%">
+            <el-table-column prop="product_title" label="订单名称" width="150" />
+            <el-table-column prop="user_info.nickname" label="用户" />
+            <el-table-column prop="real_amount_yuan" label="实际金额" />
+            <el-table-column prop="real_amount" label="收支类型">
               <template slot-scope="scope">
                 <span>{{parseInt(scope.row.real_amount_yuan)>=0?"收入":"支出"}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="channel_name" label="支付方式" width="100"/>
-            <el-table-column prop="order_state_name" label="订单状态" width="100"/>
-            <el-table-column label="创建时间" width="100">
+            <el-table-column prop="channel_name" label="支付方式" />
+            <el-table-column prop="order_state_name" label="订单状态" />
+            <el-table-column label="创建时间">
               <template slot-scope="scope">
                 <span>{{formatDate(scope.row.created_at)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="到账时间" width="100">
+            <el-table-column label="到账时间">
               <template slot-scope="scope">
                 <span>{{formatDate(scope.row.pay_time)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="订单编号" width="100">
+            <el-table-column label="订单编号">
               <template slot-scope="scope">
-                <nuxt-link target="_blank" :to="{path:'/main/orders_detail?id='+scope.row.order_no}">{{scope.row.order_no}}</nuxt-link>
+                <nuxt-link
+                  target="_blank"
+                  :to="{path:'/main/orders_detail?id='+scope.row.order_no}"
+                >{{scope.row.order_no}}</nuxt-link>
               </template>
             </el-table-column>
-            <el-table-column prop="out_order_id" label="支付编号" width="100"/>
-            <el-table-column prop="product_type_name" label="订单类型" width="100"/>
-            <el-table-column prop="order_type_name" label="交易类型" width="100"/>
-            <el-table-column label="关联项目" width="100">
+            <el-table-column prop="out_order_id" label="支付编号" />
+            <el-table-column prop="product_type_name" label="订单类型" />
+            <el-table-column prop="order_type_name" label="交易类型" />
+            <el-table-column label="关联项目">
               <template slot-scope="scope">
-                <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'" target="_blank">
-                  <span class="lblue" >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
+                <a
+                  :href="scope.row.related_project.url?scope.row.related_project.url:'#'"
+                  target="_blank"
+                >
+                  <span
+                    class="lblue"
+                  >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
                 </a>
               </template>
             </el-table-column>
-            <el-table-column label="人工" width="100">
+            <el-table-column label="人工">
               <template slot-scope="scope">
                 <span v-if="scope.row.operator_info.nickname">{{scope.row.operator_info.nickname}}</span>
                 <span>({{scope.row.operator_uid}})</span>
@@ -49,48 +61,65 @@
             </el-table-column>
           </el-table>
         </div>
-        <el-pagination class="order-footer" background layout="prev, pager, next" :page-size="10" :total="Number(jobData.sumJob.totalNum)" @current-change="handleJobCurrentChange"/>
+        <el-pagination
+          class="order-footer"
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="Number(jobData.sumJob.totalNum)"
+          @current-change="handleJobCurrentChange"
+        />
       </el-tab-pane>
       <el-tab-pane label="整包" name="package">
-        <div class="tab-header">整包项目待支出总额{{packageData.sumPackage.totalAmount/100}}元,共{{packageData.sumPackage.totalNum}}笔</div>
+        <div
+          class="tab-header"
+        >整包项目待支出总额{{packageData.sumPackage.totalAmount/100}}元,共{{packageData.sumPackage.totalNum}}笔</div>
         <div class="tab-content">
-          <el-table :data="packageData.orders" border style="width:100%;" height="100%">
-            <el-table-column prop="product_title" label="订单名称" width="300"/>
-            <el-table-column prop="user_info.nickname" label="用户" width="150"/>
-            <el-table-column prop="real_amount_yuan" label="实际金额" width="100"/>
-            <el-table-column prop="real_amount" label="收支类型" width="100">
+          <el-table :data="packageData.orders" border :stripe="true" height="100%">
+            <el-table-column prop="product_title" label="订单名称" width="150" />
+            <el-table-column prop="user_info.nickname" label="用户" />
+            <el-table-column prop="real_amount_yuan" label="实际金额" />
+            <el-table-column prop="real_amount" label="收支类型">
               <template slot-scope="scope">
                 <span>{{parseInt(scope.row.real_amount_yuan)>=0?"收入":"支出"}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="channel_name" label="支付方式" width="100"/>
-            <el-table-column prop="order_state_name" label="订单状态" width="100"/>
-            <el-table-column label="创建时间" width="100">
+            <el-table-column prop="channel_name" label="支付方式" />
+            <el-table-column prop="order_state_name" label="订单状态" />
+            <el-table-column label="创建时间">
               <template slot-scope="scope">
                 <span>{{formatDate(scope.row.created_at)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="到账时间" width="100">
+            <el-table-column label="到账时间">
               <template slot-scope="scope">
                 <span>{{formatDate(scope.row.pay_time)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="订单编号" width="100">
+            <el-table-column label="订单编号">
               <template slot-scope="scope">
-                <nuxt-link target="_blank" :to="{path:'/main/orders_detail?id='+scope.row.order_no}">{{scope.row.order_no}}</nuxt-link>
+                <nuxt-link
+                  target="_blank"
+                  :to="{path:'/main/orders_detail?id='+scope.row.order_no}"
+                >{{scope.row.order_no}}</nuxt-link>
               </template>
             </el-table-column>
-            <el-table-column prop="out_order_id" label="支付编号" width="100"/>
-            <el-table-column prop="product_type_name" label="订单类型" width="100"/>
-            <el-table-column prop="order_type_name" label="交易类型" width="100"/>
-            <el-table-column label="关联项目" width="100">
+            <el-table-column prop="out_order_id" label="支付编号" />
+            <el-table-column prop="product_type_name" label="订单类型" />
+            <el-table-column prop="order_type_name" label="交易类型" />
+            <el-table-column label="关联项目">
               <template slot-scope="scope">
-                <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'" target="_blank">
-                  <span class="lblue" >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
+                <a
+                  :href="scope.row.related_project.url?scope.row.related_project.url:'#'"
+                  target="_blank"
+                >
+                  <span
+                    class="lblue"
+                  >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
                 </a>
               </template>
             </el-table-column>
-            <el-table-column label="人工" width="100">
+            <el-table-column label="人工">
               <template slot-scope="scope">
                 <span v-if="scope.row.operator_info.nickname">{{scope.row.operator_info.nickname}}</span>
                 <span>({{scope.row.operator_uid}})</span>
@@ -98,48 +127,65 @@
             </el-table-column>
           </el-table>
         </div>
-        <el-pagination class="order-footer" background layout="prev, pager, next" :page-size="10" :total="Number(packageData.sumPackage.totalNum)" @current-change="handlePackageCurrentChange"/>
+        <el-pagination
+          class="order-footer"
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="Number(packageData.sumPackage.totalNum)"
+          @current-change="handlePackageCurrentChange"
+        />
       </el-tab-pane>
       <el-tab-pane label="雇佣" name="hire">
-        <div class="tab-header">整包项目待支出总额{{hireData.sumHire.totalAmount/100}}元,共{{hireData.sumHire.totalNum}}笔</div>
+        <div
+          class="tab-header"
+        >整包项目待支出总额{{hireData.sumHire.totalAmount/100}}元,共{{hireData.sumHire.totalNum}}笔</div>
         <div class="tab-content">
-          <el-table :data="hireData.orders" border style="width:100%;" height="100%">
-            <el-table-column prop="product_title" label="订单名称" width="300"/>
-            <el-table-column prop="user_info.nickname" label="用户" width="150"/>
-            <el-table-column prop="real_amount_yuan" label="实际金额" width="100"/>
-            <el-table-column prop="real_amount" label="收支类型" width="100">
+          <el-table :data="hireData.orders" border :stripe="true" height="100%">
+            <el-table-column prop="product_title" label="订单名称" width="150" />
+            <el-table-column prop="user_info.nickname" label="用户" />
+            <el-table-column prop="real_amount_yuan" label="实际金额" />
+            <el-table-column prop="real_amount" label="收支类型">
               <template slot-scope="scope">
                 <span>{{parseInt(scope.row.real_amount)>=0?"收入":"支出"}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="channel_name" label="支付方式" width="100"/>
-            <el-table-column prop="order_state_name" label="订单状态" width="100"/>
-            <el-table-column label="创建时间" width="100">
+            <el-table-column prop="channel_name" label="支付方式" />
+            <el-table-column prop="order_state_name" label="订单状态" />
+            <el-table-column label="创建时间">
               <template slot-scope="scope">
                 <span>{{formatDate(scope.row.created_at)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="到账时间" width="100">
+            <el-table-column label="到账时间">
               <template slot-scope="scope">
                 <span>{{formatDate(scope.row.pay_time)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="订单编号" width="100">
+            <el-table-column label="订单编号">
               <template slot-scope="scope">
-                <nuxt-link target="_blank" :to="{path:'/main/orders_detail?id='+scope.row.order_no}">{{scope.row.order_no}}</nuxt-link>
+                <nuxt-link
+                  target="_blank"
+                  :to="{path:'/main/orders_detail?id='+scope.row.order_no}"
+                >{{scope.row.order_no}}</nuxt-link>
               </template>
             </el-table-column>
-            <el-table-column prop="out_order_id" label="支付编号" width="100"/>
-            <el-table-column prop="product_type_name" label="订单类型" width="100"/>
-            <el-table-column prop="order_type_name" label="交易类型" width="100"/>
-            <el-table-column label="关联项目" width="100">
+            <el-table-column prop="out_order_id" label="支付编号" />
+            <el-table-column prop="product_type_name" label="订单类型" />
+            <el-table-column prop="order_type_name" label="交易类型" />
+            <el-table-column label="关联项目">
               <template slot-scope="scope">
-                <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'" target="_blank">
-                  <span class="lblue" >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
+                <a
+                  :href="scope.row.related_project.url?scope.row.related_project.url:'#'"
+                  target="_blank"
+                >
+                  <span
+                    class="lblue"
+                  >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
                 </a>
               </template>
             </el-table-column>
-            <el-table-column label="人工" width="100">
+            <el-table-column label="人工">
               <template slot-scope="scope">
                 <span v-if="scope.row.operator_info.nickname">{{scope.row.operator_info.nickname}}</span>
                 <span>({{scope.row.operator_uid}})</span>
@@ -147,7 +193,14 @@
             </el-table-column>
           </el-table>
         </div>
-        <el-pagination class="order-footer" background layout="prev, pager, next" :page-size="10" :total="Number(hireData.sumHire.totalNum)" @current-change="handleHireCurrentChange"/>
+        <el-pagination
+          class="order-footer"
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="Number(hireData.sumHire.totalNum)"
+          @current-change="handleHireCurrentChange"
+        />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -157,20 +210,20 @@
 export default {
   data() {
     return {
-      activeName: 'job',
+      activeName: "job",
       jobPage: 1,
-      jobData: '',
+      jobData: "",
       packagePage: 1,
-      packageData: '',
+      packageData: "",
       hirePage: 1,
-      hireData: '',
-    }
+      hireData: ""
+    };
   },
   mounted() {
-    this.activeName = this.$route.query.activeName || 'job'
-    this.getJobOrders()
-    this.getPackageOrders()
-    this.getHireOrders()
+    this.activeName = this.$route.query.activeName || "job";
+    this.getJobOrders();
+    this.getPackageOrders();
+    this.getHireOrders();
   },
   methods: {
     async getJobOrders() {
@@ -178,10 +231,10 @@ export default {
         page: this.jobPage,
         pageSize: 10,
         productType: 9
-      }
-      let res = await this.$post("/api/admin/order/getWaitExpenseOrders", data)
+      };
+      let res = await this.$post("/api/admin/order/getWaitExpenseOrders", data);
       if (res) {
-        this.jobData = res.data
+        this.jobData = res.data;
         // console.log(this.jobData)
       }
     },
@@ -190,10 +243,10 @@ export default {
         page: this.packagePage,
         pageSize: 10,
         productType: 2
-      }
-      let res = await this.$post("/api/admin/order/getWaitExpenseOrders", data)
+      };
+      let res = await this.$post("/api/admin/order/getWaitExpenseOrders", data);
       if (res) {
-        this.packageData = res.data
+        this.packageData = res.data;
         // console.log(this.packageData)
       }
     },
@@ -202,24 +255,24 @@ export default {
         page: this.hirePage,
         pageSize: 10,
         productType: 4
-      }
-      let res = await this.$post("/api/admin/order/getWaitExpenseOrders", data)
+      };
+      let res = await this.$post("/api/admin/order/getWaitExpenseOrders", data);
       if (res) {
-        this.hireData = res.data
+        this.hireData = res.data;
         // console.log(this.hireData)
       }
     },
     handleJobCurrentChange(val) {
-      this.jobPage = val
-      this.getJobOrders()
+      this.jobPage = val;
+      this.getJobOrders();
     },
     handlePackageCurrentChange(val) {
-      this.packagePage = val
-      this.getPackageOrders()
+      this.packagePage = val;
+      this.getPackageOrders();
     },
     handleHireCurrentChange(val) {
-      this.hirePage = val
-      this.getHireOrders()
+      this.hirePage = val;
+      this.getHireOrders();
     },
     formatDate(time) {
       var now = new Date(time * 1000);
@@ -251,29 +304,47 @@ export default {
         ":" +
         second
       );
-    },
-
+    }
   }
-}
+};
 </script>
 
-<style scoped>
-  .header {
-    margin-top: 20px;
-    margin-bottom: 30px;
-  }
+<style scoped lang="scss">
+.header {
+  margin-top: 20px;
+  margin-bottom: 30px;
+  font-size: 12px;
+  line-height: 1.5;
+}
 
-  .tab-header {
-    margin-bottom: 10px;
-  }
+.tab-header {
+  margin-bottom: 10px;
+  font-size: 12px;
+  line-height: 1.5;
+}
 
-  .tab-content {
-    white-space: nowrap;
-    overflow-x: scroll;
-    height: calc(100vh - 300px);
-  }
+.tab-content {
+  white-space: nowrap;
+  overflow-x: scroll;
+  height: calc(100vh - 300px);
+}
 
-  .order-footer {
-    margin-top: 10px;
+.order-footer {
+  margin-top: 10px;
+}
+.el-table {
+  font-size: 12px !important;
+  td {
+    padding: 4px 0 !important;
   }
+  th {
+    padding: 4px 0 !important;
+  }
+}
+.el-form-item {
+  margin-bottom: 0;
+}
+.el-form:last-child {
+  margin-bottom: 22px;
+}
 </style>

+ 45 - 24
pages/main/index/withdraw.vue

@@ -1,8 +1,17 @@
 <template>
   <div id="withdraw">
-    <el-select @change="changeSelect" v-model="selectValue" placeholder="请选择">
-      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-    </el-select>
+    <el-form>
+      <el-form-item label="订单状态">
+        <el-select @change="changeSelect" v-model="selectValue" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
     <div class="table">
       <el-table
         v-if="tableData.length"
@@ -56,7 +65,7 @@ const tableHeaders = [
   "订单号",
   "支付方式",
   "状态"
-]
+];
 const tableProps = [
   "uid",
   "real_name",
@@ -69,7 +78,7 @@ const tableProps = [
   "order_no",
   "channel",
   "statusShow"
-]
+];
 
 export default {
   data() {
@@ -77,24 +86,24 @@ export default {
       options: [
         {
           value: -1,
-          label: '全部'
+          label: "全部"
         },
         {
           value: 0,
-          label: '提交'
+          label: "提交"
         },
         {
           value: 1,
-          label: '成功'
+          label: "成功"
         },
         {
           value: 2,
-          label: '失败'
+          label: "失败"
         },
         {
           value: 3,
-          label: '进行中'
-        },
+          label: "进行中"
+        }
       ],
       selectValue: -1,
       // 数据总条目
@@ -109,15 +118,15 @@ export default {
     };
   },
   mounted() {
-    this.getTableData()
+    this.getTableData();
   },
   methods: {
     changeSelect(status) {
-      this.getTableData()
+      this.getTableData();
     },
     // 点击重试
     async clickRetry(id) {
-      const res = await this.$post("/api/admin/payment/redoDraw", { id })
+      const res = await this.$post("/api/admin/payment/redoDraw", { id });
     },
     // 点击用户的 uid
     clickUID(uid) {
@@ -125,9 +134,9 @@ export default {
     },
     // 根据状态显示图表样式
     tableRowClassName({ row, rowIndex }) {
-      let className = ""
-      if(row.status === "1") className = "success-row"
-      return className
+      let className = "";
+      if (row.status === "1") className = "success-row";
+      return className;
     },
     // 格式化列表数据
     formatTableData(data) {
@@ -140,19 +149,31 @@ export default {
     },
     // 获取列表数据
     async getTableData(page = this.currentPage) {
-      this.tableData = []
-      const res = await this.$post("/api/admin/payment/listDraw", { page, status: this.selectValue })
-      const data = res.data
-      this.tableData = this.formatTableData(res.data.list)
-      this.totalCount = Number(data.total)
-      this.totalPage = data.totalPage
+      this.tableData = [];
+      const res = await this.$post("/api/admin/payment/listDraw", {
+        page,
+        status: this.selectValue
+      });
+      const data = res.data;
+      this.tableData = this.formatTableData(res.data.list);
+      this.totalCount = Number(data.total);
+      this.totalPage = data.totalPage;
     }
   }
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .table {
   height: calc(100% - 80px);
 }
+.el-table {
+  font-size: 12px !important;
+  td {
+    padding: 4px 0 !important;
+  }
+  th {
+    padding: 4px 0 !important;
+  }
+}
 </style>