From e3375e6fc0c2cd2546c2c65de2da80b42f8c6abb Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 20 Oct 2025 15:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=B7=B1=E8=89=B2=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81=E7=94=9F=E6=88=90=E5=8A=A8=E7=94=BB=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6chatloading=E6=94=B9=E4=B8=BAgenerateLoading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/style.css                      | 13 +++++++
 src/assets/css/style.less                     |  7 ++++
 src/components/selectStyle/selectItem.vue     |  8 ++--
 src/views/Workshop/selectModelContinue.vue    | 39 ++++++++++++++-----
 src/views/Workshop/selectStyle.vue            |  6 +--
 .../{ChatLoading.vue => GenerateLoading.vue}  | 14 ++++---
 src/views/asistant/components/NoticeList.vue  |  2 +-
 src/views/asistant/index.vue                  |  4 +-
 8 files changed, 68 insertions(+), 25 deletions(-)
 rename src/views/asistant/components/{ChatLoading.vue => GenerateLoading.vue} (86%)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 4ffe379..db545b6 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -28,6 +28,13 @@ button.sandblasted-blurred::after {
 button.sandblasted-blurred:active {
   opacity: 0.7;
 }
+@media (prefers-color-scheme: dark) {
+  :root,
+  body {
+    background: white !important;
+    color: black !important;
+  }
+}
 html:root {
   --van-dialog-width: 90rem;
   --van-dialog-font-size: 5rem;
@@ -39,3 +46,9 @@ html:root {
   --van-dialog-message-padding: 3rem 2.5rem;
   --van-dialog-has-title-message-padding-top: 2.5rem;
 }
+.van-toast__text {
+  font-size: 4rem;
+  height: 5rem;
+  line-height: 5rem;
+  padding: 0 2rem;
+}
diff --git a/src/assets/css/style.less b/src/assets/css/style.less
index c4ff8a9..8ebce53 100644
--- a/src/assets/css/style.less
+++ b/src/assets/css/style.less
@@ -34,6 +34,13 @@ button.sandblasted-blurred {
 	}
 }
 
+//只使用浅色模式
+@media (prefers-color-scheme: dark) {
+	:root, body {
+		background: white !important;
+		color: black !important;
+	}
+}
 
 // vant dialog
 html:root {
diff --git a/src/components/selectStyle/selectItem.vue b/src/components/selectStyle/selectItem.vue
index b052897..74ab178 100644
--- a/src/components/selectStyle/selectItem.vue
+++ b/src/components/selectStyle/selectItem.vue
@@ -64,10 +64,10 @@ const {} = toRefs(data);
 				</div>
 			</div>
 			<div class="btn">
-				<div>
+				<!-- <div>
 					<SvgIcon v-if="!item.isLike" @click.stop="setLike(item,'like')" name="noLike" size="30" />
 					<SvgIcon v-else name="like" @click.stop="setLike(item,'noLike')" color="#FF4949" size="30" />
-				</div>
+				</div> -->
 				<div>
 					<SvgIcon @click.stop="updateStyle(item,index)" name="update" size="30" />
 				</div>
@@ -75,9 +75,9 @@ const {} = toRefs(data);
 					<SvgIcon v-if="!item.isAdd" @click.stop="addLibrary(item,'add')" name="add" size="30" />
 					<SvgIcon v-else @click.stop="addLibrary(item,'delete')" name="confirmation" size="30" />
 				</div> -->
-				<div>
+				<!-- <div>
 					<SvgIcon @click.stop="deleteStyle(index)" name="delete" size="30" />
-				</div>
+				</div> -->
 			</div>
 		</div>
 		
diff --git a/src/views/Workshop/selectModelContinue.vue b/src/views/Workshop/selectModelContinue.vue
index 45aad9d..49a6447 100644
--- a/src/views/Workshop/selectModelContinue.vue
+++ b/src/views/Workshop/selectModelContinue.vue
@@ -3,38 +3,47 @@ import { onMounted, onUnmounted, reactive, toRefs } from "vue";
 import HeaderTitle from '@/components/HeaderTitle.vue'
 import FooterNavigation from '@/components/FooterNavigation.vue'
 import { useRouter } from 'vue-router'
+import GenerateLoading from '@/views/asistant/components/GenerateLoading.vue'
 const router = useRouter()
 //const props = defineProps({
 //})
 const emit = defineEmits(['view-type'])
-// let data = reactive({
-// 	modelList: 
-// 	[
+let data = reactive({
+	modelList: 
+	[
 
-// 	],
-// 	selectedModelId: null,
-// })
+	],
+	isLoading: false,
+})
 
 // const setSelectedModelId = (item)=>{
 // 	data.selectedModelId = item.id;
 // }
 
+
 const onContinue = ()=>{
 	router.push('uploadFace')
+}
 
+const changeModel = ()=>{
+	router.push('selectModel')
 }
 
 onMounted(() => {
 	emit('view-type', 1)
+	data.isLoading = true;
+	setTimeout(()=>{
+		data.isLoading = false;
+	}, 2000)
 })
 onUnmounted(()=>{
 })
 defineExpose({})
-// const { modelList, selectedModelId } = toRefs(data);
+const { isLoading } = toRefs(data);
 </script>
 <template>
 	<header-title style-type="2" />
-	<div class="selectModelContinue">
+	<div class="selectModelContinue" v-if="!isLoading">
 		<div class="text">
 			<div class="title">
 				Go with this Look?
@@ -58,12 +67,15 @@ defineExpose({})
 				</div>
 			</div>
 			<div class="again">
-				<div>Re-try?</div>
+				<div @click="changeModel">Change Model</div>
 				<div @click="onContinue">Continue</div>
 			</div>
 		</div>
 	</div>
-	<footer-navigation is-placeholder />
+	<footer-navigation is-placeholder v-if="!isLoading"/>
+	<div class="loading-container" v-if="isLoading">
+		<GenerateLoading title="Generating Results..." />
+	</div>
 </template>
 <style lang="less" scoped>
 	.selectModelContinue{
@@ -157,4 +169,11 @@ defineExpose({})
 			}
 		}
 	}
+	.loading-container{
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #fff;
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue
index 95c7f77..d5992c4 100644
--- a/src/views/Workshop/selectStyle.vue
+++ b/src/views/Workshop/selectStyle.vue
@@ -66,8 +66,8 @@ let data = reactive({
 		
 	}
 })
-const toSelectModel = ()=>{
-	router.push({ path: 'selectModel' })
+const toSelectModelContinue = ()=>{
+	router.push({ path: 'selectModelContinue' })
 }
 onMounted(()=>{
 	emit('view-type', 1)
@@ -94,7 +94,7 @@ const { selectList, select } = toRefs(data);
 	</div>
 	<div class="footer placeholder"></div>
 	<div class="footer">
-		<button @click.stop="toSelectModel">Continue</button>
+		<button @click.stop="toSelectModelContinue">Continue</button>
 	</div>
 </template>
 <style lang="less" scoped>
diff --git a/src/views/asistant/components/ChatLoading.vue b/src/views/asistant/components/GenerateLoading.vue
similarity index 86%
rename from src/views/asistant/components/ChatLoading.vue
rename to src/views/asistant/components/GenerateLoading.vue
index ab170ee..05c7914 100644
--- a/src/views/asistant/components/ChatLoading.vue
+++ b/src/views/asistant/components/GenerateLoading.vue
@@ -4,19 +4,23 @@
       <img src="@/assets/images/chat_loading.png" alt="Loading" class="loading-image" />
       <!-- 阴影效果 -->
       <div class="loading-shadow"></div>
-      <div class="loading-text">Analyzing the Outfit...</div>
+      <div class="loading-text">{{ title }}</div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 // 这个组件只负责显示loading动画
-interface LoadingProps {
-  // 可以在这里定义props类型
-}
 
 // 定义组件props类型
-const props = defineProps<LoadingProps>()
+const props = defineProps({
+	title: {
+		type: String,
+		default: 'Analyzing the Outfit...'
+	}
+})
+
+
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/asistant/components/NoticeList.vue b/src/views/asistant/components/NoticeList.vue
index c75cc42..9f578ca 100644
--- a/src/views/asistant/components/NoticeList.vue
+++ b/src/views/asistant/components/NoticeList.vue
@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
 import NoticeItem from './NoticeItem.vue'
-import ChatLoading from './ChatLoading.vue'
+import GenerateLoading from './GenerateLoading.vue'
 import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue'
 
 // 定义消息类型
diff --git a/src/views/asistant/index.vue b/src/views/asistant/index.vue
index eb8d0ce..9707ec1 100644
--- a/src/views/asistant/index.vue
+++ b/src/views/asistant/index.vue
@@ -4,7 +4,7 @@
       <HeaderTitle light hasSetting />
     </div>
     <div class="loading-container" v-if="isLoading">
-      <ChatLoading />
+      <GenerateLoading />
     </div>
     <template v-else>
       <div class="content flex-1" v-if="!isLoading">
@@ -23,7 +23,7 @@
 import HeaderTitle from '@/components/HeaderTitle.vue'
 import NoticeList from './components/NoticeList.vue'
 import InputArea from './components/InputArea.vue'
-import ChatLoading from './components/ChatLoading.vue'
+import GenerateLoading from './components/GenerateLoading.vue'
 import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 const router = useRouter()