Merge branch 'feature/开门红' into release/1215

src/views/ebiz/goodStart/GoodStartScheme.vue

@@ -26,6 +26,7 @@ export default {
   },
   data() {
     return {
+      isFromService: '',
       isPrevShow: false,
       currentPage: 0,
       pics: [],
@@ -42,6 +43,7 @@ export default {
     }
   },
   created() {
+    this.isFromService = this.$route.query.from === 'service'
     this.getSchemePics()
     this.interceptAppBtn()
   },
@@ -61,6 +63,11 @@ export default {
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         if (!this.isPrevShow) {
+          if (this.isFromService) {
+            this.$jump({
+              flag: 'service'
+            })
+          } else {
             this.$jump({
               flag: 'h5',
               extra: {
@@ -69,10 +76,11 @@ export default {
                 url: location.origin + `/#/goodStart/prefecture`
               },
               routerInfo: {
-              path: `/goodStart/prefecture`,
+                path: `/goodStart/prefecture/prefecture`,
                 type: '1'
               }
             })
+          }
         } else {
           this.isPrevShow = false
         }