Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/public/OAadvancePayment.vue

@@ -32,9 +32,10 @@ import offset from "./offset.vue";
         // }
     },
     mounted() {
-      if (this.$route.query.cdState == 'true') {
-        this.addBalanceout()
-      }
+      // if (this.$route.query.cdState == 'true') {
+      //   this.addBalanceout()
+      // }
+      this.addBalanceout()
     },
     methods: {
       // 车行订单 制成本冲抵单

src/plug/index.js

@@ -199,7 +199,7 @@ export default {
           crmUrl: crmUrl,
           crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
           PptUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "https://ppt.oytour.com" : "http://localhost:8080",
-          CarUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://bus.oytour.com" : "http://localhost:8082",
+          CarUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://bus.oytour.com" : "http://localhost:8081",
           OSSUrl: "https://im.oytour.com"
         };
         return obj;