From eaa46d9fc379705c889b0afccec15c29374d4882 Mon Sep 17 00:00:00 2001
From: WangXiaoDong <1627315083@qq.com>
Date: Sun, 14 Jul 2024 00:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
=?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E7=9A=84=E7=A7=BB?=
=?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 4 +-
package-lock.json | 24 +
package.json | 1 +
src/assets/style/style.css | 5 +
src/assets/style/style.less | 5 +
src/component/HomePage/sketchCategory.vue | 1 +
src/component/Login/registerModel.vue | 30 +-
.../WorksPage/newScaleImageMobile.vue | 1189 +++++++++++++++++
src/main.ts | 3 +
src/views/HomeRecommend.vue | 26 +-
src/views/HomeView/Works.vue | 18 +-
src/views/LoginPage.vue | 15 +-
12 files changed, 1306 insertions(+), 15 deletions(-)
create mode 100644 src/component/WorksPage/newScaleImageMobile.vue
diff --git a/.env.dev b/.env.dev
index 31667458..7cb5aaab 100644
--- a/.env.dev
+++ b/.env.dev
@@ -3,8 +3,8 @@ NODE_ENV = 'development'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
-# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
-VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# 佩佩
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波
diff --git a/package-lock.json b/package-lock.json
index bcd02df6..da4af035 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
"md5": "^2.3.0",
"quantize": "^1.0.2",
"sortablejs": "^1.15.0",
+ "swiper": "^11.1.4",
"vue": "^3.2.13",
"vue-class-component": "^8.0.0-0",
"vue-cropper": "^1.0.5",
@@ -10800,6 +10801,24 @@
"node": ">= 10"
}
},
+ "node_modules/swiper": {
+ "version": "11.1.4",
+ "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.1.4.tgz",
+ "integrity": "sha512-1n7kbYJB2dFEpUHRFszq7gys/ofIBrMNibwTiMvPHwneKND/t9kImnHt6CfGPScMHgI+dWMbGTycCKGMoOO1KA==",
+ "funding": [
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/swiperjs"
+ },
+ {
+ "type": "open_collective",
+ "url": "http://opencollective.com/swiper"
+ }
+ ],
+ "engines": {
+ "node": ">= 4.7.0"
+ }
+ },
"node_modules/table": {
"version": "6.8.0",
"resolved": "https://registry.npmmirror.com/table/-/table-6.8.0.tgz",
@@ -20807,6 +20826,11 @@
}
}
},
+ "swiper": {
+ "version": "11.1.4",
+ "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.1.4.tgz",
+ "integrity": "sha512-1n7kbYJB2dFEpUHRFszq7gys/ofIBrMNibwTiMvPHwneKND/t9kImnHt6CfGPScMHgI+dWMbGTycCKGMoOO1KA=="
+ },
"table": {
"version": "6.8.0",
"resolved": "https://registry.npmmirror.com/table/-/table-6.8.0.tgz",
diff --git a/package.json b/package.json
index ce9690a4..34c4d6cd 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
"md5": "^2.3.0",
"quantize": "^1.0.2",
"sortablejs": "^1.15.0",
+ "swiper": "^11.1.4",
"vue": "^3.2.13",
"vue-class-component": "^8.0.0-0",
"vue-cropper": "^1.0.5",
diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 044d4c9b..3fe58973 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -15,6 +15,11 @@ input {
outline: none;
border: 0.1rem solid #dcdfe6;
}
+@media (max-width: 768px) {
+ .mdhidden {
+ display: none !important;
+ }
+}
select {
height: 2.5rem;
border: 0.2rem solid #c4c4c4 !important;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 6f34c26f..ec60d4e7 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -16,6 +16,11 @@ input{
outline: none;
border: .1rem solid #dcdfe6;
}
+@media (max-width: 768px) {
+ .mdhidden{
+ display: none !important;
+ }
+}
select{
height: 2.5rem;
border: 0.2rem solid #c4c4c4 !important;
diff --git a/src/component/HomePage/sketchCategory.vue b/src/component/HomePage/sketchCategory.vue
index e1b4d930..ab0d1b22 100644
--- a/src/component/HomePage/sketchCategory.vue
+++ b/src/component/HomePage/sketchCategory.vue
@@ -108,6 +108,7 @@ export default defineComponent({
for (let item of props.generateList) {
item.categoryShow = false;
}
+ file.level2Type = cate.value;
file.categoryValue = cate.value;
file.category = cate.name;
if(props.isSetSketchCategory){
diff --git a/src/component/Login/registerModel.vue b/src/component/Login/registerModel.vue
index 928a1aba..5ccdca5c 100644
--- a/src/component/Login/registerModel.vue
+++ b/src/component/Login/registerModel.vue
@@ -3,7 +3,7 @@
class="registerModel_modal generalModel"
v-model:visible="registerModel"
:footer="null"
- width="50%"
+ :width="pageWidth"
:maskClosable="false"
:centered="true"
:closable="false"
@@ -248,6 +248,7 @@ export default defineComponent({
let register = reactive({
registerModel:false,
registerModelMask:false,
+ pageWidth:'50%'
})
return{
store,
@@ -555,6 +556,27 @@ export default defineComponent({
},
});
+
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index d8f31cd5..17a51eaf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,6 +14,9 @@ import i18n from './lang/index'
import { getBrowserInfo, murmur } from './tool/util'
import "../node_modules/@flaticon/flaticon-uicons/css/all/all.css"
import { Https } from "@/tool/https";
+import 'swiper/css';
+import 'swiper/css/pagination';
+
// import "@/tool/color-thief.js";
// import "@/tool/fabric.brushes.js";
// import "@/tool/fabric.min.js";
diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue
index 3dc46243..fcda608e 100644
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -12,7 +12,7 @@
@@ -39,7 +39,7 @@
@@ -57,7 +57,7 @@