Merge branches 'main' and 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

src/views/login/customer.vue

@@ -1,53 +1,48 @@
 <template>
-  <div class="customer-container safe-area-top" :class="{ 'form-mode': pageMode === 'form' }">
+  <div
-    <template v-if="pageMode === 'entry'">
+    class="customer-container safe-area-top flex flex-column"
+    :class="{ 'form-mode': pageMode === 'form' }"
+  >
     <div class="setting flex flex-between">
-        <SvgIcon name="left" size="70" @click="handleBack" />
+      <SvgIcon name="left" size="70" @click.stop="handleBack" />
-
       <SvgIcon name="setting" size="70" />
     </div>
-      <div class="content flex flex-center flex-column">
+    <template v-if="pageMode === 'entry'">
+      <div class="content flex-1 flex flex-center flex-column">
         <div class="text">Who is Your Customer?</div>
+        <div class="btn-list flex flex-center">
+          <button class="sandblasted-blurred btn">
+            <span>Create</span>
+          </button>
+          <button class="sandblasted-blurred btn" @click="handleChangeMode('form')">
+            <span>Entry</span>
+          </button>
+        </div>
       </div>
-      <div class="entry-btn flex flex-center" @click="handleChangeMode('form')">Entry</div>
     </template>
     <template v-else>
-      <div class="form-container">
+      <div class="form-container flex-1 flex flex-column flex-center">
-        <div class="menu flex flex-between">
-          <div class="back-container flex flex-between" @click="handleBack">
-            <SvgIcon name="left" size="70" />
-          </div>
-          <SvgIcon name="setting" size="70" />
-        </div>
         <div class="text">
           <div class="form-title">Customer ID</div>
           <div class="description">
-            Redefine the styling experience with AI. Use<br />Styling Angel to speed up your
+            <p>Redefine the styling experience with AI.</p>
-            fashion<br />journey.
+            <p>Use Styling Angel to speed up your fashion journey.</p>
           </div>
         </div>
 
         <div class="glass-form">
           <div class="form-field">
-            <label class="field-label">VIP ID</label>
+            <label class="field-label">Nickname</label>
             <input
               v-model="customerData.vipId"
               type="text"
-              placeholder="Enter your ID"
+              placeholder="Enter name"
               class="form-input"
             />
           </div>
-          <!-- <div class="form-field email">
-            <label class="field-label">Email Address</label>
-            <input
-              v-model="customerData.email"
-              type="email"
-              placeholder="Enter your email"
-              class="form-input"
-            />
-          </div> -->
           <button class="confirm-btn" @click="handleConfirm">Confirm</button>
         </div>
+        <div class="show-all">Show All</div>
         <div class="copyright">Powered by AiDLab for Lane Crawford</div>
       </div>
     </template>
@@ -64,10 +59,15 @@ const router = useRouter()
 const generateStore = useGenerateStore()
 
 type PageMode = 'form' | 'entry'
-const pageMode = ref<PageMode>('form')
+const pageMode = ref<PageMode>('entry')
-// const pageMode = ref<PageMode>('entry')
 
-const handleBack = () => {
+const handleBack = (e?: Event) => {
+  e.stopPropagation()
+  e.preventDefault()
+  if (pageMode.value === 'form') {
+    pageMode.value = 'entry'
+    return
+  }
   router.go(-1)
 }
 
@@ -94,7 +94,7 @@ const handleConfirm = async () => {
     // console.log('res', res)
     generateStore.setCustomerInfo(res)
     // router.push('/workshop/stylist/index')
-    router.push('/workshop/homeNav')
+    router.push('/workshop/home')
   })
 }
 </script>
@@ -104,13 +104,12 @@ const handleConfirm = async () => {
   overflow: hidden;
   color: #fff;
   position: relative;
-  // background: url('@/assets/images/no_shouder_bg.png') no-repeat center center;
+  background: url('@/assets/images/no_shouder_bg.png') no-repeat center center;
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;
   &.form-mode {
     background: url('@/assets/images/has_shouder_bg.png') no-repeat center center/cover;
-    padding-top: 15.9rem;
   }
 
   .setting {
@@ -122,7 +121,8 @@ const handleConfirm = async () => {
     }
   }
   .content {
-    margin-top: 55.3rem;
+    // margin-top: 55.3rem;
+    row-gap: 12.7rem;
     .text {
       font-family: 'satoshiBold';
       font-size: 13rem;
@@ -140,37 +140,22 @@ const handleConfirm = async () => {
       justify-content: center;
       border-radius: 4rem;
     }
-  }
+    .btn-list {
-  .entry-btn {
+      column-gap: 17rem;
-    position: absolute;
+      .btn {
+        height: 8.3rem;
+        width: 29.7rem;
+        line-height: 8.3rem;
+        font-size: 4.8rem;
         border: 0.2rem solid #fff;
-    bottom: 10.3rem;
+      }
-    right: 5.5rem;
+    }
-    height: 9rem;
-    width: 27.5rem;
-    line-height: 9rem;
-    font-size: 5.6rem;
   }
 
   .form-container {
-    .menu {
+    width: 78.8rem;
-      padding: 0 4.8rem 0 8.4rem;
+    margin: 0 auto;
-      .back-container {
-        width: 7.3rem;
-        height: 7.3rem;
-        border-radius: 1.8rem;
-        font-size: 4.3rem;
-        position: relative;
-
-        .back-icon {
-          width: 2.08rem;
-          height: 3.47rem;
-        }
-      }
-    }
     .text {
-      padding-left: 15.2rem;
-      margin-top: 15.4rem;
       letter-spacing: 0.02rem;
     }
     .form-title {
@@ -182,18 +167,16 @@ const handleConfirm = async () => {
       font-size: 3.6rem;
       line-height: 141%;
       letter-spacing: 0.08rem;
-      margin-top: 2.7rem;
+      margin: 3.1rem 0 11rem 0;
       font-family: 'satoshiRegular';
     }
 
     .glass-form {
-      height: 68.8rem;
+      height: 68.7rem;
+      width: 78.8rem;
       border: 0.2rem solid #ffffff;
       border-radius: 4.7rem;
-      margin: 0 14.2rem;
-      //   padding: 8.2rem 7.9rem;
       padding: 11rem 7.5rem;
-      margin-top: 11rem;
       box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1), inset 0 1px 0 rgba(255, 255, 255, 0.1);
       display: flex;
       flex-direction: column;
@@ -251,6 +234,18 @@ const handleConfirm = async () => {
         box-shadow: 0 0.2rem 8px rgba(0, 0, 0, 0.2);
       }
     }
+    .show-all {
+      margin-top: 4rem;
+      width: 19rem;
+      height: 7.6rem;
+      border-radius: 54px;
+      color: #000;
+      text-align: center;
+      line-height: 7.6rem;
+      background-color: #fff;
+      font-size: 3.1rem;
+      font-family: 'satoshiRegular';
+    }
     .copyright {
       font-family: 'satoshiRegular';
       font-size: 3rem;
@@ -259,7 +254,7 @@ const handleConfirm = async () => {
       margin-top: 2.31rem;
       text-align: center;
       font-weight: 400;
-      margin-top: 18.7rem;
+      margin-top: 11.5rem;
     }
   }
 }

src/views/stylist/dressfor.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="dressfor-container flex">
     <div class="content flex-1 flex flex-column">
-      <!-- <div class="setting flex flex-between">
+      <div class="loading-container flex flex-center">
-        <van-icon name="arrow-left" color="#fff" @click="handleBack" />
+        <Icon class="icon-element" title="" />
-        <SvgIcon name="setting" size="70" />
+      </div>
-      </div> -->
+      <div class="text">
-      <div class="text">What are you dressing for?</div>
+        What are you <br />
+        dressing for?
+      </div>
       <!-- <div class="start-btn" @click="handleStart">Start</div> -->
       <div class="chatbox flex flex-center">
         <div class="input-box flex">
@@ -33,19 +35,45 @@
           <SvgIcon class="send-icon" name="send" size="26" color="#000000" />
         </div>
       </div>
+      <div class="tag-container flex flex-column flex-center">
+        <div class="tag-list short flex flex-justify-center">
+          <div
+            class="tag-item"
+            v-for="item in tagListShort"
+            :key="item"
+            @click="handleClickTag(item)"
+          >
+            {{ item }}
+          </div>
+        </div>
+        <div class="tag-list long flex flex-justify-center">
+          <div
+            class="tag-item"
+            v-for="item in tagListLong"
+            :key="item"
+            @click="handleClickTag(item)"
+          >
+            {{ item }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 <script setup lang="ts">
 import { ref, onUnmounted, nextTick, watch } from 'vue'
-import { showToast } from 'vant'
+import { showToast, closeToast } from 'vant'
 import HeaderTitle from '@/components/HeaderTitle.vue'
 import FooterNavigation from '@/components/FooterNavigation.vue'
 import { useRouter } from 'vue-router'
 import AudioVisualizer from '@/views/asistant/components/AudioVisualizer.vue'
+import Icon from '../asistant/components/GenerateLoading.vue'
 
 const router = useRouter()
 
+const tagListShort = ['Silk Slip Dress', 'Business Casual', 'Suggest Shoe Styles']
+const tagListLong = ['Linen Suit For Summer  Gaka', 'Recomment Evening Bags']
+
 const inputValue = ref('')
 const isRecording = ref(false)
 const audioVisualizerRef = ref<InstanceType<typeof AudioVisualizer> | null>(null)
@@ -73,7 +101,7 @@ const handleSendMessage = () => {
     showToast('Please enter a message')
     return
   }
-  showToast('Voice-to-text conversion has been completed.')
+
   router.push({
     path: '/asistant',
     query: message ? { message } : undefined
@@ -109,6 +137,10 @@ const startRecording = () => {
   }
 
   speechRecognition.onstart = () => {
+    showToast({
+      message: 'Listening...',
+      duration: 0
+    })
     isRecording.value = true
   }
 
@@ -136,6 +168,7 @@ const startRecording = () => {
   }
 
   speechRecognition.onend = () => {
+    closeToast()
     isRecording.value = false
     lastTranscript = ''
     isSpeechRecognitionActive = false
@@ -143,6 +176,7 @@ const startRecording = () => {
 
   speechRecognition.onerror = (event: any) => {
     console.error('Speech recognition error:', event.error)
+    closeToast()
     isRecording.value = false
     isSpeechRecognitionActive = false
     showToast('Speech recognition failed, please try again')
@@ -159,6 +193,10 @@ const stopRecording = () => {
   }
 }
 
+const handleClickTag = (tag: string) => {
+  inputValue.value = tag
+}
+
 onUnmounted(() => {
   if (speechRecognition && isRecording.value) {
     speechRecognition.stop()
@@ -173,29 +211,45 @@ onUnmounted(() => {
 }
 .dressfor-container {
   height: calc(100vh - 12rem - 14.9rem);
-  overflow: hidden;
+  // overflow: hidden;
   color: #fff;
   position: relative;
-  background: url('@/assets/images/dress_for_bg.png') no-repeat center center;
+  // background: url('@/assets/images/dress_for_bg.png') no-repeat center center;
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;
   padding: 6rem 0 0 0;
   .content {
-    .setting {
+    .loading-container {
-      padding: 0 4.9rem 0 8.4rem;
+      :deep(.loading-image) {
-      font-size: 7rem;
+        width: 17rem;
-      .c-svg {
+        height: 17rem;
-        width: initial;
+        animation: none;
+      }
+      :deep(.loading-shadow) {
+        width: 9.2rem;
+        height: 2.4rem;
+        filter: blur(6px);
+        opacity: 0.5;
+        margin: 2.4rem 0 0;
+        // background-color: #d9d9d9;
       }
     }
     .text {
       font-family: 'satoshiBold';
-      font-size: 11rem;
+      font-size: 9.6rem;
-      line-height: 106%;
       text-align: center;
-      margin-top: 43.8rem;
+      padding-top: 9rem;
-      margin-bottom: 14rem;
+      padding-bottom: 14rem;
+
+      font-weight: 700;
+      line-height: 1.12;
+      background: #b3b3b3;
+      background: linear-gradient(120deg, #b3b3b3 1%, rgba(0, 0, 0, 0) 48%),
+        linear-gradient(344deg, #b3b3b2 16%, #000000 66%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
     }
     .chatbox {
       height: 9.3rem;
@@ -204,7 +258,7 @@ onUnmounted(() => {
       .input-box {
         width: 59.8rem;
         height: 100%;
-        background-color: #fff;
+        background-color: #efefef;
         // border: 2px solid #5f5f5f;
         border-radius: 1rem;
         color: #222222;
@@ -233,6 +287,7 @@ onUnmounted(() => {
           height: 100%;
           outline: none;
           border: none;
+          background-color: #efefef;
         }
         .audio-icon {
           width: initial;
@@ -241,10 +296,36 @@ onUnmounted(() => {
       .send {
         width: 7.6rem;
         height: 7.6rem;
-        background-color: #fff;
+        background-color: #efefef;
         border-radius: 1rem;
       }
     }
+    .tag-container {
+      row-gap: 3.1rem;
+      padding-top: 5.7rem;
+      .tag-list {
+        color: #000;
+        flex-wrap: wrap;
+        &.short {
+          column-gap: 1.91rem;
+        }
+        &.long {
+          column-gap: 3.1rem;
+          padding-left: 2.1rem;
+        }
+        .tag-item {
+          height: 6.8rem;
+          line-height: 6.8rem;
+          box-sizing: border-box;
+          font-family: 'satoshiRegular';
+          font-size: 2.8rem;
+          border: 0.15rem solid #cdcdcd;
+          text-align: center;
+          border-radius: 4.6rem;
+          padding: 0 2.15rem;
+        }
+      }
+    }
   }
 }
 </style>