diff --git a/manager/src/components/editor/upload-image.vue b/manager/src/components/editor/upload-image.vue
index 9e598731..071c73a7 100644
--- a/manager/src/components/editor/upload-image.vue
+++ b/manager/src/components/editor/upload-image.vue
@@ -57,7 +57,7 @@
-
+
diff --git a/manager/src/components/hotzone/components/Zone.vue b/manager/src/components/hotzone/components/Zone.vue
index 30629309..6da0b114 100644
--- a/manager/src/components/hotzone/components/Zone.vue
+++ b/manager/src/components/hotzone/components/Zone.vue
@@ -90,6 +90,7 @@
diff --git a/manager/src/components/lili/upload-pic-input.vue b/manager/src/components/lili/upload-pic-input.vue
index c5814aaf..bde7e703 100644
--- a/manager/src/components/lili/upload-pic-input.vue
+++ b/manager/src/components/lili/upload-pic-input.vue
@@ -47,7 +47,7 @@
-
+
@@ -111,7 +111,6 @@ export default {
},
// 图片回显
callbackSelected(val) {
- console.log('图片回显', val);
this.picModalFlag = false;
this.currentValue = val.url;
this.picIndex = "";
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index dc8eae1e..3611c63e 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -94,7 +94,7 @@
-
+
diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue
index 91416b31..22fc52c8 100644
--- a/manager/src/views/member/list/memberRecycle.vue
+++ b/manager/src/views/member/list/memberRecycle.vue
@@ -140,7 +140,7 @@
-
+
diff --git a/manager/src/views/page-decoration/modelForm.vue b/manager/src/views/page-decoration/modelForm.vue
index acfaefce..b19d7f8a 100644
--- a/manager/src/views/page-decoration/modelForm.vue
+++ b/manager/src/views/page-decoration/modelForm.vue
@@ -161,6 +161,7 @@
diff --git a/manager/src/views/page-decoration/modelFormItem.vue b/manager/src/views/page-decoration/modelFormItem.vue
index 9f3ccb4e..a1a3a55e 100644
--- a/manager/src/views/page-decoration/modelFormItem.vue
+++ b/manager/src/views/page-decoration/modelFormItem.vue
@@ -246,6 +246,7 @@
diff --git a/manager/src/views/page-decoration/modelList/carousel.vue b/manager/src/views/page-decoration/modelList/carousel.vue
index 60f7fe15..64559175 100644
--- a/manager/src/views/page-decoration/modelList/carousel.vue
+++ b/manager/src/views/page-decoration/modelList/carousel.vue
@@ -121,6 +121,7 @@
diff --git a/manager/src/views/page-decoration/modelList/carousel1.vue b/manager/src/views/page-decoration/modelList/carousel1.vue
index 213606dc..e03751a1 100644
--- a/manager/src/views/page-decoration/modelList/carousel1.vue
+++ b/manager/src/views/page-decoration/modelList/carousel1.vue
@@ -84,7 +84,7 @@
-
+
diff --git a/manager/src/views/page-decoration/modelList/carousel2.vue b/manager/src/views/page-decoration/modelList/carousel2.vue
index d775feac..bf6a2723 100644
--- a/manager/src/views/page-decoration/modelList/carousel2.vue
+++ b/manager/src/views/page-decoration/modelList/carousel2.vue
@@ -204,7 +204,7 @@
-
+
diff --git a/manager/src/views/page-decoration/modelList/firstPageAdvert.vue b/manager/src/views/page-decoration/modelList/firstPageAdvert.vue
index a01f4092..2568df6b 100644
--- a/manager/src/views/page-decoration/modelList/firstPageAdvert.vue
+++ b/manager/src/views/page-decoration/modelList/firstPageAdvert.vue
@@ -85,6 +85,7 @@
@@ -195,4 +196,4 @@ export default {
height: 50px;
}
}
-
\ No newline at end of file
+
diff --git a/manager/src/views/page-decoration/modelList/forYour.vue b/manager/src/views/page-decoration/modelList/forYour.vue
index a644b3a7..0c3af4b4 100644
--- a/manager/src/views/page-decoration/modelList/forYour.vue
+++ b/manager/src/views/page-decoration/modelList/forYour.vue
@@ -168,6 +168,7 @@
diff --git a/manager/src/views/page-decoration/modelList/mixModel.vue b/manager/src/views/page-decoration/modelList/mixModel.vue
index 8f7edb57..cb11329f 100644
--- a/manager/src/views/page-decoration/modelList/mixModel.vue
+++ b/manager/src/views/page-decoration/modelList/mixModel.vue
@@ -152,6 +152,7 @@
diff --git a/manager/src/views/page-decoration/modelList/newGoodsSort.vue b/manager/src/views/page-decoration/modelList/newGoodsSort.vue
index 4e6f07ab..b6cedf8d 100644
--- a/manager/src/views/page-decoration/modelList/newGoodsSort.vue
+++ b/manager/src/views/page-decoration/modelList/newGoodsSort.vue
@@ -216,6 +216,7 @@
@@ -443,4 +444,4 @@ export default {
align-items: start;
padding: 0 30px;
}
-
\ No newline at end of file
+
diff --git a/manager/src/views/page-decoration/modelList/oneRowThreeColumns.vue b/manager/src/views/page-decoration/modelList/oneRowThreeColumns.vue
index 244735c2..5aff7791 100644
--- a/manager/src/views/page-decoration/modelList/oneRowThreeColumns.vue
+++ b/manager/src/views/page-decoration/modelList/oneRowThreeColumns.vue
@@ -54,6 +54,7 @@
diff --git a/manager/src/views/page-decoration/modelList/recommend.vue b/manager/src/views/page-decoration/modelList/recommend.vue
index 31db3eef..adbeaa6e 100644
--- a/manager/src/views/page-decoration/modelList/recommend.vue
+++ b/manager/src/views/page-decoration/modelList/recommend.vue
@@ -209,6 +209,7 @@
@@ -427,4 +428,4 @@ export default {
align-items: start;
padding: 0 30px;
}
-
\ No newline at end of file
+
diff --git a/manager/src/views/page-decoration/wap/advertising.vue b/manager/src/views/page-decoration/wap/advertising.vue
index a6945717..73e56188 100644
--- a/manager/src/views/page-decoration/wap/advertising.vue
+++ b/manager/src/views/page-decoration/wap/advertising.vue
@@ -80,7 +80,7 @@
-
+
diff --git a/manager/src/views/page-decoration/wap/alertAdvertising.vue b/manager/src/views/page-decoration/wap/alertAdvertising.vue
index bb5f7afd..64584d6d 100644
--- a/manager/src/views/page-decoration/wap/alertAdvertising.vue
+++ b/manager/src/views/page-decoration/wap/alertAdvertising.vue
@@ -83,7 +83,7 @@
>
-
+
diff --git a/manager/src/views/page-decoration/wap/decorate.vue b/manager/src/views/page-decoration/wap/decorate.vue
index 5d58e1f7..7becf254 100644
--- a/manager/src/views/page-decoration/wap/decorate.vue
+++ b/manager/src/views/page-decoration/wap/decorate.vue
@@ -497,7 +497,7 @@
-
+
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index 1eb0fc3f..aa698360 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -374,8 +374,8 @@
-
-
+
+
@@ -433,7 +433,7 @@ export default {
loading: false,
auditModel: false,
auditModalLoading: false,
- picModalFlag: false, // 图片选择器
+ picModelFlag: false, // 图片选择器
address: "", // 地址
returnAddress: "", // 退货地址
memberModalFlag: false, // 商家账号
@@ -634,13 +634,13 @@ export default {
// 选择图片modal
handleCLickImg(val, index) {
this.$refs.ossManage.selectImage = true;
- this.picModalFlag = true;
+ this.picModelFlag = true;
this.selectedFormBtnName = val;
this.picIndex = index;
},
// 图片回显
callbackSelected(val) {
- this.picModalFlag = false;
+ this.picModelFlag = false;
if (this.picIndex === 0 || this.picIndex === 1) {
this.shopForm[this.selectedFormBtnName][this.picIndex] = val.url;
} else {
diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue
index 4cae2593..f1f1269a 100644
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -431,7 +431,11 @@ export default {
choose: {
type: String,
default: ""
- }
+ },
+ initialize: {
+ type: Boolean,
+ default: false,
+ },
},
data() {
return {
@@ -858,9 +862,15 @@ export default {
if (val) this.selectImage = val
},
selectedOss(val) {
- if (val) {
+ if (val && val.length) {
this.$emit("callback", {url: val[val.length-1].split(',')[1]});
}
+ },
+ // 初始化监听 是否清空所选图片
+ initialize(val) {
+ if (val && this.isComponent) {
+ this.selectedOss = [];
+ }
}
},
diff --git a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
index cab33f2c..fd3c551e 100644
--- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@@ -75,7 +75,7 @@
-
+
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index d5955fe0..ea2f39b3 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -472,11 +472,11 @@
-
+
-
- { selectedImage = list}"/>
+
+ { selectedImage = list}"/>
@@ -688,7 +688,7 @@ export default {
"specId",
"specValueId",
],
- picModalFlag: false, // 图片选择器
+ picModelFlag: false, // 图片选择器
selectedFormBtnName: "", // 点击图片绑定form
selectedImage: [],
lastEditSkuValue: '',
@@ -706,7 +706,7 @@ export default {
// 选择图片modal
handleCLickImg(val, index) {
this.$refs.ossManage.selectImage = true;
- this.picModalFlag = true;
+ this.picModelFlag = true;
this.selectedFormBtnName = val;
// this.picIndex = index;
},
@@ -744,7 +744,7 @@ export default {
},
// 图片选择后回调
callbackSelected(val) {
- this.picModalFlag = false;
+ this.picModelFlag = false;
if (val && this.selectedFormBtnName == 'selectedSkuImages') {
this.selectedSku.images.push(val);
} else {
diff --git a/seller/src/views/lili-components/editor/upload-image.vue b/seller/src/views/lili-components/editor/upload-image.vue
index 6373db62..44ee38f7 100644
--- a/seller/src/views/lili-components/editor/upload-image.vue
+++ b/seller/src/views/lili-components/editor/upload-image.vue
@@ -57,7 +57,7 @@
- { selectedImage = list}" @callback="handleCallback" />
+ { selectedImage = list}" @callback="handleCallback" />
diff --git a/seller/src/views/my-components/lili/upload-pic-thumb.vue b/seller/src/views/my-components/lili/upload-pic-thumb.vue
index 630bb1e8..b17e030c 100644
--- a/seller/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/seller/src/views/my-components/lili/upload-pic-thumb.vue
@@ -56,8 +56,8 @@
-
- { selectedImage = list}" ref="ossManage" />
+
+ { selectedImage = list}" ref="ossManage" />
@@ -108,7 +108,7 @@ export default {
uploadList: [], // 上传文件列表
viewImage: false, // 是否预览图片
imgUrl: "", // 图片地址
- picModalFlag: false, // 图片选择器
+ picModelFlag: false, // 图片选择器
selectedFormBtnName: "", // 点击图片绑定form
selectedImage: [],
};
@@ -117,12 +117,12 @@ export default {
// 选择图片modal
handleCLickImg(val, index) {
this.$refs.ossManage.selectImage = true;
- this.picModalFlag = true;
+ this.picModelFlag = true;
this.selectedFormBtnName = val;
},
// 图片选择后回调
callbackSelected(val) {
- this.picModalFlag = false;
+ this.picModelFlag = false;
if (!this.multiple && this.uploadList && this.uploadList.length > 0) {
// 删除第一张
this.uploadList.splice(0, 1);
diff --git a/seller/src/views/shop/hotzone/components/Zone.vue b/seller/src/views/shop/hotzone/components/Zone.vue
index 9ab67499..bbf32657 100644
--- a/seller/src/views/shop/hotzone/components/Zone.vue
+++ b/seller/src/views/shop/hotzone/components/Zone.vue
@@ -87,11 +87,7 @@
-
+
diff --git a/seller/src/views/shop/modelForm.vue b/seller/src/views/shop/modelForm.vue
index 4c2356cb..4820bda9 100644
--- a/seller/src/views/shop/modelForm.vue
+++ b/seller/src/views/shop/modelForm.vue
@@ -150,11 +150,7 @@
-
+
diff --git a/seller/src/views/shop/modelFormItem.vue b/seller/src/views/shop/modelFormItem.vue
index 8c0af939..0f1b3343 100644
--- a/seller/src/views/shop/modelFormItem.vue
+++ b/seller/src/views/shop/modelFormItem.vue
@@ -216,7 +216,7 @@
>
-
+
diff --git a/seller/src/views/shop/modelList/carousel.vue b/seller/src/views/shop/modelList/carousel.vue
index 4f54f448..cfa2873b 100644
--- a/seller/src/views/shop/modelList/carousel.vue
+++ b/seller/src/views/shop/modelList/carousel.vue
@@ -114,7 +114,7 @@
>
-
+
diff --git a/seller/src/views/shop/modelList/carousel1.vue b/seller/src/views/shop/modelList/carousel1.vue
index f3421b6a..6feba2b7 100644
--- a/seller/src/views/shop/modelList/carousel1.vue
+++ b/seller/src/views/shop/modelList/carousel1.vue
@@ -85,7 +85,7 @@
>
-
+
diff --git a/seller/src/views/shop/modelList/carousel2.vue b/seller/src/views/shop/modelList/carousel2.vue
index 99e52a87..7a553f9a 100644
--- a/seller/src/views/shop/modelList/carousel2.vue
+++ b/seller/src/views/shop/modelList/carousel2.vue
@@ -175,7 +175,7 @@
>
-
+
diff --git a/seller/src/views/shop/modelList/firstPageAdvert.vue b/seller/src/views/shop/modelList/firstPageAdvert.vue
index 1150f191..f9d77c2b 100644
--- a/seller/src/views/shop/modelList/firstPageAdvert.vue
+++ b/seller/src/views/shop/modelList/firstPageAdvert.vue
@@ -58,7 +58,7 @@
>
-
+
diff --git a/seller/src/views/shop/modelList/newGoodsSort.vue b/seller/src/views/shop/modelList/newGoodsSort.vue
index b473e396..5cdc74be 100644
--- a/seller/src/views/shop/modelList/newGoodsSort.vue
+++ b/seller/src/views/shop/modelList/newGoodsSort.vue
@@ -134,7 +134,7 @@
>
-
+
diff --git a/seller/src/views/shop/modelList/recommend.vue b/seller/src/views/shop/modelList/recommend.vue
index 989823e3..542314ef 100644
--- a/seller/src/views/shop/modelList/recommend.vue
+++ b/seller/src/views/shop/modelList/recommend.vue
@@ -200,7 +200,7 @@
>
-
+
diff --git a/seller/src/views/shop/ossManages.vue b/seller/src/views/shop/ossManages.vue
index 6182e3d4..58ce1a48 100644
--- a/seller/src/views/shop/ossManages.vue
+++ b/seller/src/views/shop/ossManages.vue
@@ -217,7 +217,11 @@
choose: {
type: String,
default: ""
- }
+ },
+ initialize: {
+ type: Boolean,
+ default: false,
+ },
},
data() {
return {
@@ -643,9 +647,15 @@
if (val) this.selectImage = val
},
selectedOss(val) {
- if (val) {
+ if (val && val.length) {
this.$emit("callback", {url: val[val.length-1].split(',')[1]});
}
+ },
+ // 初始化监听 是否清空所选图片
+ initialize(val) {
+ if (val && this.isComponent) {
+ this.selectedOss = [];
+ }
}
},
diff --git a/seller/src/views/shop/wap/decorate.vue b/seller/src/views/shop/wap/decorate.vue
index d7dd8802..9f300a2f 100644
--- a/seller/src/views/shop/wap/decorate.vue
+++ b/seller/src/views/shop/wap/decorate.vue
@@ -221,7 +221,7 @@
>
-
+