From 0a1182f1e6686d12600eed305e15b0d89affc1ba Mon Sep 17 00:00:00 2001
From: Yer11214 <17633066053@163.com>
Date: Mon, 7 Oct 2024 22:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3oss=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/editor/upload-image.vue    | 23 +++++++++----------
 manager/src/views/goods/goodsOperationSec.vue |  8 +------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/manager/src/components/editor/upload-image.vue b/manager/src/components/editor/upload-image.vue
index 071c73a7..c2498522 100644
--- a/manager/src/components/editor/upload-image.vue
+++ b/manager/src/components/editor/upload-image.vue
@@ -57,13 +57,14 @@
     </Modal>
 
     <Modal width="1000" v-model="showOssManager" @on-ok="confirmUrls">
-    <OssManage ref="ossManage" :isComponent="true" :initialize="showOssManager" @selected="handleCallback"  />
+    <OssManage ref="ossManage" :isComponent="true" :initialize="showOssManager"  @selected="(list)=>{ selectedImage = list}" @callback="handleCallback" />
     </Modal>
   </div>
 </template>
 <script>
 import vuedraggable from "vuedraggable";
-import { uploadFile } from "@/libs/axios";
+import {uploadFile} from "@/libs/axios";
+// import OssManage from "@/views/sys/oss-manage/ossManage";
 import OssManage from "@/views/sys/oss-manage/ossManage.vue";
 
 export default {
@@ -88,11 +89,8 @@ export default {
     };
   },
   methods: {
-    confirmUrl(){
-
-    },
     handleClickUploadImage(){
-      this.show = true
+      this.show = true;
     },
     // 回调给父级
     callback() {
@@ -122,21 +120,22 @@ export default {
     handleSuccessGoodsPicture(res, file) {
       if (file.response) {
         file.url = file.response.result;
-          this.images.push(file);
+        this.images.push(file);
       }
     },
     confirmUrls(){
-      this.selectedImage.length ? this.selectedImage.forEach(element => {
-        this.images.push({ url: element.url })
-      }):''
+      // this.selectedImage.length ? this.selectedImage.forEach(element => {
+      //   this.images.push({ url: element.url })
+      // }):''
       this.showOssManager = false
     },
     handleCallback(val){
-      this.selectedImage = val
+      this.$Message.success("导入成功")
+      this.images.push({url:val.url})
     },
     // 从资源库中导入图片
     importOSS(){
-      this.showOssManager = true
+      this.showOssManager = true;
       this.$refs.ossManage.selectImage = true;
     }
   }
diff --git a/manager/src/views/goods/goodsOperationSec.vue b/manager/src/views/goods/goodsOperationSec.vue
index 2ec73c3b..17b43f76 100644
--- a/manager/src/views/goods/goodsOperationSec.vue
+++ b/manager/src/views/goods/goodsOperationSec.vue
@@ -354,12 +354,6 @@
           </div>
           <h4>商品详情描述</h4>
           <div class="form-item-view">
-            <div class="tree-bar">
-              <FormItem class="form-item-view-el" label="店内分类" prop="shopCategory">
-                <Tree ref="tree" :check-strictly="false" :data="shopCategory" show-checkbox style="text-align: left"
-                      @on-select-change="selectTree" @on-check-change="changeSelect"></Tree>
-              </FormItem>
-            </div>
             <FormItem class="form-item-view-el" label="PC商品描述" prop="intro" style="width: 100%">
               <editor
                 ref="editor"
@@ -1187,7 +1181,7 @@ export default {
       this.goodsParams = []
       API_GOODS.getCategoryParamsListDataSeller(this.categoryId).then(
         (response) => {
-          if (!response || response.length <= 0) {
+          if (!Array.isArray(response) || response.length <= 0) {
             return;
           }
           this.goodsParams = response;