From 83dbd6bd41cf1b66d56866a2c077b686ad51f42b Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 20 Nov 2025 14:54:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/stores/modules/overall.ts | 12 ++++++++++++
src/views/Workshop/home.vue | 15 +++++++++++----
src/views/stylist/index.vue | 5 ++++-
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/stores/modules/overall.ts b/src/stores/modules/overall.ts
index 7689f34..78c4d21 100644
--- a/src/stores/modules/overall.ts
+++ b/src/stores/modules/overall.ts
@@ -5,6 +5,15 @@ export const useOverallStore = defineStore({
state: () => {
return {
loading:false,
+ /**
+ * 流程类型
+ * main: 主流程
+ * reinventing: 魔改
+ * stylist: 查看设计师
+ * clientId: 切换客户
+ *
+ */
+ flowType:'',
}
},
getters: {
@@ -14,6 +23,9 @@ export const useOverallStore = defineStore({
// 全局loading
setLoading(data:boolean){
this.loading = data
+ },
+ setFlowType(data:string){
+ this.flowType = data
}
}
})
diff --git a/src/views/Workshop/home.vue b/src/views/Workshop/home.vue
index d96a2c1..1a49ee2 100644
--- a/src/views/Workshop/home.vue
+++ b/src/views/Workshop/home.vue
@@ -3,6 +3,7 @@ import { onMounted, onUnmounted, reactive, toRefs, computed, onActivated } from
import HeaderTitle from '@/components/HeaderTitle.vue'
import FooterNavigation from '@/components/FooterNavigation.vue'
import { useRouter } from 'vue-router'
+import { useOverallStore } from '@/stores'
const router = useRouter()
import { showConfirmDialog } from 'vant'
import MyEvent from '@/utils/myEvent'
@@ -13,6 +14,7 @@ const emit = defineEmits([
'view-type'
])
+const overallStore = useOverallStore()
// const data = reactive({
// })
@@ -30,6 +32,11 @@ const clickSwitchVIPID = ()=>{
})
.catch(() => {})
}
+const openFlow = (path:string,flowType:string)=>{
+ if(flowType == 'clientId')return clickSwitchVIPID
+ overallStore.setFlowType(flowType)
+ router.push(path)
+}
onMounted(()=>{
emit('view-type', 1)
@@ -51,16 +58,16 @@ defineExpose({})
Explore
-
router.push('/stylist/index')">
+
-
router.push('/workshop/recommended')">
+
-
router.push('/stylist/index')">
+
-
diff --git a/src/views/stylist/index.vue b/src/views/stylist/index.vue
index 4b6f030..bed04c7 100644
--- a/src/views/stylist/index.vue
+++ b/src/views/stylist/index.vue
@@ -34,7 +34,7 @@
-
Continue
+
Continue
(null)
const showVideo = ref(false)
const videoRef = ref(null)
+const overallStore = useOverallStore()
+
const handleChangeCurrent = (index: number) => {
currentChoosed.value = stylists.value[index].id
}
From b4242614ea8c897e0f49f9af07288702fd1fd5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Thu, 20 Nov 2025 16:40:13 +0800
Subject: [PATCH 2/5] fix
---
src/stores/modules/generate.ts | 5 +++++
src/views/Workshop/uploadFace1.vue | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/stores/modules/generate.ts b/src/stores/modules/generate.ts
index 19bb34b..6b50236 100644
--- a/src/stores/modules/generate.ts
+++ b/src/stores/modules/generate.ts
@@ -156,6 +156,11 @@ export const useGenerateStore = defineStore({
for (const key in data) {
this.customizeInfo[key] = data[key]
}
+ },
+ uploadCustomizeInfoDemo(data: object) {
+ for (const key in data) {
+ this.customizeInfoDemo[key] = data[key]
+ }
},
clearCustomerInfo() {
this.customerInfo = {
diff --git a/src/views/Workshop/uploadFace1.vue b/src/views/Workshop/uploadFace1.vue
index e3be873..7f6f566 100644
--- a/src/views/Workshop/uploadFace1.vue
+++ b/src/views/Workshop/uploadFace1.vue
@@ -51,7 +51,7 @@
-
+
From 1adf4f18c26f9f9cc8089cf2253a8c415e34d8d4 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 20 Nov 2025 16:59:39 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=9C=A8=E8=B7=AF?=
=?UTF-8?q?=E7=94=B1=E4=B8=AD=E8=A1=A8=E7=A4=BA=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/stores/modules/overall.ts | 12 ------------
src/views/Workshop/home.vue | 18 ++++++++++--------
src/views/stylist/index.vue | 4 +---
3 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/stores/modules/overall.ts b/src/stores/modules/overall.ts
index 78c4d21..95e5635 100644
--- a/src/stores/modules/overall.ts
+++ b/src/stores/modules/overall.ts
@@ -5,15 +5,6 @@ export const useOverallStore = defineStore({
state: () => {
return {
loading:false,
- /**
- * 流程类型
- * main: 主流程
- * reinventing: 魔改
- * stylist: 查看设计师
- * clientId: 切换客户
- *
- */
- flowType:'',
}
},
getters: {
@@ -24,8 +15,5 @@ export const useOverallStore = defineStore({
setLoading(data:boolean){
this.loading = data
},
- setFlowType(data:string){
- this.flowType = data
- }
}
})
diff --git a/src/views/Workshop/home.vue b/src/views/Workshop/home.vue
index 1a49ee2..b52add8 100644
--- a/src/views/Workshop/home.vue
+++ b/src/views/Workshop/home.vue
@@ -3,7 +3,6 @@ import { onMounted, onUnmounted, reactive, toRefs, computed, onActivated } from
import HeaderTitle from '@/components/HeaderTitle.vue'
import FooterNavigation from '@/components/FooterNavigation.vue'
import { useRouter } from 'vue-router'
-import { useOverallStore } from '@/stores'
const router = useRouter()
import { showConfirmDialog } from 'vant'
import MyEvent from '@/utils/myEvent'
@@ -14,7 +13,6 @@ const emit = defineEmits([
'view-type'
])
-const overallStore = useOverallStore()
// const data = reactive({
// })
@@ -28,14 +26,18 @@ const clickSwitchVIPID = ()=>{
.then(() => {
MyEvent.emit('clear-generate-state')
MyEvent.emit('clearAllCache')
- router.push('/stylist/customer')
+ router.push({ name: 'customer', query: { demo: 1 } })
})
.catch(() => {})
}
const openFlow = (path:string,flowType:string)=>{
- if(flowType == 'clientId')return clickSwitchVIPID
- overallStore.setFlowType(flowType)
+ if(flowType == 'clientId')return clickSwitchVIPID()
router.push(path)
+ if(flowType == 'main'){
+ router.push({ name: path })
+ }else{
+ router.push({ name: path, query: { demo: 1 } })
+ }
}
onMounted(()=>{
@@ -58,13 +60,13 @@ defineExpose({})
Explore
-
+
-
+
-
+
diff --git a/src/views/stylist/index.vue b/src/views/stylist/index.vue
index bed04c7..369b609 100644
--- a/src/views/stylist/index.vue
+++ b/src/views/stylist/index.vue
@@ -34,7 +34,7 @@
-
Continue
+
Continue
(null)
const showVideo = ref(false)
const videoRef = ref(null)
-const overallStore = useOverallStore()
const handleChangeCurrent = (index: number) => {
currentChoosed.value = stylists.value[index].id
From 448294cd665f4a0cec0623eb5c4e3473f6786ec8 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 20 Nov 2025 17:05:03 +0800
Subject: [PATCH 4/5] fix
---
src/views/Workshop/home.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/Workshop/home.vue b/src/views/Workshop/home.vue
index b52add8..d16c8da 100644
--- a/src/views/Workshop/home.vue
+++ b/src/views/Workshop/home.vue
@@ -32,7 +32,6 @@ const clickSwitchVIPID = ()=>{
}
const openFlow = (path:string,flowType:string)=>{
if(flowType == 'clientId')return clickSwitchVIPID()
- router.push(path)
if(flowType == 'main'){
router.push({ name: path })
}else{
From 613f1f27f86e36d3c70b43c75d166bccc3b29b69 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 21 Nov 2025 14:45:05 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Workshop/product.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue
index 50e8b29..7f7b124 100644
--- a/src/views/Workshop/product.vue
+++ b/src/views/Workshop/product.vue
@@ -167,7 +167,7 @@ const { isLoading } = toRefs(data);
Do you have any suggestions
for this outfit?
-
Congratulation!
+
Done!
Your feedback will be very
helpful to us.