秒杀活动，状态展示

manager/src/config/index.js

@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: "https://common-api.pickmall.cn",
+    common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
+    manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.109:8890',
+    // common: 'http://192.168.0.109:8890',
-    buyer: 'http://192.168.0.109:8888',
+    // buyer: 'http://192.168.0.109:8888',
-    seller: 'http://192.168.0.109:8889',
+    // seller: 'http://192.168.0.109:8889',
-    manager: 'http://192.168.0.109:8887'
+    // manager: 'http://192.168.0.109:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/order/order/orderList.vue

@@ -40,7 +40,7 @@
       </Row>
       <div>
         <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
-          <Button type="primary" class="export">
+          <Button type="info" class="export">
             导出Excel
           </Button>
         </download-excel>
@@ -72,10 +72,6 @@ export default {
         订单编号: "sn",
         下单时间: "createTime",
         客户名称: "memberName",
-        客户账号: "",
-        收货人: "",
-        收货人手机号: "",
-        收货人地址: "",
         支付方式: {
           field: "clientType",
           callback: (value) => {
@@ -92,15 +88,7 @@ export default {
             }
           },
         },
-        配送方式: "",
-        配送费用: "",
-        订单商品金额: "",
-        订单优惠金额: "",
-        订单应付金额: "",
-        商品SKU编号: "",
         商品数量: "groupNum",
-        买家备注: "",
-        订单状态: "",
         付款状态: {
           field: "payStatus",
           callback: (value) => {
@@ -111,9 +99,6 @@ export default {
               : "";
           },
         },
-        发货状态: "",
-        发票类型: "",
-        发票抬头: "",
         店铺: "storeName",
       },
       loading: true, // 表单加载状态
@@ -222,56 +207,23 @@ export default {
           title: "下单时间",
           key: "createTime",
           width: 170,
-          sortable: true,
-          sortType: "desc",
         },
-
         {
           title: "操作",
           key: "action",
           align: "center",
           width: 150,
           render: (h, params) => {
-            return h("div", [
+            return h("div", [h("Button", {props: {type: "primary", size: "small",},
-              h(
+                attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,},
-                "Button",
+                style: {marginRight: "5px",},
-
+                on: {click: () => {this.confirmPrice(params.row);},},
-                {
+                }, "收款"
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  attrs: {
-                    disabled: params.row.orderStatus == "UNPAID" ? false : true,
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.confirmPrice(params.row);
-                    },
-                  },
-                },
-                "收款"
               ),
-              h(
+              h("Button", {props: {type: "info", size: "small",},
-                "Button",
+                  style: {marginRight: "5px",},
-                {
+                  on: {click: () => {this.detail(params.row);},},
-                  props: {
+                }, "查看"
-                    type: "info",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.detail(params.row);
-                    },
-                  },
-                },
-                "查看"
               ),
             ]);
           },

manager/src/views/promotion/seckill/seckill.vue

@@ -102,13 +102,13 @@ export default {
           width: 100,
           render: (h, params) => {
             if (params.row.promotionStatus == "NEW") {
-              return h("Tag", {props: {color: "volcano",},},"新建");
+              return h("Tag", {props: {color: "geekblue",},},"新建");
             } else if (params.row.promotionStatus == "START") {
-              return h("Tag", {props: {color: "blue",},},"开始");
+              return h("Tag", {props: {color: "green",},},"开始");
             } else if (params.row.promotionStatus == "END") {
-              return h("Tag", {props: {color: "green",},},"结束");
-            } else if (params.row.promotionStatus == "CLOSE") {
               return h("Tag", {props: {color: "volcano",},},"结束");
+            } else if (params.row.promotionStatus == "CLOSE") {
+              return h("Tag", {props: {color: "red",},},"结束");
             }
           },
         },

seller/src/views/order/order/orderList.vue

@@ -80,7 +80,7 @@ export default {
         {
           title: "订单号",
           key: "sn",
-          minWidth: 240,
+          minWidth: 200,
           tooltip: true,
         },
         {
@@ -95,7 +95,7 @@ export default {
             } else if (params.row.clientType == "WECHAT_MP") {
               return h("div", {}, "小程序端");
             } else if (params.row.clientType == "APP") {
-              return h("div", {}, "移动应用端");
+              return h("div", {}, "APP端");
             } else {
               return h("div", {}, params.row.clientType);
             }
@@ -145,11 +145,8 @@ export default {
         {
           title: "下单时间",
           key: "createTime",
-          width: 170,
+          width: 170
-          sortable: true,
-          sortType: "desc",
         },
-
         {
           title: "操作",
           key: "action",

seller/src/views/promotion/seckill/seckill.vue

@@ -105,13 +105,13 @@ export default {
               color = "default";
             if (params.row.promotionStatus == "NEW") {
               text = "未开始";
-              color = "default";
+              color = "geekblue";
             } else if (params.row.promotionStatus == "START") {
               text = "已开始";
               color = "green";
             } else if (params.row.promotionStatus == "END") {
               text = "已结束";
-              color = "red";
+              color = "volcano";
             } else if (params.row.promotionStatus == "CLOSE") {
               text = "已关闭";
               color = "red";