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

manager/src/views/goods/goods-info/goodsDetail.vue

@@ -72,14 +72,24 @@
                 </Modal>
               </div>
             </FormItem>
+            <FormItem label="商品视频">
+              <video
+                v-if="goods.goodsVideo"
+                controls
+                class="player"
+                :src="goods.goodsVideo"
+              />
+            </FormItem>
             <FormItem label="商品规格">
               <Table :columns="skuColumn" :data="skuData">
                 <template slot="showImage" slot-scope="scope">
-                  <div style="margin-top: 5px; height: 80px; display: flex">
+                  <div style="margin-top: 5px; display: flex">
                     <div>
                       <img
-                        :src="scope.row.image"
+                        v-for="(item,index) in scope.row.image"
-                        style="height: 60px; margin-top: 1px; width: 60px"
+                        :key="index"
+                        :src="item"
+                        style="height: 60px; margin:10px; width: 60px"
                       />
                     </div>
                   </div>
@@ -191,7 +201,8 @@ export default {
             weight: sku.weight,
             cost: sku.cost,
             price:sku.price,
-            image: sku.thumbnail,
+            image: sku.goodsGalleryList,
+            quantity:sku.quantity
           });
         });
         if (res.result.salesModel === "WHOLESALE" && res.result.wholesaleList) {
@@ -214,9 +225,12 @@ export default {
             {
               title: "价格",
               key: "price",
-              render: (h, params) => {
+              render: (h, params) => {v
-                return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
+                return h("priceColorScheme", {props:{alue:params.row.price,color:this.$mainColor}} );
               },
+            },{
+              title: "库存",
+              key: "quantity",
             }
           );
         }

manager/src/views/goods/goods-manage/brand.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="search">
     <Card>
-      <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70"
+      <Form ref="searchForm" @submit.native.prevent @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70"
             class="search-form">
         <Form-item label="品牌名称">
           <Input type="text" v-model="searchForm.name" placeholder="请输入品牌名称" clearable style="width: 200px"/>

manager/src/views/goods/goods-manage/spec.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="search">
     <Card>
-      <Form @keydown.enter.native="handleSearch" ref="searchForm" :model="searchForm" inline :label-width="70"
+      <Form @submit.native.prevent @keydown.enter.native="handleSearch" ref="searchForm" :model="searchForm" inline :label-width="70"
         class="search-form">
         <Form-item label="规格名称" prop="specName">
           <Input type="text" v-model="searchForm.specName" placeholder="请输入规格名称" clearable style="width: 200px" />

manager/src/views/order/after-order/orderComplaintDetail.vue

@@ -151,7 +151,7 @@
                 <img :src="complaintInfo.goodsImage" height="60px">
               </dt>
               <dd>
-                <a>{{complaintInfo.goodsName}}</a><br>
+                <a @click="linkTo(complaintInfo.goodsId, complaintInfo.skuId)">{{complaintInfo.goodsName}}</a><br>
                 <span>￥{{complaintInfo.goodsPrice}} * {{complaintInfo.num}}(数量)</span>
               </dd>
             </dl>

manager/src/views/promotions/coupon/coupon-publish.vue

@@ -566,10 +566,11 @@ export default {
         onOk: () => {
           let ids = [];
           this.selectedGoods.forEach(function (e) {
-            ids.push(e.id);
+            ids.push(e.skuId);
           });
+
           this.form.promotionGoodsList = this.form.promotionGoodsList.filter((item) => {
-            return !ids.includes(item.id);
+            return !ids.includes(item.skuId);
           });
         },
       });

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

@@ -199,6 +199,7 @@
             <Icon type="ios-cloud-upload" size="102" style="color: #3399ff"></Icon>
             <h2>选择或拖拽文件上传</h2>
           </div>
+          <Spin fix v-if="spinShow"></Spin>
         </Upload>
         <Button @click="exportGoods" type="text" style="color: red">下载导入模板</Button>
       </div>
@@ -222,13 +223,14 @@ import {
 } from "@/api/goods";
 import { baseUrl } from "@/libs/axios.js";
 import * as API_Shop from "@/api/shops";
-import Cookies from "js-cookie";
+
 import {uploadGoodsExcel} from "../../../api/goods";
 
 export default {
   name: "goods",
   data() {
     return {
+      spinShow:false,
       accessToken: {}, // 验证token
       importModal: false,
       action: baseUrl + "/goods/import/import", // 上传接口
@@ -546,15 +548,11 @@ export default {
     async upload() {
       let fd = new FormData();
       fd.append("files", this.file);
+      this.spinShow = false
       let res = await uploadGoodsExcel(fd);
       if (res.success) {
-        this.stepList.map((item) => {
+        this.spinShow = true
-          item.checked = false;
         this.$Message.success("导入成功")
-          this.importModal = false
-        });
-
-        this.stepList[2].checked = true;
       }
     },
     openImportGoods(){

seller/src/views/promotion/coupon/coupon.vue

@@ -277,9 +277,14 @@ export default {
       this.getDataList();
     },
     handleReset() {
-      this.searchForm = {};
+      this.searchForm = {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      };
       this.selectDate = "";
-      this.searchForm.pageNumber = 1;
       this.getDataList();
     },
     clearSelectAll() {

seller/src/views/promotion/full-discount/full-discount.vue

@@ -168,9 +168,13 @@ export default {
     // 重置
     handleReset () {
       this.selectDate = "";
-      this.searchForm = {};
+      this.searchForm = {
-      this.searchForm.pageNumber = 1;
+        // 搜索框初始化对象
-      this.searchForm.pageSize = 10;
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      };
       this.getDataList();
     },
     //  编辑

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

@@ -205,10 +205,15 @@ export default {
     },
     // 重置
     handleReset() {
-      this.searchForm = {};
+      this.searchForm = {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime",
+        order: "desc", // 默认排序方式
+      };
       this.selectDate = "";
-      this.searchForm.pageNumber = 0;
+
-      this.searchForm.pageSize = 10;
       this.getDataList();
     },
     // 时间段分别赋值

seller/src/views/promotion/seckill/seckill.vue

@@ -145,10 +145,14 @@ export default {
     },
     // 重置
     handleReset () {
-      this.searchForm = {};
+      this.searchForm = {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime",
+        order: "desc", // 默认排序方式
+      };
       this.selectDate = "";
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
       this.getDataList();
     },
     // 管理