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

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -586,7 +586,6 @@ export default {
       if (!this.imgList) {
         this.imgList = [this.skuDetail.original];
       }
-      console.log(this.imgList);
 
     },
   },

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

@@ -287,8 +287,7 @@
                           .ivu-table-overflowX {
                             overflow-x: hidden;
                           }
-                        "
-                             @mouseenter="handleMouseEnter">
+                        ">
                         <template slot="sn" slot-scope="{ row }">
                           <Input v-model="row.sn" clearable placeholder="请输入货号"
                                  @on-change="updateSkuTable(row, 'sn')"/>
@@ -530,6 +529,7 @@ export default {
       total: 0,
       goodsVideo: "",
       showContent: false,
+      loadingVideo: false,
       listImages: [],
       newSkuValues: [],
       contentImage: "",
@@ -721,6 +721,13 @@ export default {
         })
       }
     },
+    // ship大小不正确
+    handleVideoMaxSize(file) {
+      this.$Notice.warning({
+        title: "超过文件大小限制",
+        desc: "视频大小不能超过10MB",
+      });
+    },
     onAddSku(index) {
       if (!this.newSkuValues[index]) {
         this.$Message.error('请输入规格值')
@@ -856,7 +863,7 @@ export default {
     },
     // 移除已选图片
     handleRemove(item, index) {
-      images.splice(index, 1)
+      item.splice(index, 1)
       this.previewPicture = "";
     },
     // 查看商品大图
@@ -953,6 +960,7 @@ export default {
     },
     // 商品图片上传成功
     handleSuccessGoodsPicture(res, file) {
+      this.$Spin.hide();
       if (file.response) {
         file.url = file.response.result;
         this.baseInfoForm.goodsGalleryFiles.push(file.url);