Merge branch 'modifywebsite' of fxie/hichina2023 into master

hichina-main-front-mobile-first/src/i18n/en-US/index.js

@@ -36,4 +36,6 @@ export default {
   enter_email: "Enter your email",
   enter_password: "Enter your password",
   confirm_password: "Confirm your password",
+  place_to_go_in: "Place to go in",
+  guidebook_of: "Guidebook of",
 };

hichina-main-front-mobile-first/src/i18n/ko-KR/index.js

@@ -34,4 +34,9 @@ export default {
   search_by_title: "제목으로 검색",
   deals_for_you: "당신을 위한 거래",
   seasonal_recommendation: "계절 추천",
+  // enter_email: "Enter your email",
+  // enter_password: "Enter your password",
+  // confirm_password: "Confirm your password",
+  // place_to_go_in: "Place to go in",
+  // guidebook_of: "Guidebook of",
 };

hichina-main-front-mobile-first/src/i18n/ru-RU/index.js

@@ -34,4 +34,9 @@ export default {
   search_by_title: "Поиск по названию",
   deals_for_you: "Предложения для вас",
   seasonal_recommendation: "Seasonal Recommendation",
+  enter_email: "Enter your email",
+  enter_password: "Enter your password",
+  confirm_password: "Confirm your password",
+  place_to_go_in: "Place to go in",
+  guidebook_of: "Guidebook of",
 };

hichina-main-front-mobile-first/src/i18n/th-TH/index.js

@@ -36,4 +36,6 @@ export default {
   enter_email: "กรุณากรอกอีเมลของคุณ",
   enter_password: "กรุณากรอกรหัสผ่านของคุณ",
   confirm_password: "กรุณายืนยันรหัสผ่านของคุณ",
+  place_to_go_in: "สถานที่น่าไปใน",
+  guidebook_of: "คู่มือท่องเที่ยวของ",
 };

hichina-main-front-mobile-first/src/index.template.html

@@ -16,6 +16,27 @@
       content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
     />
 
+    <!-- Facebook Meta Tags -->
+    <meta property="og:url" content="https://www.hichinatravel.com/" />
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="Hichina Travel" />
+    <meta property="og:description" content=" " />
+    <meta
+      property="og:image"
+      content="https://scontent-sin6-2.xx.fbcdn.net/v/t39.30808-6/325757110_733421888052955_3781198283661166489_n.png?_nc_cat=108&ccb=1-7&_nc_sid=09cbfe&_nc_ohc=d0ZMFqXFTtMAX-_O-ge&_nc_oc=AQn5FuKmWJAepS7Q252GbeUupavd9_h8KQrvrDJZmBp0FslCLIdZO9IAKLezChiqhUE&_nc_ht=scontent-sin6-2.xx&oh=00_AfDPKCdYestTe6r7Z6cfz332JfMsoqBvUhEnX9P1e28FrA&oe=64F07000"
+    />
+
+    <!-- Twitter Meta Tags -->
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta property="twitter:domain" content="hichinatravel.com" />
+    <meta property="twitter:url" content="https://www.hichinatravel.com/" />
+    <meta name="twitter:title" content="Hichina Travel" />
+    <meta name="twitter:description" content=" " />
+    <meta
+      name="twitter:image"
+      content="https://scontent-sin6-2.xx.fbcdn.net/v/t39.30808-6/325757110_733421888052955_3781198283661166489_n.png?_nc_cat=108&ccb=1-7&_nc_sid=09cbfe&_nc_ohc=d0ZMFqXFTtMAX-_O-ge&_nc_oc=AQn5FuKmWJAepS7Q252GbeUupavd9_h8KQrvrDJZmBp0FslCLIdZO9IAKLezChiqhUE&_nc_ht=scontent-sin6-2.xx&oh=00_AfDPKCdYestTe6r7Z6cfz332JfMsoqBvUhEnX9P1e28FrA&oe=64F07000"
+    />
+
     <link
       rel="icon"
       type="image/png"

hichina-main-front-mobile-first/src/opengraph.html

@@ -1,24 +0,0 @@
-<!-- HTML Meta Tags -->
-<title>Hichina Travel</title>
-<meta name="description" content=" " />
-
-<!-- Facebook Meta Tags -->
-<meta property="og:url" content="https://www.hichinatravel.com/" />
-<meta property="og:type" content="website" />
-<meta property="og:title" content="Hichina Travel" />
-<meta property="og:description" content=" " />
-<meta
-  property="og:image"
-  content="https://scontent-lax3-1.xx.fbcdn.net/v/t39.30808-6/325757110_733421888052955_3781198283661166489_n.png?_nc_cat=108&ccb=1-7&_nc_sid=09cbfe&_nc_ohc=nnRyKDARUw0AX-E-BER&_nc_ht=scontent-lax3-1.xx&oh=00_AfAX9XbmGXWh2aBOOvbqGKyzxJaaT_bXlD7szExCS7C3-w&oe=64EC7B80"
-/>
-
-<!-- Twitter Meta Tags -->
-<meta name="twitter:card" content="summary_large_image" />
-<meta property="twitter:domain" content="hichinatravel.com" />
-<meta property="twitter:url" content="https://www.hichinatravel.com/" />
-<meta name="twitter:title" content="Hichina Travel" />
-<meta name="twitter:description" content=" " />
-<meta
-  name="twitter:image"
-  content="https://scontent-lax3-1.xx.fbcdn.net/v/t39.30808-6/325757110_733421888052955_3781198283661166489_n.png?_nc_cat=108&ccb=1-7&_nc_sid=09cbfe&_nc_ohc=nnRyKDARUw0AX-E-BER&_nc_ht=scontent-lax3-1.xx&oh=00_AfAX9XbmGXWh2aBOOvbqGKyzxJaaT_bXlD7szExCS7C3-w&oe=64EC7B80"
-/>

hichina-main-front-mobile-first/src/pages/ContactPage.vue

@@ -20,12 +20,8 @@
       <div class="col-6 text-center">
         <q-card
           class="trip"
-          style="max-width: 300px; display: inline-block"
-          @click="
-            redirectToLink(
-              'https://docs.qq.com/form/page/DSWdXS0d0REt3Y3FO#/fill'
-            )
-          "
+          style="max-width: 450px; display: inline-block"
+          @click="redirectToLink('https://wj.qq.com/s2/13001219/6136/')"
         >
           <q-card-section>
             <q-img
@@ -40,18 +36,24 @@
         </q-card>
       </div>
       <div class="col-6 text-center">
-        <q-card class="ticket" style="max-width: 300px; display: inline-block">
+        <q-card
+          class="ticket"
+          style="max-width: 450px; display: inline-block"
+          @click="
+            goPage('/product-detail/770ccc30-7369-4df5-83df-35977653219d')
+          "
+        >
           <q-card-section>
             <q-img
-              src="https://as1.ftcdn.net/v2/jpg/01/23/56/18/1000_F_123561829_C1XI8R9kugI01FEbDvaF5LmDpmaorH7u.jpg"
+              src="https://newblogimages.oss-cn-nanjing.aliyuncs.com/96cd118a-2f2f-4954-b629-c7f51a65493e.jpg?x-oss-process=style/blogcontent"
               alt="Image 2"
             />
           </q-card-section>
           <q-card-section>
             <div class="text-h6">Book Flights</div>
             <div>
-              This functionality is currently under maintenance and will be
-              available soon.
+              Saves your time in flight search, price comparison, through our 1
+              on 1 VIP communication
             </div>
           </q-card-section>
         </q-card>
@@ -89,18 +91,17 @@ export default {
 .trip {
   cursor: pointer;
   width: 100%;
-  max-width: 350;
   margin-bottom: 50px;
   margin-top: 50px;
-  height: 300px;
+  height: 450px;
 }
 
 .ticket {
+  cursor: pointer;
   width: 100%;
-  max-width: 350;
   margin-bottom: 50px;
   margin-top: 50px;
-  height: 300px;
+  height: 450px;
 }
 
 .q-img {

hichina-main-front-mobile-first/src/pages/DestinationDetailPage.vue

@@ -1,8 +1,7 @@
 <template>
   <q-page>
     <div class="row" style="height: 110px; background-color: #e5f2fa">
-      <div class="col-sm-2"></div>
-      <div class="col-12 col-sm-10 column">
+      <div class="col-12 col-sm-10 column" style="margin-left: 20px">
         <div class="q-pt-md q-pl-md text-black text-weight-bold">
           Home > Destination > {{ destinationName }}
         </div>
@@ -12,38 +11,51 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-12 col-sm-5 row q-px-md q-py-lg" style="height: 450px">
-        <div class="col-12" style="background-color: white">
-          <q-img :src="destinationProfileImage" fit="fill"> </q-img>
-        </div>
+      <!-- Left Column for Image -->
+      <div
+        class="col-12 col-sm-5 row q-px-md q-py-lg d-flex justify-center align-center"
+        style="height: 450px; background-color: white"
+      >
+        <q-img
+          :src="destinationProfileImage"
+          style="width: 100%; max-width: 650px; height: 100%"
+          fit="cover"
+        >
+        </q-img>
       </div>
+
+      <!-- Right Column for Description, Guidebook, and Download Button -->
       <div class="col-12 col-sm-7 row q-px-md q-py-lg" style="height: 450px">
-        <div class="column col-12">
-          <div
-            class="col-9 q-pa-md text-subtitle1"
-            style="background-color: #fff9c6"
-            v-html="description"
-          ></div>
-          <div class="col-3 row">
-            <div class="col-6 text-h4 flex flex-center">
-              Guidbook of {{ destinationName }}
-            </div>
-            <div class="col-6 flex flex-center">
-              <q-btn class="glossy" rounded color="blue-6" @click="goDownload"
-                ><q-icon left size="3em" name="download" />
-                <div>Download</div></q-btn
-              >
-            </div>
+        <div
+          class="column col-12 d-flex flex-column justify-between"
+          style="background-color: #eff6fd; height: 100%"
+        >
+          <div class="q-pa-md text-subtitle1">
+            <div v-html="description"></div>
+          </div>
+          <div class="q-pa-md text-h4" style="margin-top: auto">
+            {{ $t("guidebook_of") }} {{ destinationName }}
+            <q-btn class="primary" color="primary" @click="goDownload">
+              <q-icon left size="3em" name="download" />
+              <div>Download</div>
+            </q-btn>
           </div>
         </div>
       </div>
     </div>
+
     <div
-      class="row flex flex-center text-h4"
-      style="border-top: 1px solid gray; height: 80px"
+      class="row flex flex-left text-h4 text-weight-bold"
+      style="
+        background-color: #eff6fd;
+        border-top: 1px solid gray;
+        height: 55px;
+        margin-left: 30px;
+      "
     >
-      Places to go in {{ destinationName }}
+      {{ $t("place_to_go_in") }} {{ destinationName }}
     </div>
+
     <div
       v-for="item in childDestinations"
       v-bind:key="item.destinationId"
@@ -59,7 +71,7 @@
         ></q-img>
       </div>
       <div class="col-9 column q-pa-md">
-        <div class="text-h4 text-weight-bold">
+        <div class="text-h4 text-weight-bold" style="background-color: #f3f6f8">
           <a :href="'./destination-detail/' + item.destinationId">{{
             item.destinationName
           }}</a>

hichina-main-front-mobile-first/src/pages/ProductDetailPage.vue

@@ -69,7 +69,7 @@
             class="col-11 col-sm-10 flex text-h6 q-pl-sm"
             style="align-items: center"
           >
-            {{ days - 1 }} nights {{ days }} days
+            {{ days - 1 }} {{ $t("nights") }} {{ days }} {{ $t("days") }}
           </div>
           <div
             v-if="productTypeId === FLIGHTPRODUCTTYPE"
@@ -248,7 +248,12 @@
     >
       <div
         class="col-12"
-        style="background-color: white"
+        style="
+          background-color: white;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        "
         v-html="productDescription"
       ></div>
     </div>