商家订单 财务

.env.development

@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = https://yybtest.ali251.langye.net
+VUE_APP_BASE_API = https://yybtest.ali251.langye.net
-VUE_APP_BASE_API = https://yunyubang.ali251.langye.net
+#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net

src/views/finance/index.vue

@@ -84,14 +84,14 @@ export default {
           width: 160,
           sortable: false
         },
-        {
+        // {
-          label:'相关流水号',
+        //   label:'相关流水号',
-          prop:'related_id',
+        //   prop:'related_id',
-          sortable:false
+        //   sortable:false
-        },
+        // },
         {
           label:'相关子订单号',
-          prop:'order_item_id',
+          prop:'order.serial',
           sortable: false
         }
       ]
@@ -116,9 +116,9 @@ export default {
       return function(key){
         let map = new Map([
           ['balance','余额'],
-          ['fees','充值'],
+          ['recharges','充值'],
-          ['recharges','退款'],
+          ['refunds','退款'],
-          ['refunds','佣金']
+          ['fees','佣金']
         ])
         return map.get(key)
       }

src/views/order/index.vue

@@ -71,17 +71,20 @@ export default {
         rows:10,
         show_history:0,
         state:'',
-        keyword:''
+        keyword:'',
+        not_state:["pending"],
+        sort_name:"updated_at",
+        sort_type:"desc"
       },
       status:[
         {
           label:'全部',
           value:''
         },
-        {
+        // {
-          label:'待处理',
+        //   label:'待处理',
-          value:'pending'
+        //   value:'pending'
-        },
+        // },
         {
           label:'已分发',
           value:'assigned'
@@ -180,6 +183,12 @@ export default {
           width:180,
           sortable:false,
         },
+        {
+          prop:'updated_at',
+          label:'订单更新时间',
+          width:180,
+          sortable:false,
+        },
         {
           label:'状态',
           sortable:false,

vue.config.js

@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/merchant/',
-  outputDir: '/Users/liuxiangyu/Work/yunyubang/yunyubang-service/public/merchant',
+  outputDir: '/Users/mac/Documents/朗业/2022/y-孕育邦/后端代码/yunyubang/public/merchant',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项