广播订阅 + 福利

src/main/resources/views/mobile/welfare/evaluate/index.html

@@ -105,6 +105,16 @@ layout("/mobile/platform.html"){
         max-width: 100%!important;
     }
 
+    .pretty-text {
+        white-space: pre-line; /* 保留换行符 */
+        font-family: Arial, sans-serif; /* 设置字体 */
+        line-height: 1.5; /* 设置行高 */
+        margin: 10px 0; /* 设置外边距 */
+        padding: 10px; /* 设置内边距 */
+        border: 1px solid #ccc; /* 设置边框 */
+        background-color: #f9f9f9; /* 设置背景颜色 */
+        border-radius: 5px; /* 设置圆角 */
+    }
 </style>
 
 <div id="app" v-cloak>
@@ -114,6 +124,10 @@ layout("/mobile/platform.html"){
         <div class="description" v-if="activity.description">
             <div v-html="activity.description"></div>
         </div>
+        <div class="description" v-if="activity.selectWelfareName">
+            <span style="color: #1867b0">此调查您选择的福利是：</span>
+            <div class="pretty-text" v-html="activity.selectWelfareName"></div>
+        </div>
         <div v-if="!isFinished">
             <div v-for="(subject, index) in subjects" :key="index" class="subject" :class="{ 'first-box': index === 0 }">
                 <p>{{index+1}}、{{ subject.title }}</p>
@@ -158,7 +172,7 @@ layout("/mobile/platform.html"){
                                 </div>
                             </van-cell>
 
-                            <div v-if="option.isOpenContent==true && selectOptionIds.includes(option.id)">
+                            <div v-if="option.isOpenContent==true && subject.userSelectOptionIds.includes(option.id)">
                                 <van-field v-model="option.content" :label="option.contentPrefix"
                                            :placeholder="'请填写' + (option.contentPrefix ? option.contentPrefix : '')"
                                            :disabled="answerRecord.isFinish"></van-field>
@@ -230,6 +244,7 @@ layout("/mobile/platform.html"){
                 $.post("/platform/h5/welfare/evaluate/subjects", { activityId: this.id }).then((res) => {
                     if (res.code === 0) {
                         this.activity = res.data.activity
+                        this.activity.selectWelfareName = this.activity.selectWelfareName.replace(/\n/g, '<br>');
                         this.subjects = res.data.subjects
                         this.answerRecordId = res.data.answerRecordId
                         this.getAnswerRecord()
@@ -238,7 +253,7 @@ layout("/mobile/platform.html"){
                             title: '温馨提示',
                             message: res.msg,
                         }).then(() => {
-                            pjaxReplace("/mobile/index")
+                            this.doBack()
                         })
                     }
                 })
@@ -300,12 +315,8 @@ layout("/mobile/platform.html"){
 
                 if (subject.type === "radio") {
                     this.$refs["subject" + subject.id][0].toggleAll(false)
-                    const option = subject.options.find(option => option.id === optionId)
-                    this.selectOptionIds = this.selectOptionIds.filter(item => item !== optionId)
-                    if (option.isOpenContent == true) {
-                        this.selectOptionIds.push(optionId)
-                    }
                 }
+
                 this.$refs["option" + optionId][0].toggle()
             },