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/lang/cn.ts b/src/lang/cn.ts
index a8cc8d96..ab99708e 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -141,6 +141,7 @@ export default {
jsContent5:"我们很高兴让您体验AiDA 3.0。请注意，部分服务在试用期间可能会受到限制。如果您已经准备好全身心投入并享受完整的体验，我们诚挚地邀请您订阅。只需访问",
jsContent6:" 就可以开始订阅。感谢您试用我们的服务！",
jsContent9:"您确定要清除当前系列并重新开始吗?",
+ jsContent10:"二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'",
},
ProductImg:{
Finalize:'完成',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 462a489d..fa8014a0 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -142,6 +142,7 @@ export default {
jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
jsContent6:" to get started. Thank you for trying our services!",
jsContent9:"Are you sure to erase current collection and start over?",
+ jsContent10:"Re-created works are not allowed to use 'design', but you can use 'redesign'",
},
ProductImg:{
Finalize:'Finalize',
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 @@