up

components/menu/data.js

@@ -10,91 +10,134 @@ export default [{
     }]
   },
   {
-    title: "财务",
+    title: "财务-管理",
     icon: "coin",
     path: "",
     subs: [{
-        title: "交易订单",
-        path: baseUrl + "orders"
-      },
+      title: "订单中心",
+      path: baseUrl + "orders"
+    },
       {
         title: "人工订单",
         path: baseUrl + "artificial_orders"
       },
       {
-        title: "薪资订单",
-        path: baseUrl + "qingtuanbao",
+        title: "支付宝提现管理",
+        path: baseUrl + "withdraw",
         hidden: false
       },
       {
-        title: "领薪宝",
+        title: "领薪宝提现管理",
         path: baseUrl + "kaifabao",
         hidden: false
       },
+    ]
+  },
+  {
+    title: "财务-报表",
+    icon: "coin",
+    path: "",
+    subs: [{
+      title: "月度营业额报表",
+      path: baseUrl + ""
+    },
       {
-        title: "云端结算",
-        path: baseUrl + "cloud_balance"
-      },
-      {
-        title: "人工财务表单",
-        path: baseUrl + "artificial_order",
-        hidden: true
-      },
-      {
-        title: "余额变动管理",
-        path: baseUrl + "balance_change"
-      },
-      {
-        title: "提现账单",
-        path: baseUrl + "withdraw"
-      },
-      {
-        title: "工资结算",
-        path: baseUrl + "wage_settlement",
-        hidden: true
-      },
-      {
-        title: "冻结订单",
-        path: baseUrl + "orders_frozen",
-        hidden: false
+        title: "月度现金流报表",
+        path: baseUrl + ""
       },
       {
-        title: "待支出订单",
+        title: "待支出订单报表",
         path: baseUrl + "wait_expend",
         hidden: false
       },
-      {
-        title: "账单详情",
-        path: baseUrl + "bills",
-        hidden: true
-      },
-      {
-        title: "财务订单详情",
-        path: baseUrl + "orders_detail",
-        hidden: true
-      },
-      {
-        title: "整包账单明细",
-        path: baseUrl + "outsource_bill",
-        hidden: true
-      },
-      {
-        title: "工资账单明细",
-        path: baseUrl + "work_bill",
-        hidden: true
-      },
-      {
-        title: "用户账单列表",
-        path: baseUrl + "user_bills",
-        hidden: true
-      },
-      {
-        title: "工资账单明细",
-        path: baseUrl + "wage_details",
-        hidden: true
-      }
     ]
   },
+  // {
+  //   title: "财务",
+  //   icon: "coin",
+  //   path: "",
+  //   subs: [{
+  //       title: "交易订单",
+  //       path: baseUrl + "orders"
+  //     },
+  //     {
+  //       title: "人工订单",
+  //       path: baseUrl + "artificial_orders"
+  //     },
+  //     {
+  //       title: "薪资订单",
+  //       path: baseUrl + "qingtuanbao",
+  //       hidden: false
+  //     },
+  //     {
+  //       title: "领薪宝",
+  //       path: baseUrl + "kaifabao",
+  //       hidden: false
+  //     },
+  //     {
+  //       title: "云端结算",
+  //       path: baseUrl + "cloud_balance"
+  //     },
+  //     {
+  //       title: "人工财务表单",
+  //       path: baseUrl + "artificial_order",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "余额变动管理",
+  //       path: baseUrl + "balance_change"
+  //     },
+  //     {
+  //       title: "提现账单",
+  //       path: baseUrl + "withdraw"
+  //     },
+  //     {
+  //       title: "工资结算",
+  //       path: baseUrl + "wage_settlement",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "冻结订单",
+  //       path: baseUrl + "orders_frozen",
+  //       hidden: false
+  //     },
+  //     {
+  //       title: "待支出订单",
+  //       path: baseUrl + "wait_expend",
+  //       hidden: false
+  //     },
+  //     {
+  //       title: "账单详情",
+  //       path: baseUrl + "bills",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "财务订单详情",
+  //       path: baseUrl + "orders_detail",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "整包账单明细",
+  //       path: baseUrl + "outsource_bill",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "工资账单明细",
+  //       path: baseUrl + "work_bill",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "用户账单列表",
+  //       path: baseUrl + "user_bills",
+  //       hidden: true
+  //     },
+  //     {
+  //       title: "工资账单明细",
+  //       path: baseUrl + "wage_details",
+  //       hidden: true
+  //     }
+  //   ]
+  // },
   {
     title: "运营",
     icon: "service",

pages/main/index/kaifabao.vue

@@ -1,6 +1,14 @@
 <template>
   <div>
+    <div style="margin-bottom: 4px">
+      <span class="left-title">历史数据:</span>
+      <el-radio-group v-model="tabUrl" size="small" @change="onToUrl">
+        <el-radio-button label="gongmao">工猫提现记录</el-radio-button>
+        <el-radio-button label="qingtuanbao">青团宝提现记录</el-radio-button>
+      </el-radio-group>
+    </div>
     <div>
+      <span class="left-title">领薪宝配置:</span>
       <el-radio-group v-model="tab" size="small" @change="getList">
         <el-radio-button label="service">领薪宝服务配置</el-radio-button>
         <el-radio-button label="salary">领薪宝结薪订单</el-radio-button>
@@ -12,7 +20,7 @@
     <div class="t-content">
       <template v-if="tab ==='service'">
         <div class="t-title">
-          <span>基本服务配置</span>
+          <span class="left-title">基本服务配置</span>
         </div>
         <el-table border :data="basicConfigData" style="width: 100%">
           <el-table-column prop="config_key" label="键" width="180"></el-table-column>
@@ -33,7 +41,7 @@
           </el-table-column>
         </el-table>
         <div class="t-title">
-          <span>
+          <span class="left-title">
             扣费方式配置
             <el-button size="medium" @click="onAddService">添加扣税方式</el-button>
           </span>
@@ -411,6 +419,7 @@ export default {
   data() {
     return {
       tab: "service",
+      tabUrl: "",
       accountType: "1",
       editorOption: {
         modules: {
@@ -477,7 +486,6 @@ export default {
             "/api/admin/kaifabao/getKaifabaoOrderList",
             data
           );
-          debugger;
           if (res && res.status === 1) {
             this.salaryData = res.data.list || [];
             this.serviceCountData.totalDraw = this.formatPrice(
@@ -620,6 +628,21 @@ export default {
         this.getList();
       }
     },
+    onToUrl(){
+      let la = this.tabUrl;
+      let url = '';
+      switch (la) {
+        case "gongmao":
+          url = '/main/gongmall';
+          break;
+        case "qingtuanbao":
+          url = '/main/qingtuanbao';
+          break;
+      }
+      if(url === '') return;
+      this.$router.push({ path:url});
+      // window.location.href = url;
+    },
     projectLink(row) {
       const type = row.entity_type;
       if (type === "2") {
@@ -739,4 +762,8 @@ export default {
 .ql-editor {
   height: 200px;
 }
+  .left-title{
+    font-size: 22px;
+    font-weight: 500;
+  }
 </style>

pages/main/index/withdraw.vue

@@ -63,6 +63,7 @@ const tableHeaders = [
   "到账时间",
   "订单号",
   "支付方式",
+  "失败原因",
   "状态"
 ];
 const tableProps = [
@@ -76,6 +77,7 @@ const tableProps = [
   "taken_atShow",
   "order_no",
   "channel",
+  "fail",
   "statusShow"
 ];
 

plugins/http.js

@@ -30,7 +30,7 @@ const post = async (path, data = {}, payload) => {
   for(const key in data) {
     if(data.hasOwnProperty(key)) {
       const element = data[key]
-      if(element || element === 0) formData += `${key}=${element}&`
+      if(element || element === 0) formData += `${key}=${encodeURIComponent(element)}&`
     }
   }
   formData = formData.slice(0, formData.length - 1)
@@ -86,4 +86,4 @@ const consoleFormat = obj => {
 
 Vue.prototype.$get = get
 Vue.prototype.$post = post
-Vue.prototype.$request = request
+Vue.prototype.$request = request