diff --git a/package-lock.json b/package-lock.json index 1d80b144..c3a21f93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "ant-design-vue": "^3.2.12", "axios": "^1.4.0", "core-js": "^3.8.3", + "driver.js": "^1.3.1", "element-plus": "^2.4.2", "file-saver": "^2.0.5", "html2canvas": "^1.4.1", @@ -5445,6 +5446,11 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, + "node_modules/driver.js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/driver.js/-/driver.js-1.3.1.tgz", + "integrity": "sha512-MvUdXbqSgEsgS/H9KyWb5Rxy0aE6BhOVT4cssi2x2XjmXea6qQfgdx32XKVLLSqTaIw7q/uxU5Xl3NV7+cN6FQ==" + }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz", @@ -16565,6 +16571,11 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, + "driver.js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/driver.js/-/driver.js-1.3.1.tgz", + "integrity": "sha512-MvUdXbqSgEsgS/H9KyWb5Rxy0aE6BhOVT4cssi2x2XjmXea6qQfgdx32XKVLLSqTaIw7q/uxU5Xl3NV7+cN6FQ==" + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz", diff --git a/package.json b/package.json index 4fabaf1a..04a4ba0d 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "ant-design-vue": "^3.2.12", "axios": "^1.4.0", "core-js": "^3.8.3", + "driver.js": "^1.3.1", "element-plus": "^2.4.2", "file-saver": "^2.0.5", "html2canvas": "^1.4.1", diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 840700bd..85d5a44b 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4292253 */ - src: url('iconfont.woff2?t=1700017557054') format('woff2'), - url('iconfont.woff?t=1700017557054') format('woff'), - url('iconfont.ttf?t=1700017557054') format('truetype'); + src: url('iconfont.woff2?t=1700554220413') format('woff2'), + url('iconfont.woff?t=1700554220413') format('woff'), + url('iconfont.ttf?t=1700554220413') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-bingji:before { + content: "\e620"; +} + +.icon-bingji1:before { + content: "\e668"; +} + .icon-biaoqian:before { content: "\e603"; } diff --git a/src/assets/iconfont2/iconfont.woff b/src/assets/iconfont2/iconfont.woff index 82644975..a306b346 100644 Binary files a/src/assets/iconfont2/iconfont.woff and b/src/assets/iconfont2/iconfont.woff differ diff --git a/src/assets/iconfont2/iconfont.woff2 b/src/assets/iconfont2/iconfont.woff2 index 7cf007e3..547b03cf 100644 Binary files a/src/assets/iconfont2/iconfont.woff2 and b/src/assets/iconfont2/iconfont.woff2 differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index b79066b0..0f527e9f 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -127,7 +127,7 @@ li { --el-cascader-tag-background: #e1d9ec; --el-fill-color: #e1d9ec; height: 80%; - width: 80% !important; + width: 90% !important; flex-wrap: nowrap; overflow: hidden; } @@ -159,7 +159,8 @@ li { --el-cascader-menu-selected-text-color: #000; } .el-popper .el-cascader-panel .el-scrollbar { - min-width: 18rem; + min-width: 19rem; + max-width: 19rem; } .el-popper .el-cascader-panel .el-scrollbar .el-cascader-menu__wrap { height: 24.4rem; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 1c422068..8252780f 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -141,7 +141,7 @@ ul,li{ --el-cascader-tag-background:#e1d9ec; --el-fill-color:#e1d9ec; height: 80%; - width: 80% !important; + width: 90% !important; flex-wrap: nowrap; overflow: hidden; .el-tag--light{ @@ -173,7 +173,8 @@ ul,li{ .el-cascader-panel{ --el-cascader-menu-selected-text-color: #000; .el-scrollbar{ - min-width: 18rem; + min-width: 19rem; + max-width: 19rem; .el-cascader-menu__wrap{ height: 24.4rem; .el-cascader-menu__list{ diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 60073dcf..5735a344 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -39,14 +39,14 @@ - {{ workspaceItem.sex }} + {{ workspaceItem.sex.label }}
@@ -334,7 +334,7 @@ export default defineComponent({ let arr:any = [] rv.forEach((item:any) => { let obj = { - value:item.name, + value:item.key, label:item.name, } arr.push(obj) @@ -548,7 +548,8 @@ export default defineComponent({ }, setSex(v:any){ this.openType.sex = false - this.workspaceItem.sex = v + this.workspaceItem.sex.value = v.value + this.workspaceItem.sex.label = v.label this.getMannequins() this.setMannequinsSex() this.getPosition('sex') @@ -563,11 +564,11 @@ export default defineComponent({ // this.workspaceItem.mannequinId = item.id // this.workspaceItem.mannequinType = str // this.workspaceItem.mannequinUrl = item.presignedUrl - if(this.workspaceItem.sex == 'Female'){ + if(this.workspaceItem.sex.value == 'FEMALE'){ this.workspaceItem.femalePresignedUrl = item.presignedUrl this.workspaceItem.mannequinFemaleType = str this.workspaceItem.mannequinFemaleId = item.id - }else if(this.workspaceItem.sex == 'Male'){ + }else if(this.workspaceItem.sex.value == 'MALE'){ this.workspaceItem.malePresignedUrl = item.presignedUrl this.workspaceItem.mannequinMaleType = str this.workspaceItem.mannequinMaleId = item.id @@ -577,11 +578,11 @@ export default defineComponent({ this.workspaceItem.mannequinId = item.id }, setMannequinsSex(){ - if(this.workspaceItem.sex == 'Female'){ + if(this.workspaceItem.sex.value == 'FEMALE'){ this.workspaceItem.mannequinUrl = this.workspaceItem.femalePresignedUrl this.workspaceItem.mannequinType = this.workspaceItem.mannequinFemaleType this.workspaceItem.mannequinId = this.workspaceItem.mannequinFemaleId - }else if(this.workspaceItem.sex == 'Male'){ + }else if(this.workspaceItem.sex.value == 'MALE'){ this.workspaceItem.mannequinUrl = this.workspaceItem.malePresignedUrl this.workspaceItem.mannequinType = this.workspaceItem.mannequinMaleType this.workspaceItem.mannequinId = this.workspaceItem.mannequinMaleId diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 828c6923..4ac56347 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -18,7 +18,7 @@
{{ $t('MoodboardUpload.Generate') }} diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index 0e28b904..c37aefc6 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -1,6 +1,6 @@ +