Merge branch 'feature-template2' into uat

src/views/Answer/questions/QImgShow.vue

@@ -8,7 +8,7 @@
       :key="option.option_key"
     >
       <!-- 闪照 -->
-      <div v-if="config.countdown_type && config.countdown_time">
+      <div v-if="config?.countdown_type && config?.countdown_time">
         <!-- 点击查看图片 -->
         <div v-if="option.preview" class="thumbnail see" @click="previewImg(option)">
           <img src="@/assets/img/answer/see-img.png" alt="" />

src/views/TempMarket/components/CreateSurveyProduct.vue

@@ -657,7 +657,7 @@ export default defineComponent({
             packingData.value = JSON.parse(packingInit);
             ruleForm.tags = [];
             ruleForm.remarks = "";
-            ruleForm.project_name = "";
+            ruleForm.project_name = props.info?.project_name || "";
             modalVisible.value = false;
           },
         });

src/views/planetDesign/Design/fragement/QuestionConfig.vue

@@ -233,4 +233,16 @@ export default {
   width: 100%;
   padding: 14px 10px;
 }
+
+:deep(.ant-radio-wrapper-disabled .ant-radio-checked .ant-radio-inner) {
+  border-color: rgba(112, 185, 54, 0.5) !important;
+}
+
+:deep(.ant-radio-wrapper-disabled .ant-radio-checked .ant-radio-inner::after) {
+  background-color: rgba(112, 185, 54, 0.5) !important;
+}
+
+:deep(.config-require[data-v-51a4fc66] .ant-switch-disabled) {
+  background-color: #F5F5F5;
+}
 </style>

src/views/planetDesign/Design/questions/choice/Choice.vue

@@ -438,6 +438,9 @@ export default {
         background: #f5f5f5;
         border: 1px solid transparent !important;
       }
+      &-disable {
+        margin-left: 24px;
+      }
       &-disable:hover {
         border: 1px solid transparent;
       }