diff --git a/index.html b/index.html index 10aa4bac..fd90fbd6 100644 --- a/index.html +++ b/index.html @@ -17,6 +17,7 @@ + diff --git a/src/assets/fonts/ARIAL.ttf b/src/assets/fonts/ARIAL.ttf new file mode 100644 index 00000000..8682d946 Binary files /dev/null and b/src/assets/fonts/ARIAL.ttf differ diff --git a/src/assets/fonts/ARIALBD.ttf b/src/assets/fonts/ARIALBD.ttf new file mode 100644 index 00000000..a6037e68 Binary files /dev/null and b/src/assets/fonts/ARIALBD.ttf differ diff --git a/src/assets/fonts/ArialMdm.ttf b/src/assets/fonts/ArialMdm.ttf new file mode 100644 index 00000000..3222b81e Binary files /dev/null and b/src/assets/fonts/ArialMdm.ttf differ diff --git a/src/assets/fonts/Poppins-Medium.ttf b/src/assets/fonts/Poppins-Medium.ttf new file mode 100644 index 00000000..6bcdcc27 Binary files /dev/null and b/src/assets/fonts/Poppins-Medium.ttf differ diff --git a/src/assets/fonts/Poppins-Regular.ttf b/src/assets/fonts/Poppins-Regular.ttf new file mode 100644 index 00000000..9f0c71b7 Binary files /dev/null and b/src/assets/fonts/Poppins-Regular.ttf differ diff --git a/src/assets/fonts/Poppins-SemiBold.ttf b/src/assets/fonts/Poppins-SemiBold.ttf new file mode 100644 index 00000000..74c726e3 Binary files /dev/null and b/src/assets/fonts/Poppins-SemiBold.ttf differ diff --git a/src/assets/fonts/fontFamily.css b/src/assets/fonts/fontFamily.css new file mode 100644 index 00000000..a2f7501e --- /dev/null +++ b/src/assets/fonts/fontFamily.css @@ -0,0 +1,31 @@ +/* 字体定义 */ +@font-face { + font-family: 'Arial'; + src: url('./fonts/ARIAL.ttf') format('ttf'); +} + +@font-face { + font-family: 'ArialBold'; + src: url('./fonts/ARIALBD.ttf') format('ttf'); +} + +@font-face { + font-family: 'ArialMedium'; + src: url('./fonts/ArialMdm.ttf') format('ttf'); +} + +@font-face { + font-family: 'Poppins'; + src: url('./fonts/Poppins-Regular.ttf') format('ttf'); + font-weight: normal; +} + +@font-face { + font-family: 'PoppinsMedium'; + src: url('./fonts/Poppins-Medium.ttf') format('ttf'); +} + +@font-face { + font-family: 'PoppinsBold'; + src: url('./fonts/Poppins-SemiBold.ttf') format('ttf'); +} diff --git a/src/assets/images/award/apply_bg.png b/src/assets/images/award/apply_bg.png new file mode 100644 index 00000000..f13d7359 Binary files /dev/null and b/src/assets/images/award/apply_bg.png differ diff --git a/src/assets/images/award/arrow_right.png b/src/assets/images/award/arrow_right.png new file mode 100644 index 00000000..8bd157a6 Binary files /dev/null and b/src/assets/images/award/arrow_right.png differ diff --git a/src/assets/images/award/banner.png b/src/assets/images/award/banner.png new file mode 100644 index 00000000..e9691416 Binary files /dev/null and b/src/assets/images/award/banner.png differ diff --git a/src/assets/images/award/certification_bg.png b/src/assets/images/award/certification_bg.png new file mode 100644 index 00000000..a07df1ee Binary files /dev/null and b/src/assets/images/award/certification_bg.png differ diff --git a/src/assets/images/award/close.svg b/src/assets/images/award/close.svg new file mode 100644 index 00000000..3fdbc854 --- /dev/null +++ b/src/assets/images/award/close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/award/code_create_logo.png b/src/assets/images/award/code_create_logo.png index a0d6cf52..d4758b21 100644 Binary files a/src/assets/images/award/code_create_logo.png and b/src/assets/images/award/code_create_logo.png differ diff --git a/src/assets/images/award/criteria_1.png b/src/assets/images/award/criteria_1.png new file mode 100644 index 00000000..38288d04 Binary files /dev/null and b/src/assets/images/award/criteria_1.png differ diff --git a/src/assets/images/award/criteria_2.png b/src/assets/images/award/criteria_2.png new file mode 100644 index 00000000..eb51c6f4 Binary files /dev/null and b/src/assets/images/award/criteria_2.png differ diff --git a/src/assets/images/award/criteria_3.png b/src/assets/images/award/criteria_3.png new file mode 100644 index 00000000..9603e998 Binary files /dev/null and b/src/assets/images/award/criteria_3.png differ diff --git a/src/assets/images/award/criteria_4.png b/src/assets/images/award/criteria_4.png new file mode 100644 index 00000000..8afd7449 Binary files /dev/null and b/src/assets/images/award/criteria_4.png differ diff --git a/src/assets/images/award/criteria_bg.png b/src/assets/images/award/criteria_bg.png new file mode 100644 index 00000000..0b46c8c8 Binary files /dev/null and b/src/assets/images/award/criteria_bg.png differ diff --git a/src/assets/images/award/desmond.png b/src/assets/images/award/desmond.png new file mode 100644 index 00000000..2b666a28 Binary files /dev/null and b/src/assets/images/award/desmond.png differ diff --git a/src/assets/images/award/diego.png b/src/assets/images/award/diego.png new file mode 100644 index 00000000..5cf6637f Binary files /dev/null and b/src/assets/images/award/diego.png differ diff --git a/src/assets/images/award/facebook.svg b/src/assets/images/award/facebook.svg new file mode 100644 index 00000000..b03f1f6b --- /dev/null +++ b/src/assets/images/award/facebook.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/award/first_bg.png b/src/assets/images/award/first_bg.png new file mode 100644 index 00000000..d57212f2 Binary files /dev/null and b/src/assets/images/award/first_bg.png differ diff --git a/src/assets/images/award/grand_bg.png b/src/assets/images/award/grand_bg.png new file mode 100644 index 00000000..1471441e Binary files /dev/null and b/src/assets/images/award/grand_bg.png differ diff --git a/src/assets/images/award/gregory.png b/src/assets/images/award/gregory.png new file mode 100644 index 00000000..aa00078c Binary files /dev/null and b/src/assets/images/award/gregory.png differ diff --git a/src/assets/images/award/jae.png b/src/assets/images/award/jae.png new file mode 100644 index 00000000..b37eb53f Binary files /dev/null and b/src/assets/images/award/jae.png differ diff --git a/src/assets/images/award/judges_bg.png b/src/assets/images/award/judges_bg.png new file mode 100644 index 00000000..00a40048 Binary files /dev/null and b/src/assets/images/award/judges_bg.png differ diff --git a/src/assets/images/award/linkdin.svg b/src/assets/images/award/linkdin.svg new file mode 100644 index 00000000..b2611635 --- /dev/null +++ b/src/assets/images/award/linkdin.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/images/award/point.png b/src/assets/images/award/point.png new file mode 100644 index 00000000..ade4dab4 Binary files /dev/null and b/src/assets/images/award/point.png differ diff --git a/src/assets/images/award/prizes_bg.png b/src/assets/images/award/prizes_bg.png new file mode 100644 index 00000000..c6410ac6 Binary files /dev/null and b/src/assets/images/award/prizes_bg.png differ diff --git a/src/assets/images/award/second_bg.png b/src/assets/images/award/second_bg.png new file mode 100644 index 00000000..2f4f676a Binary files /dev/null and b/src/assets/images/award/second_bg.png differ diff --git a/src/assets/images/award/selection_bg.png b/src/assets/images/award/selection_bg.png new file mode 100644 index 00000000..47f3af8a Binary files /dev/null and b/src/assets/images/award/selection_bg.png differ diff --git a/src/assets/images/award/tiktok.svg b/src/assets/images/award/tiktok.svg new file mode 100644 index 00000000..a9a54ad5 --- /dev/null +++ b/src/assets/images/award/tiktok.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/award/tim.png b/src/assets/images/award/tim.png new file mode 100644 index 00000000..bab3ba14 Binary files /dev/null and b/src/assets/images/award/tim.png differ diff --git a/src/assets/images/award/timeline_line.png b/src/assets/images/award/timeline_line.png index 38bb94a8..b622b437 100644 Binary files a/src/assets/images/award/timeline_line.png and b/src/assets/images/award/timeline_line.png differ diff --git a/src/assets/images/award/vincenzo.png b/src/assets/images/award/vincenzo.png new file mode 100644 index 00000000..96ab59a5 Binary files /dev/null and b/src/assets/images/award/vincenzo.png differ diff --git a/src/assets/images/award/weichat.svg b/src/assets/images/award/weichat.svg new file mode 100644 index 00000000..3430eb35 --- /dev/null +++ b/src/assets/images/award/weichat.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/images/award/xiaohongshu.svg b/src/assets/images/award/xiaohongshu.svg new file mode 100644 index 00000000..0e2163bc --- /dev/null +++ b/src/assets/images/award/xiaohongshu.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 7a70bd88..df4233a9 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -2488,3 +2488,22 @@ textarea:focus { background: #ffffff; color: #000; } +.flex { + display: flex; +} +.flex-col { + flex-direction: column; +} +.flex-center { + justify-content: center; + align-items: center; +} +.align-center { + align-items: center; +} +.space-between { + justify-content: space-between; +} +.justify-center { + justify-content: center; +} \ No newline at end of file diff --git a/src/assets/style/style.less b/src/assets/style/style.less index f5173acc..e1c0a640 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -2406,3 +2406,22 @@ textarea:focus{ color: #000; } } +.flex { + display: flex; +} +.flex-col { + flex-direction: column; +} +.flex-center { + justify-content: center; + align-items: center; +} +.align-center { + align-items: center; +} +.space-between { + justify-content: space-between; +} +.justify-center { + justify-content: center; +} \ No newline at end of file diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 7e229bdb..c2f32f13 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -85,7 +85,7 @@ " alt="">
- +
- +
- +
@@ -141,7 +141,11 @@ export default defineComponent({ type: { type: String, default: 'print', - } + }, + sketchSize:{ + type:Object, + default:()=>{} + }, }, setup(props,{emit}) { const { t } = useI18n() @@ -273,7 +277,7 @@ export default defineComponent({ let x = Number(style.left.replace(/px/g,'')) let y = Number(style.top.replace(/px/g,'')) location = [(x*sketchWH[0]) ,(y*sketchWH[1])] - scale =[ editPrintElementData.systemDesignerPercentage/100, editPrintElementData.systemDesignerPercentage/100] + scale = item.scale // scale = [item.pattern.style.width/item.pattern.style.height,item.pattern.style.height/item.pattern.style.width] // location = [item.pattern.style.left,item.pattern.style.top] } @@ -352,18 +356,9 @@ export default defineComponent({ } editPrintElementData.printZIndex++ item.pattern = pattern - function isJSONString(str) { - try { - JSON.parse(str); - return true; // 解析成功，是有效的JSON字符串 - } catch (e) { - return false; // 解析失败，不是有效的JSON字符串 - } - } + if(item.object){ - if(isJSONString(item.object)){ - item.object = JSON.parse(item.object) - } + }else{ item.object = { top: 0, @@ -916,6 +911,7 @@ export default defineComponent({ } const inputFillScale = (scale:any)=>{ let arr = editPrintElementData.printStyleList[props.type].overall + console.log(arr,scale,editPrintElementData.imgDomIndex) arr[editPrintElementData.imgDomIndex].scale = [scale,scale] editPrintElementDom.pingpuRef.updataList([ { @@ -1104,7 +1100,10 @@ export default defineComponent({ .habit_System_Designer { align-items: center; display: flex; - justify-content: center; + justify-content: flex-end; + margin-top: 1.8rem; + margin-right: .8rem; + .ant-slider-track, .ant-slider-rail { background-color: #e1e1e1; diff --git a/src/component/Detail/detailRight/index.vue b/src/component/Detail/detailRight/index.vue index 8ce41684..d835f5d8 100644 --- a/src/component/Detail/detailRight/index.vue +++ b/src/component/Detail/detailRight/index.vue @@ -6,8 +6,8 @@ --> - - + + @@ -24,6 +24,12 @@ export default defineComponent({ components:{ sketchType,printType,editPrintElement,modelsType }, + props:{ + sketchSize:{ + type:Object, + default:()=>{} + }, + }, setup(props,{emit}) { const store = useStore(); const detailData = reactive({ diff --git a/src/router/index.ts b/src/router/index.ts index 5d6eea99..aad115c2 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -424,7 +424,19 @@ const routes: Array = [ meta: { enter: "all", }, - component: () => import("@/views/AwardPage/index.vue"), + component: () => import("@/views/AwardPage/container.vue"), + children:[ + { + path:'index', + name:'AwardIndex', + component:()=>import('@/views/AwardPage/index.vue') + }, + { + path:'apply', + name:'Apply', + component:()=>import('@/views/AwardPage/apply.vue') + } + ] }, { path: "/:catchAll(.*)", diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index e2bf5948..4c92a6c7 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -54,6 +54,25 @@ const DesignDetail : Module = { data.clothes.forEach((v:any,index:any)=>{ // if(!v?.partialDesignDTO){ // } + function isJSONString(str) { + try { + JSON.parse(str); + return true; // 解析成功，是有效的JSON字符串 + } catch (e) { + return false; // 解析失败，不是有效的JSON字符串 + } + } + v?.printObject?.prints?.forEach((item:any) => { + console.log(item.object) + if(isJSONString(item.object)){ + item.object = JSON.parse(item.object) + } + }); + v?.trims?.prints?.forEach((item:any) => { + if(isJSONString(item.object)){ + item.object = JSON.parse(item.object) + } + }); for (let i = v.layersObject.length-1; i >= 0; i--) { v.layersObject[i].style = { top:v.layersObject[i].position?.[0], diff --git a/src/views/AwardPage/apply.vue b/src/views/AwardPage/apply.vue new file mode 100644 index 00000000..b5337d90 --- /dev/null +++ b/src/views/AwardPage/apply.vue @@ -0,0 +1,437 @@ + + + + + + diff --git a/src/views/AwardPage/components/VerificationCodeInput.vue b/src/views/AwardPage/components/VerificationCodeInput.vue new file mode 100644 index 00000000..35bfd3d4 --- /dev/null +++ b/src/views/AwardPage/components/VerificationCodeInput.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/src/views/AwardPage/container.vue b/src/views/AwardPage/container.vue new file mode 100644 index 00000000..7ec496dc --- /dev/null +++ b/src/views/AwardPage/container.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/views/AwardPage/index.vue b/src/views/AwardPage/index.vue index f04e0d4f..8899972c 100644 --- a/src/views/AwardPage/index.vue +++ b/src/views/AwardPage/index.vue @@ -1,15 +1,12 @@