Merge branch 'test' into 'dev'

Publisher 自动合并请求 [5JQnVY6IgMY__UHm8RmAf]

See merge request !104

components/Submit/SubmitForm.vue

@@ -653,7 +653,7 @@ export default {
             path: '/success',
             query: {
               uin: this.$route.query.uin,
-              id: this.$route.query.id,
+              id: this.$route.query.tempId,
               backUrl: this.$route.query.backUrl,
             },
           })

components/Success/SuccessIndex.vue

@@ -10,9 +10,9 @@
     </div>
     <div class="index-button">
       <van-button class="index-button__submit" @click="backLive"
-        >返回直播间</van-button
+        >{{translateBackBtn}}</van-button
       >
-      <div class="index-button__confirm">
+      <div v-if="$route.query.backUrl" class="index-button__confirm" >
         <div class="argument">
           <a href="javascript:;">{{ count }}s</a>后自动返回直播间
         </div>
@@ -29,6 +29,15 @@ export default {
       count: 4,
     }
   },
+  computed: {
+    translateBackBtn() {
+      if(this.$route.query.backUrl) {
+        return '返回直播间'
+      }else {
+        return '继续投递'
+      }
+    }
+  },
   mounted() {
     const timer = setInterval(() => {
       if (this.count >= 2) {
@@ -45,6 +54,14 @@ export default {
     backLive() {
       if (this.$route.query.backUrl) {
         window.location.replace(decodeURIComponent(this.$route.query.backUrl))
+      }else {
+        this.$router.replace({
+          path: '/index',
+          query: {
+            uin: this.$route.query.uin,
+            id: this.$route.query.id,
+          },
+        })
       }
     },
   },

pages/Index/index.vue

@@ -134,7 +134,7 @@ export default {
       if (window.self === window.top) {
         if (this.token) {
           this.$router.replace({
-            path: '/detail',
+            path: '/submit',
             query: {
               uin: this.$route.query.uin,
               id: submitId,