Merge branch 'master' into ma

# Conflicts: # buyer/src/components/goodsDetail/ShowGoodsDetail.vue # buyer/src/config/index.js # seller/src/views/goods/goods-seller/goodsOperation.vue
2021-07-07 16:14:23 +08:00 · 2021-07-07 16:14:23 +08:00 · c835616ad2
parent 9b9295ea94 e5449213c2
commit c835616ad2
21 changed files with 150 additions and 158 deletions
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@ -29,6 +29,9 @@
            {{ skuDetail.goodsName }}
          </p>
        </div>
+        <div class="sell-point">
+          {{skuDetail.sellingPoint}}
+        </div>
        <!-- 限时秒杀 -->
        <Promotion v-if="promotionMap['SECKILL']" :time="promotionMap['SECKILL'].endTime"></Promotion>
        <!-- 商品详细 价格、优惠券、促销 -->
@ -655,5 +658,10 @@ export default {
    }
  }
 }
+.sell-point {
+  font-size: 12px;
+  color: red;
+  margin-bottom: 5px;
+}
 /******************商品图片及购买详情结束******************/
 </style>
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@ -92,7 +92,7 @@
                  <span class="ml_10">{{item.groupName}}</span>
                  <table class="mb_10" cellpadding='0' cellspacing="0" >
                    <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
-                      <td style="text-align:right">{{param.paramName}}</td><td>{{param.paramValue}}</td>
+                      <td style="text-align: center">{{param.paramName}}</td><td>{{param.paramValue}}</td>
                    </tr>
                  </table>
                </div>
@ -222,7 +222,7 @@ export default {
    });
    window.addEventListener('scroll', this.handleScroll)
    this.getList();
-  },
+  }
 };
 </script>

@ -491,16 +491,15 @@ export default {
 table{
  border-color:#efefef;
  color: #999;
-  width: 40%;
-  margin-left: 10px;
-  margin-bottom: 10px;
+  min-width: 30%;
+  margin-left: 30px;
  font-size: 12px;
  tr{
    td:nth-child(1){
-      width: 70px;
+      width: 100px;
    }
    td:nth-child(2){
-      padding-left: 10px;
+      padding-left: 20px;
    }
  }
  td{
@ -509,7 +508,6 @@ table{
 }
 .goods-params {
  display: flex;
-  align-items: center;
  border-bottom: 1px solid #eee;
  margin-left: 30px;
  span{color:#999}
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@ -17,15 +17,15 @@ export default {
   * @description api请求基础路径
   */
  api_dev: {
-    common: 'http://192.168.0.105:8890',
-    buyer: 'http://192.168.0.105:8888',
-    seller: 'http://192.168.0.105:8889',
-    manager: 'http://192.168.0.105:8887'
+    // common: 'http://192.168.0.106:8890',
+    // buyer: 'http://192.168.0.106:8888',
+    // seller: 'http://192.168.0.106:8889',
+    // manager: 'http://192.168.0.106: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: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
  },
  api_prod: {
    common: 'https://common-api.pickmall.cn',
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@ -46,9 +46,7 @@
        <thead>
          <tr>
            <th width="50%">商品</th>
-            <!-- <th width="20%">属性</th> -->
            <th width="20%">货号</th>
-            <!-- <th width="10%">发货仓库</th> -->
            <th width="10%">单价</th>
            <th width="10%">数量</th>
            <th width="10%">小计</th>
@ -82,10 +80,11 @@
        <div>
          <span>运费：</span><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span><br>
        </div>
-        <div><span>优惠金额：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
+        <div><span>优惠券：</span><span>-{{ order.order.priceDetailDTO.couponPrice || 0 | unitPrice("￥") }}</span></div>
+        <div><span>活动优惠：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
        <div>
-          <span>应付金额：</span
-          ><span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
+          <span>应付金额：</span>
+          <span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
        </div>
      </div>
    </div>
@ -121,7 +120,7 @@ export default {
      });
      window.open(routeUrl.href, '_blank');
    },
-    getDetail () { // 订单详情
+    getDetail () { // 获取订单详情
      orderDetail(this.$route.query.sn).then(res => {
        if (res.success) {
          this.order = res.result;
--- 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.106:8890',
+    // buyer: 'http://192.168.0.106:8888',
+    // seller: 'http://192.168.0.106:8889',
+    // manager: 'http://192.168.0.106:8887'
  },
  api_prod: {
    common: "https://common-api.pickmall.cn",
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@ -1,5 +1,3 @@
-
-
 <template>
  <div class="ivu-shrinkable-menu">
    <!-- 一级菜单 -->
@ -38,6 +36,9 @@ export default {
    navList() {
      return this.$store.state.app.navList;
    },
+    currNav() {
+      return this.$store.state.app.currNav;
+    }
  },
  watch: {
    // 监听路由变化
@ -45,29 +46,17 @@ export default {
      handler: function (val, oldVal) {
        console.log(val);
      }
-    },
-    menuList: {
-      handler: function (val, oldVal) {
-      }
    } 
  },
-  mounted() {
-  },
  methods: {
    changeMenu(name) { //二级路由点击
-    console.log(name)
      this.$router.push({
        name: name
      });
    },
-    selectNav(name) {
+    selectNav(name) { // 一级路由点击事件
      this.$store.commit("setCurrNav", name);
      this.setStore("currNav", name);
-      // if (this.$route.name != "home_index") {
-      //   this.$router.push({
-      //     name: "home_index"
-      //   });
-      // }
      util.initRouter(this);
    },
  }
--- a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
@ -3,9 +3,7 @@
    width: 180px;
    display: flex;
 }
-.ivu-menu-vertical .ivu-menu-item-group-title {
-    padding-left: 5px;
-}
+
 .ivu-btn-text:hover {
    background-color: rgba(255,255,255,.2) !important;
 }
@ -21,3 +19,8 @@
 .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
    color: #ed3f14;
 }
+/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+}
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@ -30,26 +30,22 @@
    </Card>

    <!-- 添加用户模态框 -->
-    <Modal v-model="addFlag" title="添加用户">
+    <Modal v-model="addFlag" title="添加会员">
      <Form ref="addMemberForm" :model="addMemberForm" :rules="addRule" :label-width="100">
        <FormItem label="手机号码" prop="mobile" style="width: 90%;">
          <Input v-model="addMemberForm.mobile" maxlength="11" placeholder="请输入手机号码" />
        </FormItem>
-        <FormItem label="会员名称" prop="uname" style="width: 90%">
+        <FormItem label="会员名称" prop="username" style="width: 90%">
          <Input v-model="addMemberForm.username" maxlength="15" placeholder="请输入会员名称" />
        </FormItem>

-        <FormItem label="会员密码" prop="pwd" style="width: 90%">
+        <FormItem label="会员密码" prop="password" style="width: 90%">
          <Input type="password" password v-model="addMemberForm.password" maxlength="20" placeholder="请输入会员密码" />
        </FormItem>
      </Form>

      <div slot="footer">
-        <Button @click="
-            () => {
-              addFlag = false;
-            }
-          ">
+        <Button @click="addFlag = false">
          取消
        </Button>
        <Button type="primary" :loading="handleAddLoading" @click="addMemberSubmit">
@ -163,8 +159,8 @@ export default {
            message: "请输入正确的手机号",
          },
        ],
-        uname: [{ required: true, message: "请输入会员名称" }],
-        pwd: [{ required: true, message: "请输入密码" }],
+        username: [{ required: true, message: "请输入会员名称" }],
+        password: [{ required: true, message: "请输入密码" }],
      },
      ruleValidate: {}, //修改验证
      submitLoading: false, // 添加或编辑提交状态
@ -421,11 +417,7 @@ export default {
    },
    addMember() {
      this.addFlag = true;
-      this.addMemberForm = {
-        mobile: "",
-        username: "",
-        password: "",
-      };
+      this.$refs.addMemberForm.resetFields()
    },
    /**
     * 查询查看会员详情
@ -460,6 +452,7 @@ export default {
        if (valid) {
          API_Member.addMember(this.addMemberForm).then((res) => {
            if (res.result) {
+              this.$refs.addMemberForm.resetFields()
              this.getData();
              this.$Message.success("添加成功！");
              this.addFlag = false;
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@ -141,12 +141,14 @@
                this.modalVisible = true;
            },
            edit(v) {
+                console.log(v);
                this.modalType = 1;
                this.modalTitle = "编辑";
                this.formAdd.id = v.id;
                this.formAdd.articleCategoryName = v.articleCategoryName;
                this.formAdd.level = v.level;
                this.formAdd.parentId = v.parentId;
+                this.formAdd.sort = v.sort;
                this.showParent = false;
                this.modalVisible = true;
            },
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@ -26,10 +26,10 @@
        <!-- <Button @click="upAll" >批量上架</Button> -->
      </Row>
      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-select-cancel="cancelSelect" @on-selection-change="changeSelect">
-        <template slot-scope="{ row,index }" slot="action">
-          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="primary" size="small" style="margin-right: 10px" @click="edit(row)">编辑
+        <template slot-scope="{ row }" slot="action">
+          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="success" :class="{'mr_10' : !checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'}" size="small" @click="edit(row)">编辑
          </Button>
-          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" style="margin-right: 10px" @click="remove(row)">下架
+          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" @click="remove(row)">下架
          </Button>
        </template>
      </Table>
@ -215,7 +215,7 @@ export default {
          slot: "action",
          align: "center",
          fixed: "right",
-          maxWidth: 140,
+          width: 130,
        },
      ],
      data: [], // 表单数据
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@ -68,7 +68,7 @@
              </div>
              <div v-if="rangeTimeType == 1">
                <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择"
-                            :options="options" style="width: 260px">
+                  :options="options" style="width: 260px">
                </DatePicker>
              </div>
              <div class="effectiveDays" v-if="rangeTimeType == 0">
@ -100,8 +100,8 @@

            <FormItem v-if="form.scopeType == 'PORTION_GOODS_CATEGORY'">

-              <Cascader @on-change="getGoodsCategory" :data="goodsCategoryList" style="width:300px;"
-                        v-model="form.scopeIdGoods"></Cascader>
+              <Cascader :data="goodsCategoryList" style="width:260px;"
+                v-model="form.scopeIdGoods"></Cascader>

            </FormItem>
            <div>
@ -127,7 +127,7 @@ import {regular} from "@/utils";
 import skuSelect from "@/views/lili-dialog";

 export default {
-  name: "addCoupon",
+  name: "edit-platform-coupon",
  components: {
    skuSelect,
  },
@ -140,6 +140,14 @@ export default {
      },
      deep: true,
    },
+    $route(e) { // 监听路由，参数变化调取接口
+      this.id = e.query.id;
+      if (this.id) {
+        this.getCoupon()
+      } else {
+        this.$refs.form.resetFiles()
+      }
+    }
  },
  data() {
    const checkPrice = (rule, value, callback) => {
@ -165,7 +173,7 @@ export default {
      }
    };
    return {
-      rangeTimeType: 1,
+      rangeTimeType: 1, // 当前时间类型
      modalType: 0, // 是否编辑
      form: {
        /** 店铺承担比例 */
@ -289,7 +297,7 @@ export default {
      },
    };
  },
-  async mounted() {
+  async mounted () {
    await this.getCagetoryList();
    // 如果id不为空则查询信息
    if (this.id) {
@ -495,7 +503,7 @@ export default {
    async getCagetoryList() {
      // 获取全部商品分类
      let data = await getCategoryTree();
-      this.goodsCategoryList = this.filterCategory(data.result);
+      this.goodsCategoryList = data.result;
      // 过滤出可显示的值

      this.goodsCategoryList = this.goodsCategoryList.map((item) => {
@ -523,18 +531,7 @@ export default {
        }
        return {value: item.id, label: item.name, children: item.children};
      });
-    },
-    filterCategory(list) {
-      // 递归删除空children
-      list.forEach((item) => {
-        if (item.children.length == 0) {
-          delete item.children;
-        } else {
-          this.filterCategory(item.children);
-        }
-      });
-
-      return list;
+      console.log(this.goodsCategoryList);
    },
    filterCategoryId(list, idArr) {
      // 递归获取分类id
--- a/manager/src/views/promotion/couponActivity/coupon.vue
+++ b/manager/src/views/promotion/couponActivity/coupon.vue
@ -7,7 +7,7 @@
      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">

        <template slot-scope="{ row,index }" slot="action">
-          <Button type="primary"
+          <Button type="info"
                  size="small" style="margin-right: 10px" @click="info(row)">查看
          </Button>
          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error"
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@ -8,7 +8,7 @@
            <!-- 遮罩层  -->
            <div v-if="isRead" class="mask">只读不可修改</div>
            <div>
-              <FormItem label="会员名称" required prop="memberName">
+              <FormItem label="会员名称" prop="memberName">
                <div class="item">
                  <Input disabled v-model="shopForm.memberName" />
                  <Button @click="selectMember()" v-if="!$route.query.shopId">选择会员</Button>
@ -44,7 +44,7 @@
              <FormItem label="店铺所在地" prop="storeAddressPath">
                <Input disabled v-model="shopForm.storeAddressPath" style="width: 350px" />
              </FormItem>
-              <FormItem label="店铺详细地址" required prop="storeAddressDetail">
+              <FormItem label="店铺详细地址"  prop="storeAddressDetail">
                <Input v-model="shopForm.storeAddressDetail" clearable style="width: 350px" />
              </FormItem>

@ -91,60 +91,60 @@
            <div v-if="isRead" class="mask">只读不可修改</div>
            <Divider orientation="left">公司信息</Divider>
            <div>
-              <FormItem label="公司名称" required prop="companyName">
+              <FormItem label="公司名称"  prop="companyName">
                <Input v-model="shopForm.companyName" clearable style="width: 350px" />
              </FormItem>

-              <FormItem label="公司电话" required prop="companyPhone">
+              <FormItem label="公司电话"  prop="companyPhone">
                <Input v-model="shopForm.companyPhone" clearable style="width: 350px" />
              </FormItem>
-              <FormItem label="公司所在地" required>
+              <FormItem label="公司所在地" >
                <Input v-model="shopForm.companyAddressPath" disabled style="width: 260px" v-if="showRegion == false" />
                <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary" icon="ios-create-outline" style="margin-left: 8px">修改
                </Button>
                <region style="width: 350px" @selected="selectedRegion" v-if="showRegion == true" />
              </FormItem>
-              <FormItem label="公司详细地址" required prop="companyAddress">
+              <FormItem label="公司详细地址"  prop="companyAddress">
                <Input v-model="shopForm.companyAddress" clearable style="width: 350px" />
              </FormItem>
-              <FormItem label="员工总数" required prop="employeeNum">
+              <FormItem label="员工总数"  prop="employeeNum">
                <InputNumber style="width: 150px" :min="1" :max="9999999" v-model="shopForm.employeeNum">
                </InputNumber>
              </FormItem>
-              <FormItem label="注册资金" required prop="registeredCapital">
+              <FormItem label="注册资金"  prop="registeredCapital">
                <InputNumber style="width: 150px" :min="1" :max="9999999" v-model="shopForm.registeredCapital">
                </InputNumber>
                <span style="margin-left: 10px">万</span>
              </FormItem>
-              <FormItem label="联系人姓名" required prop="linkName">
+              <FormItem label="联系人姓名"  prop="linkName">
                <Input v-model="shopForm.linkName" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="联系人手机" required prop="linkPhone">
+              <FormItem label="联系人手机"  prop="linkPhone">
                <Input v-model="shopForm.linkPhone" maxlength="11" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="电子邮箱" required prop="companyEmail">
+              <FormItem label="电子邮箱"  prop="companyEmail">
                <Input v-model="shopForm.companyEmail" clearable style="width: 200px" />
              </FormItem>

              <Divider orientation="left">营业执照信息</Divider>

-              <FormItem label="营业执照号" required prop="licenseNum">
+              <FormItem label="营业执照号"  prop="licenseNum">
                <Input v-model="shopForm.licenseNum" clearable style="width: 200px" />
              </FormItem>

-              <FormItem label="法定经营范围" required prop="scope">
+              <FormItem label="法定经营范围"  prop="scope">
                <Input v-model="shopForm.scope" clearable style="width: 200px" />
              </FormItem>

              <Divider orientation="left">法人信息</Divider>

-              <FormItem label="法人姓名" required prop="legalName">
+              <FormItem label="法人姓名"  prop="legalName">
                <Input v-model="shopForm.legalName" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="法人证件号" required prop="legalId">
+              <FormItem label="法人证件号"  prop="legalId">
                <Input v-model="shopForm.legalId" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="法人身份证照片" required ref="legalPhoto">
+              <FormItem label="法人身份证照片"  ref="legalPhoto">
                <Avatar style="height: 100px;width: 100px" v-if="shopForm.legalPhoto" shape="square" icon="ios-person" size="default" :src="shopForm.legalPhoto" />
                <div>
                  <Button @click="handleCLickImg('legalPhoto')" type="primary">选择图片</Button>
@ -152,20 +152,20 @@
              </FormItem>

              <Divider orientation="left">结算银行信息</Divider>
-              <FormItem label="银行开户名" required prop="settlementBankAccountName">
+              <FormItem label="银行开户名"  prop="settlementBankAccountName">
                <Input v-model="shopForm.settlementBankAccountName" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="银行账号" required prop="settlementBankAccountNum">
+              <FormItem label="银行账号"  prop="settlementBankAccountNum">
                <Input v-model="shopForm.settlementBankAccountNum" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="银行支行名称" required prop="settlementBankBranchName">
+              <FormItem label="银行支行名称"  prop="settlementBankBranchName">
                <Input v-model="shopForm.settlementBankBranchName" clearable style="width: 200px" />
              </FormItem>
-              <FormItem label="支行联行号" required prop="settlementBankJointName">
+              <FormItem label="支行联行号"  prop="settlementBankJointName">
                <Input v-model="shopForm.settlementBankJointName" clearable style="width: 200px" />
              </FormItem>

-              <FormItem label="许可证电子版" required>
+              <FormItem label="许可证电子版" >
                <Avatar style="height: 100px;width: 100px" v-if="shopForm.licencePhoto" shape="square" icon="ios-person" size="default" :src="shopForm.licencePhoto" />
                <div>
                  <Button @click="handleCLickImg('licencePhoto')" type="primary">选择图片</Button>
@ -262,28 +262,28 @@ export default {
      shopValidate: {
        // 表单验证规则
        memberName: [
-          { required: true, message: "会员不能为空", trigger: "blur" },
+          { required: true, message: "会员不能为空" },
        ],
        storeName: [
-          { required: true, message: "店铺名称不能为空", trigger: "blur" },
+          { required: true, message: "店铺名称不能为空" },
        ],
        companyAddress: [
-          { required: true, message: "公司地址不能为空", trigger: "blur" },
+          { required: true, message: "公司地址不能为空" },
        ],
        storeAddressDetail: [
-          { required: true, message: "店铺详细地址不能为空", trigger: "blur" },
+          { required: true, message: "店铺详细地址不能为空" },
        ],
        storeDesc: [
-          { required: true, message: "店铺简介不能为空", trigger: "blur" },
+          { required: true, message: "店铺简介不能为空" },
        ],
        storeCenter: [
-          { required: true, message: "店铺未定位", trigger: "change" },
+          { required: true, message: "店铺未定位" },
        ],
        companyName: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" },
+          { required: true, message: "公司名称不能为空", },
        ],
        companyPhone: [
-          { required: true, message: "公司电话不能为空", trigger: "blur" },
+          { required: true, message: "公司电话不能为空", },
        ],
        employeeNum: [
          {
@ -302,10 +302,10 @@ export default {
          },
        ],
        linkName: [
-          { required: true, message: "联系人姓名不能为空", trigger: "blur" },
+          { required: true, message: "联系人姓名不能为空", },
        ],
        linkPhone: [
-          { required: true, message: "联系人手机号不能为空", trigger: "blur" },
+          { required: true, message: "联系人手机号不能为空", },
          {
            type: "string",
            pattern: /^1[3|4|5|6|7|8][0-9]{9}$/,
@ -314,32 +314,32 @@ export default {
          },
        ],
        companyEmail: [
-          { required: true, message: "邮箱不能为空", trigger: "blur" },
-          { type: "email", message: "邮箱格式错误", trigger: "blur" },
+          { required: true, message: "邮箱不能为空", },
+          { type: "email", message: "邮箱格式错误", },
        ],
        licenseNum: [
-          { required: true, message: "营业执照号不能为空", trigger: "blur" },
+          { required: true, message: "营业执照号不能为空", },
        ],
        scope: [
-          { required: true, message: "法定经营范围不能为空", trigger: "blur" },
+          { required: true, message: "法定经营范围不能为空", },
        ],
        legalName: [
-          { required: true, message: "法人姓名不能为空", trigger: "blur" },
+          { required: true, message: "法人姓名不能为空", },
        ],
        legalId: [
-          { required: true, message: "法人证件号不能为空", trigger: "blur" },
+          { required: true, message: "法人证件号不能为空", },
        ],
        settlementBankAccountName: [
-          { required: true, message: "银行开户名不能为空", trigger: "blur" },
+          { required: true, message: "银行开户名不能为空", },
        ],
        settlementBankAccountNum: [
-          { required: true, message: "银行账号不能为空", trigger: "blur" },
+          { required: true, message: "银行账号不能为空", },
        ],
        settlementBankBranchName: [
-          { required: true, message: "银行支行名称不能为空", trigger: "blur" },
+          { required: true, message: "银行支行名称不能为空", },
        ],
        settlementBankJointName: [
-          { required: true, message: "支行联行号不能为空", trigger: "blur" },
+          { required: true, message: "支行联行号不能为空", },
        ],
        salesConsigneeMobile: [
          {
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@ -22,10 +22,10 @@ export default {
    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: 'http://192.168.0.106:8890',
+    // buyer: 'http://192.168.0.106:8888',
+    // seller: 'http://192.168.0.106:8889',
+    // manager: 'http://192.168.0.106:8887'

  },
  api_prod: {
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@ -77,10 +77,6 @@
  }
 }

-/*平铺*/
-div.base-info-item > div {
-  margin-left: 5%;
-}

 div.base-info-item {
  h4 {
@ -94,13 +90,15 @@ div.base-info-item {
    line-height: 40px;
    text-align: left;
  }
-
+  >div{
+    padding-left: 5%;
+  }
  .form-item-view {
    display: flex;
    flex-direction: column;
    align-items: flex-start;
    justify-content: space-between;
-    padding-left: 80px;
+    // padding-left: 80px;

    .layout {
      margin-bottom: 20px;
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@ -1,7 +1,6 @@
 <style lang="scss" scoped>
@import "./styles/menu.scss";
 </style>
-
 <template>
  <div class="ivu-shrinkable-menu">
    <!-- 一级菜单 -->
@ -40,6 +39,9 @@ export default {
    navList() {
      return this.$store.state.app.navList;
    },
+    currNav() {
+      return this.$store.state.app.currNav;
+    }
  },
  methods: {
    changeMenu(name) { //二级路由点击
@ -47,7 +49,7 @@ export default {
        name: name
      });
    },
-    selectNav(name) {
+    selectNav(name) { // 一级路由点击
      this.$store.commit("setCurrNav", name);
      this.setStore("currNav", name);
      util.initRouter(this);
--- a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
@ -3,9 +3,7 @@
  width: 180px;
  display: flex;
 }
-.ivu-menu-vertical .ivu-menu-item-group-title {
-  padding-left: 5px;
-}
+
 .ivu-btn-text:hover {
  background-color: rgba(255,255,255,.2) !important;
 }
@ -21,3 +19,8 @@
 .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
  color: #ed3f14;
 }
+/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
+  height: 40px;
+  line-height: 40px;
+  padding-left: 20px;
+}
--- a/seller/src/views/my-components/lili/editor.vue
+++ b/seller/src/views/my-components/lili/editor.vue
@ -90,7 +90,6 @@ export default {
    initEditor() {
      let that = this;
      this.editor = new E(`#${this.id}`);
-
      // 编辑内容绑定数据
      this.editor.config.onchange = (html) => {
        if (this.openXss) {
@ -195,6 +194,7 @@ export default {
      });
    },
    setData(value) {
+      // 设置数据
      if (!this.editor) {
        this.initEditor();
      }
@ -204,15 +204,14 @@ export default {
        this.$emit("input", this.data);
        this.$emit("on-change", this.data);
      }
-    },
+    }
  },
  watch: {
    value: {
      immediate: true,
      handler: function (val) {
-
        this.setData(val);
-      }
+      },
    },
  },
  mounted() {
@ -231,6 +230,10 @@ export default {
    color: #333;
  }
 }
+.w-e-toolbar {
+  // 给工具栏换行
+  flex-wrap: wrap;
+}
 .e-code {
  top: 6px;
  left: 976px;
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@ -79,13 +79,11 @@ export default {
        {
          title: "活动名称",
          key: "promotionName",
-          minWidth: 100,
          fixed: "left",
        },
        {
          title: "优惠券名称",
          key: "couponName",
-          minWidth: 100,
          tooltip: true,
        },
        {
@ -107,18 +105,16 @@ export default {
        {
          title: "领取数量/总数量",
          key: "publishNum",
-          width: 130,
          render: (h, params) => {
            return h(
              "div",
-              params.row.receivedNum + "/" + params.row.publishNum
+              params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '无限制' : params.row.publishNum)
            );
          },
        },
        {
          title: "优惠券类型",
          key: "couponType",
-          width: 120,
          render: (h, params) => {
            let text = "未知";
            if (params.row.couponType === "DISCOUNT") {
@ -195,8 +191,7 @@ export default {
                text
              ),
            ]);
-          },
-          minWidth: 70,
+          }
        },
        {
          title: "操作",
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@ -180,11 +180,11 @@ export default {
        ],
        publishNum: [
          { required: true, message: "请输入发放数量" },
-          { pattern: regular.integer, message: "请输入正整数" },
+          { pattern: regular.Integer, message: "请输入正整数" },
        ],
        couponLimitNum: [
          { required: true, message: "请输入领取限制" },
-          { pattern: regular.integer, message: "请输入正整数" },
+          { pattern: regular.Integer, message: "请输入正整数" },
        ],
        description: [{ required: true, message: "请输入范围描述" }],
      },
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@ -277,6 +277,7 @@ export default {

      // 将数据回调到liveform里面
      if (result.success) {
+        console.log(result);
        let data = result.result;
        for (let key in data) {
          this.liveForm[key] = data[key];
@ -494,11 +495,12 @@ export default {
      this.$refs["liveForm"].validate((valid) => {
        if (valid) {
          // 需判断当前是否是添加商品
-          if (this.$route.query.id && this.liveData.length != 0) {
+          if (this.$route.query.id) {
            this.spinShow = true;
            this.liveForm.commodityList = JSON.stringify(
              this.liveForm.commodityList
            );
+            delete this.liveForm.updateTime
            // 将当前直播间修改
            editLive(this.liveForm).then((res) => {
              if (res.success) {