commit

src/main/resources/views/mobile/welfare/list/receive.html

@@ -527,7 +527,6 @@ layout("/mobile/platform.html"){
                 this.selectSpecsPopup = true
             },
             specsSelectConfirm(value) {
-                debugger
                 this.selectSpecsPopup = false
                 if (value) {
                     this.projectInfo.welfareProjectSubjects[0].options.forEach(v => {
@@ -681,7 +680,7 @@ layout("/mobile/platform.html"){
 
                 for (const option of options) {
                     // 检查是否有 specs
-                    if (option.specs) {
+                    if (option.specs && option.specs.length > 0) {
                         // 检查 selectSpecs 是否为空或未定义
                         if (!option.selectSpecs) {
                             this.$toast.fail('请选择' + option.optionName + '的规格')
@@ -713,24 +712,28 @@ layout("/mobile/platform.html"){
                 if (code === 0) {
                     this.getUserSelection(this.projectId)
                     // 女性健康知识讲座福利品Id
-                    if (this.projectId === '8799d66b0bb640078f50feb029e506ed') {
+                    // if (this.projectId === '8799d66b0bb640078f50feb029e506ed') {
                         pjaxReplace('/mobile/welfare/list/receive_success?projectId=' + this.projectId + '&provideMode=' + this.projectInfo.provideMode)
-                    } else {
-                        vant.Dialog.alert({
-                            title: '温馨提示',
-                            message: "您已完成本次选择。",
-                        }).then(async () => {
-                            this.confirmPopup = false
-                            await this.getProjectInfo()
-                            window.location.reload()
-                        });
-                    }
+                    // } else {
+                    //     vant.Dialog.alert({
+                    //         title: '温馨提示',
+                    //         message: "您已完成本次选择。",
+                    //     }).then(async () => {
+                    //         this.confirmPopup = false
+                    //         await this.getProjectInfo()
+                    //         window.location.reload()
+                    //     });
+                    // }
                     // this.$modal.msgSuccess("您已完成本次福利选择。")
                 } else {
-                    this.$modal.msgError(msg)
-                    this.confirmPopup = false
-                    await this.getProjectInfo()
-                    window.location.reload()
+                    vant.Dialog.alert({
+                        title: '温馨提示',
+                        message: msg,
+                    })
+                    // this.$modal.msgError(msg)
+                    // this.confirmPopup = false
+                    // await this.getProjectInfo()
+                    // window.location.reload()
                 }
             },
 
@@ -833,6 +836,11 @@ layout("/mobile/platform.html"){
                 window.sessionStorage.removeItem('welfareProjectSelectInfo' + loginname)
                 // this.selectAddressPopup = true
             } else {
+                const flag = localStorage.getItem("reload")
+                if (flag) {
+                    window.location.reload()
+                    localStorage.removeItem("reload")
+                }
                 this.getProjectInfo()
             }
         },

src/main/resources/views/mobile/welfare/list/receive_success.html

@@ -23,7 +23,7 @@ layout("/mobile/platform.html"){
             <path d="M955.330366 240.548613h-83.927839a30.723584 30.723584 0 0 0-31.472939 30.161567v1.124034a30.910923 30.910923 0 0 0 30.348906 31.472939H955.330366a30.723584 30.723584 0 0 0 31.2856-30.348906v-1.124033A30.536245 30.536245 0 0 0 955.330366 240.548613z m-72.125487-168.605033a32.222295 32.222295 0 0 0-43.837308 4.121457L786.725333 141.071644a31.285601 31.285601 0 0 0 48.146104 39.903191l52.080221-64.819268a30.536245 30.536245 0 0 0-2.810084-42.900614zM683.126907 0.005433a30.910923 30.910923 0 0 0-31.47294 30.161567v84.864533a30.723584 30.723584 0 0 0 30.348906 31.285601h1.124034a30.536245 30.536245 0 0 0 31.2856-30.161567V31.291033A30.723584 30.723584 0 0 0 684.25094 0.005433z"
                   fill="#07C160" p-id="3085"></path>
         </svg>
-        <div style="margin-top: 20px;">{{code=='2' ? '您已领取' : '您已选择'}}</div>
+        <div style="margin-top: 20px;">{{code=='2' ? '您已领取' : '您已完成本次选择。'}}</div>
         <div style="margin: 20px auto 0px auto;width: 300px;word-break: break-all">
             <!-- 女性健康知识讲座福利品Id -->
             {{ projectId == '8799d66b0bb640078f50feb029e506ed' ? '纪念品' : '福利品' }}： {{selectOptionNames}}
@@ -55,6 +55,7 @@ layout("/mobile/platform.html"){
             },
             back() {
                 pjaxReplace('/mobile/welfare/list/receive?projectId=' + this.projectId)
+                localStorage.setItem("reload", '1')
             }
         },
         created() {