diff --git a/.env.dev b/.env.dev index d429345a..fca07508 100644 --- a/.env.dev +++ b/.env.dev @@ -3,6 +3,7 @@ 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://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'http://192.168.1.9:17088' # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' +VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/src/assets/style/style.css b/src/assets/style/style.css index bab09fce..e5a77f2b 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1223,6 +1223,10 @@ i { width: 100%; height: 100%; } +.selectActive { + opacity: 0.5; + transform: scale(0.9); +} .collection_modal_body .input_border, .design_detail_modal_component .input_border, .library_page .input_border { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 48efec0e..b47b6ac7 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1320,6 +1320,11 @@ i{ height: 100%; } } +//设置选中样式 +.selectActive{ + opacity: .5; + transform: scale(.9); +} //设计input和上传按钮样式 .collection_modal_body,.design_detail_modal_component,.library_page{ diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index d747612c..ba5b8ff4 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -407,6 +407,10 @@ export default defineComponent({ // this.fileList = [] this.reviewColor={} this.pantongName = '' + this.colorList[this.selectIndex] = {} + let colorList =this.colorList.filter((v) => Object.keys(v).length) + this.setColorboardList(colorList) + // this.pantongNameList = [] this.tcxColor = '' }, diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 4119ca77..b30385e7 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -401,8 +401,6 @@ export default defineComponent({ "sketchboardFiles", "likeDesignCollectionList", ]; - - let oldKey = ""; let margin = 20; //每个图形边距 let maxHeight = 0 diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index 7d1b8460..251dd8bd 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -136,6 +136,8 @@ export default defineComponent({ methods:{ nextStep(){ let colorBoards = this.store.state.UploadFilesModule.colorBoards + console.log(colorBoards); + if(this.collectionStep == 1){ let disposeMoodboard = this.store.state.UploadFilesModule.disposeMoodboard let moodboard = this.store.state.UploadFilesModule.moodboard diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index bb7df1aa..3f4e7fb1 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -23,17 +23,17 @@