diff --git a/vue/package-lock.json b/vue/package-lock.json index 6de81cc..4c79f5e 100644 --- a/vue/package-lock.json +++ b/vue/package-lock.json @@ -11331,22 +11331,6 @@ "integrity": "sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY=", "dev": true }, - "v-viewer": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.5.1.tgz", - "integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==", - "requires": { - "throttle-debounce": "^2.0.1", - "viewerjs": "^1.5.0" - }, - "dependencies": { - "throttle-debounce": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz", - "integrity": "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==" - } - } - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz", @@ -11380,11 +11364,6 @@ "extsprintf": "^1.2.0" } }, - "viewerjs": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.5.0.tgz", - "integrity": "sha512-ZiJ0vrXDvomLSY3ixaZCJtmdenomsvPPQwZKwvtXUMCiO2HHtFGoB/KqpS9QzABSeKaRLfcENp1uRYJ7l1MkYQ==" - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -12090,6 +12069,15 @@ "source-map": "~0.6.1" } }, + "webpack-theme-color-replacer": { + "version": "1.3.14", + "resolved": "https://registry.npmjs.org/webpack-theme-color-replacer/-/webpack-theme-color-replacer-1.3.14.tgz", + "integrity": "sha512-PKT/OD2+iXxGuGDxH/MVkt36EKYtYckowzPlZBdPOgGIVk8MbvLfdRFYOmWz6vhVJpyIGWtpfpoP9ecWZP8qYg==", + "dev": true, + "requires": { + "webpack-sources": "*" + } + }, "websocket-driver": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", diff --git a/vue/package.json b/vue/package.json index 2dda380..8fbf4ae 100644 --- a/vue/package.json +++ b/vue/package.json @@ -41,7 +41,8 @@ "svg-sprite-loader": "^4.3.0", "svgo": "^1.3.2", "vue-template-compiler": "^2.6.11", - "webpack-bundle-analyzer": "^3.6.1" + "webpack-bundle-analyzer": "^3.6.1", + "webpack-theme-color-replacer": "^1.3.14" }, "postcss": { "plugins": { diff --git a/vue/src/api/message/user.js b/vue/src/api/message/user.js index 0af9ae8..fc9e76e 100644 --- a/vue/src/api/message/user.js +++ b/vue/src/api/message/user.js @@ -1,6 +1,6 @@ import request from "@/config/request" -const baseUrl = '/message/user' +export const baseUrl = '/message/user' export function search(data) { return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) diff --git a/vue/src/assets/styles/element-ui.scss b/vue/src/assets/styles/element-ui.scss index 3494fb6..e681673 100644 --- a/vue/src/assets/styles/element-ui.scss +++ b/vue/src/assets/styles/element-ui.scss @@ -70,6 +70,12 @@ } } +.el-drawer { + &__body { + overflow-y: overlay; + } +} + .el-loading-mask { background: #fff; color: $--color-primary; diff --git a/vue/src/components/ColorCheckBox/group.vue b/vue/src/components/ColorCheckBox/group.vue new file mode 100644 index 0000000..56581dd --- /dev/null +++ b/vue/src/components/ColorCheckBox/group.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/vue/src/components/ColorCheckBox/index.vue b/vue/src/components/ColorCheckBox/index.vue new file mode 100644 index 0000000..57ba8ad --- /dev/null +++ b/vue/src/components/ColorCheckBox/index.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/vue/src/config/index.js b/vue/src/config/index.js index 50f0265..824773b 100644 --- a/vue/src/config/index.js +++ b/vue/src/config/index.js @@ -1,8 +1,10 @@ -const isDevelopment = process.env.NODE_ENV === 'development' +const isDev = process.env.NODE_ENV === 'development' const contextPath = '/' module.exports = { + isDev, + title: 'BiuBiuBiu~', //项目的部署路径 @@ -15,11 +17,11 @@ module.exports = { routerMode: 'history', //socket连接地址 - socketUrl: isDevelopment ? 'localhost:12580' : 'wss://toesbieya.cn', + socketUrl: isDev ? 'localhost:12580' : 'wss://toesbieya.cn', sidebarLogoUrl: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png', - errorLog: ['production', 'development'], + errorLog: true, //storage的相关键名 sessionUserKey: 'GCC-SESS-USER', @@ -37,7 +39,7 @@ module.exports = { attachmentPrefix: 'https://static.toesbieya.cn/', //文件预览接口前缀 - filePreviewPrefix: isDevelopment ? 'http://localhost:8012' : 'https://preview.toesbieya.cn', + filePreviewPrefix: isDev ? 'http://localhost:8012' : 'https://preview.toesbieya.cn', //省市地区json数据请求地址 regionDataUrl: `${contextPath}static/json/region-pca.json` diff --git a/vue/src/layout/components/Navbar/components/Bell.vue b/vue/src/layout/components/Navbar/components/Bell.vue index cb06fcd..72627e0 100644 --- a/vue/src/layout/components/Navbar/components/Bell.vue +++ b/vue/src/layout/components/Navbar/components/Bell.vue @@ -1,10 +1,12 @@