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

src/components/index.vue

@@ -3265,7 +3265,8 @@ export default {
           }
           this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
             if (res.data.resultCode == 1) {
-              let pageName = url=='/JapanHotel' ? 'hotelHome' : 'FreeHome';
+              let urlS = url
+              let pageName = urlS == '/JapanHotel' ? 'hotelHome' : 'FreeHome';
                 this.EnCodeWord=res.data.data;
                 // http://testb2b.oytour.com
                 // http://www.oytour.com

src/components/public/leftNav.vue

@@ -202,14 +202,15 @@
         })
       },
       goUrl(path) {
-        if(path=='/JapanHotel' || url=='/KKDayFree'){
+        if(path=='/JapanHotel' || path=='/KKDayFree'){
             let userInfo = this.getLocalStorage();
             let msg = {
               id:userInfo.EmployeeId
             }
             this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
               if (res.data.resultCode == 1) {
-                let pageName = url=='/JapanHotel' ? 'hotelHome' : 'FreeHome';
+                let urlS = path
+                let pageName = urlS =='/JapanHotel' ? 'hotelHome' : 'FreeHome';
                 this.EnCodeWord=res.data.data;
                 // http://testb2b.oytour.com
                 // http://www.oytour.com