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

# Conflicts:
#	src/components/navs/hor-btm.vue

src/boot/utils.js

@@ -25,8 +25,8 @@ Vue.prototype.domainManager = function() {
         if (domainNameUrl.indexOf('testerp.oytour') !== -1) {
             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://reborn.oytour.com";
+            domainUrl = 'http://192.168.10.11:8083' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
         }
         var obj = {
             //主地址

src/components/navs/city-category.vue

@@ -185,6 +185,7 @@
           <q-menu
             ref="address"
             @mouseenter="addressMenuEnter"
+          @mouseleave="addressMenuLeave"
             class="light-shadow"
           >
             <div class="address-box flex">
@@ -493,6 +494,7 @@ export default {
       this.$refs.address.show();
     },
     mouseeleaveAddress() {
+      this.addressFocus = 0;
       setTimeout(() => {
         if (!this.addressFocus) {
           this.$refs.address.hide();

src/components/navs/hor-btm.vue

@@ -373,16 +373,18 @@ cursor: pointer;
       </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 class=" text-weight-bold text-white" :class="$q.platform.is.desktop ? 'text-subtitle1': 'f16'">{{ item.NavTitle }}</div>
+          <div :class="$q.platform.is.desktop ? 'q-mt-xl': 'q-mt-md row'"  v-if="item.SubList">
+            <div :class="$q.platform.is.desktop ? 'text-subtitle2 text-regular': 'f14'" class="q-mb-lg q-mr-md  text-grey-8 cursor-pointer" v-for="item2 in item.SubList" :key="item2.Id" @click="navigateTo(item2)">{{item2.NavTitle}}</div>
           </div>
         </div> 
       </div>
       <div  v-for="item in dataList.BottomList" :key="item.Id">
-        <div class="text-subtitle1 text-weight-bold text-white">{{ item.NavTitle }}</div>
-        <div class="q-mt-xl row" style="width:210px">
-          <img  v-for="item2 in item.SubList" :key="item2.Id" style="width:40px;border-radius: 2px;" class="q-mb-md q-mr-md bg-white" :src="item2.Icon" :title="item2.NavTitle" />
+        <div class="text-weight-bold text-white" :class="$q.platform.is.desktop ? 'text-subtitle1': 'f16'">{{ item.NavTitle }}</div>
+        <div class="row" :class="$q.platform.is.desktop ? 'q-mt-xl' : 'q-mt-md'" :style="$q.platform.is.desktop ? 'width:210px': 'width:100%'" >
+            <div class="bg-white rounded-borders q-pa-xs overflow-hidden q-mb-md q-mr-md" @click="navigateTo(item2)" v-for="item2 in item.SubList" :key="item2.Id"  style="width:40px;height:34px;">
+              <img style="width:100%" :src="item2.Icon" :title="item2.NavTitle" />
+            </div>
         </div>
       </div>
     </div>

src/css/app.scss

@@ -117,9 +117,18 @@
 .f36 {
     font-size: 36px;
 }
+.f40 {
+    font-size: 40px;
+}
 .f42 {
     font-size: 42px;
 }
+.lh200 {
+    line-height: 200%;
+}
+.lh150 {
+    line-height: 150%;
+}
 .text-center {
     text-align: center;
 }

src/pages/Pickuporder/orderForm.vue

@@ -516,6 +516,16 @@
               <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
               <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
             </div>
+            <hr
+              style="border: none; border-top: 1px dashed #eee !important"
+              class="bg-transparent q-mb-sm"
+            />
+            <div class="row q-mb-sm items-center">
+              <div class="col">總金額</div>
+              <div class="text-subtitle2 text-weight-bolder text-primary">
+                CNY {{ moneyFormat(sumPrice, 2) }}
+              </div>
+            </div>
             <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
             <div class="row q-mb-sm items-center">
                 <div class="col">優惠金額</div>

src/pages/ScenicSpotTicket/orderForm.vue

@@ -282,6 +282,16 @@
                   </template>
                 </div>
               </template>
+              <hr
+                style="border: none; border-top: 1px dashed #eee !important"
+                class="bg-transparent q-mb-sm"
+              />
+              <div class="row q-mb-sm items-center">
+                <div class="col">總金額</div>
+                <div class="text-subtitle2 text-weight-bolder text-primary">
+                  CNY {{ moneyFormat(sumPrice, 2) }}
+                </div>
+              </div>
               <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
               <div class="row q-mb-sm items-center" v-if="parameters.MailingState==2&&parameters.MailingMoney>0">
                 <div class="col">邮寄费</div>

src/pages/login.vue

@@ -11,7 +11,7 @@
   right: 0;
 }
 .login-box-pc {
-  max-width: 436px;
+  width: 436px;
   padding: 30px 40px;
   margin: 100px auto;
   position: absolute;

src/pages/resetPassword.vue

 <style>
 .login {
-  background: url('../assets/img/login-bg.png');background-size: cover;
+  background: url("../assets/img/login-bg.png");
+  background-size: cover;
   width: 100%;
   height: 100%;
   position: fixed;
@@ -9,7 +10,7 @@
   left: 0;
   right: 0;
 }
-.login-box {
+.login-box-pc {
   width: 436px;
   padding: 30px 40px;
   margin: 100px auto;
@@ -19,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;
@@ -82,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': ''">
           <div class="f34 bold">重置密码</div>
         <div class="login_row">
           <div class="form-group">

src/router/routes.js

@@ -59,6 +59,10 @@ const routes = [{
                 meta: { title: '酒店' },
                 component: () =>
                     import ('pages/detailsHotal.vue')
+            }, { // 酒店下单
+                path: '/HotalForm/:id',
+                component: () =>
+                    import ('pages/hotel/orderForm.vue')
             }, { // 旅程
                 path: '/detail/:id/:tcid/:newConfigId',
                 meta: { title: '旅程' },