Merge branch 'master' into dev

src/pages/FormVolume/index.vue

@@ -22,8 +22,9 @@
           <h3>提交成功</h3>
           <van-icon name="checked" class="icon" />
           <p v-if="data.topic.submessage">{{ data.topic.submessage }}</p>
-          <!-- <div>{{ codeMess.message }}</div> -->
+          <div>{{ codeMess.message }}</div>
           <van-button round plain type="info" @click="btnLinkBack" style="width: 80%;">点击返回</van-button>
+          <span>无法返回时，请手动关闭页面</span>
         </div>
       </van-dialog>
     </div>

src/pages/FormVolume/mixins/index.js

@@ -76,7 +76,7 @@ export default {
       this.inData()
     },
     // 秒倒计时
-    loopCode(num, callback) {
+    async loopCode(num, callback) {
       let msg = '自动跳转'
       clearInterval(this.codeMess.t)
       function loopNum() {
@@ -90,6 +90,7 @@ export default {
         this.codeMess['disabled'] = true
         this.codeMess['message'] = `${num}s ${msg}`
         num = num - 1
+        console.log(this.codeMess['message'])
       }
       loopNum.call(this)
       this.codeMess.t = setInterval(() => loopNum.call(this), 1000)
@@ -147,11 +148,11 @@ export default {
     },
     btnOpenSuccess(callback) {
       this.show.submit = true
-      // this.loopCode(this.codeMess.num, async () => {
-      //   this.show.submit = false
-      //   await this.$nextTick()
-      //   callback && callback()
-      // })
+      this.loopCode(this.codeMess.num, async () => {
+        this.show.submit = false
+        await this.$nextTick()
+        callback && callback()
+      })
     },
     async btnSubmit() {
       this.loading.submit = true
@@ -182,9 +183,10 @@ export default {
       this.loading.submit = false
     },
     btnLinkBack() {
+      clearInterval(this.codeMess.t)
       let { go, replace } = this.$route.query
       replace
-        ? this.$router.replace({ name: replace })
+        ? location.replace(replace)
         : this.$router.go(go || -1)
     }
   }

src/pages/FormVolume/style.scss

@@ -22,6 +22,12 @@
   }
   > div {
     color: $color-3;
+    margin-bottom: $sp-sm;
+  }
+  > span {
+    margin-top: $sp-sm;
+    font-size: $size-xs;
+    color: $color-2;
   }
 }
 .tel-message {