Merge branch 'master' into ma

2025-12-18 17:05:54 +08:00 · 2021-06-24 15:56:48 +08:00
parent 6475be77bc dbd3bb6124
commit 7b2054206a
53 changed files with 1115 additions and 1426 deletions
--- a/manager/src/api/goods.js
+++ b/manager/src/api/goods.js
@@ -76,15 +76,15 @@ export const disableCategory = (id, type) => {

 //  获取商品规格分页列表
 export const getSpecListData = (params) => {
-    return getRequest('/goods/spec/page', params)
+    return getRequest('/goods/spec', params)
 }
 //  添加或修改规格设置
 export const insertSpec = (params) => {
    return postRequest('/goods/spec', params)
 }
 //  添加或修改规格设置
-export const updateSpec = (params) => {
-    return putRequest('/goods/spec', params)
+export const updateSpec = (id,params) => {
+    return putRequest(`/goods/spec/${id}`, params)
 }
 //根据分类id获取关联规格
 export const getCategorySpecListData = (category_id, params) => {
@@ -94,15 +94,6 @@ export const getCategorySpecListData = (category_id, params) => {
 export const delSpec = (id, params) => {
    return deleteRequest(`/goods/spec/${id}`, params)
 }
-//  获取商品规格值列表
-export const getSpecValuesListData = (id, params) => {
-    return getRequest(`/goods/specValues/values/${id}`, params)
-}
-//  添加商品规格值
-export const saveSpecValues = (id, params) => {
-    return postRequest(`/goods/specValues/save/${id}`, params)
-}
-

 // 查询某分类下的全部子分类列表
 export const getGoodsCategory = (parent_id) => {
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -30,7 +30,7 @@ export const getLiveList = params => {

 // 获取直播间详情
 export const getLiveInfo = studioId => {
-  return getRequest(`/broadcast/studio/studioInfo/${studioId}`);
+  return getRequest(`/broadcast/studio/${studioId}`);
 };

 // 获取当前进行中的促销活动商品
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,14 +17,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/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -64,14 +64,6 @@ service.interceptors.response.use(
        }
        return data;
        break;
-      case 403:
-        // 权限不足
-        if (data.message !== null) {
-          Message.error(data.message);
-        } else {
-          Message.error("权限不足");
-        }
-        break;
      case 500:
        // 系统异常
        if (data.message !== null) {
@@ -89,6 +81,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/manager/src/utils/filters.js
+++ b/manager/src/utils/filters.js
@@ -16,6 +16,22 @@ export function unitPrice(val, unit, location) {
  return (unit || '') + price
 }

+/**
+ * 订单来源
+ */
+export function clientTypeWay(val) {
+  if (val == "H5") {
+    return "移动端";
+  } else if (val == "PC") {
+    return "PC端";
+  } else if (val == "WECHAT_MP") {
+    return "小程序端";
+  } else if (val == "APP") {
+    return "移动应用端";
+  } else {
+    return val;
+  }
+}



--- a/manager/src/views/distribution/distributionGoods.vue
+++ b/manager/src/views/distribution/distributionGoods.vue
@@ -67,10 +67,12 @@ export default {
        {
          type: "selection",
          width: 60,
-          align: "center"
+          align: "center",
+          fixed: "left",
        },
        {
          title: "商品图片",
+          fixed: "left",
          key: "thumbnail",
          width: 120,
          align: "center",
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -261,7 +261,6 @@ export default {
      getCategorySpecListData(v.id).then((res) => {
        this.categoryId = v.id;
        this.modalSpecTitle = "规格关联";
-        console.log(res);
        this.specForm.categorySpecs = res.map((item) => item.id);
        this.modalSpecVisible = true;
      });
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -23,8 +23,8 @@
        </Form>
      </Row>
      <Row class="operation padding-row">
-        <Button @click="add" type="primary" >添加</Button>
-        <Button @click="delAll" >批量删除</Button>
+        <Button @click="add" type="primary">添加</Button>
+        <Button @click="delAll">批量删除</Button>
      </Row>
      <Table
        :loading="loading"
@@ -60,53 +60,33 @@
    >
      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
        <FormItem label="规格名称" prop="specName">
-          <Input v-model="form.specName" maxlength="30" clearable style="width: 100%" />
+          <Input v-model="form.specName" maxlength="30" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="规格值" prop="specValue">
+          <Select
+            v-model="form.specValue"
+            placeholder="输入后回车添加"
+            multiple
+            filterable
+            allow-create
+            :popper-append-to-body="false"
+            popper-class="spec-values-popper"
+            style="width: 100%; text-align: left; margin-right: 10px"
+          >
+            <Option
+              v-for="item in specValue"
+              :value="item"
+              :label="item"
+            >
+            </Option>
+          </Select>
        </FormItem>
      </Form>
      <div slot="footer">
        <Button type="text" @click="modalVisible = false">取消</Button>
        <Button type="primary" :loading="submitLoading" @click="saveSpec"
-          >提交</Button
-        >
-      </div>
-    </Modal>
-    <Modal
-      :title="modalTitle"
-      v-model="dialogSpecValuesVisible"
-      :mask-closable="false"
-      :width="500"
-      :styles="{ top: '30px' }"
-      class="permModal"
-    >
-      <Form ref="specForm" :model="specForm" :label-width="100">
-        <Select
-          v-model="specForm.specValue"
-          placeholder="输入后回车添加"
-          multiple
-          filterable
-          allow-create
-          :popper-append-to-body="false"
-          popper-class="spec-values-popper"
-          style="width: 100%; text-align: left; margin-right: 10px"
-        >
-          <Option
-            v-for="item in specValues"
-            :value="item.specValue"
-            :key="item.id"
-            :label="item.specValue"
-          >
-          </Option>
-        </Select>
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="dialogSpecValuesVisible = false"
-          >取消</Button
-        >
-        <Button
-          type="primary"
-          :loading="submitLoading"
-          @click="submitSpecValuesForm"
-          >提交</Button
+        >提交
+        </Button
        >
      </div>
    </Modal>
@@ -118,10 +98,9 @@ import {
  getSpecListData,
  insertSpec,
  updateSpec,
-  delSpec,
-  getSpecValuesListData,
-  saveSpecValues,
+  delSpec
 } from "@/api/goods";
+
 export default {
  name: "spec",
  components: {},
@@ -131,7 +110,6 @@ export default {
      modalType: 0, // 添加或编辑标识
      modalVisible: false, // 添加或编辑显示
      modalTitle: "", // 添加或编辑标题
-      dialogSpecValuesVisible: false, // 添加或编辑规格值
      specTitle: "", // 添加或编辑规格值
      searchForm: {
        // 搜索框初始化对象
@@ -145,9 +123,8 @@ export default {
        specName: "",
        specValue: "",
      },
-      specForm: {},
      /** 编辑规格值 */
-      specValues: [],
+      specValue: [],
      // 表单验证规则
      formValidate: {},
      submitLoading: false, // 添加或编辑提交状态
@@ -179,24 +156,7 @@ export default {
          width: 250,
          render: (h, params) => {
            return h("div", [
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.editSpec(params.row);
-                    },
-                  },
-                },
-                "编辑规格值"
-              ),
+
              h(
                "Button",
                {
@@ -239,23 +199,28 @@ export default {
    };
  },
  methods: {
+    //初始化，获取数据
    init() {
      this.getDataList();
    },
+    //修改分页
    changePage(v) {
      this.searchForm.pageNumber = v;
      this.getDataList();
      this.clearSelectAll();
    },
+    //修改页面大小
    changePageSize(v) {
      this.searchForm.pageSize = v;
      this.getDataList();
    },
+    //搜索参数
    handleSearch() {
      this.searchForm.pageNumber = 1;
      this.searchForm.pageSize = 10;
      this.getDataList();
    },
+    //重置搜索参数
    handleReset() {
      this.$refs.searchForm.resetFields();
      this.searchForm.pageNumber = 1;
@@ -263,6 +228,7 @@ export default {
      // 重新加载数据
      this.getDataList();
    },
+    //更改排序
    changeSort(e) {
      this.searchForm.sort = e.key;
      this.searchForm.order = e.order;
@@ -271,36 +237,27 @@ export default {
      }
      this.getDataList();
    },
+    //清除已选择
    clearSelectAll() {
      this.$refs.table.selectAll(false);
    },
+    //修改已选择
    changeSelect(e) {
      this.selectList = e;
      this.selectCount = e.length;
    },
+    //获取数据
    getDataList() {
      this.loading = true;
      // 带多条件搜索参数获取表单数据 请自行修改接口
      getSpecListData(this.searchForm).then((res) => {
        this.loading = false;
-        if (res.success) {
-          this.data = res.result.records;
-          this.total = res.result.total;
-        }
+        this.data = res.records;
+        this.total = res.total;
      });
      this.loading = false;
    },
-    submitSpecValuesForm() {
-      saveSpecValues(this.specForm.specId, this.specForm).then((res) => {
-        this.submitLoading = false;
-        if (res.success) {
-          this.$Message.success("规格值保存成功");
-          this.getDataList();
-          this.modalVisible = false;
-          this.dialogSpecValuesVisible = false;
-        }
-      });
-    },
+    //新增规格
    saveSpec() {
      this.$refs.form.validate((valid) => {
        if (valid) {
@@ -318,7 +275,7 @@ export default {
            });
          } else {
            // 编辑
-            updateSpec(this.form).then((res) => {
+            updateSpec(this.form.id, this.form).then((res) => {
              this.submitLoading = false;
              if (res.success) {
                this.$Message.success("操作成功");
@@ -330,6 +287,7 @@ export default {
        }
      });
    },
+    //弹出添加框
    add() {
      this.modalType = 0;
      this.modalTitle = "添加";
@@ -337,31 +295,31 @@ export default {
      delete this.form.id;
      this.modalVisible = true;
    },
+    //弹出编辑框
    edit(v) {
      this.modalType = 1;
      this.modalTitle = "编辑";
-      this.$refs.form.resetFields();
      // 转换null为""
      for (let attr in v) {
        if (v[attr] === null) {
          v[attr] = "";
        }
      }
-      let str = JSON.stringify(v);
-      let data = JSON.parse(str);
-      this.form = data;
+      let localVal = v.specValue;
+
+      this.form.specName = v.specName;
+      this.form.id = v.id;
+      this.form.specValue = v.specValue;
+
+      if (localVal && localVal.indexOf("," > 0)) {
+        this.form.specValue = localVal.split(",")
+        this.specValue = this.form.specValue
+        this.$set(this, 'specValue', this.form.specValue)
+      } else {
+        this.specValue = [];
+      }
      this.modalVisible = true;
    },
-    editSpec(v) {
-      getSpecValuesListData(v.id).then((res) => {
-        this.modalType = 1;
-        this.modalTitle = "编辑";
-        this.specValues = res.result;
-        this.specForm.specValue = res.result.map(item => item.specValue)
-        this.specForm.specId = v.id;
-        this.dialogSpecValuesVisible = true;
-      });
-    },
    remove(v) {
      this.$Modal.confirm({
        title: "确认删除",
@@ -415,5 +373,5 @@ export default {
 };
 </script>
 <style lang="scss">
-  @import "@/styles/table-common.scss";
+@import "@/styles/table-common.scss";
 </style>
--- a/manager/src/views/main-components/footer.vue
+++ b/manager/src/views/main-components/footer.vue
@@ -8,7 +8,7 @@
    <Row type="flex" justify="center" class="copyright">
      Copyright © 2020 - Present
      <a
-        href="http://lili.cn"
+        href="https://pickmall.cn/"
        target="_blank"
        style="margin:0 5px;"
      >lili-shop</a> {{ $t('rights') }}
--- 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/order/orderList.vue
+++ b/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", [
-              h(
-                "Button",
-
-                {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  attrs: {
-                    disabled: params.row.orderStatus == "UNPAID" ? false : true,
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.confirmPrice(params.row);
-                    },
-                  },
-                },
-                "收款"
+            return h("div", [h("Button", {props: {type: "primary", size: "small",},
+                attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,},
+                style: {marginRight: "5px",},
+                on: {click: () => {this.confirmPrice(params.row);},},
+                }, "收款"
              ),
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.detail(params.row);
-                    },
-                  },
-                },
-                "查看"
+              h("Button", {props: {type: "info", size: "small",},
+                  style: {marginRight: "5px",},
+                  on: {click: () => {this.detail(params.row);},},
+                }, "查看"
              ),
            ]);
          },
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -57,7 +57,7 @@
                <Input type="number" v-model="form.sort" clearable style="width: 10%" />
              </FormItem>
              <FormItem class="form-item-view-el" label="文章内容" prop="content">
-                <editor openXss v-model="form.content"></editor>
+                <editor  openXss v-model="form.content"></editor>
              </FormItem>
              <FormItem label="是否展示" prop="openStatus">
                <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
@@ -435,28 +435,13 @@ export default {
          this.form.categoryId = res.result.categoryId;
          this.treeValue = data.articleCategoryName;
          this.form.id = data.id;
-          this.form.content = htmlEscape(res.result.content);
+          this.form.content =res.result.content;
          this.form.title = res.result.title;
          this.form.sort = res.result.sort;
          this.form.openStatus = res.result.openStatus;
        }
      });
    },
-
-    htmlEscape(text) {
-      return text.replace(/[<>"&]/g, function (match, pos, originalText) {
-        switch (match) {
-          case "<":
-            return "&lt;";
-          case ">":
-            return "&gt;";
-          case "&":
-            return "&amp;";
-          case '"':
-            return "&quot;";
-        }
-      });
-    },
    remove(v) {
      this.$Modal.confirm({
        title: "确认删除",
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -161,7 +161,7 @@ export default {
        },
        {
          title: "活动时间",
-
+          width: 150,
          render: (h, params) => {
            if (params.row.getType === "ACTIVITY") {
              return h("div", "长期有效");
--- 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/pointsGoods/pointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@@ -2,78 +2,37 @@
  <div class="search">
    <Card>
      <Row>
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
          <Form-item label="商品名称">
-            <Input
-              type="text"
-              v-model="searchForm.goodsName"
-              placeholder="请输入商品名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="积分区间">
-            <Input
-              type="text"
-              v-model="searchForm.pointsS"
-              placeholder="请输入开始区间"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.pointsS" placeholder="请输入开始区间" clearable style="width: 200px" />
            -
-            <Input
-              type="text"
-              v-model="searchForm.pointsE"
-              placeholder="请输入结束区间"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.pointsE" placeholder="请输入结束区间" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="状态">
            <Select v-model="searchForm.promotionStatus" style="width: 200px">
-              <Option
-                v-for="item in statusList"
-                :value="item.value"
-                :key="item.value"
-                >{{ item.label }}</Option
-              >
+              <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
            </Select>
          </Form-item>
          <Form-item label="SKU编码">
-            <Input
-              type="text"
-              v-model="searchForm.skuId"
-              placeholder="请输入SKU编码"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.skuId" placeholder="请输入SKU编码" clearable style="width: 200px" />
          </Form-item>
          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
        </Form>
      </Row>
      <Row class="operation padding-row">
-        <Button @click="addPointsGoods" type="primary" >添加积分商品</Button>
+        <Button @click="addPointsGoods" type="primary">添加积分商品</Button>

      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table">
        <template slot-scope="{ row }" slot="goodsName">
          <div>
            <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
            <Poptip trigger="hover" title="扫码在手机中查看" transfer>
              <div slot="content">
-                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
              </div>
              <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
            </Poptip>
@@ -94,48 +53,15 @@
        </template>

        <template slot-scope="{ row }" slot="action">
-          <Button
-            v-if="row.promotionStatus == 'NEW'"
-            type="info"
-            size="small"
-            @click="edit(row.id)"
-            style="margin-right: 5px"
-            >编辑</Button
-          >
-          <Button
-            v-if="row.promotionStatus == 'START'"
-            type="warning"
-            size="small"
-            @click="statusChanged(row.id, 'CLOSE')"
-            style="margin-right: 5px"
-            >停用</Button
-          >
-          <Button
-            v-if="row.promotionStatus == 'CLOSE'"
-            type="warning"
-            size="small"
-            @click="statusChanged(row.id, 'START')"
-            style="margin-right: 5px"
-            >启用</Button
-          >
-          <Button type="error" size="small" @click="close(row.id)"
-            >删除</Button
-          >
+          <Button v-if="row.promotionStatus == 'NEW'" type="info" size="small" @click="edit(row.id)" style="margin-right: 5px">编辑</Button>
+          <Button v-if="row.promotionStatus == 'START'" type="warning" size="small" @click="statusChanged(row.id, 'CLOSE')" style="margin-right: 5px">停用</Button>
+          <Button v-if="row.promotionStatus == 'CLOSE'" type="warning" size="small" @click="statusChanged(row.id, 'START')" style="margin-right: 5px">启用</Button>
+          <Button type="error" size="small" @click="close(row.id)">删除</Button>
        </template>
      </Table>
      <Row type="flex" justify="end" class="page">
-        <Page
-          :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>
+        <Page :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>
    </Card>
  </div>
@@ -159,55 +85,62 @@ export default {
        pageSize: 10, // 页面大小
        order: "desc", // 默认排序方式
      },
-      statusList: [ // 活动状态
+      statusList: [
+        // 活动状态
        { label: "未开始", value: "NEW" },
        { label: "已开始", value: "START" },
        { label: "已结束", value: "END" },
        { label: "已关闭", value: "CLOSE" },
      ],
-      columns: [ // 表头
+      columns: [
+        // 表头
        {
          title: "商品名称",
          slot: "goodsName",
-          minWidth: 120,
+          minWidth: 150,
+          fixed: "left",
          tooltip: true,
        },
        {
          title: "市场价",
          slot: "price",
+          width: 100,
        },
        {
          title: "结算价",
          slot: "settlementPrice",
+          width: 100,
        },
-        {
-          title: "分类",
-          key: "pointsGoodsCategoryName",
-        },
+
        {
          title: "库存数量",
          slot: "quantity",
+          width: 100,
        },
        {
          title: "活动剩余库存",
          key: "activeStock",
+          width: 150,
        },
        {
          title: "兑换积分",
          key: "points",
+          width: 100,
        },
        {
          title: "所属店铺",
          key: "storeName",
+          width: 100,
        },
        {
          title: "活动开始时间",
          slot: "startTime",
-          minWidth:100
+          minWidth: 150,
        },
        {
          title: "状态",
          key: "promotionStatus",
+          width: 100,
          render: (h, params) => {
            let text = "未知",
              color = "";
@@ -227,10 +160,16 @@ export default {
            return h("div", [h("Tag", { props: { color: color } }, text)]);
          },
        },
+        {
+          title: "分类",
+          key: "pointsGoodsCategoryName",
+          width: 100,
+        },
        {
          title: "操作",
          slot: "action",
          align: "center",
+          fixed: "right",
          width: 150,
        },
      ],
@@ -327,5 +266,5 @@ export default {
 };
 </script>
 <style lang="scss">
-  @import "@/styles/table-common.scss";
+@import "@/styles/table-common.scss";
 </style>
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/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",},},"结束");
            }
          },
        },
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -65,13 +65,13 @@
              <FormItem label="详细地址" prop="salesConsigneeDetail">
                <Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
              </FormItem>
-              <!-- <Divider orientation="left">腾讯云智服</Divider>
+              <Divider orientation="left">腾讯云智服</Divider>
              <FormItem label="唯一标识" prop="salesConsigneeDetail">
                <Input v-model="shopForm.yzfSign" clearable style="width: 350px" />
              </FormItem>
              <FormItem label="小程序唯一标识" prop="salesConsigneeDetail">
                <Input v-model="shopForm.yzfMpSign" clearable style="width: 350px" />
-              </FormItem> -->
+              </FormItem>
              <Spin fix v-if="loading"></Spin>
            </div>
          </TabPane>