Merge branch 'master' into dev

src/pages/FormVolume/index.vue

@@ -22,7 +22,8 @@
           <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>
         </div>
       </van-dialog>
     </div>

src/pages/FormVolume/mixins/index.js

@@ -147,11 +147,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
@@ -174,17 +174,18 @@ export default {
           data: JSON.stringify(result)
         }
         await api.apiPostVolumeInfo(query)
-        this.btnOpenSuccess(() => {
-          let { go, replace } = this.$route.query
-          replace
-            ? this.$router.replace({ name: replace })
-            : this.$router.go(go || -1)
-        })
+        this.btnOpenSuccess(() => this.btnLinkBack())
       } catch (error) {
         console.log(error)
       }
       ld && ld.clear()
       this.loading.submit = false
+    },
+    btnLinkBack() {
+      let { go, replace } = this.$route.query
+      replace
+        ? this.$router.replace({ name: replace })
+        : this.$router.go(go || -1)
     }
   }
 }