diff --git a/dist.7z b/dist.7z deleted file mode 100644 index 866b68e7..00000000 Binary files a/dist.7z and /dev/null differ diff --git a/public/image/toolsGuide/detailCN.png b/public/image/toolsGuide/detailCN.png new file mode 100644 index 00000000..22b87e78 Binary files /dev/null and b/public/image/toolsGuide/detailCN.png differ diff --git a/public/image/toolsGuide/detailEN.png b/public/image/toolsGuide/detailEN.png new file mode 100644 index 00000000..a12455a5 Binary files /dev/null and b/public/image/toolsGuide/detailEN.png differ diff --git a/src/assets/images/socialMediaLogo/biliBliIcon.png b/src/assets/images/socialMediaLogo/biliBliIcon.png deleted file mode 100644 index 21a861d7..00000000 Binary files a/src/assets/images/socialMediaLogo/biliBliIcon.png and /dev/null differ diff --git a/src/assets/images/socialMediaLogo/biliBliIcon.svg b/src/assets/images/socialMediaLogo/biliBliIcon.svg new file mode 100644 index 00000000..44e1d963 --- /dev/null +++ b/src/assets/images/socialMediaLogo/biliBliIcon.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/socialMediaLogo/faceBookIcon.svg b/src/assets/images/socialMediaLogo/faceBookIcon.svg new file mode 100644 index 00000000..c311c85f --- /dev/null +++ b/src/assets/images/socialMediaLogo/faceBookIcon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/images/socialMediaLogo/instagramIcon.png b/src/assets/images/socialMediaLogo/instagramIcon.png deleted file mode 100644 index 6fd366b6..00000000 Binary files a/src/assets/images/socialMediaLogo/instagramIcon.png and /dev/null differ diff --git a/src/assets/images/socialMediaLogo/linkedinIcon.svg b/src/assets/images/socialMediaLogo/linkedinIcon.svg new file mode 100644 index 00000000..7dcdf6d7 --- /dev/null +++ b/src/assets/images/socialMediaLogo/linkedinIcon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/images/socialMediaLogo/socialIcons.svg b/src/assets/images/socialMediaLogo/socialIcons.svg new file mode 100644 index 00000000..50893423 --- /dev/null +++ b/src/assets/images/socialMediaLogo/socialIcons.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/images/socialMediaLogo/tikTokIcon.png b/src/assets/images/socialMediaLogo/tikTokIcon.png deleted file mode 100644 index 1fa7db89..00000000 Binary files a/src/assets/images/socialMediaLogo/tikTokIcon.png and /dev/null differ diff --git a/src/assets/images/socialMediaLogo/tikTokIcon.svg b/src/assets/images/socialMediaLogo/tikTokIcon.svg new file mode 100644 index 00000000..5d8d6b2a --- /dev/null +++ b/src/assets/images/socialMediaLogo/tikTokIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/socialMediaLogo/xiaoHongShuIcon.png b/src/assets/images/socialMediaLogo/xiaoHongShuIcon.png deleted file mode 100644 index 44fa3fa1..00000000 Binary files a/src/assets/images/socialMediaLogo/xiaoHongShuIcon.png and /dev/null differ diff --git a/src/assets/images/socialMediaLogo/xiaoHongShuIcon.svg b/src/assets/images/socialMediaLogo/xiaoHongShuIcon.svg new file mode 100644 index 00000000..affe86d3 --- /dev/null +++ b/src/assets/images/socialMediaLogo/xiaoHongShuIcon.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/socialMediaLogo/youTubeIcon.png b/src/assets/images/socialMediaLogo/youTubeIcon.png deleted file mode 100644 index 3e6b31e8..00000000 Binary files a/src/assets/images/socialMediaLogo/youTubeIcon.png and /dev/null differ diff --git a/src/assets/images/socialMediaLogo/zhiHuIcon.png b/src/assets/images/socialMediaLogo/zhiHuIcon.png deleted file mode 100644 index 1cd479e3..00000000 Binary files a/src/assets/images/socialMediaLogo/zhiHuIcon.png and /dev/null differ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index d887d1a2..4b63b4d4 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -61,7 +61,7 @@
-
+
+ +
+
@@ -128,17 +137,18 @@ import { useI18n } from 'vue-i18n' import addDetails from '@/component/Detail/addDetails.vue' export default defineComponent({ components:{ - detailLeft,model,detailRight,canvasBox + detailLeft,model,detailRight,canvasBox,addDetails }, emits:['destroy'], setup(props,{emit}) { const store = useStore(); - + const {locale} = useI18n() const detailDom = reactive({ model:null, canvasBox, detailRight, detailLeft:null as any, + addDetails:null as any, }) const userDetail = computed(()=>{ return store.state.UserHabit.userDetail @@ -506,6 +516,17 @@ export default defineComponent({ sessionStorage.setItem('revocation', JSON.stringify(revocation)); sessionStorage.setItem('oppositeRevocation',JSON.stringify([])); } + + const addDetail = () =>{ + let addDetails:any = detailDom.addDetails + addDetails.init(detailData.selectDetail,'') + } + const setSloganData = (data:any)=>{ + detailData.selectDetail.sketchString = data + if(detailData.currentDetailType == 'sketch' && detailData.selectDetail?.newDetail?.sketch){ + detailData.selectDetail.newDetail.sketch = null + } + } onMounted(()=>{ window.addEventListener('resize', handleResize); }) @@ -518,6 +539,7 @@ export default defineComponent({ }) return{ + locale, ...toRefs(detailDom), ...toRefs(detailData), closeModal, @@ -531,6 +553,8 @@ export default defineComponent({ canvasReload, modelOnLoad, sketchSysToLibrary, + addDetail, + setSloganData, } }, diff --git a/src/component/Detail/detailLeft/index.vue b/src/component/Detail/detailLeft/index.vue index 37c64ef5..e97c4ed0 100644 --- a/src/component/Detail/detailLeft/index.vue +++ b/src/component/Detail/detailLeft/index.vue @@ -6,7 +6,6 @@ -