Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/boot/utils.js

@@ -41,7 +41,7 @@ Vue.prototype.domainManager = function() {
     //获取当前域名
 Vue.prototype.GetDomain = function() {
     var domainNameUrl = window.location.hostname;
-    domainNameUrl = "www.oytour.com";
+    domainNameUrl = "t.oytour.com";
     return domainNameUrl;
 }
 Vue.prototype.groupBy = function(array, f) {
@@ -198,12 +198,12 @@ Vue.prototype.OpenNewUrl = function(URL) {
 //公用跳转
 Vue.prototype.CommonJump = function(path, obj, type = 'push') {
     let p = typeof(path) == 'string' ? path : this.$product.genernalUrl(path)
-    if(type === 'blank') { // 新窗口打开
+    if (type === 'blank') { // 新窗口打开
         let routeUrl = this.$router.resolve({
             path: p,
             query: obj
-       });
-       window.open(routeUrl.href, '_blank');
+        });
+        window.open(routeUrl.href, '_blank');
     } else if (type === 'replace') { // replace
         this.$router.replace({
             path: p,

src/pages/detailsHotal.vue

@@ -654,7 +654,7 @@ import comments from "./hotel/comments.vue";
 import selectRoom from './hotel/selectRoom.vue';
 import componentsMap from 'src/components/car/Map.vue';
 import ImagePreview from 'src/components/common/ImagePreview.vue'
-import RoomCard from 'src/components/hotal/RoomCard.vue'
+import RoomCard from '../components/hotal/RoomCard.vue'
 import OrderPreview from "src/components/hotal/orderPreview.vue";
 export default {
   props: [],