commit

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

@@ -649,15 +649,26 @@ layout("/mobile/platform.html"){
                 })
                 if (code === 0) {
                     this.getUserSelection(this.projectId)
-                    this.$modal.msgSuccess("您已完成本次福利选择。")
+                    // 女性健康知识讲座福利品Id
+                    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()
+                        });
+                    }
+                    // this.$modal.msgSuccess("您已完成本次福利选择。")
                 } else {
                     this.$modal.msgError(msg)
-                }
-                this.confirmPopup = false
-                await this.getProjectInfo()
-                setTimeout(() => {
+                    this.confirmPopup = false
+                    await this.getProjectInfo()
                     window.location.reload()
-                }, 1000)
+                }
             },
 
             //查看详情

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

@@ -9,7 +9,7 @@ layout("/mobile/platform.html"){
 <div id="app" v-cloak>
     <van-sticky>
         <van-nav-bar :title="title" left-arrow
-                     @click-left="history.back()"></van-nav-bar>
+                     @click-left="back"></van-nav-bar>
     </van-sticky>
 
     <div style="text-align: center;margin-top: 200px;">
@@ -25,7 +25,8 @@ layout("/mobile/platform.html"){
         </svg>
         <div style="margin-top: 20px;">{{code=='2' ? '您已领取' : '您已选择'}}</div>
         <div style="margin: 20px auto 0px auto;width: 300px;word-break: break-all">
-            福利品： {{selectOptionNames}}
+            <!-- 女性健康知识讲座福利品Id -->
+            {{ projectId == '8799d66b0bb640078f50feb029e506ed' ? '纪念品' : '福利品' }}： {{selectOptionNames}}
         </div>
         <van-button style="margin-top: 20px;width: 100px" size="small" hairline type="primary"
                     @click="back">返回
@@ -43,6 +44,7 @@ layout("/mobile/platform.html"){
         mixins: [mobileMixins, welfareMixins],
         data() {
             return {
+                projectId: '',
                 selectOptionNames: null
             }
         },
@@ -52,7 +54,7 @@ layout("/mobile/platform.html"){
                 this.selectOptionNames = resp.data
             },
             back() {
-                window.history.go(-1)
+                pjaxReplace('/mobile/welfare/list/receive?projectId=' + this.projectId)
             }
         },
         created() {

src/main/resources/views/mobile/welfare/mine/myWelfare.html

@@ -54,7 +54,7 @@ layout("/mobile/platform.html"){
 
 <div id="app" v-cloak>
     <van-sticky>
-        <van-nav-bar @click-left="pjaxReplace('/mobile//index')" left-arrow
+        <van-nav-bar @click-left="pjaxReplace('/mobile/index')" left-arrow
                      title="我的福利"></van-nav-bar>
 
         <van-dropdown-menu active-color="#1989fa">