合并master上面的冲突

2025-12-18 08:55:52 +08:00 · 2021-06-23 18:13:11 +08:00
parent 2391f71d9a 6bc0591418
commit b7dd7f1c3b
35 changed files with 632 additions and 651 deletions
--- a/seller/src/api/goods.js
+++ b/seller/src/api/goods.js
@@ -209,11 +209,6 @@ export const deleteParamsGroup = (id, params) => {
  return deleteRequest(`/goods/category/parameters/${id}`, params);
 };

-//保存获取关联规格
-export const getGoodsSpecInfo = (category_id, params) => {
-  return getRequest(`/goods/category/spec/goods/${category_id}`, params);
-};
-
 //获取sku列表
 export const getSkuPage = params => {
  return getRequest(`/goodsSku/getByPage`, params);
@@ -318,7 +313,7 @@ export const getCategoryParamsListDataSeller = (id, params) => {

 //保存获取关联规格
 export const getGoodsSpecInfoSeller = (category_id, params) => {
-  return getRequest(`/goods/category/spec/goods/${category_id}`, params);
+  return getRequest(`/goods/spec/${category_id}`, params);
 };

 //批量设置运费模板
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
   * @description api请求基础路径
   */
  api_dev: {
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn',
-    // common: 'http://192.168.0.109:8890',
-    // buyer: 'http://192.168.0.109:8888',
-    // seller: 'http://192.168.0.109:8889',
-    // manager: 'http://192.168.0.109:8887'
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn',
+    common: 'http://192.168.0.109:8890',
+    buyer: 'http://192.168.0.109:8888',
+    seller: 'http://192.168.0.109:8889',
+    manager: 'http://192.168.0.109:8887'
  },
  api_prod: {
    common: 'https://common-api.pickmall.cn',
--- a/seller/src/libs/axios.js
+++ b/seller/src/libs/axios.js
@@ -69,14 +69,6 @@ service.interceptors.response.use(
          router.push("/login");
        }
        break;
-      case 403:
-        // 权限不足
-        if (data.message !== null) {
-          Message.error(data.message);
-        } else {
-          Message.error("权限不足");
-        }
-        break;
      case 500:
        // 系统异常
        if (data.message !== null) {
@@ -94,6 +86,8 @@ service.interceptors.response.use(
    if (error.response) {
      if (error.response.status === 401) {
        // 这种情况一般调到登录页
+      } else if (error.response.status === 404) {
+        // 避免刷新token报错
      } else if (error.response.status === 403) {
        isRefreshToken++;
        if (isRefreshToken === 1) {
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -54,20 +54,20 @@ export const result = [
            children: null,
            permTypes: []
          },
-          {
-            name: "daft-goods",
-            showAlways: true,
-            level: 2,
-            type: 0,
-            title: "草稿商品",
-            path: "daft-goods",
-            component: "goods/goods-seller/draftGoods",
-            icon: "md-person",
-            isMenu: true,
-            url: "",
-            children: null,
-            permTypes: []
-          },
+          // {
+          //   name: "daft-goods",
+          //   showAlways: true,
+          //   level: 2,
+          //   type: 0,
+          //   title: "草稿商品",
+          //   path: "daft-goods",
+          //   component: "goods/goods-seller/draftGoods",
+          //   icon: "md-person",
+          //   isMenu: true,
+          //   url: "",
+          //   children: null,
+          //   permTypes: []
+          // },

          {
            path: "template-goods",
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -5,7 +5,7 @@ import ViewUI from "view-design";
 import "./styles/theme.less";

 import "core-js/stable";
-import "regenerator-runtime/runtime";
+// import "regenerator-runtime/runtime";
 import vueQr from 'vue-qr'

 import App from "./App";
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -5,7 +5,7 @@ export const loginRouter = {
  path: "/login",
  name: "login",
  meta: {
-    title: "登录 - lili商家后台 "
+    title: "登录 - lili商家后台"
  },
  component: () => import("@/views/login.vue")
 };
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -395,11 +395,11 @@ div.base-info-item {
  text-align: center;
  border: 1px solid transparent;
  border-radius: 4px;
-  display: inline-flex;
-  flex-direction: column;
+  display: inline-block;
  background: #fff;
  position: relative;
  margin-right: 4px;
+  vertical-align: bottom;
 }
 .demo-upload-list img {
  width: 100%;
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -174,32 +174,11 @@ 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: "blue",},},"待审核");
            } 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",},},"审核拒绝");
            }
          },
        },
@@ -263,12 +242,12 @@ export default {
          key: "goodsType",
          width: 130,
          render: (h, params) => {
-            if (params.row.goodsType === "PHYSICAL_GOODS") {
-              return h("div", "实物商品");
-            } else if (params.row.goodsType === "VIRTUAL_GOODS") {
-              return h("div", "虚拟商品");
+            if (params.row.goodsType === 'PHYSICAL_GOODS') {
+              return h("Tag", {props: {color: "geekblue"}},"实物商品");
+            } else if (params.row.goodsType === 'VIRTUAL_GOODS') {
+              return h("Tag", {props: {color: "purple"}},"虚拟商品");
            } else {
-              return h("div", "电子卡券");
+              return h("Tag", {props: {color: "cyan"}},"电子卡券");
            }
          },
        },
@@ -301,32 +280,11 @@ export default {
          width: 120,
          render: (h, params) => {
            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 == "TOBEAUDITED") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "待审核",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano"}},"待审核");
            } else if (params.row.isAuth == "REFUSE") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "审核拒绝",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "red"}},"审核拒绝");
            }
          },
        },
@@ -337,28 +295,12 @@ export default {
          sortable: false,
          render: (h, params) => {
            if (params.row.marketEnable == "DOWN") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "下架",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "red"}},"下架");
            } else if (params.row.marketEnable == "UPPER") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "上架",
-                  },
-                }),
-              ]);
-            } else {
+              return h("Tag", {props: {color: "green"}},"上架");
            }
          },
        },
-
        {
          title: "操作",
          key: "action",
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -317,7 +317,7 @@
              <editor id="mobileIntr" v-model="baseInfoForm.mobileIntro"></editor>
            </FormItem>
          </div>
-          <div v-if="this.baseInfoForm.goodsType!='VIRTUAL_GOODS'">
+          <div v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
            <h4>商品物流信息</h4>
            <div class="form-item-view">
              <FormItem class="form-item-view-el" label="商品重量" prop="weight">
@@ -325,24 +325,11 @@
                <span slot="append">kg</span>
              </Input>
            </FormItem>
-            <FormItem class="form-item-view-el" label="运费" prop="skuList">
-              <RadioGroup type="button" button-style="solid"
-                @on-change="logisticsTemplateChange"
-                v-model="baseInfoForm.freightPayer"
-              >
-                <Radio label="STORE">
-                  <span>卖家承担运费</span>
-                </Radio>
-                <Radio label="BUYER">
-                  <span>使用物流规则</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
+            
            <FormItem
              class="form-item-view-el"
              label="物流模板"
              prop="templateId"
-              v-if="logisticsTemplateShow"
            >
              <Select v-model="baseInfoForm.templateId" style="width: 200px">
                <Option
@@ -352,7 +339,7 @@
                >{{ item.name }}
                </Option>
              </Select>
-            </FormItem>
+            </FormItem> 
          </div>
          <h4>其他信息</h4>
          <div class="form-item-view">
@@ -431,10 +418,11 @@
        <Button type="primary" @click="save" :loading="submitLoading" v-if="activestep === 1">
          {{ this.goodsId ? "保存" : "保存商品" }}
        </Button>
-        <Button type="primary" @click="saveToDraft('TEMPLATE')" v-if="activestep === 1">保存为模版
-        </Button>
-        <Button type="primary" @click="saveToDraft('DRAFT')" v-if="activestep === 1 && !isOperationGoods">保存至草稿箱
+        <Button type="primary" @click="saveToDraft('TEMPLATE')" v-if="activestep === 1">
+          保存为模版
        </Button>
+        <!-- <Button type="primary" @click="saveToDraft('DRAFT')" v-if="activestep === 1 && !isOperationGoods">保存至草稿箱
+        </Button> -->
      </ButtonGroup>

    </div>
@@ -632,8 +620,6 @@ export default {
        salesModel: "RETAIL",
        /** 商品参数列表 */
        goodsParamsList: [],
-        /** 运费承担者 */
-        // freightPayer: "STORE",
        /** 商品重量 */
        weight: "",
        /** 商品相册列表 */
@@ -710,9 +696,6 @@ export default {
      /** 当前百分比 */
      currentPercent: 0,

-      /** 物流模板是否展示 **/
-      logisticsTemplateShow: false,
-
      /** 运费模板 **/
      logisticsTemplate: [],

@@ -779,6 +762,12 @@ export default {
    this.accessToken = {
      accessToken: this.getStore("accessToken"),
    };
+    // 获取运费模板
+    API_Shop.getShipTemplate().then((res) => {
+      if (res.success) {
+        this.logisticsTemplate = res.result;
+      }
+    })
    //编辑商品
    if (this.$route.query.id) {
      this.activestep = 1;
@@ -786,7 +775,7 @@ export default {
      this.GET_GoodData();
      this.selectGoodsType = false;
    }
-    //编辑模版/草稿
+    //编辑模版
    else if (this.$route.query.draftId) {
      this.draftId = this.$route.query.draftId;
      this.activestep = 1;
@@ -806,7 +795,6 @@ export default {
      this.baseInfoForm = {
        salesModel: "RETAIL",
        goodsParamsList: [],
-        // freightPayer: "STORE",
        weight: "",
        goodsGalleryFiles: [],
        release: "true",
@@ -984,20 +972,7 @@ export default {
        });
      }
    },
-    //选择运费模板则展示运费规则
-    logisticsTemplateChange(v) {
-      if (v == "BUYER") {
-        // 如果买家承担运费 则需要查询运费规则
-        API_Shop.getShipTemplate().then((res) => {
-          if (res.success) {
-            this.logisticsTemplate = res.result;
-          }
-        });
-        this.logisticsTemplateShow = true;
-      } else {
-        this.logisticsTemplateShow = false;
-      }
-    },
+        
    gotoGoodsList() {
      this.$router.push({ name: "goods" });
    },
@@ -1053,15 +1028,8 @@ export default {
        ...this.baseInfoForm,
        ...response.result,
      };
-      console.warn(this.baseInfoForm);
-      // if (this.baseInfoForm.freightPayer === "BUYER") {
-      //   API_Shop.getShipTemplate().then((res) => {
-      //     if (res.success) {
-      //       this.logisticsTemplate = res.result;
-      //     }
-      //   });
-      //   this.logisticsTemplateShow = true;
-      // }
+      // console.warn(this.baseInfoForm);
+     
      this.baseInfoForm.release = "true";
      this.baseInfoForm.recommend = this.baseInfoForm.recommend
        ? "true"
@@ -1555,7 +1523,6 @@ export default {
    },
    /** 下一步*/
    next() {
-      console.log(111);
      window.scrollTo(0, 0);
      if (this.activestep === 0 && this.draftId) {
        this.activestep = 1;
@@ -1666,10 +1633,6 @@ export default {
            this.submitLoading = false;
            return;
          }
-          //如果选择的是卖家承担运费 则运费模板重置为0
-          // if (this.baseInfoForm.freightPayer !== "BUYER") {
-          //   this.baseInfoForm.templateId = 0;
-          // }

          this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
            delete sku._index;
@@ -1762,7 +1725,7 @@ export default {
        },
      });
    },
-    SAVE_DRAFT_GOODS() {
+    SAVE_DRAFT_GOODS() { // 保存草稿商品
      API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
        if (res.success) {
          this.$Message.info("保存成功！");
--- a/seller/src/views/logistics/index.vue
+++ b/seller/src/views/logistics/index.vue
@@ -134,21 +134,18 @@ export default {
          key: "name",
          minWidth: 120
        },
-
        {
          title: "状态",
          key: "disabled",
          minWidth: 50,
          render(h, params) {
-            return h("Badge", {
-              props: {
-                status: params.row.disabled ? "success" : "error",
-                text: params.row.disabled ? "开启" : "关闭",
-              },
-            });
+            if(params.row.disabled){
+              return h("div", [h("tag", {props: {color: "green"}}, "开启")]);
+            }else{
+              return h("div", [h("tag", {props: {color: "volcano"}}, "关闭")]);
+            }
          },
        },
-
        {
          title: "操作",
          key: "action",
--- a/seller/src/views/member/memberComment.vue
+++ b/seller/src/views/member/memberComment.vue
@@ -210,11 +210,11 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.grade == "GOOD") {
-              return h("Badge", {props: {status: "success", text: "好评"}})
+              return h("Tag", {props: {color: "green",},}, "好评");
            } else if (params.row.grade == "MODERATE") {
-              return h("Badge", {props: {status: "success", text: "中评"}})
-            } else if (params.row.grade == "WORSE") {
-              return h("Badge", {props: {status: "error", text: "差评"}})
+              return h("Tag", {props: {color: "orange",},}, "中评");
+            } else {
+              return h("Tag", {props: {color: "red",},}, "差评");
            }
          }
        },
@@ -224,9 +224,9 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.status === "OPEN") {
-              return h("Badge", {props: {status: "success", text: "展示"}})
+              return h("Tag", {props: {color: "green"}},"展示")
            } else {
-              return h("Badge", {props: {status: "error", text: "隐藏"}})
+              return h("Tag", {props: {color: "red"}},"隐藏")
            }
          },
        },
@@ -236,9 +236,9 @@ export default {
          width: 110,
          render: (h, params) => {
            if (params.row.replyStatus) {
-              return h("Badge", {props: {status: "success", text: "已回复"}})
+              return h("Tag", {props: {color: "green"}},"已回复")
            } else {
-              return h("Badge", {props: {status: "error", text: "未回复"}})
+              return h("Tag", {props: {color: "blue"}},"未回复")
            }
          },
        },
@@ -334,7 +334,7 @@ export default {
        this.loading = false;
        if (res.success) {
          this.data = res.result.records;
-          this.total = res.result.total; 
+          this.total = res.result.total;
        }
      });
    },
--- a/seller/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/seller/src/views/my-components/lili/upload-pic-thumb.vue
@@ -1,49 +1,50 @@
 <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'">
-          <img :src="item.url" />
-          <div class="upload-list-cover">
-            <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
-            <Icon v-if="remove" 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'">
+            <img :src="item.url" />
+            <div class="upload-list-cover">
+              <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
+              <Icon v-if="remove" 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
+        :disabled="disable"
+        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;"
+        v-if="!isView"
+      >
+        <div style="width: 58px;height:58px;line-height: 58px;">
+          <Icon type="md-camera" size="20"></Icon>
        </div>
-      </div>
-    </vuedraggable>
-    <Upload
-      :disabled="disable"
-      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;"
-      v-if="!isView"
-    >
-      <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">
@@ -252,10 +253,12 @@ export default {
  }
 };
 </script>
-
 <style lang="scss" scoped>
+.upload-pic-thumb{
+  display: flex;
+}
 .upload-list {
-  display: inline-block;
+  display: inline-flex;
  width: 60px;
  height: 60px;
  text-align: center;
@@ -267,6 +270,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/seller/src/views/order/after-order/orderComplaint.vue
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@@ -185,17 +185,17 @@
            key: "complainStatus",
            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/seller/src/views/order/after-order/returnGoodsOrder.vue
+++ b/seller/src/views/order/after-order/returnGoodsOrder.vue
@@ -176,25 +176,23 @@
            width: 120,
            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', { }, '商家换货/补发'),]);
-              }else if (params.row.serviceStatus == "SELLER_CONFIRM") {
-                return h('div', [h('span', { }, '卖家确认收货'),]);
-              }else if (params.row.serviceStatus == "SELLER_TERMINATION") {
-                return h('div', [h('span', { }, '卖家终止售后'),]);
-              }else if (params.row.serviceStatus == "BUYER_CONFIRM") {
-                return h('div', [h('span', { }, '买家确认收货'),]);
-              }else if (params.row.serviceStatus == "BUYER_CANCEL") {
-                return h('div', [h('span', { }, '买家取消售后'),]);
-              }else if (params.row.serviceStatus == "COMPLETE") {
-                return h('div', [h('span', { }, '完成'),]);
+                return h('div', [h('tag', {props: {color: "orange"}}, '买家退货，待卖家收货'),]);
+              } else if (params.row.serviceStatus == "SELLER_CONFIRM") {
+                return h('div', [h('tag', {props: {color: "gold"}}, '卖家确认收货'),]);
+              } else if (params.row.serviceStatus == "SELLER_TERMINATION") {
+                return h('div', [h('tag', {props: {color: "lime"}}, '卖家终止售后'),]);
+              } else if (params.row.serviceStatus == "BUYER_CANCEL") {
+                return h('div', [h('tag', {props: {color: "purple"}}, '买家取消售后'),]);
+              } else if (params.row.serviceStatus == "COMPLETE") {
+                return h('div', [h('tag', {props: {color: "green"}}, '完成售后'),]);
+              }else if (params.row.serviceStatus == "WAIT_REFUND") {
+                return h('div', [h('tag', {props: {color: "geekblue"}}, '待平台退款'),]);
              }
            }
          },
--- a/seller/src/views/order/after-order/returnMoneyOrder.vue
+++ b/seller/src/views/order/after-order/returnMoneyOrder.vue
@@ -182,27 +182,17 @@
            minWidth: 120,
            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', { }, '审核拒绝'),]);
-              } 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', { }, '商家换货/补发'),]);
-              }else if (params.row.serviceStatus == "SELLER_CONFIRM") {
-                return h('div', [h('span', { }, '卖家确认收货'),]);
-              }else if (params.row.serviceStatus == "SELLER_TERMINATION") {
-                return h('div', [h('span', { }, '卖家终止售后'),]);
-              }else if (params.row.serviceStatus == "BUYER_CONFIRM") {
-                return h('div', [h('span', { }, '买家确认收货'),]);
-              }else if (params.row.serviceStatus == "BUYER_CANCEL") {
-                return h('div', [h('span', { }, '买家取消售后'),]);
+                return h('div', [h('tag', {props: {color: "volcano"}}, '拒绝售后'),]);
+              } else if (params.row.serviceStatus == "BUYER_CANCEL") {
+                return h('div', [h('tag', {props: {color: "purple"}}, '买家取消售后'),]);
+              } else if (params.row.serviceStatus == "COMPLETE") {
+                return h('div', [h('tag', {props: {color: "green"}}, '完成售后'),]);
              }else if (params.row.serviceStatus == "WAIT_REFUND") {
-                return h('div', [h('span', { }, '等待平台退款'),]);
-              }else if (params.row.serviceStatus == "COMPLETE") {
-                return h('div', [h('span', { }, '完成'),]);
+                return h('div', [h('tag', {props: {color: "geekblue"}}, '待平台退款'),]);
              }
            }
          },
--- a/seller/src/views/order/order/orderList.vue
+++ b/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);
            }
@@ -126,29 +126,27 @@ 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"}}, "已取消")]);
            }
          },
        },
        {
          title: "下单时间",
          key: "createTime",
-          width: 170,
-
+          width: 170
        },
-
        {
          title: "操作",
          key: "action",
--- a/seller/src/views/order/order/virtualOrderList.vue
+++ b/seller/src/views/order/order/virtualOrderList.vue
@@ -135,19 +135,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"}}, "已取消")]);
            }
          },
        },
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -125,9 +125,13 @@ export default {
          tooltip: true,
          render: (h, params) => {
            if (params.row.receiptStatus == 0) {
-              return h("div", "未开票");
+              return h("div", [
+                h("tag", { props: { color: "volcano" } }, "未开票"),
+              ]);
            } else {
-              return h("div", "已开票");
+              return h("div", [
+                h("tag", { props: { color: "green" } }, "未开票"),
+              ]);
            }
          },
        },
@@ -137,22 +141,37 @@ export default {
          width: 90,
          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" } }, "已取消"),
+              ]);
            }
          },
        },
+
        {
          title: "操作",
          key: "action",
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/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";
--- a/seller/src/views/shop/bill/accountStatementBill.vue
+++ b/seller/src/views/shop/bill/accountStatementBill.vue
@@ -132,15 +132,13 @@
            width: 100,
            render: (h, params) => {
              if (params.row.billStatus == "OUT") {
-                return h( "Badge", {props: { status: "success",text: "已出账" } })
-              } else if (params.row.billStatus == "EXAMINE") {
-                return h( "Badge", {props: { status: "success",text: "已审核" } })
+                return h("Tag", {props: {color: "blue",},},"已出账");
              } else if (params.row.billStatus == "CHECK") {
-                return h( "Badge", {props: { status: "success",text: "已对账" } })
-              } else if (params.row.billStatus == "PAY") {
-                return h( "Badge", {props: { status: "success",text: "已付款" } })
-              }else if (params.row.billStatus == "COMPLETE") {
-                return h( "Badge", {props: { status: "success",text: "已完成" } })
+                return h("Tag", {props: {color: "geekblue",},},"已对账");
+              } else if (params.row.billStatus == "EXAMINE") {
+                return h("Tag", {props: {color: "purple",},},"已审核");
+              } else {
+                return h("Tag", {props: {color: "green",},},"已付款");
              }
            }
          },
--- a/seller/src/views/shop/bill/storeBill.vue
+++ b/seller/src/views/shop/bill/storeBill.vue
@@ -143,15 +143,13 @@
            width: 100,
            render: (h, params) => {
              if (params.row.billStatus == "OUT") {
-                return h( "Badge", {props: { status: "success",text: "已出账" } })
-              } else if (params.row.billStatus == "EXAMINE") {
-                return h( "Badge", {props: { status: "success",text: "已审核" } })
+                return h("Tag", {props: {color: "blue",},},"已出账");
              } else if (params.row.billStatus == "CHECK") {
-                return h( "Badge", {props: { status: "success",text: "已对账" } })
-              } else if (params.row.billStatus == "PAY") {
-                return h( "Badge", {props: { status: "success",text: "已付款" } })
-              }else if (params.row.billStatus == "COMPLETE") {
-                return h( "Badge", {props: { status: "success",text: "已完成" } })
+                return h("Tag", {props: {color: "geekblue",},},"已对账");
+              } else if (params.row.billStatus == "EXAMINE") {
+                return h("Tag", {props: {color: "purple",},},"已审核");
+              } else {
+                return h("Tag", {props: {color: "green",},},"已付款");
              }
            }
          },
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -58,10 +58,10 @@
            minWidth: 120,
            sortable: true,
            render: (h, params) => {
-              if (params.row.selected === null || params.row.selected === "") {
-                return h( "Badge", {props: { status: "error",text: "关闭" } })
-              } else if (params.row.selected !== "") {
-                return h( "Badge", {props: { status: "success",text: "开启" } })
+              if(params.row.selected === null || params.row.selected === ""){
+                return h("div", [h("tag", {props: {color: "volcano"}}, "关闭")]);
+              }else{
+                return h("div", [h("tag", {props: {color: "green"}}, "开启")]);
              }
            }
          },