From ff9e2f510b1bd98f9b34705839aa666486f00cc2 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Sat, 1 Jun 2024 10:02:21 +0800 Subject: [PATCH] product --- package-lock.json | 11 + package.json | 3 +- src/assets/style/style.css | 79 ++- src/assets/style/style.less | 56 +- src/component/Detail/habit.vue | 34 +- src/component/HomePage/ExportModel.vue | 31 +- src/component/HomePage/Generate.vue | 352 ++-------- src/component/HomePage/Material.vue | 10 +- src/component/HomePage/PrintboardUpload.vue | 530 +------------- src/component/HomePage/SketchboardUpload.vue | 416 +---------- src/component/HomePage/createSlogan.vue | 2 + src/component/HomePage/productImg.vue | 500 ++++++++++++++ src/component/HomePage/sketchCategory.vue | 2 +- src/component/WorksPage/Falls.vue | 337 +++++++++ src/router/index.ts | 7 +- src/store/userHabit/userHabit.ts | 80 ++- src/views/HomeMain.vue | 6 +- src/views/HomeRecommend.vue | 376 ++++++++++ src/views/HomeView/HomeView.vue | 17 +- src/views/HomeView/Works.vue | 304 ++++---- src/views/HomeView/library.vue | 691 ++++++++----------- 21 files changed, 2046 insertions(+), 1798 deletions(-) create mode 100644 src/component/HomePage/productImg.vue create mode 100644 src/component/WorksPage/Falls.vue create mode 100644 src/views/HomeRecommend.vue diff --git a/package-lock.json b/package-lock.json index 1ba6e98f..bcd02df6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "element-plus": "^2.4.2", "file-saver": "^2.0.5", "fingerprintjs2": "^2.1.4", + "gsap": "^3.12.5", "html2canvas": "^1.4.1", "jszip": "^3.10.1", "md5": "^2.3.0", @@ -6893,6 +6894,11 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/gsap": { + "version": "3.12.5", + "resolved": "https://registry.npmmirror.com/gsap/-/gsap-3.12.5.tgz", + "integrity": "sha512-srBfnk4n+Oe/ZnMIOXt3gT605BX9x5+rh/prT2F1SsNJsU1XuMiP0E2aptW481OnonOGACZWBqseH5Z7csHxhQ==" + }, "node_modules/gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz", @@ -17722,6 +17728,11 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "gsap": { + "version": "3.12.5", + "resolved": "https://registry.npmmirror.com/gsap/-/gsap-3.12.5.tgz", + "integrity": "sha512-srBfnk4n+Oe/ZnMIOXt3gT605BX9x5+rh/prT2F1SsNJsU1XuMiP0E2aptW481OnonOGACZWBqseH5Z7csHxhQ==" + }, "gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz", diff --git a/package.json b/package.json index d90da5c5..ce9690a4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "vue-cli-service build", "serve:test": "vue-cli-service serve --mode test", "build:test": "vue-cli-service build --mode test_build", - "serve:dev": "vue-cli-service serve --mode dev", + "serve:dev": "vue-cli-service serve --mode dev", "build:dev": "vue-cli-service build --mode dev_build", "lint": "vue-cli-service lint" }, @@ -22,6 +22,7 @@ "element-plus": "^2.4.2", "file-saver": "^2.0.5", "fingerprintjs2": "^2.1.4", + "gsap": "^3.12.5", "html2canvas": "^1.4.1", "jszip": "^3.10.1", "md5": "^2.3.0", diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 7acf4e34..58b943b0 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -38,7 +38,7 @@ li { border: 2px solid; } .button_second { - width: 11.85rem; + width: 14rem; text-align: center; height: 4rem; line-height: 4rem; @@ -1166,7 +1166,8 @@ li { .design_detail_modal_component .ant-modal-body, .designOpenrtion_modal .ant-modal-body, .library_page .ant-modal-body, -.Export .ant-modal-body { +.Export .ant-modal-body, +.productImg_modal .ant-modal-body { overflow-y: hidden; } .collection_modal .ant-upload.ant-upload-select-picture-card, @@ -1175,7 +1176,8 @@ li { .design_detail_modal_component .ant-upload.ant-upload-select-picture-card, .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card, .library_page .ant-upload.ant-upload-select-picture-card, -.Export .ant-upload.ant-upload-select-picture-card { +.Export .ant-upload.ant-upload-select-picture-card, +.productImg_modal .ant-upload.ant-upload-select-picture-card { background: #FFFFFF; width: calc(6rem*1.2); height: calc(6rem*1.2); @@ -1189,7 +1191,8 @@ li { .design_detail_modal_component .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao, .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao, .library_page .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao, -.Export .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao { +.Export .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao, +.productImg_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao { font-size: calc(3.2rem*1.2); color: #B7B7B7; } @@ -1199,7 +1202,8 @@ li { .design_detail_modal_component .ant-upload.ant-upload-select-picture-card .ant-upload-text, .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text, .library_page .ant-upload.ant-upload-select-picture-card .ant-upload-text, -.Export .ant-upload.ant-upload-select-picture-card .ant-upload-text { +.Export .ant-upload.ant-upload-select-picture-card .ant-upload-text, +.productImg_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text { font-size: calc(1.6rem*1.2); color: #B7B7B7; } @@ -1209,7 +1213,8 @@ li { .design_detail_modal_component .ant-upload-list-picture-card-container, .designOpenrtion_modal .ant-upload-list-picture-card-container, .library_page .ant-upload-list-picture-card-container, -.Export .ant-upload-list-picture-card-container { +.Export .ant-upload-list-picture-card-container, +.productImg_modal .ant-upload-list-picture-card-container { display: none !important; } .collection_modal .ant-upload-picture-card-wrapper, @@ -1218,7 +1223,8 @@ li { .design_detail_modal_component .ant-upload-picture-card-wrapper, .designOpenrtion_modal .ant-upload-picture-card-wrapper, .library_page .ant-upload-picture-card-wrapper, -.Export .ant-upload-picture-card-wrapper { +.Export .ant-upload-picture-card-wrapper, +.productImg_modal .ant-upload-picture-card-wrapper { width: auto; vertical-align: top; } @@ -1323,10 +1329,20 @@ textarea:focus { flex: 1; display: flex; align-items: center; + flex-wrap: wrap; } -.collection_modal_body .input_border .input_box.active input, -.design_detail_modal_component .input_border .input_box.active input, -.library_page .input_border .input_box.active input { +.collection_modal_body .input_border .input_box .inputShowText, +.design_detail_modal_component .input_border .input_box .inputShowText, +.library_page .input_border .input_box .inputShowText { + width: 100%; + display: none; +} +.collection_modal_body .input_border .input_box.active .input_box_btnBox, +.design_detail_modal_component .input_border .input_box.active .input_box_btnBox, +.library_page .input_border .input_box.active .input_box_btnBox, +.collection_modal_body .input_border .input_box.active textarea, +.design_detail_modal_component .input_border .input_box.active textarea, +.library_page .input_border .input_box.active textarea { border: 1px solid #ff0001; box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); } @@ -1334,6 +1350,8 @@ textarea:focus { .design_detail_modal_component .input_border .input_box.active span, .library_page .input_border .input_box.active span { opacity: 1; + display: block; + color: rgba(255, 0, 0.7); } .collection_modal_body .input_border .search_keyword, .design_detail_modal_component .input_border .search_keyword, @@ -1376,6 +1394,7 @@ textarea:focus { padding: 0.5rem 1rem; color: #fff; font-weight: 600; + font-size: 1.2rem; cursor: pointer; } .collection_modal_body .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, @@ -1391,6 +1410,11 @@ textarea:focus { display: flex; float: left; } +.collection_modal_body .input_border .input_box_btnBox .ant-spin-text, +.design_detail_modal_component .input_border .input_box_btnBox .ant-spin-text, +.library_page .input_border .input_box_btnBox .ant-spin-text { + font-size: 1.2rem; +} .collection_modal_body .input_border .upload_item .upload_file_item, .design_detail_modal_component .input_border .upload_item .upload_file_item, .library_page .input_border .upload_item .upload_file_item { @@ -1444,8 +1468,15 @@ textarea:focus { z-index: 4; width: 4rem; align-items: center; + background-color: #fff; justify-content: center; } +.collection_modal_body .input_border .fi.fi-br-loading, +.design_detail_modal_component .input_border .fi.fi-br-loading, +.library_page .input_border .fi.fi-br-loading { + height: 100%; + background-color: rgba(0, 0, 0, 0); +} .collection_modal_body .input_border .fi.active, .design_detail_modal_component .input_border .fi.active, .library_page .input_border .fi.active { @@ -1489,7 +1520,7 @@ textarea:focus { width: var(--width); border-radius: 4px; height: 20rem; - top: 0.2rem; + top: 0rem; border: 1px solid #dcdfe6; } .collection_modal_body .input_border .generage_btn, @@ -1664,6 +1695,32 @@ textarea:focus { padding: 8rem 5rem !important; overflow-y: hidden; } +.generalScroll { + /* 进度 */ + /* 轨道 */ +} +.generalScroll.generalScroll::-webkit-scrollbar { + width: calc(1rem*1.2); + height: calc(1rem*1.2); + transition: all 0.3s; +} +.generalScroll.generalScroll::-webkit-scrollbar-thumb { + border-radius: calc(1rem*1.2); + background: rgba(238, 238, 244, 0); +} +.generalScroll.generalScroll::-webkit-scrollbar-track { + border-radius: calc(1rem*1.2); + background: rgba(238, 238, 244, 0); +} +.generalScroll.generalScroll:hover { + /* 轨道 */ +} +.generalScroll.generalScroll:hover.generalScroll::-webkit-scrollbar-thumb { + background: #543087; +} +.generalScroll.generalScroll:hover.generalScroll::-webkit-scrollbar-track { + background: rgba(84, 48, 135, 0.2); +} .scroll_style::-webkit-scrollbar-button:single-button { display: block; border-style: solid; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 611fda46..10c7e9a3 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -42,7 +42,7 @@ input:focus{ border: 2px solid; } .button_second{ - width: 11.85rem; + width: 14rem; text-align: center; // background: #343579; height: 4rem; @@ -1305,7 +1305,7 @@ input:focus{ } } //collection 弹窗 -.collection_modal,.generalModel_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export{ +.collection_modal,.generalModel_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export,.productImg_modal{ .ant-modal-body{ overflow-y: hidden; @@ -1407,7 +1407,7 @@ textarea:focus{ outline: none; /* 清除默认焦点样式 */ } //设计input和上传按钮样式 -.collection_modal_body,.design_detail_modal_component,.library_page{ +.collection_modal_body,.design_detail_modal_component,.library_page,{ .input_border{ z-index: 2; display: flex; @@ -1424,15 +1424,21 @@ textarea:focus{ flex: 1; display: flex; align-items: center; + flex-wrap: wrap; + .inputShowText{ + width: 100%; + display: none; + } &.active{ - input{ + .input_box_btnBox,textarea{ // color: rgb(255, 0, .7); border: 1px solid rgb(255, 0, .7); box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); - } span{ opacity: 1; + display: block; + color: rgba(255, 0, .7); } } } @@ -1468,6 +1474,7 @@ textarea:focus{ padding: .5rem 1rem; color: #fff; font-weight: 600; + font-size: 1.2rem; cursor: pointer; } .search_keyword_center_item:last-child{ @@ -1480,6 +1487,9 @@ textarea:focus{ width: var(--width); display: flex; float: left; + .ant-spin-text{ + font-size: 1.2rem; + } } .upload_item{ .upload_file_item{ @@ -1523,8 +1533,12 @@ textarea:focus{ z-index: 4; width: 4rem; align-items: center; - + background-color: #fff; justify-content: center; + &.fi-br-loading{ + height: 100%; + background-color: rgba(0, 0, 0, 0); + } &.active{ transform: rotate(180deg); } @@ -1558,7 +1572,7 @@ textarea:focus{ width: var(--width); border-radius: 4px; height: 20rem; - top: .2rem; + top: 0rem; border: 1px solid #dcdfe6; } @@ -1729,7 +1743,33 @@ textarea:focus{ overflow-y: hidden; } } - +.generalScroll{ + &.generalScroll::-webkit-scrollbar { + width: calc(1rem*1.2); + height: calc(1rem*1.2); + transition: all .3s; + } + /* 进度 */ + &.generalScroll::-webkit-scrollbar-thumb { + border-radius: calc(1rem*1.2); + background: rgba(238, 238, 244, 0); + } + /* 轨道 */ + &.generalScroll::-webkit-scrollbar-track { + border-radius: calc(1rem*1.2); + background: rgba(238, 238, 244, 0); + } + &.generalScroll:hover { + // overflow-x: scroll; + &.generalScroll::-webkit-scrollbar-thumb { + background: #543087; + } + /* 轨道 */ + &.generalScroll::-webkit-scrollbar-track { + background: rgba(84, 48, 135,.2); + } + } +} .scroll_style{ &::-webkit-scrollbar-button:single-button { // background-color: #ffffff; diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 00e59d06..a6f39f1a 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -129,7 +129,7 @@
+
+