From d2bc62e4cc3b415f21fac42db16552cfe6907c4e Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 22 Dec 2022 04:59:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=AA=8C=E8=AF=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Creative/Material.vue               |  8 ++--
 .../Creative/components/ChooseMarerial.vue    |  8 ++--
 .../Creative/components/Create3D.constant.js  |  6 ++-
 src/views/Creative/components/Create3D.vue    | 39 +++++++++++++++++--
 .../Creative/components/CreateMaterial.vue    | 15 +++++++
 .../Index.vue}                                |  0
 6 files changed, 64 insertions(+), 12 deletions(-)
 rename src/views/Creative/components/{Previewer.vue => PreviewerCreation/Index.vue} (100%)

diff --git a/src/views/Creative/Material.vue b/src/views/Creative/Material.vue
index 78d03abb..c05db202 100644
--- a/src/views/Creative/Material.vue
+++ b/src/views/Creative/Material.vue
@@ -45,7 +45,7 @@
                     <template #overlay>
                       <a-menu>
                         <a-menu-item>
-                          <a href="javascript:;" @click="previewerRef.show()">预览</a>
+                          <a href="javascript:;" @click="previewerCreationRef.show()">预览</a>
                         </a-menu-item>
                         <a-menu-item>
                           <a href="javascript:;" @click="renameMeterialRef.show(row)">重命名</a>
@@ -62,7 +62,7 @@
           </div>
         </div>
       </div>
-      <Previewer ref="previewerRef" />
+      <PreviewerCreation ref="previewerCreationRef" />
       <RenameMeterial ref="renameMeterialRef" @complete="query" />
       <CreateMaterial ref="createMaterialRef" @complete="query" />
     </div>
@@ -74,13 +74,13 @@
 import { SearchOutlined, PlusOutlined } from "@ant-design/icons-vue"
 import { computed, ref, watch } from "@vue/runtime-core";
 import { Modal } from "ant-design-vue";
-import Previewer from "./components/Previewer.vue";
+import PreviewerCreation from "./components/PreviewerCreation/Index.vue";
 import RenameMeterial from "./components/RenameMeterial.vue";
 import CreateMaterial from "./components/CreateMaterial.vue";
 import { THREE_D_TYPE, THREE_D_TYPE_S } from "./components/CreateMaterial.constant";
 import { getMaterialLibrary, delMaterialLibrary } from "./api";
 
-const previewerRef = ref();
+const previewerCreationRef = ref();
 const renameMeterialRef = ref();
 const createMaterialRef = ref();
 
diff --git a/src/views/Creative/components/ChooseMarerial.vue b/src/views/Creative/components/ChooseMarerial.vue
index a65cad29..59608f7a 100644
--- a/src/views/Creative/components/ChooseMarerial.vue
+++ b/src/views/Creative/components/ChooseMarerial.vue
@@ -2,7 +2,7 @@
   <div class="choose-marerial">
     <div class="item" v-for="(item, index) in list" :key="index" :class="current.includes(item) ? 'selected' : ''" @click="toggle(item)">
       <div class="cover">
-        <img :src="item.material_json?.urlThumb" alt="">
+        <img v-if="item.cover" :src="item.cover" alt="">
       </div>
       <div class="title">
         {{item.title}}
@@ -59,8 +59,10 @@ onMounted(async () => {
     .cover{
       width: 100%;
       height: 120px;
+      overflow: hidden;
       img{
-        max-width: 100%;
+        width: 100%;
+        height: 100%;
       }
     }
     .title{
@@ -69,7 +71,7 @@ onMounted(async () => {
     }
   }
   .selected{
-    outline: solid 1px green;
+    border: solid 1px green;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/Creative/components/Create3D.constant.js b/src/views/Creative/components/Create3D.constant.js
index 79b7b01e..378e5c60 100644
--- a/src/views/Creative/components/Create3D.constant.js
+++ b/src/views/Creative/components/Create3D.constant.js
@@ -99,10 +99,12 @@ const factorys = [
       const data = origin.data;
       var key = new Date().getTime();
 
-      origin = {
-        imgs: data.data.fileList.map(x => ({name: x.name, url: x.response.url}))
+      origin.data = {
+        imgs: data.fileList.map(x => ({name: x.name, url: x.response.url}))
       };
 
+      origin.cover = data.fileList[0].response.url;
+
       return origin;
     }
   },
diff --git a/src/views/Creative/components/Create3D.vue b/src/views/Creative/components/Create3D.vue
index 3c36cd52..280bf4fe 100644
--- a/src/views/Creative/components/Create3D.vue
+++ b/src/views/Creative/components/Create3D.vue
@@ -64,6 +64,7 @@ import ChooseMarerial from "./ChooseMarerial.vue"
 const { ref, reactive }=require("@vue/reactivity");
 import common from "@/api/common.js";
 import { createMaterialCenter } from "../api";
+import { message } from 'ant-design-vue';
 
 const emit = defineEmits(["complete"]);
 
@@ -113,7 +114,35 @@ const show = (type) => {
 }
 
 const ok = async () => {
+  if(step.value == 0) {
+    if(!formData.value.title) {
+      message.warning("请输入素材名称")
+      return;
+    }
+  }
   if(formData.value.type == CREATIVE_TYPE.THREE_D) {
+    if(step.value == 1) {
+      if(formData.value.data.panorama.length <= 0) {
+        message.warning("请请选择一个场景")
+        return;
+      }
+      if(formData.value.data.panorama.length > 1) {
+        message.warning("请请选择一个场景")
+        return;
+      }
+    }
+    if(step.value == 2) {
+      if(formData.value.data.shelves.length <= 0) {
+        message.warning("请请选择货架")
+        return;
+      }
+    }
+    if(step.value == 3) {
+      if(formData.value.data.wares.length <= 0) {
+        message.warning("请请选择商品")
+        return;
+      }
+    }
     if(step.value >= 3) {
       const data = JSON.parse(JSON.stringify(formData.value));
       await createMaterialCenter(buildData(data));
@@ -121,8 +150,12 @@ const ok = async () => {
       emit("complete");
     }
   }
-  else {
+  if(formData.value.type == CREATIVE_TYPE.RING_360) {
     if(step.value >= 1) {
+      if(formData.value.data.fileList.length <= 0) {
+        message.warning("请上传3D环物资源")
+        return;
+      }
       const data = JSON.parse(JSON.stringify(formData.value));
       await createMaterialCenter(buildData(data));
       visible.value = false;
@@ -156,8 +189,8 @@ defineExpose({
     position: relative;
     font-size: 40px;
     img{
-      max-width: 100%;
-      max-height: 100%;
+      width: 100%;
+      height: 100%;
     }
     .del{
       color: red;
diff --git a/src/views/Creative/components/CreateMaterial.vue b/src/views/Creative/components/CreateMaterial.vue
index a93cee4a..ee0e7f92 100644
--- a/src/views/Creative/components/CreateMaterial.vue
+++ b/src/views/Creative/components/CreateMaterial.vue
@@ -145,6 +145,21 @@ const onCustomRequest = async (upload) => {
 }
 
 const ok = async () => {
+  
+  if(step.value == 0) {
+    if(!formData.value.title) {
+      message.warning("请输入素材名称")
+      return;
+    }
+  }
+  
+  if(step.value == 1) {
+    if(formData.value.fileList.length <= 0) {
+      message.warning("请上传资源文件")
+      return;
+    }
+  }
+
   if(step.value >= 1) {
 
     if([THREE_D_TYPE.ENV_3D, THREE_D_TYPE.SHELF, THREE_D_TYPE.EXHIBITION_BOOTH, THREE_D_TYPE.WARE].includes(formData.value.type)){
diff --git a/src/views/Creative/components/Previewer.vue b/src/views/Creative/components/PreviewerCreation/Index.vue
similarity index 100%
rename from src/views/Creative/components/Previewer.vue
rename to src/views/Creative/components/PreviewerCreation/Index.vue