Browse Source

Merge branch 'dev'

戴艳蓉 3 years ago
parent
commit
fad65990f9

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


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-7276db90.32d7a339.css


BIN
dist/static/css/chunk-883b4048.de69dcad.css.gz → dist/static/css/chunk-7276db90.32d7a339.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1f9442b9.js


BIN
dist/static/js/app.1f9442b9.js.gz


BIN
dist/static/js/app.bbdbfd88.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7276db90.ff151a46.js


BIN
dist/static/js/chunk-7276db90.ff151a46.js.gz


BIN
dist/static/js/chunk-883b4048.19f76b97.js.gz


+ 13 - 11
src/views/search/commission/index.vue

@@ -246,25 +246,26 @@ export default {
           label: "一级分类",
           "min-width": "90",
         },
-        {
-          prop: "order_num",
-          label: "销售数量",
+         {
+          prop: "sale_price",
+          label: "销售单价",
           "min-width": "90",
         },
         {
-          prop: "sale_price",
-          label: "销售单价",
+          prop: "order_num",
+          label: "销售数量",
           "min-width": "90",
         },
+
         {
           prop: "sale_total",
           label: "销售总额",
           "min-width": "90",
         },
         {
-          prop: "fund_fee",
-          label: "回款金额",
-          "min-width": "140",
+          prop: "ordertime",
+          label: "确认单下单时间",
+          width: "145",
         },
         {
           prop: "addtime",
@@ -272,10 +273,11 @@ export default {
           width: "145",
         },
         {
-          prop: "ordertime",
-          label: "下单时间",
-          width: "145",
+          prop: "fund_fee",
+          label: "回款金额",
+          "min-width": "140",
         },
+
         {
           prop: "pay_day",
           label: "账期",

Some files were not shown because too many files changed in this diff