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"
-                        style="height: 60px; margin-top: 1px; width: 60px"
+                        v-for="(item,index) in scope.row.image"
+                        :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) => {
-                return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
+              render: (h, params) => {v
+                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);
           });
         },
       });