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

src/App.vue

@@ -118,7 +118,7 @@ body.desktop .q-tree__node .q-focus-helper:after{
   background: none !important;
 }
 .q-tree__node-header:hover{
-  background: #f1416c1a;
+  background:  #E3F2FD;
 }
 .q-tree__arrow{
   position: absolute;

src/components/hotal/RoomCard.vue

@@ -50,17 +50,17 @@
                 <div class="q-pt-sm" 
                 :class="{'row no-wrap justify-between':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
                     <template v-if="$q.platform.is.desktop">
-                    <div class="col-2 text-grey-6 q-pr-sm">
+                    <div class="col-3 text-grey-6 q-pr-sm">
                         {{subItem.bookingDeadline}}
                     </div>
-                    <div class="col">{{subItem.childRates}}</div>
-                    <div class="col-2 text-red">
+                    <div class="col-4 q-px-sm">{{subItem.childRates}}</div>
+                    <div class="col text-red">
                         <div>入住时间 {{subItem['check-inStartTime']}}</div>
                         <div>最迟入住时间 {{subItem['finalCheck-inTime']}}</div>
                         <div>最迟退房时间 {{subItem['finalCheck-outTime']}}</div>
                     </div>
                     </template>
-                    <div class="col"
+                    <div class="col text-center"
                     :class="{'row justify-end q-pb-sm':$q.platform.is.mobile}"
                     v-if="getPrice2(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)">
                         <span class="fz13">CNY</span>
@@ -71,7 +71,8 @@
                         <!-- <span>{{getPrice(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}</span> -->
                     </div>
                     <div :class="{'row justify-end':$q.platform.is.mobile}">
-                        <q-btn color="primary" :size="$q.platform.is.desktop?'md':'sm'" label="立即預訂" unelevated :class="{'q-px-lg':$q.platform.is.desktop}"
+                        <q-btn color="primary" :size="$q.platform.is.desktop?'md':'sm'" label="立即預訂" unelevated 
+                        :class="{'q-px-xs':$q.platform.is.desktop}"
                         @click="goOrderHandler(subItem.roomOptionCd)"/>
                     </div>
                 </div>
@@ -163,6 +164,15 @@
       },
       showImageHandler(url,img) {
         this.images = img
+        let index = 0
+        let images = this.images
+        this.$viewerApi({
+          options: {
+            initialViewIndex: index,
+          },
+          images,
+        });
+        return
         this.currentImage = url
         this.showImagePriview = true
       },

src/components/navs/hor-big-one.vue

@@ -158,6 +158,11 @@
 .category-btn {
   width: 100px;
 }
+.mobile-logo{
+  max-height: 35px;
+  max-width: 120px;
+  object-fit: contain;
+}
 </style>
 <template>
   <q-header
@@ -180,10 +185,11 @@
         :src="baseData.logo"
         style="
           cursor: pointer;
+          height: 35px;
           filter: drop-shadow(0px 0px var(--q-color-primary));
         "
-        :style="{'height':$q.platform.is.desktop?'35px':'30px'}"
         class="q-mr-lg q-ml-sm"
+        :class="{'mobile-logo':$q.platform.is.mobile}"
         @click="CommonJump('/index', {})"
       /></div>
       <!-- <div style="transform:scale(0.6,0.6)"> -->

src/components/searchdata/kkday.vue

@@ -937,7 +937,7 @@ export default {
 
 <style>
 .addr-list:hover {
-  background: #f1416c1a;
+  background: #E3F2FD;
 }
 </style>
 <style lang="scss" scoped>

src/pages/ScenicSpotTicket/details.vue

@@ -878,7 +878,7 @@ export default {
             });
             
           } else {
-            this.$message.error(r.data.message)
+            this.$message.error(r.data.message) 
           }
           this.$q.loading.hide();
         },
@@ -908,13 +908,14 @@ export default {
               let MailingMoneyList = x.PriceList.sort((a,b)=>{return b.MailingMoney-a.MailingMoney})
               let dataObj = {
                   startDate: x.Date,
-                  originalB2CPrice: x.PriceList[0].Price,
+                  originalB2CPrice: x.PriceList[0].Price>0?x.PriceList[0].Price:'',
                   remainNum: 1,
                   Count: 1,
                   safeMoney: 0,
                   MailingMoney: MailingMoneyList[0].MailingMoney,
                   PriceList: x.PriceList,
                 }
+                x.Date = date.formatDate(new Date(x.Date), 'YYYY/MM/DD')
                 if(date.formatDate(Date.now(), 'YYYY/MM/DD')!=x.Date&&x.Date>date.formatDate(Date.now(), 'YYYY/MM/DD')){
                   arr.push(dataObj)
                 }

src/pages/detailHotal.vue

@@ -199,7 +199,7 @@
           <q-popup-proxy :offset="[0, 10]">
             <div class="q-pa-lg q-py-lg bg-white">
               <div class="column">
-                <span class="text-grey-7 product-price fz14 q-mr-lg">客房</span>
+                <span class="text-grey-7 fz14 q-mr-lg">客房</span>
                 <div>
                   <q-input
                   v-model="roomGroup"
@@ -1020,6 +1020,15 @@ export default {
       this.showOrderPreview = !this.showOrderPreview
     },
     showImageHandler(url) {
+      let index = 0
+      let images = this.images
+      this.$viewerApi({
+        options: {
+          initialViewIndex: index,
+        },
+        images,
+      });
+      return
       this.currentImage = url
       this.showImagePriview = true
     },

src/pages/login.vue

@@ -281,7 +281,7 @@ export default {
       flag: 2,
       mylabel: "登入",
       loading: false,
-      inSending: false,
+      inSending:false
     };
   },
   created() {},
@@ -289,11 +289,19 @@ export default {
     console.log("login", this.$route.query);
     const { code, state, path } = this.$route.query;
     this.path = path;
-    if (code) {
-      this.fetchLoginInfo(code, state);
-      this.isLogin = false;
-      this.loginType = "bindEmail";
-      this.mylabel = "立即绑定";
+    
+    try {
+      if (code) {
+        this.fetchLoginInfo(code, state);
+        this.isLogin = false;
+        this.loginType = "bindEmail";
+        this.mylabel = "立即绑定";
+      } else if(this.$q.platform.is.mobile && location.href.indexOf('?code=')!=-1){
+        let params = location.href.split('?')[1].split('#/')[0].split('&')
+        this.fetchLoginInfo(params[0].split('=')[1], params[1].split('=')[1]);
+      }
+    } catch (error) {
+      console.log(error.message)
     }
     this.getOpenInfo();
     var jObj = JSON.parse(localStorage.getItem("groupinfo"));
@@ -322,11 +330,13 @@ export default {
         {
           code,
           state,
+          platform:this.$q.platform.is.desktop?'':'mobile'
         },
         (res) => {
           if (res.data.resultCode == 1) {
             const { type, unoinid } = res.data.data;
             if (type === 1) {
+              
               window.localStorage.setItem(
                 "b2bUser",
                 JSON.stringify(res.data.data)
@@ -453,30 +463,25 @@ export default {
         this.loginType = "PassWord";
       }
     },
-    isWeChat() {
-      //window.navigator.userAgent属性包含了浏览器类型、版本、操作系统类型、浏览器引擎类型等信息，这个属性可以用来判断浏览器类型
-      var ua = window.navigator.userAgent.toLowerCase();
-      //通过正则表达式匹配ua中是否含有MicroMessenger字符串
-      return ua.match(/MicroMessenger/i) == "micromessenger";
-    },
     useWechatLogin() {
       // this.loginType = "wechat";
       // this.setWechatCode()
       const { AppID, State, OpenRedirectUri } = this.openInfo;
-      let redirect_uri = OpenRedirectUri;
-      let url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${encodeURIComponent(
-        "http://www.oytour.com/#/login"
-      )}&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
-      // this.windowObjectReference = window.open(url, 'wechat', 'left: 20,top: 20,width:200,height:200,')
-      // console.log('windowObjectReference', this.windowObjectReference)
-      // setTimeout(() => {console.log(this.windowObjectReference.close())}, 1000)
-      if (this.$q.platform.is.mobile && this.isWeChat()) {
-        // 移动端微信环境
-        url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${AppID}&redirect_uri=${encodeURIComponent(
-          "http://www.oytour.com/#/login"
-        )}&response_type=code&scope=snsapi_userinfo&state=${State}&wechat_redirect=${redirect_uri}`;
+        let redirect_uri = OpenRedirectUri;
+      if(this.$q.platform.is.desktop){
+        const url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${encodeURIComponent('http://www.oytour.com/#/login')}&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
+        // this.windowObjectReference = window.open(url, 'wechat', 'left: 20,top: 20,width:200,height:200,')
+        // console.log('windowObjectReference', this.windowObjectReference)
+        // setTimeout(() => {console.log(this.windowObjectReference.close())}, 1000)
+        window.location.href = url;
+      }else{
+        const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx44c35529819fc345&redirect_uri=${encodeURIComponent('http://www.oytour.com/#/login')}&response_type=code&scope=snsapi_userinfo&state=${State}&&connect_redirect=1#wechat_redirect`;
+        // this.windowObjectReference = window.open(url, 'wechat', 'left: 20,top: 20,width:200,height:200,')
+        // console.log('windowObjectReference', this.windowObjectReference)
+        // setTimeout(() => {console.log(this.windowObjectReference.close())}, 1000)
+        window.location.href = url;
       }
-      window.location.href = url;
+      
     },
     async login() {
       if (this.loading) {