任一存 2 anni fa
parent
commit
f843591f20

+ 2 - 1
packages/qjkankan-editor/src/components/materialListInMaterialSelector.vue

@@ -461,7 +461,6 @@ export default {
           }, i * 100);
           return;
         }
-
         let WHRate = null
         try {
           const { width, height } = await getImgWH(eachFile)
@@ -477,6 +476,7 @@ export default {
           return
         }
         if (WHRate !== 2) {
+          console.log('宽高比不对!');
           setTimeout(() => {
             this.$msg({
               message: `“${eachFile.name}”${this.fileInputFailString}`,
@@ -507,6 +507,7 @@ export default {
           },
           (response) => { // 上传成功
             if (response.code !== 0) {
+              console.error('上传接口响应异常:', response);
               return
             }
             console.log('全景图上传成功');

+ 18 - 9
packages/qjkankan-editor/src/components/materialSelectorForManageCenter.vue

@@ -128,16 +128,25 @@
     <div class="btns">
       <button v-if="currentMaterialType !== '3D'" class="ui-button upload-btn" @click="onClickUpload">
         <span>{{ upload_material }}</span>
-        <i :key="currentMaterialType" class="iconfont icon-material_prompt tool-tip-for-editor" v-tooltip="
-          currentMaterialType === 'image' ? img_size :
+        <i
+          :key="currentMaterialType"
+          class="iconfont icon-material_prompt tool-tip-for-editor"
+          v-tooltip="
+            currentMaterialType === 'image' ? img_size :
             currentMaterialType === 'pano' ? pano_size :
-              currentMaterialType === 'audio' ? audio_size :
-                currentMaterialType === 'video' ? video_size : ''
-        ">
-        </i>
-        <FileInput ref="file-input" :failString="fileInputFailString" :limitFailStr="fileInputLimitFailStr"
-          :acceptType="fileInputAcceptType" :mediaType="fileInputMediaType" :limit="fileInputLimit"
-          @file-change="onFileInputChange"></FileInput>
+            currentMaterialType === 'audio' ? audio_size :
+            currentMaterialType === 'video' ? video_size : ''
+          "
+        />
+        <FileInput
+          ref="file-input"
+          :failString="fileInputFailString"
+          :limitFailStr="fileInputLimitFailStr"
+          :acceptType="fileInputAcceptType"
+          :mediaType="fileInputMediaType"
+          :limit="fileInputLimit"
+          @file-change="onFileInputChange"
+        />
       </button>
       <div v-else class="button-placeholder"></div>
       <div>

+ 0 - 6
packages/qjkankan-editor/src/utils/file.js

@@ -108,22 +108,16 @@ export const blobToBase64 = function (blob) {
  */
 export const getImgWH = (file) => {
   return new Promise((resolve) => {
-    // console.log(1);
     var reader = new FileReader()
     //读取图片文件
-    // console.log(2);
     reader.readAsDataURL(file)
-    // console.log(3);
     reader.onload = function (e) {
       //初始化JavaScript图片对象
-      // console.log(4);
       var image = new Image()
       //FileReader获得Base64字符串
       image.src = e.target.result
-      // console.log(5);
       image.onload = function () {
         //获得图片高宽
-        // console.log(6);
         var height = this.height
         var width = this.width
         resolve({