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

buyer/src/pages/forgetPassword.vue

@@ -93,13 +93,13 @@
     </div>
     <div class="foot">
       <Row type="flex" justify="space-around" class="help">
-        <a class="item" href="https://lilishop.com" target="_blank">帮助</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
-        <a class="item" href="https://lilishop.com" target="_blank">隐私</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
-        <a class="item" href="https://lilishop.com" target="_blank">条款</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
       </Row>
       <Row type="flex" justify="center" class="copyright">
         Copyright © 2020 - Present
-        <a href="http://lili.cn" target="_blank" style="margin: 0 5px"
+        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
           >lili-shop</a
         >
         版权所有

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -29,7 +29,6 @@
             <div>{{ filterOrderStatus(order.orderStatus) }}</div>
             <div>
               订单号：{{ order.sn }} &nbsp; &nbsp; &nbsp;{{order.createTime}}
-              &nbsp; &nbsp;{{ order.memberName | secrecyMobile }}
             </div>
           </div>
           <div>

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}`);
 };
 
 // 获取当前进行中的促销活动商品

manager/src/config/index.js

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

manager/src/views/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",

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') }}

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

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

manager/src/views/page/article-manage/articleList.vue

@@ -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: "确认删除",

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", "长期有效");

manager/src/views/promotion/pointsGoods/pointsGoods.vue

@@ -2,57 +2,22 @@
   <div class="search">
     <Card>
       <Row>
-        <Form
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
           <Form-item label="商品名称">
-            <Input
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
-              type="text"
-              v-model="searchForm.goodsName"
-              placeholder="请输入商品名称"
-              clearable
-              style="width: 200px"
-            />
           </Form-item>
           <Form-item label="积分区间">
-            <Input
+            <Input type="text" v-model="searchForm.pointsS" placeholder="请输入开始区间" clearable style="width: 200px" />
-              type="text"
-              v-model="searchForm.pointsS"
-              placeholder="请输入开始区间"
-              clearable
-              style="width: 200px"
-            />
             -
-            <Input
+            <Input type="text" v-model="searchForm.pointsE" placeholder="请输入结束区间" clearable style="width: 200px" />
-              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
+              <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-                v-for="item in statusList"
-                :value="item.value"
-                :key="item.value"
-                >{{ item.label }}</Option
-              >
             </Select>
           </Form-item>
           <Form-item label="SKU编码">
-            <Input
+            <Input type="text" v-model="searchForm.skuId" placeholder="请输入SKU编码" clearable style="width: 200px" />
-              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>
@@ -61,13 +26,7 @@
         <Button @click="addPointsGoods" type="primary">添加积分商品</Button>
 
       </Row>
-      <Table
+      <Table :loading="loading" border :columns="columns" :data="data" ref="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>
@@ -94,48 +53,15 @@
         </template>
 
         <template slot-scope="{ row }" slot="action">
-          <Button
+          <Button v-if="row.promotionStatus == 'NEW'" type="info" size="small" @click="edit(row.id)" style="margin-right: 5px">编辑</Button>
-            v-if="row.promotionStatus == 'NEW'"
+          <Button v-if="row.promotionStatus == 'START'" type="warning" size="small" @click="statusChanged(row.id, 'CLOSE')" style="margin-right: 5px">停用</Button>
-            type="info"
+          <Button v-if="row.promotionStatus == 'CLOSE'" type="warning" size="small" @click="statusChanged(row.id, 'START')" style="margin-right: 5px">启用</Button>
-            size="small"
+          <Button type="error" size="small" @click="close(row.id)">删除</Button>
-            @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
+        <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"
-          :current="searchForm.pageNumber"
+          show-total show-elevator show-sizer></Page>
-          :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,
         },
       ],

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",},},"结束");
             }
           },
         },

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>

seller/src/api/goods.js

@@ -132,13 +132,13 @@ export const delSpec = (id, params) => {
   return deleteRequest(`/goods/spec/del/${id}`, params);
 };
 //  获取商品规格值列表
-export const getSpecValuesListData = (id, params) => {
+// export const getSpecValuesListData = (id, params) => {
-  return getRequest(`/goods/spec-values/values/${id}`, params);
+//   return getRequest(`/goods/spec-values/values/${id}`, params);
-};
+// };
 //  添加商品规格值
-export const saveSpecValues = (id, params) => {
+// export const saveSpecValues = (id, params) => {
-  return postRequest(`/goods/spec-values/save/${id}`, params);
+//   return postRequest(`/goods/spec-values/save/${id}`, params);
-};
+// };
 
 // 查询某分类下的全部子分类列表
 export const getGoodsCategory = parent_id => {

seller/src/config/index.js

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

seller/src/views/goods/goods-seller/goods.vue

@@ -55,8 +55,7 @@
               </div>
               <Poptip trigger="hover" title="扫码在手机中查看" transfer>
                 <div slot="content">
-                  <vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff"
+                  <vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                          :size="150"></vue-qr>
                 </div>
                 <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
               </Poptip>
@@ -67,15 +66,21 @@
       </Table>
 
       <Row type="flex" justify="end" class="page">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+        <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"
-              @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
           show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
 
     <Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
-      <Input type="number" v-model="stockAllUpdate" placeholder="全部修改，如不需全部修改，则不需输入"/>
+      <Tabs value="updateStock">
+        <TabPane label="手动规格更新" name="updateStock">
           <Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
+        </TabPane>
+        <TabPane label="批量规格更新" name="stockAll">
+          <Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
+        </TabPane>
+      </Tabs>
+
       <div slot="footer">
         <Button type="text" @click="updateStockModalVisible = false">取消</Button>
         <Button type="primary" @click="updateStock">更新</Button>
@@ -86,8 +91,7 @@
     <Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500">
       <Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
         <FormItem class="form-item-view-el" label="运费" prop="freightPayer">
-          <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange"
+          <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
-                      v-model="shipTemplateForm.freightPayer">
             <Radio label="STORE">
               <span>卖家承担运费</span>
             </Radio>

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -185,10 +185,7 @@
                       <div class="sku-item" v-for="(item, $index) in skuInfo" :key="$index">
                         <Card :bordered="true">
                           <FormItem label="规格名：" class="sku-item-content-name">
-                            <AutoComplete style="width: 150px" v-model="item.name" :maxlength="30" :data="specListSelected" placeholder="请输入规格项名称" :filter-method="filterMethod"
+                            <AutoComplete style="width: 150px" v-model="item.name" :maxlength="30" :data="specListSelected" placeholder="请输入规格项名称" />
-                              @on-change="skuItemChange(item.name, $index)" @keyup.enter.native="editSkuItem(item, $index)" @on-focus="
-                                getActiveSkuItem(index, $index, item, val)
-                              " @on-blur="editSkuItem(item, $index)" />
                             <Button type="error" style="margin-left: 10px" @click="handleCloseSkuItem($index)">删除
                             </Button>
                           </FormItem>
@@ -197,22 +194,8 @@
                             <!--规格值文本列表-->
                             <div v-for="(val, index) in item.spec_values" :key="index" style="padding: 0px 20px 10px 0px; float: left">
                               <div>
-                                <AutoComplete style="width: 150px; float: left" v-model="val.value" :maxlength="30" :data="skuValue" placeholder="请输入规格值名称" :filter-method="filterMethod" @on-change="
+                                <AutoComplete style="width: 150px; float: left" v-model="val.value" :maxlength="30" :data="skuValue" placeholder="请输入规格值名称"></AutoComplete>
-                                    skuValueChange(val.value, index, item)
+                                <Button type="error" style="float: left; margin-left: 10px" @click="handleCloseSkuValue($index, index)">删除</Button>
-                                  " @on-focus="
-                                    getActiveSkuValueItem(
-                                      index,
-                                      $index,
-                                      item,
-                                      val
-                                    )
-                                  " @keyup.enter.native="
-                                    editSkuIValue(item, val, $index, index)
-                                  " @on-blur="
-                                    editSkuIValue(item, val, $index, $index)
-                                  "></AutoComplete>
-                                <Button type="error" style="float: left; margin-left: 10px" @click="handleCloseSkuValue($index, index)">删除
-                                </Button>
                               </div>
                             </div>
                             <div style="float: left">
@@ -853,6 +836,7 @@ export default {
         fieldData.unshift(fieldData.splice(index, 1)[0]);
       }
     },
+    // 获取商品模板
     GET_GoodsTemplate() {
       let searchParams = {
         saveType: "TEMPLATE",
@@ -865,6 +849,7 @@ export default {
         }
       });
     },
+    // 编辑sku图片
     editSkuPicture(row) {
       console.log(row);
       if (row.images && row.images.length > 0) {
@@ -952,26 +937,6 @@ export default {
       }
       return !check;
     },
-    async getActiveSkuItem(index, $index, item, val) {
-      this.specSelected = "";
-      await this.GET_SkuSpec();
-    },
-    async getActiveSkuValueItem(index, $index, item, val) {
-      this.specValSelected = "";
-      await this.GET_SkuSpecVal(item.spec_id);
-    },
-    async editSkuItem(item, $index) {
-      if (item.name) {
-        API_GOODS.insertSpecSeller({
-          specName: item.name,
-          categoryPath: this.baseInfoForm.categoryPath,
-        }).then((res) => {
-          if (res.message !== "60001") {
-            this.skuItemChange(item.name, $index);
-          }
-        });
-      }
-    },
         
     gotoGoodsList() {
       this.$router.push({ name: "goods" });
@@ -1170,25 +1135,7 @@ export default {
         }
       );
     },
-    async GET_SkuSpec() {
+
-      if(!this.specSelected){
-        return;
-      }
-      let specResult = await API_GOODS.getSpecListSellerData({
-        pageNumber: 1,
-        pageSize: 10,
-        specName: this.specSelected,
-        categoryPath: this.baseInfoForm.categoryPath,
-      });
-      if (specResult.success && specResult.result.records.length > 0) {
-        this.specListSelected = specResult.result.records.map(
-          (i) => i.specName
-        );
-        this.specList = specResult.result.records;
-      } else {
-        this.specListSelected = [];
-      }
-    },
     /** 添加规格项 */
     addSkuItem() {
       if (this.skuInfo.length >= 5) {
@@ -1296,49 +1243,6 @@ export default {
        */
       this.renderTableData();
     },
-    /** 编辑规格值时触发 */
-    async editSkuIValue(item, val, $index, index) {
-      await API_GOODS.saveSpecValuesSeller(item.spec_id, {
-        spec_value: [val.value],
-      });
-
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    /** 获取编辑时的skuInfo信息 */
-    getSkuInfo() {
-      /** 下拉列表数据(skuData)存在时 检测productSkuInfo中对应的规格(spec_id)项 并且赋值于skuInfo中对应的规格项信息（描述 + 名称） */
-      if (this.categoryId) {
-        API_GOODS.getSpecValuesListData(this.categoryId, {}).then(
-          (response) => {
-            this.skuData = response;
-            if (
-              this.skuData.length > 0 &&
-              Array.isArray(this.productSkuInfo) &&
-              this.productSkuInfo.length > 0
-            ) {
-              this.skuInfo = cloneObj(this.productSkuInfo);
-              if (this.skuInfo.length > 0) {
-                this.skuInfo.forEach((key) => {
-                  this.skuData.forEach((item) => {
-                    if (key.spec_id === item.spec_id) {
-                      key.name = item.name;
-                      key.spec_memo = item.spec_memo;
-                    }
-                  });
-                });
-              }
-            }
-          }
-        );
-      }
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
     /**
      * 渲染table所需要的column 和 data
      */

seller/src/views/login.vue

@@ -162,7 +162,7 @@ export default {
 }
 .login {
   height: 100%;
-  background: url("../assets/background.svg") no-repeat;
+  background: url("../assets/background.png") no-repeat;
   background-size: 100%;
   background-position-y: bottom;
   background-color: #edf0f3;

seller/src/views/main-components/footer.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="foot">
     <Row type="flex" justify="space-around" class="help">
-      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('help') }}</a>
+      <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('help') }}</a>
-      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('privacy') }}</a>
+      <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('privacy') }}</a>
-      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('terms') }}</a>
+      <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('terms') }}</a>
     </Row>
     <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') }}

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

@@ -53,8 +53,8 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
+        sort: "", // 默认排序字段
-        order: "desc", // 默认排序方式
+        order: "", // 默认排序方式
         startDate: "", // 起始时间
         endDate: "", // 终止时间
         orderSn: "",
@@ -80,7 +80,7 @@ export default {
         {
           title: "订单号",
           key: "sn",
-          minWidth: 240,
+          minWidth: 200,
           tooltip: true,
         },
         {
@@ -95,7 +95,7 @@ export default {
             } else if (params.row.clientType == "WECHAT_MP") {
               return h("div", {}, "小程序端");
             } else if (params.row.clientType == "APP") {
-              return h("div", {}, "移动应用端");
+              return h("div", {}, "APP端");
             } else {
               return h("div", {}, params.row.clientType);
             }
@@ -145,11 +145,8 @@ export default {
         {
           title: "下单时间",
           key: "createTime",
-          width: 170,
+          width: 170
-          sortable: true,
-          sortType: "desc",
         },
-
         {
           title: "操作",
           key: "action",

seller/src/views/order/order/virtualOrderList.vue

@@ -69,7 +69,7 @@ export default {
         orderSn: "",
         buyerName: "",
         orderStatus: "",
-        orderType:"VIRTUAL"
+        orderType: "VIRTUAL",
       },
       selectDate: null,
       form: {
@@ -200,8 +200,6 @@ export default {
       let result = await verificationCode(this.orderCode);
 
       if (result.success) {
-
-
         this.$router.push({
           name: "order-detail",
           query: { sn: result.result.sn || this.orderCode },
@@ -228,6 +226,7 @@ export default {
       this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
+      this.searchForm.orderType = "VIRTUAL";
       this.selectDate = null;
       this.searchForm.startDate = "";
       this.searchForm.endDate = "";

seller/src/views/order/receiptManager/receipt.vue

@@ -2,39 +2,15 @@
   <div class="search">
     <Card>
       <Row @keydown.enter.native="handleSearch">
-        <Form
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
           <Form-item label="订单编号" prop="orderSn">
-            <Input
+            <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 200px" />
-              type="text"
-              v-model="searchForm.orderSn"
-              clearable
-              placeholder="请输入订单编号"
-              style="width: 200px"
-            />
           </Form-item>
           <Form-item label="会员名称" prop="memberName">
-            <Input
+            <Input type="text" v-model="searchForm.memberName" clearable placeholder="请输入会员名称" style="width: 200px" />
-              type="text"
-              v-model="searchForm.memberName"
-              clearable
-              placeholder="请输入会员名称"
-              style="width: 200px"
-            />
           </Form-item>
           <Form-item label="发票抬头" prop="receiptTitle">
-            <Input
+            <Input type="text" v-model="searchForm.receiptTitle" clearable placeholder="请输入发票抬头" style="width: 200px" />
-              type="text"
-              v-model="searchForm.receiptTitle"
-              clearable
-              placeholder="请输入发票抬头"
-              style="width: 200px"
-            />
           </Form-item>
           <Form-item label="状态" prop="receiptStatus">
             <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
@@ -46,35 +22,15 @@
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
-      <Table
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      >
         <!-- 订单详情格式化 -->
         <template slot="orderSlot" slot-scope="scope">
-          <a
+          <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-            @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">
-        <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"
-          :current="searchForm.pageNumber"
+          show-total show-elevator show-sizer></Page>
-          :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>
@@ -121,32 +77,40 @@
           title: "会员名称",
           key: "memberName",
           minWidth: 90,
-            tooltip: true
+          tooltip: true,
         },
 
         {
           title: "发票抬头",
           key: "receiptTitle",
           minWidth: 90,
-            tooltip: true
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.receiptTitle || "暂未填写");
+          },
         },
         {
           title: "纳税人识别号",
           key: "taxpayerId",
           minWidth: 100,
-            tooltip: true
+          tooltip: true,
-
+          render: (h, params) => {
+            return h("div", params.row.taxpayerId || "暂未填写");
+          },
         },
         {
           title: "发票内容",
           key: "receiptContent",
           minWidth: 120,
-            tooltip: true
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.receiptContent || "暂未填写");
+          },
         },
         {
           title: "发票金额",
           key: "billPrice",
-            width: 90,
+          width: 150,
           render: (h, params) => {
             return h(
               "div",
@@ -161,9 +125,13 @@
           tooltip: true,
           render: (h, params) => {
             if (params.row.receiptStatus == 0) {
-                return h("div", [h("tag", {props: {color: "volcano"}}, "未开票")]);
+              return h("div", [
+                h("tag", { props: { color: "volcano" } }, "未开票"),
+              ]);
             } else {
-                return h("div", [h("tag", {props: {color: "green"}}, "未开票")]);
+              return h("div", [
+                h("tag", { props: { color: "green" } }, "未开票"),
+              ]);
             }
           },
         },
@@ -173,22 +141,37 @@
           width: 90,
           render: (h, params) => {
             if (params.row.orderStatus == "UNPAID") {
-                return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
+              return h("div", [
+                h("tag", { props: { color: "magenta" } }, "未付款"),
+              ]);
             } else if (params.row.orderStatus == "PAID") {
-                return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
+              return h("div", [
+                h("tag", { props: { color: "blue" } }, "已付款"),
+              ]);
             } else if (params.row.orderStatus == "UNDELIVERED") {
-                return h("div", [h("tag", {props: {color: "geekblue"}}, "待发货")]);
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待发货"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
-                return h("div", [h("tag", {props: {color: "cyan"}}, "已发货")]);
+              return h("div", [
+                h("tag", { props: { color: "cyan" } }, "已发货"),
+              ]);
             } else if (params.row.orderStatus == "COMPLETED") {
-                return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
+              return h("div", [
+                h("tag", { props: { color: "green" } }, "已完成"),
+              ]);
             } else if (params.row.orderStatus == "TAKE") {
-                return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
+              return h("div", [
+                h("tag", { props: { color: "volcano" } }, "待核验"),
+              ]);
             } else if (params.row.orderStatus == "CANCELLED") {
-                return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
+              return h("div", [
-              }
+                h("tag", { props: { color: "red" } }, "已取消"),
+              ]);
             }
           },
+        },
+
         {
           title: "操作",
           key: "action",
@@ -204,7 +187,11 @@
                     size: "small",
                   },
                   attrs: {
-                      disabled: params.row.orderStatus == "COMPLETED"  && params.row.receiptStatus == 0? false : true,
+                    disabled:
+                      params.row.orderStatus == "COMPLETED" &&
+                      params.row.receiptStatus == 0
+                        ? false
+                        : true,
                   },
                   style: {
                     marginRight: "5px",
@@ -244,7 +231,7 @@
       this.getData();
     },
     handleReset() {
-        this.searchForm = {}
+      this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getData();
@@ -296,12 +283,13 @@
             this.$Modal.remove();
             this.getData();
           });
-
+        },
-
-          }
       });
     },
   },
+  mounted() {
+    this.init();
+  },
   activated() {
     this.init();
   },

seller/src/views/promotion/fullCut/newFullCut.vue

@@ -113,9 +113,11 @@
               > 
               <Checkbox
                 :disabled="form.promotionStatus != 'NEW'"
+                v-if="JSON.parse(getStore('userInfo')).selfOperated"
                 v-model="form.isPoint"
                 >送积分</Checkbox
               >
+
             </FormItem>
             <FormItem v-if="form.isCoupon" label="赠送优惠券" prop="couponId">
               <Select

seller/src/views/promotion/live/addLive.vue

@@ -130,7 +130,7 @@
         </FormItem>
 
         <FormItem>
-          <Button type="primary" @click="createLives()">保存</Button>
+          <Button type="primary" v-if="liveStatus=='NEW'" @click="createLives()">保存</Button>
 
         </FormItem>
       </Form>
@@ -342,8 +342,7 @@ export default {
      * dialog点击确定时判断
      */
     addGoods() {
-      console.log(this.commodityList);
+      this.liveData.forEach((item) => {
-      this.liveData.forEach((item, index) => {
         if (this.commodityList.length == 1 && this.liveData.length == 1) {
           addLiveGoods({
             roomId: this.$route.query.roomId,
@@ -517,7 +516,7 @@ export default {
               if (res.success) {
                 this.$Message.success("修改成功!");
 
-                this.$router.push({ path: "/storePromotion/live" });
+                this.$router.push({ path: "/promotion/live" });
               }
               this.spinShow = false;
             });
@@ -528,7 +527,7 @@ export default {
               if (res.success) {
                 this.$Message.success("添加成功!");
 
-                this.$router.push({ path: "/storePromotion/live" });
+                this.$router.push({ path: "/promotion/live" });
               }
               this.spinShow = false;
             });

seller/src/views/promotion/pintuan/pintuan.scss

@@ -1,41 +1,11 @@
-
 .search {
   .operation {
     margin-bottom: 2vh;
   }
-
-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
-
-  .select-clear {
-    margin-left: 10px;
-  }
-
   .page {
     margin-top: 2vh;
   }
-
-  .drop-down {
-    margin-left: 5px;
-  }
-}
-
-.newPromotionView {
-  width: 80%;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-
-
-  Input {
-    flex-direction: row;
-  }
-
-  .slotSpan {
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
 }
+.row {
+  margin-bottom: 5px;
 }

seller/src/views/promotion/pintuan/pintuan.vue

@@ -52,6 +52,7 @@
         @on-selection-change="changeSelect"
       >
         <template slot-scope="{ row }" slot="action">
+          <div  class="row">
           <Button
             type="primary"
             size="small"
@@ -97,6 +98,7 @@
             @click="close(row)"
             >关闭</Button
           >
+          </div>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">

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";