fengchang 1 жил өмнө
parent
commit
c56e26c651

+ 42 - 9
hichina-main-front-mobile-first/src/layouts/MainLayout.vue

@@ -82,14 +82,36 @@
           />
         </div>
         <div v-if="currentUser != ''" class="row">
-          <q-btn v-if="$q.screen.gt.xs" round flat class="q-mr-md">
+          <q-btn v-if="$q.screen.gt.xs" round flat>
             <q-avatar size="36px">
               <img :src="currentProfileImage" />
             </q-avatar>
             <q-tooltip>{{ currentUser }}</q-tooltip>
           </q-btn>
         </div>
-        <div v-if="currentUser != ''" class="row no-wrap">
+        <div v-if="currentUser != ''" class="row q-mr-xl">
+          <q-btn icon="arrow_drop_down" flat dense>
+            <q-menu
+              style="width: 100px"
+              transition-show="flip-right"
+              transition-hide="flip-left"
+            >
+              <q-list dense class="text-grey-9 text-caption">
+                <q-item clickable>
+                  <q-item-section>My Content</q-item-section>
+                </q-item>
+                <q-item clickable>
+                  <q-item-section>Edit Profile</q-item-section>
+                </q-item>
+                <q-separator />
+                <q-item clickable @click="logout()">
+                  <q-item-section>Logout</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+        </div>
+        <!-- <div v-if="currentUser != ''" class="row no-wrap q-ml-md">
           <q-btn
             @click="logout()"
             v-if="$q.screen.gt.xs"
@@ -100,7 +122,7 @@
             icon="logout"
             ><q-tooltip>logout</q-tooltip></q-btn
           >
-        </div>
+        </div> -->
         <div>
           <q-btn
             v-if="!$q.screen.gt.xs"
@@ -118,7 +140,7 @@
     <q-drawer v-model="leftDrawerOpen" bordered class="bg-grey-2" :width="240">
       <q-scroll-area class="fit">
         <q-list padding>
-          <q-item v-ripple clickable>
+          <q-item v-ripple clickable @click="goPage('/guideintro')">
             <q-item-section avatar>
               <q-icon color="grey" name="fingerprint" />
             </q-item-section>
@@ -126,7 +148,7 @@
               <q-item-label>GuideBooks</q-item-label>
             </q-item-section>
           </q-item>
-          <q-item v-ripple clickable>
+          <q-item v-ripple clickable @click="goPage('/blog')">
             <q-item-section avatar>
               <q-icon color="grey" name="fingerprint" />
             </q-item-section>
@@ -134,7 +156,7 @@
               <q-item-label>Blogs/Vlogs</q-item-label>
             </q-item-section>
           </q-item>
-          <q-item v-ripple clickable>
+          <q-item v-ripple clickable @click="goPage('/product')">
             <q-item-section avatar>
               <q-icon color="grey" name="fingerprint" />
             </q-item-section>
@@ -142,7 +164,7 @@
               <q-item-label>Travel Shop</q-item-label>
             </q-item-section>
           </q-item>
-          <q-item v-ripple clickable>
+          <q-item v-ripple clickable @click="goPage('/destination')">
             <q-item-section avatar>
               <q-icon color="grey" name="fingerprint" />
             </q-item-section>
@@ -153,7 +175,12 @@
 
           <q-separator class="q-my-md" />
 
-          <q-item v-if="currentUser === ''" v-ripple clickable>
+          <q-item
+            v-if="currentUser === ''"
+            v-ripple
+            clickable
+            @click="goPage('/auth/login')"
+          >
             <q-item-section avatar>
               <q-icon color="grey" name="login" />
             </q-item-section>
@@ -161,7 +188,12 @@
               <q-item-label>Login</q-item-label>
             </q-item-section>
           </q-item>
-          <q-item v-if="currentUser === ''" v-ripple clickable>
+          <q-item
+            v-if="currentUser === ''"
+            v-ripple
+            clickable
+            @click="goPage('/auth/register')"
+          >
             <q-item-section avatar>
               <q-icon color="grey" name="account_circle" />
             </q-item-section>
@@ -305,6 +337,7 @@ export default defineComponent({
       leftDrawerOpen,
       currentUser,
       currentProfileImage,
+      menu_profile: false,
       logout,
       toggleLeftDrawer() {
         leftDrawerOpen.value = !leftDrawerOpen.value;

+ 13 - 11
hichina-main-front-mobile-first/src/pages/IndexPage.vue

@@ -34,7 +34,10 @@
     <div class="row">
       <div class="col-6 col-md-2 text-blue-6 text-h4 q-pl-md">Destinations</div>
       <div class="col-md-8"></div>
-      <div class="col-6 col-md-2 text-blue-6 cursor-pointer">
+      <div
+        @click="goPage('/destination')"
+        class="col-6 col-md-2 text-blue-6 cursor-pointer"
+      >
         More destinations >
       </div>
     </div>
@@ -49,6 +52,7 @@
       >
         <div class="q-pa-md">
           <q-card
+            @click="goPage('/destination-detail/' + item.destinationId)"
             class="rand-destination-card cursor-pointer rounded-borders"
             @mouseenter="hoverFlag = true"
             @mouseleave="hoverFlag = false"
@@ -73,6 +77,7 @@
       <div class="row">
         <div
           v-if="$q.screen.gt.xs"
+          @click="goPage('/contact')"
           class="cursor-pointer col-12 q-mt-md q-pt-md rounded-borders text-white text-weight-bold text-h5 text-no-wrap text-center"
           style="
             background-color: #2a82e4;
@@ -85,6 +90,7 @@
         </div>
         <div
           v-if="!$q.screen.gt.xs"
+          @click="goPage('/contact')"
           class="cursor-pointer col-12 q-mt-md q-pt-md rounded-borders text-white text-weight-bold text-subtitle1 text-no-wrap text-center"
           style="
             background-color: #2a82e4;
@@ -99,7 +105,11 @@
     </div>
     <div class="q-pa-md">
       <div class="row">
-        <div class="col-12 cursor-pointer" style="height: 160px">
+        <div
+          class="col-12 cursor-pointer"
+          style="height: 160px"
+          @click="goPage('/contact')"
+        >
           <q-img :src="homePostImageUrl" fit="fill" style="height: 100%">
           </q-img>
         </div>
@@ -155,6 +165,7 @@
             bordered
           >
             <q-img
+              @click="goPage('/product-detail/' + item.value.skuGroupId)"
               :src="item.value.imageUrl"
               placeholder-src="https://photoprism.hichinatravel.com/api/v1/t/2bfc32550ae040956f7e861566d26c487c0143e7/32mcf2k4/tile_224"
             />
@@ -167,15 +178,6 @@
                 {{ item.value.skuGroupName }}
               </div>
             </q-card-section>
-
-            <q-slide-transition>
-              <div v-show="expanded">
-                <q-separator />
-                <q-card-section class="text-subitle2">
-                  {{ lorem }}
-                </q-card-section>
-              </div>
-            </q-slide-transition>
           </q-card>
         </div>
       </div>

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

@@ -620,7 +620,6 @@ export default {
       autoplay: ref(true),
       imageContainer,
       productDescription,
-      removeHtmlTag,
       handleSelectDate,
       selectedDate,
       state,