diff --git a/src/assets/icons/share.svg b/src/assets/icons/share.svg
new file mode 100644
index 0000000..cc12dc6
--- /dev/null
+++ b/src/assets/icons/share.svg
@@ -0,0 +1,9 @@
+
diff --git a/src/components/WaveLoading.vue b/src/components/WaveLoading.vue
new file mode 100644
index 0000000..99f3c8d
--- /dev/null
+++ b/src/components/WaveLoading.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/Workshop/creation/creation-list.vue b/src/views/Workshop/creation/creation-list.vue
index 2671bf0..bf54c68 100644
--- a/src/views/Workshop/creation/creation-list.vue
+++ b/src/views/Workshop/creation/creation-list.vue
@@ -7,7 +7,9 @@
import {
getGenerateHistoricals,
setTryOnEffectFavorite,
- cancelTryOnEffectFavorite
+ cancelTryOnEffectFavorite,
+ cancelStyleFavorite,
+ setStyleFavorite
} from '@/api/workshop'
import { useRouter } from 'vue-router'
import MyEvent from '@/utils/myEvent'
@@ -106,17 +108,22 @@
}
// 详情页
const onDetailsItem = (v) => {
- if (v.isRegenerated) return
+ if (v.isRegenerated || !v.styleUrl) return
router.push({ query: { ...query.value, styleUrl: v.styleUrl } })
}
// 喜欢
const isLoveLoading = ref(false)
const onLoveItem = (v) => {
if (isLoveLoading.value) return
- const http = v.isFavorite ? cancelTryOnEffectFavorite : setTryOnEffectFavorite
+ var http
+ if (navActive.value === 'Outfit') {
+ http = v.isFavorite ? cancelStyleFavorite : setStyleFavorite
+ } else {
+ http = v.isFavorite ? cancelTryOnEffectFavorite : setTryOnEffectFavorite
+ }
isLoveLoading.value = true
v.isFavorite = !v.isFavorite
- http(v.tryOnId)
+ http(v.id)
.then(() => {
isLoveLoading.value = false
})
@@ -154,7 +161,10 @@
alert(`现在${isShare.value ? '可以' : '不可以'}分享`)
}
-
+ const onShareItem = (v) => {
+ const url = v.tryOnUrl || v.url
+ if (url) shareImageToWhatsapp(url)
+ }
const onDownloadItem = async (v) => {
if (isShare.value) {
await shareImageToWhatsapp(v.tryOnUrl)
@@ -287,9 +297,12 @@
-
diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue
index 3b60cc7..7d8ba2a 100644
--- a/src/views/Workshop/product.vue
+++ b/src/views/Workshop/product.vue
@@ -38,7 +38,7 @@ const onContinue = ()=>{
if(!isHistoryFlow.value){
router.push({ path: 'uploadFace', query: {...query.value} })
}else{
- router.push({ path: 'creation', query: {...query.value} })
+ router.push({ path: 'creation', query: {...query.value, active: FlowType.H_TRYON } })
}
}
diff --git a/src/views/Workshop/profile.vue b/src/views/Workshop/profile.vue
index 6c642d4..ea6f451 100644
--- a/src/views/Workshop/profile.vue
+++ b/src/views/Workshop/profile.vue
@@ -2,7 +2,7 @@
import { ref, reactive, onMounted, inject } from 'vue'
import router from '@/router'
import { showConfirmDialog, showToast } from 'vant'
- import { useUserInfoStore, useOverallStore } from '@/stores'
+ import { useUserInfoStore, useOverallStore,useGenerateStore } from '@/stores'
import { LogOut } from '@/api/login'
import { getCustomerList, type CustomerListParams, customerCheckin } from '@/api/workshop'
import MyEvent from '@/utils/myEvent'
@@ -15,6 +15,8 @@
const userInfoStore = useUserInfoStore()
const overallStore = useOverallStore()
+ const generateStore = useGenerateStore()
+
const emit = defineEmits(['selected-customer'])
const show = ref(false)
const isEdit = ref(false)
@@ -187,7 +189,8 @@
customerCheckin({ nickname: selectedCustomer.name }).then((res) => {
useUserInfoStore().resetGenerateParams()
MyEvent.emit('clear-generate-state')
- useUserInfoStore().setCustomerInfo(res)
+ useGenerateStore().setCustomerInfo(res)
+ router.push({ path: '/workshop/home' })
})
}
showSwitchCustomerPopup.value = false
diff --git a/src/views/asistant/components/NoticeItem.vue b/src/views/asistant/components/NoticeItem.vue
index e82501a..5151ede 100644
--- a/src/views/asistant/components/NoticeItem.vue
+++ b/src/views/asistant/components/NoticeItem.vue
@@ -9,7 +9,8 @@
@@ -35,7 +35,13 @@
-
Continue
+