Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

2025-12-18 17:05:54 +08:00 · 2021-06-23 16:58:22 +08:00
parent 8032f3bda1 752d967a50
commit ee5759c86a
57 changed files with 883 additions and 1141 deletions
--- a/manager/src/views/distribution/distribution.vue
+++ b/manager/src/views/distribution/distribution.vue
@@ -147,21 +147,13 @@ export default {
          sortable: false,
          render: (h, params) => {
            if (params.row.distributionStatus == "PASS") {
-              return h("Badge", {
-                props: { status: "success", text: "审核通过" },
-              });
+              return h("Tag", {props: {color: "green",},},"通过");
            } else if (params.row.distributionStatus == "APPLY") {
-              return h("Badge", {
-                props: { status: "processing", text: "申请中" },
-              });
+              return h("Tag", {props: {color: "geekblue",},},"待审核");
            } else if (params.row.distributionStatus == "RETREAT") {
-              return h("Badge", {
-                props: { status: "warning", text: "已清退" },
-              });
+              return h("Tag", {props: {color: "volcano",},},"清退");
            } else if (params.row.distributionStatus == "REFUSE") {
-              return h("Badge", {
-                props: { status: "error", text: "审核拒绝" },
-              });
+              return h("Tag", {props: {color: "red",},},"拒绝");
            }
          },
        },
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -186,11 +186,11 @@ export default {
          width: 130,
          render: (h, params) => {
            if (params.row.goodsType === 'PHYSICAL_GOODS') {
-              return h("div", "实物商品");
+              return h("Tag", {props: {color: "green",},}, "实物商品");
            } else if (params.row.goodsType === 'VIRTUAL_GOODS') {
-              return h("div", "虚拟商品");
+              return h("Tag", {props: {color: "volcano",},}, "虚拟商品");
            } else {
-              return h("div", "电子卡券");
+              return h("Tag", {props: {color: "geekblue",},}, "电子卡券");
            }
          },
        },
@@ -200,23 +200,9 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.marketEnable == "DOWN") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "下架",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "green"},},"上架");
            } else if (params.row.marketEnable == "UPPER") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "上架",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"下架");
            }
          },
        },
@@ -226,36 +212,14 @@ export default {
          width: 130,
          render: (h, params) => {
            if (params.row.isAuth == "TOBEAUDITED") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "待审核",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"待审核");
            } else if (params.row.isAuth == "PASS") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "审核通过",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "green"},},"通过");
            } else if (params.row.isAuth == "REFUSE") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "审核拒绝",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "red",},},"拒绝");
            }
          },
        },
-
        {
          title: "店铺名称",
          key: "storeName",
--- a/manager/src/views/goods/goods-manage/brand.vue
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -113,23 +113,9 @@ export default {
          align: "left",
          render: (h, params) => {
            if (params.row.deleteFlag == 0) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "启用",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "green",},},"启用");
            } else if (params.row.deleteFlag == 1) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "禁用",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"禁用");
            }
          },
          filters: [
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -135,35 +135,11 @@ export default {
          width: 90,
          render: (h, params) => {
            if (params.row.grade == "GOOD") {
-              return h(
-                "Tag",
-                {
-                  props: {
-                    color: "success",
-                  },
-                },
-                "好评"
-              );
+              return h("Tag", {props: {color: "green",},}, "好评");
            } else if (params.row.grade == "MODERATE") {
-              return h(
-                "Tag",
-                {
-                  props: {
-                    color: "warning",
-                  },
-                },
-                "中评"
-              );
+              return h("Tag", {props: {color: "orange",},}, "中评");
            } else {
-              return h(
-                "Tag",
-                {
-                  props: {
-                    color: "error",
-                  },
-                },
-                "差评"
-              );
+              return h("Tag", {props: {color: "red",},}, "差评");
            }
          },
        },
--- a/manager/src/views/lili-dialog/template/other.vue
+++ b/manager/src/views/lili-dialog/template/other.vue
@@ -18,7 +18,7 @@
                  <Input type="text" @keyup="handleLink(linkItem,linkList.length)" v-model="linkItem.url" placeholder="https://"></Input>
              </div>
          </Poptip>
-          
+
        </div>
      </Col>
    </Row>
@@ -74,7 +74,12 @@ export default {
          icon: "md-happy",
          ___type: "sign",
        },
-        
+        {
+          title: "小程序直播",
+          icon: "ios-videocam",
+          ___type: "live",
+        },
+
      ],
      linkItem: {
        title: "外部链接",
--- a/manager/src/views/member/advance/recharge.vue
+++ b/manager/src/views/member/advance/recharge.vue
@@ -131,23 +131,9 @@
            sortable: false,
            render: (h, params) => {
              if (params.row.payStatus == "PAID") {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "success",
-                      text: "已付款",
-                    },
-                  }),
-                ]);
-              } else if (params.row.payStatus == "UNPAID") {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "error",
-                      text: "未付款",
-                    },
-                  }),
-                ]);
+                return h("Tag", {props: {color: "green",},}, "已付款");
+              } else {
+                return h("Tag", {props: {color: "red",},}, "未付款");
              }
            },
          },
--- a/manager/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue
@@ -1,47 +1,48 @@
 <template>
  <div>
-    <vuedraggable
-      :list="uploadList"
-      :disabled="!draggable||!multiple"
-      :animation="200"
-      class="list-group"
-      ghost-class="thumb-ghost"
-      @end="onEnd"
-    >
-      <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
-        <div v-if="item.status == 'finished'" style="height:60px;">
-          <img :src="item.url" />
-          <div class="upload-list-cover">
-            <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
-            <Icon type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+    <div class="upload-pic-thumb">
+      <vuedraggable
+        :list="uploadList"
+        :disabled="!draggable||!multiple"
+        :animation="200"
+        class="list-group"
+        ghost-class="thumb-ghost"
+        @end="onEnd"
+      >
+        <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
+          <div v-if="item.status == 'finished'" style="height:60px;">
+            <img :src="item.url" />
+            <div class="upload-list-cover">
+              <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
+              <Icon type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+            </div>
+          </div>
+          <div v-else>
+            <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
          </div>
        </div>
-        <div v-else>
-          <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+      </vuedraggable>
+      <Upload
+        ref="upload"
+        :multiple="multiple"
+        :show-upload-list="false"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :format="['jpg','jpeg','png','gif']"
+        :max-size="maxSize*1024"
+        :on-format-error="handleFormatError"
+        :on-exceeded-size="handleMaxSize"
+        :before-upload="handleBeforeUpload"
+        type="drag"
+        :action="uploadFileUrl"
+        :headers="accessToken"
+        style="display: inline-block;width:58px;"
+      >
+        <div style="width: 58px;height:58px;line-height: 58px;">
+          <Icon type="md-camera" size="20"></Icon>
        </div>
-      </div>
-    </vuedraggable>
-    <Upload
-      ref="upload"
-      :multiple="multiple"
-      :show-upload-list="false"
-      :on-success="handleSuccess"
-      :on-error="handleError"
-      :format="['jpg','jpeg','png','gif']"
-      :max-size="maxSize*1024"
-      :on-format-error="handleFormatError"
-      :on-exceeded-size="handleMaxSize"
-      :before-upload="handleBeforeUpload"
-      type="drag"
-      :action="uploadFileUrl"
-      :headers="accessToken"
-      style="display: inline-block;width:58px;"
-    >
-      <div style="width: 58px;height:58px;line-height: 58px;">
-        <Icon type="md-camera" size="20"></Icon>
-      </div>
-    </Upload>
-
+      </Upload>
+    </div>
    <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
      <img :src="imgUrl" alt="无效的图片链接" style="width: 100%;margin: 0 auto;display: block;" />
      <div slot="footer">
@@ -242,6 +243,9 @@ export default {
 </script>

 <style lang="scss" scoped>
+.upload-pic-thumb{
+  display: flex;
+}
 .upload-list {
  display: inline-block;
  width: 60px;
@@ -255,6 +259,7 @@ export default {
  position: relative;
  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
  margin-right: 5px;
+  vertical-align: middle;
 }
 .upload-list img {
  width: 100%;
--- a/manager/src/views/order/after-order/afterSaleOrder.vue
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -216,11 +216,11 @@
            width: 100,
            render: (h, params) => {
              if (params.row.serviceType == "RETURN_MONEY") {
-                return h('div', [h('span', {}, '退款'),]);
+                return h('div', [h('tag', {props: {color: "blue"}}, '退款'),]);
              } else if (params.row.serviceType == "RETURN_GOODS") {
-                return h('div', [h('span', {}, '退货'),]);
+                return h('div', [h('tag', {props: {color: "volcano"}}, '退货'),]);
              } else if (params.row.serviceType == "EXCHANGE_GOODS") {
-                return h('div', [h('span', {}, '换货'),]);
+                return h('div', [h('tag', {props: {color: "green"}}, '换货'),]);
              }
            }
          },
@@ -231,27 +231,23 @@
            width: 110,
            render: (h, params) => {
              if (params.row.serviceStatus == "APPLY") {
-                return h('div', [h('span', {}, '申请中'),]);
+                return h('div', [h('tag', {props: {color: "blue"}}, '申请中'),]);
              } else if (params.row.serviceStatus == "PASS") {
-                return h('div', [h('span', {}, '通过售后'),]);
+                return h('div', [h('tag', {props: {color: "cyan"}}, '通过售后'),]);
              } else if (params.row.serviceStatus == "REFUSE") {
-                return h('div', [h('span', {}, '拒绝售后'),]);
+                return h('div', [h('tag', {props: {color: "volcano"}}, '拒绝售后'),]);
              } else if (params.row.serviceStatus == "BUYER_RETURN") {
-                return h('div', [h('span', {}, '买家退货，待卖家收货'),]);
-              } else if (params.row.serviceStatus == "SELLER_RE_DELIVERY") {
-                return h('div', [h('span', {}, '商家换货/补发'),]);
+                return h('div', [h('tag', {props: {color: "orange"}}, '买家退货，待卖家收货'),]);
              } else if (params.row.serviceStatus == "SELLER_CONFIRM") {
-                return h('div', [h('span', {}, '卖家确认收货'),]);
+                return h('div', [h('tag', {props: {color: "gold"}}, '卖家确认收货'),]);
              } else if (params.row.serviceStatus == "SELLER_TERMINATION") {
-                return h('div', [h('span', {}, '卖家终止售后'),]);
-              } else if (params.row.serviceStatus == "BUYER_CONFIRM") {
-                return h('div', [h('span', {}, '买家确认收货'),]);
+                return h('div', [h('tag', {props: {color: "lime"}}, '卖家终止售后'),]);
              } else if (params.row.serviceStatus == "BUYER_CANCEL") {
-                return h('div', [h('span', {}, '买家取消售后'),]);
+                return h('div', [h('tag', {props: {color: "purple"}}, '买家取消售后'),]);
              } else if (params.row.serviceStatus == "COMPLETE") {
-                return h('div', [h('span', {}, '完成售后'),]);
+                return h('div', [h('tag', {props: {color: "green"}}, '完成售后'),]);
              }else if (params.row.serviceStatus == "WAIT_REFUND") {
-                return h('div', [h('span', {}, '待平台退款'),]);
+                return h('div', [h('tag', {props: {color: "geekblue"}}, '待平台退款'),]);
              }
            }
          },
--- a/manager/src/views/order/after-order/orderComplaint.vue
+++ b/manager/src/views/order/after-order/orderComplaint.vue
@@ -191,17 +191,17 @@
            width: 100,
            render: (h, params) => {
              if (params.row.complainStatus == "NEW") {
-                return h('div', [h('span', { }, '新投诉'),]);
+                return h('div', [h('tag',{props: {color: "purple"}}, '新投诉'),]);
              } else if (params.row.complainStatus == "CANCEL") {
-                return h('div', [h('span', { }, '已撤销'),]);
+                return h('div', [h('tag', {props: {color: "cyan"}}, '已撤销'),]);
              } else if (params.row.complainStatus == "WAIT_APPEAL") {
-                return h('div', [h('span', { }, '待申诉'),]);
+                return h('div', [h('tag', {props: {color: "volcano"}}, '待申诉'),]);
              } else if (params.row.complainStatus == "COMMUNICATION") {
-                return h('div', [h('span', { }, '对话中'),]);
+                return h('div', [h('tag', {props: {color: "orange"}}, '对话中'),]);
              }else if (params.row.complainStatus == "WAIT_ARBITRATION") {
-                return h('div', [h('span', { }, '等待仲裁'),]);
+                return h('div', [h('tag', {props: {color: "blue"}}, '等待仲裁'),]);
              }else if (params.row.complainStatus == "COMPLETE") {
-                return h('div', [h('span', { }, '已完成'),]);
+                return h('div', [h('tag', {props: {color: "green"}}, '已完成'),]);
              }
            }
          },
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -72,51 +72,13 @@ export default {
          align: "center",
          render: (h, params) => {
            if (params.row.paymentMethod === "WECHAT") {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "green",
-                    },
-                  },
-                  "微信"
-                ),
-              ]);
+              return h("div", [h("Tag", {props: {color: "green",},}, "微信"),]);
            } else if (params.row.paymentMethod === "ALIPAY") {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "blue",
-                    },
-                  },
-                  "支付宝"
-                ),
-              ]);
+              return h("div", [h("Tag", {props: {color: "blue",},}, "支付宝"),]);
            } else if (params.row.paymentMethod === "WALLET") {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {},
-                  },
-                  "余额支付"
-                ),
-              ]);
+              return h("div", [h("Tag", {props: {color: "geekblue",},}, "余额支付"),]);
            } else if (params.row.paymentMethod === "BANK_TRANSFER") {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "orange",
-                    },
-                  },
-                  "银行转帐"
-                ),
-              ]);
+              return h("div", [h("Tag", {props: {color: "orange",},}, "银行转帐"),]);
            } else {
              return h("div", [h("Tag", {}, "暂未付款")]);
            }
--- a/manager/src/views/order/flow/refundLog.vue
+++ b/manager/src/views/order/flow/refundLog.vue
@@ -100,9 +100,9 @@ export default {
          width: 95,
          render: (h, params) => {
            if (params.row.isRefund == "1") {
-              return h("div", [h("span", {}, "已退款")]);
+              return h("div", [h("Tag", {props: {color: "green",},}, "已退款")]);
            } else {
-              return h("div", [h("span", {}, "未退款")]);
+              return h("div", [h("Tag", {props: {color: "orange",},}, "未退款")]);
            }
          },
        },
--- a/manager/src/views/order/order/fictitiousOrderList.vue
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -94,8 +94,8 @@
          // 搜索框初始化对象
          pageNumber: 1, // 当前页数
          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
+          sort: "", // 默认排序字段
+          order: "", // 默认排序方式
          startDate: "", // 起始时间
          endDate: "", // 终止时间
          orderType: "FICTITIOUS",
@@ -118,8 +118,6 @@
            title: "下单时间",
            key: "createTime",
            width: 200,
-            sortable: true,
-            sortType: "desc",
          },
          {
            title: "订单来源",
@@ -150,19 +148,15 @@
            width:95,
            render: (h, params) => {
              if (params.row.orderStatus == "UNPAID") {
-                return h('div', [h('span', { }, '未付款'),]);
+                return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
              } else if (params.row.orderStatus == "PAID") {
-                return h('div', [h('span', { }, '已付款'),]);
-              } else if (params.row.orderStatus == "UNDELIVERED") {
-                return h('div', [h('span', { }, '待发货'),]);
-              } else if (params.row.orderStatus == "DELIVERED") {
-                return h('div', [h('span', { }, '已发货'),]);
-              }else if (params.row.orderStatus == "COMPLETED") {
-                return h('div', [h('span', { }, '已完成'),]);
-              }else if (params.row.orderStatus == "TAKE") {
-                return h('div', [h('span', { }, '待核验'),]);
-              }else if (params.row.orderStatus == "CANCELLED") {
-                return h('div', [h('span', { }, '已取消'),]);
+                return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
+              } else if (params.row.orderStatus == "COMPLETED") {
+                return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
+              } else if (params.row.orderStatus == "TAKE") {
+                return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
+              } else if (params.row.orderStatus == "CANCELLED") {
+                return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
              }
            }
          },
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -37,7 +37,7 @@
              <div class="div-item">
                <div class="div-item-left">订单来源：</div>
                <div class="div-item-right">
-                  {{ orderInfo.order.clientType }}
+                  {{ orderInfo.order.clientType  | clientTypeWay}}
                </div>
              </div>

--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -166,13 +166,13 @@ export default {
          width: 120,
          render: (h, params) => {
            if (params.row.orderType == "NORMAL") {
-              return h("div", [h("span", {}, "普通订单")]);
+              return h("div", [h("tag", {props: {color: "blue"}}, "普通订单")]);
            } else if (params.row.orderType == "PINTUAN") {
-              return h("div", [h("span", {}, "拼团订单")]);
+              return h("div", [h("tag", {props: {color: "volcano"}}, "拼团订单")]);
            } else if (params.row.orderType == "GIFT") {
-              return h("div", [h("span", {}, "赠品订单")]);
+              return h("div", [h("tag", {props: {color: "green"}}, "赠品订单")]);
            } else if (params.row.orderType == "VIRTUAL") {
-              return h("div", [h("tag", {}, "核验订单")]);
+              return h("div", [h("tag", {props: {color: "geekblue"}}, "核验订单")]);
            }
          },
        },
@@ -202,19 +202,19 @@ export default {
          minWidth: 100,
          render: (h, params) => {
            if (params.row.orderStatus == "UNPAID") {
-              return h("div", [h("span", {}, "未付款")]);
+              return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
            } else if (params.row.orderStatus == "PAID") {
-              return h("div", [h("span", {}, "已付款")]);
+              return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
            } else if (params.row.orderStatus == "UNDELIVERED") {
-              return h("div", [h("span", {}, "待发货")]);
+              return h("div", [h("tag", {props: {color: "geekblue"}}, "待发货")]);
            } else if (params.row.orderStatus == "DELIVERED") {
-              return h("div", [h("span", {}, "已发货")]);
+              return h("div", [h("tag", {props: {color: "cyan"}}, "已发货")]);
            } else if (params.row.orderStatus == "COMPLETED") {
-              return h("div", [h("span", {}, "已完成")]);
+              return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
            } else if (params.row.orderStatus == "TAKE") {
-              return h("div", [h("span", {}, "待核验")]);
+              return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
            } else if (params.row.orderStatus == "CANCELLED") {
-              return h("div", [h("span", {}, "已取消")]);
+              return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
            }
          },
        },
@@ -230,7 +230,7 @@ export default {
          title: "操作",
          key: "action",
          align: "center",
-          width: 100,
+          width: 150,
          render: (h, params) => {
            return h("div", [
              h(
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -101,7 +101,7 @@ export default {
        {
          title: "面额/折扣",
          key: "price",
-          width: 120,
+          width: 100,
          render: (h, params) => {
            if (params.row.price) {
              return h(
@@ -117,27 +117,28 @@ export default {
        {
          title: "领取数量/总数量",
          key: "publishNum",
-          width: 150,
+          width: 130,
          render: (h, params) => {
            return h(
              "div",
              params.row.receivedNum + "/" + params.row.publishNum
            );
          },
-          minWidth: 130,
+
        },
        {
          title: "优惠券类型",
          key: "couponType",
          width: 120,
          render: (h, params) => {
-            let text = "未知";
+            let text = "";
            if (params.row.couponType === "DISCOUNT") {
-              text = "打折";
+              return h("Tag", {props: {color: "blue",},}, "打折");
            } else if (params.row.couponType === "PRICE") {
-              text = "减免现金";
+              return h("Tag", {props: {color: "geekblue",},}, "减免现金");
+            }else {
+              return h("Tag", {props: {color: "purple",},}, "未知");
            }
-            return h("div", [text]);
          },
        },
        {
@@ -184,7 +185,7 @@ export default {
              color = "red";
            if (params.row.promotionStatus == "NEW") {
              text = "未开始";
-              color = "default";
+              color = "geekblue";
            } else if (params.row.promotionStatus == "START") {
              text = "已开始";
              color = "green";
--- a/manager/src/views/promotion/fullCut/full-cut.vue
+++ b/manager/src/views/promotion/fullCut/full-cut.vue
@@ -132,19 +132,19 @@ export default {
          minWidth: 60,
          render: (h, params) => {
            let text = "未知",
-              color = "default";
+              color = "purple";
            if (params.row.promotionStatus == "NEW") {
              text = "未开始";
-              color = "default";
+              color = "geekblue";
            } else if (params.row.promotionStatus == "START") {
              text = "已开始";
-              color = "green";
+              color = "blue";
            } else if (params.row.promotionStatus == "END") {
              text = "已结束";
-              color = "blue";
+              color = "green";
            } else if (params.row.promotionStatus == "CLOSE") {
              text = "已关闭";
-              color = "red";
+              color = "volcano";
            }
            return h("div", [
              h(
--- a/manager/src/views/promotion/live/live.vue
+++ b/manager/src/views/promotion/live/live.vue
@@ -119,14 +119,13 @@ export default {
        {
          title: "直播状态",
          render: (h, params) => {
-            return h(
-              "span",
-              params.row.status == "NEW"
-                ? "未开始"
-                : params.row.status == "START"
-                ? "直播中"
-                : "已结束"
-            );
+            if(params.row.status == "NEW"){
+              return h("div", [h("tag", {props: {color: "blue"}}, "未开始")]);
+            }else if(params.row.status == "START"){
+              return h("div", [h("tag", {props: {color: "green"}}, "直播中")]);
+            }else{
+              return h("div", [h("tag", {props: {color: "volcano"}}, "已结束")]);
+            }
          },
        },
        {
--- a/manager/src/views/promotion/pintuan/pintuan.vue
+++ b/manager/src/views/promotion/pintuan/pintuan.vue
@@ -122,16 +122,16 @@ export default {
              color = "";
            if (params.row.promotionStatus == "NEW") {
              text = "未开始";
-              color = "default";
+              color = "geekblue";
            } else if (params.row.promotionStatus == "START") {
              text = "已开始";
-              color = "green";
+              color = "blue";
            } else if (params.row.promotionStatus == "END") {
              text = "已结束";
-              color = "blue";
+              color = "green";
            } else if (params.row.promotionStatus == "CLOSE") {
              text = "已关闭";
-              color = "red";
+              color = "volcano";
            }
            return h("div", [
              h(
--- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@@ -92,7 +92,7 @@
          <div>{{ row.startTime }}</div>
          <div>{{ row.endTime }}</div>
        </template>
-        
+
        <template slot-scope="{ row }" slot="action">
          <Button
            v-if="row.promotionStatus == 'NEW'"
@@ -213,16 +213,16 @@ export default {
              color = "";
            if (params.row.promotionStatus == "NEW") {
              text = "未开始";
-              color = "default";
+              color = "geekblue";
            } else if (params.row.promotionStatus == "START") {
              text = "已开始";
-              color = "green";
+              color = "blue";
            } else if (params.row.promotionStatus == "END") {
              text = "已结束";
-              color = "blue";
+              color = "green";
            } else if (params.row.promotionStatus == "CLOSE") {
              text = "已关闭";
-              color = "red";
+              color = "volcano";
            }
            return h("div", [h("Tag", { props: { color: color } }, text)]);
          },
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -24,78 +24,35 @@
      <Row class="operation padding-row">
        <Button type="primary" @click="add">添加活动</Button>
      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        class="page"
-      >
-        <template slot-scope="{ row }" slot="action">
-          <Button
-            type="info"
-            size="small"
-            class="mr_5"
-            v-if="row.promotionStatus == 'NEW'"
-            @click="edit(row)"
-            >编辑</Button
-          >
+      <Tabs value="list"  @on-click="clickTabPane">
+        <TabPane label="秒杀活动列表" name="list">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="page">
+            <template slot-scope="{ row }" slot="action">
+              <Button type="info" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="edit(row)">编辑</Button>

-          <Button
-            type="info"
-            size="small"
-            class="mr_5"
-            v-else
-            @click="manage(row)"
-            >查看</Button
-          >
+              <Button type="info" size="small" class="mr_5" v-else @click="manage(row)">查看</Button>

-          <Button
-            type="primary"
-            size="small"
-            class="mr_5"
-            v-if="row.promotionStatus == 'NEW'"
-            @click="manage(row)"
-            >管理</Button
-          >
+              <Button type="primary" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="manage(row)">管理</Button>

-          <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
-          <Button
-            type="error"
-            size="small"
-            v-if="
-              row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
-            "
-            class="mr_5"
-            @click="off(row)"
-            >下架</Button
-          >
+              <Button type="error" size="small" v-if="
+                row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
+              " class="mr_5" @click="off(row)">下架</Button>
+              &nbsp;
+              <Button type="error" size="small" v-if="row.promotionStatus == 'CLOSE'" ghost @click="expire(row)">删除</Button>
+            </template>
+          </Table>
+
+          <Row type="flex" justify="end" class="page">
+            <Page style="margin: 20px 0;" :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="秒杀活动设置" name="setup">
+
+          <setupSeckill v-if="setupFlag"></setupSeckill>
+        </TabPane>
+      </Tabs>

-          <Button
-            type="error"
-            size="small"
-            v-if="row.promotionStatus == 'CLOSE'"
-            ghost
-            @click="expire(row)"
-            >删除</Button
-          >
-        </template>
-      </Table>
-      <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber + 1"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
    </Card>
  </div>
 </template>
@@ -145,41 +102,13 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.promotionStatus == "NEW") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "新建",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"新建");
            } else if (params.row.promotionStatus == "START") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "开始",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "blue",},},"开始");
            } else if (params.row.promotionStatus == "END") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "结束",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "green",},},"结束");
            } else if (params.row.promotionStatus == "CLOSE") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "废弃",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"结束");
            }
          },
        },
@@ -302,7 +231,7 @@ export default {
 </script>
 <style lang="scss">
@import "@/styles/table-common.scss";
-.mr_5{
-  margin: 0 4px;
+.mr_5 {
+  margin: 0 5px;
 }
 </style>
--- a/manager/src/views/promotion/seckill/setupSeckill.vue
+++ b/manager/src/views/promotion/seckill/setupSeckill.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="templateShow">
    <Form :model="form" :label-width="120">
      <FormItem label="每日场次设置">
        <Row :gutter="16" class="row">
@@ -27,6 +27,7 @@ import { getSetting, setSetting } from "@/api/index";
 export default {
  data() {
    return {
+      templateShow:false,
      submitLoading: false,
      selectedTime: [],
      times: [], //时间集合 1-24点
@@ -81,6 +82,7 @@ export default {
    async init() {
      let result = await getSetting("SECKILL_SETTING");
      if (result.success) {
+        this.templateShow = true
        this.form.seckillRule = result.result.seckillRule;
        this.times=[]
        for (let i = 0; i < 24; i++) {
--- a/manager/src/views/seller/bill/accountStatementBill.vue
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -95,13 +95,13 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.billStatus == "OUT") {
-              return h("div", "已出账");
+              return h("Tag", {props: {color: "blue",},},"已出账");
            } else if (params.row.billStatus == "CHECK") {
-              return h("div", "已对账");
+              return h("Tag", {props: {color: "geekblue",},},"已对账");
            } else if (params.row.billStatus == "EXAMINE") {
-              return h("div", "已审核");
+              return h("Tag", {props: {color: "purple",},},"已审核");
            } else {
-              return h("div", "已付款");
+              return h("Tag", {props: {color: "green",},},"已付款");
            }
          },
        },
--- a/manager/src/views/seller/bill/bill.vue
+++ b/manager/src/views/seller/bill/bill.vue
@@ -106,13 +106,13 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.billStatus == "OUT") {
-              return h("div", "已出账");
+              return h("Tag", {props: {color: "blue",},},"已出账");
            } else if (params.row.billStatus == "CHECK") {
-              return h("div", "已对账");
+              return h("Tag", {props: {color: "geekblue",},},"已对账");
            } else if (params.row.billStatus == "EXAMINE") {
-              return h("div", "已审核");
+              return h("Tag", {props: {color: "purple",},},"已审核");
            } else {
-              return h("div", "已付款");
+              return h("Tag", {props: {color: "green",},},"已付款");
            }
          },
        },
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -126,7 +126,7 @@ export default {
              "Tag",
              {
                props: {
-                  color: params.row.selfOperated ? "error" : "success",
+                  color: params.row.selfOperated ? "volcano" : "green",
                },
              },
              params.row.selfOperated  ? "自营" : "非自营"
@@ -141,50 +141,15 @@ export default {
          width: 130,
          render: (h, params) => {
            if (params.row.storeDisable == "OPEN") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "开启中",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "green",},},"开启中");
            } else if (params.row.storeDisable == "CLOSED") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "已关闭",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"已关闭");
            } else if (params.row.storeDisable == "APPLY") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "申请中",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "geekblue",},},"申请中");
            } else if (params.row.storeDisable == "APPLYING") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "审核中",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "purple",},},"审核中");
            } else if (params.row.storeDisable == "REFUSED") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "审核拒绝",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "red",},},"审核拒绝");
            }
          },
        },
--- a/manager/src/views/statistics/order/orderDetail.vue
+++ b/manager/src/views/statistics/order/orderDetail.vue
@@ -6,7 +6,7 @@
      <div class="shop-item">
        <div class="label-item">
          <span>订单来源</span>
-          <span>{{res.clientType}}</span>
+          <span>{{res.clientType | clientTypeWay}}</span>
        </div>
        <div class="label-item">
          <span>订单状态</span>