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

src/boot/product.js

@@ -16,7 +16,7 @@ const product = {
             } else if (t === 2) {
                 url = "/detailsScenicSpotTicket/" + configId
             } else if (t === 1) {
-                url = "/detail/" + encodeURIComponent(item.id) + "/" + 0 + "/" + configId
+                url = "/detail/" + encodeURIComponent(productInfo.id ? productInfo.id : productInfo.ID) + "/" + 0 + "/" + configId
             } else if (t === 5) {
                 url = "/hotel/" + configId
             }

src/boot/utils.js

@@ -26,7 +26,7 @@ Vue.prototype.domainManager = function() {
             domainUrl = "http://testapi.oytour.com";
         } else if (domainNameUrl.indexOf('oytour') !== -1) {
             domainUrl = "http://reborn.oytour.com";
-            domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
+            //domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
         }
         var obj = {
             //主地址
@@ -41,7 +41,7 @@ Vue.prototype.domainManager = function() {
     //获取当前域名
 Vue.prototype.GetDomain = function() {
     var domainNameUrl = window.location.hostname;
-    domainNameUrl = "t.oytour.com";
+    domainNameUrl = "www.oytour.com";
     return domainNameUrl;
 }
 Vue.prototype.groupBy = function(array, f) {

src/components/navs/hor-btm.vue

@@ -362,20 +362,20 @@ cursor: pointer;
         </template>
       </div>
     </template>
-    <div class="footer-content" v-if="dataList&&dataList.Config">
-      <div class="row  justify-between full-width">
-      <div class="">
+    <div :class="$q.platform.is.desktop ? 'footer-content': 'q-pa-lg'" v-if="dataList&&dataList.Config">
+      <div :class="$q.platform.is.desktop ? 'row  justify-between full-width': ''">
+      <div>
         <img style="width:auto;height:35px;" :src="dataList.Config.WhiteLogo" />
         <div class="rounded-borders q-mt-lg q-pa-md text-grey-8" style="background:rgba(255,255,255,.05)">
           <div class="f12">服务热线：{{ dataList.Config.Tel }}</div>
           <div class="q-mt-md">服务时间：08:00 至 21:00</div>
         </div>
       </div>
-      <div class="row">
-        <div  v-for="(item,i) in dataList.FooterList" :key="item.Id" :class="{'q-ml-xl':i>0}">
-          <div class="text-subtitle1 text-weight-bold text-white">{{ item.NavTitle }}</div>
-          <div class="q-mt-xl"  v-if="item.SubList">
-            <div class="q-mb-lg text-subtitle2 text-regular text-grey-8 cursor-pointer" v-for="item2 in item.SubList" :key="item2.Id" @click="navigateTo(item2)">{{item2.NavTitle}}</div>
+      <div :class="$q.platform.is.desktop ? 'row': 'q-mt-lg'">
+        <div  v-for="(item,i) in dataList.FooterList" :key="item.Id" :class="{'q-ml-xl':i>0 && $q.platform.is.desktop}">
+          <div class=" text-weight-bold text-white" :class="$q.platform.is.desktop ? 'text-subtitle1': 'f14'">{{ item.NavTitle }}</div>
+          <div :class="$q.platform.is.desktop ? 'q-mt-xl': 'q-mt-md'"  v-if="item.SubList">
+            <div :class="$q.platform.is.desktop ? 'text-subtitle2 text-regular': 'f12'" class="q-mb-lg  text-grey-8 cursor-pointer" v-for="item2 in item.SubList" :key="item2.Id" @click="navigateTo(item2)">{{item2.NavTitle}}</div>
           </div>
         </div> 
       </div>
@@ -388,7 +388,7 @@ cursor: pointer;
         </div>
       </div>
     </div>
-      <div class="text-center q-py-xl text-grey-8" style="margin-top:35px">
+      <div class="q-py-xl text-grey-8" :class="$q.platform.is.desktop ? 'text-center' : ''" style="margin-top:35px">
         蜀ICP备13000760号 © 2010-{{year}} {{ dataList.Config.Name }}. All Rights Reserved. 旅行社业务经营许可证 {{ dataList.Config.UnifyCode }}
       </div>
     </div>

src/pages/city/cityDetail.vue

@@ -345,7 +345,7 @@ export default {
       this.CommonJump(
         "/search",
         {
-        qsearchKey: this.detail.AreaName,
+        areaId: this.detail.Id,
         qsearchDate: this.searchDate,
         qsearchEndDate: this.searchEndDate,
         CategoryName: item.title}

src/pages/city/components/near-city.vue

@@ -44,7 +44,7 @@
         <div class="row no-wrap">
           <div
           @click="navToSearch(item)"
-          class="relative card"
+          class="relative card cursor-pointer"
           v-for="item in cityList"
           :key="item.Id"
         >
@@ -96,7 +96,7 @@ export default {
         qsearchEndDate: this.searchEndDate,
       };
       if (item) {
-        params.qsearchKey = item.AreaName
+        params.areaId = item.Id
       }
       this.CommonJump("/search", params);
     },

src/pages/login.vue

@@ -10,7 +10,7 @@
   left: 0;
   right: 0;
 }
-.login-box {
+.login-box-pc {
   max-width: 436px;
   padding: 30px 40px;
   margin: 100px auto;
@@ -20,6 +20,12 @@
   background: #ffffff;
   border-radius: 18px;
 }
+.login-box {
+  max-width: 436px;
+  padding: 30px 40px;
+  background-clip: padding-box;
+  background: #ffffff;
+}
 
 .login-box .tw_logo {
   margin: 0 auto 20px;
@@ -83,8 +89,8 @@
 }
 </style>
 <template>
-  <div class="login">
-    <div class="login-box">
+  <div :class="$q.platform.is.desktop ? 'login': 'full-width'">
+    <div class="login-box" :class="$q.platform.is.desktop ? 'login-box-pc': ''">
       <!-- <img :src="logo" class="tw_logo" /> -->
       <!-- <p class="tip-text">
         還沒有帳號嗎？立即<a style="cursor:pointer;" @click="CommonJump('/register',{})">免費加入</a>