From ad6fb44bd57053b42738ba2869309ed148506451 Mon Sep 17 00:00:00 2001
From: wanganmao <525987762@qq.com>
Date: Wed, 26 Oct 2022 09:57:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20bug=20=E3=80=90=E5=88=9B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E3=80=91=E9=80=89=E6=8B=A9=E9=A2=98=20?=
 =?UTF-8?q?=E5=AF=B9=E4=BA=8E3D=E5=9C=BA=E6=99=AF=E8=A2=AB=E8=AE=BF?=
 =?UTF-8?q?=E8=80=85=E4=BD=9C=E7=AD=94=E9=A1=B5=E9=9D=A2=20=E6=AF=8F?=
 =?UTF-8?q?=E8=A1=8C=E5=88=97=E6=95=B0=E8=AE=BE=E7=BD=AE=20=E5=AF=B9?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E5=A4=9A=E9=80=89=20=E5=81=9A=E5=9D=87?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Answer/questions/components/viewer.utils.scss     | 6 ++++++
 .../planetDesign/Design/questions/choice/ChoiceConfig.vue   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/Answer/questions/components/viewer.utils.scss b/src/views/Answer/questions/components/viewer.utils.scss
index 2852e28f..2578e6e0 100644
--- a/src/views/Answer/questions/components/viewer.utils.scss
+++ b/src/views/Answer/questions/components/viewer.utils.scss
@@ -213,6 +213,12 @@
   border-color: #fff !important;
 }
 
+
+.q-content-top .checkbox-group>.checkbox {
+  width: auto !important;
+  color: #fff !important;
+}
+
 .q-content-top p {
   color: #fff !important;
 }
diff --git a/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue b/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
index 924f5fac..418ca23c 100644
--- a/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
+++ b/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
@@ -90,12 +90,12 @@
       <ConfigBaseItem class="block">
         <div class="row">
           <span class="choice-config-label">每行列数</span>
-          <a-tooltip title="最大为3列">
+          <a-tooltip :title="copyConfig.config.is_three_dimensions?'3D场景下无法生效':'最大为3列'">
             <a-input-number
               v-model:value="copyConfig.config.each_number"
               :min="1"
               :max="3"
-              :disabled="!!copyConfig.config.is_binding_goods"
+              :disabled="!!copyConfig.config.is_three_dimensions"
               class="custom-input-number"
               style="width: 115px"
               @blur="updateInput('each_number')"
@@ -105,7 +105,7 @@
         </div>
       </ConfigBaseItem>
       <!-- 3D 相关配置 -->
-      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type" :question="copyConfig"/>
+      <Config3D :key="copyConfig.question_index&&copyConfig.question_type" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type" :question="copyConfig"/>
     </template>
   </div>
 </template>

From 23347179fc60be32150a51535577be19bf7b03ed Mon Sep 17 00:00:00 2001
From: wanganmao <525987762@qq.com>
Date: Wed, 26 Oct 2022 10:22:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=97=AE=E5=8D=B7=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Design/components/config/Config3D.vue             |  1 +
 .../Design/components/config/config3d.constant.js     |  3 +++
 .../Design/questions/choice/ChoiceConfig.vue          | 11 ++++++-----
 .../Design/questions/completion/CompletionConfig.vue  |  5 +++--
 .../Design/questions/hotArea/hotAreaConfig.vue        |  6 ++++--
 .../Design/questions/matrix/MatrixConfig.vue          | 11 ++++++-----
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/planetDesign/Design/components/config/Config3D.vue b/src/views/planetDesign/Design/components/config/Config3D.vue
index c8cc2cef..2bcc1c85 100644
--- a/src/views/planetDesign/Design/components/config/Config3D.vue
+++ b/src/views/planetDesign/Design/components/config/Config3D.vue
@@ -176,6 +176,7 @@
         </div>
       </template>
     </template>
+    <div v-else class="config-item-last"></div>
     <a-modal
       v-model:visible="glbViewer.visible"
       title="商品截图"
diff --git a/src/views/planetDesign/Design/components/config/config3d.constant.js b/src/views/planetDesign/Design/components/config/config3d.constant.js
index edf92bad..7467b734 100644
--- a/src/views/planetDesign/Design/components/config/config3d.constant.js
+++ b/src/views/planetDesign/Design/components/config/config3d.constant.js
@@ -6,6 +6,9 @@ export const QUESTION_TYPE = {
   // 多选
   CHOICE_MULT: 2,
 
+  // 输入
+  INPUT_MULT: 4,
+
   // 图文说明
   IMG_TEXT_EXPLAIN: 6,
 
diff --git a/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue b/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
index 418ca23c..9311e1b8 100644
--- a/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
+++ b/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
@@ -59,11 +59,6 @@
         :checked="copyConfig.config.is_required"
         @update:checked="update('is_required', $event)"
       />
-      <ConfigRequire
-        title="选项随机"
-        :checked="copyConfig.config.select_random"
-        @update:checked="update('select_random', $event)"
-      />
       <ConfigBaseItem class="block">
         <div class="title">选择题型</div>
         <div class="row">
@@ -106,6 +101,12 @@
       </ConfigBaseItem>
       <!-- 3D 相关配置 -->
       <Config3D :key="copyConfig.question_index&&copyConfig.question_type" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type" :question="copyConfig"/>
+        
+      <ConfigRequire
+        title="选项随机"
+        :checked="copyConfig.config.select_random"
+        @update:checked="update('select_random', $event)"
+      />
     </template>
   </div>
 </template>
diff --git a/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue b/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue
index 7c9cd171..46ce78b0 100644
--- a/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue
+++ b/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue
@@ -74,6 +74,9 @@
           @update:value="update('text_type', $event)"
         />
 
+        <!-- 3D 相关配置 -->
+        <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
+        
         <ConfigTextCount
           v-if="![5, 6, 7].includes(text_type)"
           :min="min"
@@ -151,8 +154,6 @@
         />
       </template>
       
-      <!-- 3D 相关配置 -->
-      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
     </div>
   </div>
 </template>
diff --git a/src/views/planetDesign/Design/questions/hotArea/hotAreaConfig.vue b/src/views/planetDesign/Design/questions/hotArea/hotAreaConfig.vue
index 045f97e8..74bdd33b 100644
--- a/src/views/planetDesign/Design/questions/hotArea/hotAreaConfig.vue
+++ b/src/views/planetDesign/Design/questions/hotArea/hotAreaConfig.vue
@@ -10,6 +10,10 @@
           }
         "
       />
+      
+      <!-- 3D 相关配置 -->
+      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
+
       <ConfigBaseItem class="block">
         <div>
           <div class="title">互动方式</div>
@@ -117,8 +121,6 @@
         </a-radio-group>
       </ConfigBaseItem>
       
-      <!-- 3D 相关配置 -->
-      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
     </div>
   </div>
 </template>
diff --git a/src/views/planetDesign/Design/questions/matrix/MatrixConfig.vue b/src/views/planetDesign/Design/questions/matrix/MatrixConfig.vue
index 762c45ac..1c004461 100644
--- a/src/views/planetDesign/Design/questions/matrix/MatrixConfig.vue
+++ b/src/views/planetDesign/Design/questions/matrix/MatrixConfig.vue
@@ -6,11 +6,6 @@
         :checked="copyConfig.config.is_required"
         @update:checked="update('is_required', $event)"
       />
-      <ConfigRequire
-        title="选项随机"
-        :checked="copyConfig.config.select_random"
-        @update:checked="update('select_random', $event)"
-      />
       <ConfigBaseItem class="block">
         <div class="right-limit">
           <span>右极文字</span>
@@ -52,6 +47,12 @@
       <!-- 3D 相关配置 -->
       <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
 
+      <ConfigRequire
+        title="选项随机"
+        :checked="copyConfig.config.select_random"
+        @update:checked="update('select_random', $event)"
+      />
+      
       <template v-if="copyConfig.question_type === 10">
         <ConfigBaseItem class="block">
           <ConfigOptionCount