From ed5b3626d2b1f955ab89c87dac0691d650f6bfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com> Date: Thu, 16 May 2024 15:26:21 +0800 Subject: [PATCH] 1 --- .env.development | 44 +- .env.production | 16 +- package.json | 236 +-- src/utils/auth.js | 36 +- src/views/dy/commentSOP.vue | 2805 ++++++++++++++++---------------- src/views/dy/hotCommentSOP.vue | 2630 +++++++++++++++--------------- 6 files changed, 2889 insertions(+), 2878 deletions(-) diff --git a/.env.development b/.env.development index 27ecb8b..cde499b 100644 --- a/.env.development +++ b/.env.development @@ -1,23 +1,23 @@ -### - # @Description: - # @Autor: 飘泊客 - # @Date: 2023-04-21 10:31:24 - # @LastEditors: 飘泊客 - # @LastEditTime: 2023-04-24 13:59:00 -### -ENV = 'development' - -# 接口地址 -VUE_APP_BASE_API = 'https://cdp.baiyee.vip' -#VUE_APP_BASE_API = 'https://cdp.baiyee.vip' -VUE_APP_BASE_APIs = 'https://cdp.baiyee.vip' -VUE_APP_BASE='//8.130.96.163' -VUE_APP_WS_API1 = 'ws://172.18.1.8:8099' -VUE_APP_WS_API2 = 'ws://172.18.1.8:8100' - - -# VUE_APP_BASE_API = 'http://172.18.1.8:8899' -# VUE_APP_WS_API = 'ws://172.18.1.8:8099' - -# 是否启用 babel-plugin-dynamic-import-node插件 +### + # @Description: + # @Autor: 飘泊客 + # @Date: 2023-04-21 10:31:24 + # @LastEditors: 飘泊客 + # @LastEditTime: 2023-04-24 13:59:00 +### +ENV = 'development' + +# 接口地址 +VUE_APP_BASE_API = 'https://cdp.baiyee.vip' +#VUE_APP_BASE_API = 'https://cdp.baiyee.vip' +VUE_APP_BASE_APIs = 'https://cdp.baiyee.vip' +VUE_APP_BASE='http://8.130.96.163' +VUE_APP_WS_API1 = 'ws://172.18.1.8:8099' +VUE_APP_WS_API2 = 'ws://172.18.1.8:8100' + + +# VUE_APP_BASE_API = 'http://172.18.1.8:8899' +# VUE_APP_WS_API = 'ws://172.18.1.8:8099' + +# 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true \ No newline at end of file diff --git a/.env.production b/.env.production index 9857c3f..83907b9 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ -ENV = 'production' - -# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'https://cdp.baiyee.vip' -VUE_APP_BASE_APIs = 'https://cdp.baiyee.vip' -VUE_APP_BASE='https://cdp.baiyee.vip/xhs' -# 如果接口是 http 形式， wss 需要改为 ws -VUE_APP_WS_API = 'wss://api.auauz.net' +ENV = 'production' + +# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http +VUE_APP_BASE_API = 'https://cdp.baiyee.vip' +VUE_APP_BASE_APIs = 'https://cdp.baiyee.vip' +VUE_APP_BASE='https://cdp.baiyee.vip/xhs' +# 如果接口是 http 形式， wss 需要改为 ws +VUE_APP_WS_API = 'wss://cdp.baiyee.vip' diff --git a/package.json b/package.json index 4067898..23d7826 100644 --- a/package.json +++ b/package.json @@ -1,118 +1,118 @@ -{ - "name": "eladmin-web", - "version": "2.5.0", - "description": "EL-ADMIN 前端源码", - "author": "Zheng Jie", - "license": "Apache-2.0", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src", - "test:unit": "jest --clearCache && vue-cli-service test:unit", - "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", - "new": "plop" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "repository": { - "type": "git", - "url": "https://github.com/elunez/eladmin-web.git" - }, - "bugs": { - "url": "https://github.com/elunez/eladmin/issues" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.18.1", - "better-scroll": "^1.8.1", - "clipboard": "^2.0.4", - "codemirror": "^5.49.2", - "connect": "3.6.6", - "echarts": "^4.2.1", - "echarts-gl": "^1.1.1", - "echarts-wordcloud": "^1.1.3", - "element-ui": "^2.13.2", - "file-saver": "1.3.8", - "fuse.js": "3.4.4", - "js-beautify": "^1.10.2", - "js-cookie": "2.2.0", - "jsencrypt": "^3.0.0-rc.1", - "jszip": "3.1.5", - "mavon-editor": "^2.7.0", - "normalize.css": "7.0.0", - "nprogress": "0.2.0", - "path-to-regexp": "2.4.0", - "qrcode": "^1.5.1", - "qs": "^6.9.1", - "screenfull": "4.2.0", - "sortablejs": "1.8.4", - "vant": "^2.12.48", - "vue": "2.6.10", - "vue-aplayer": "^1.6.1", - "vue-count-to": "1.0.13", - "vue-cropper": "0.4.9", - "vue-echarts": "^5.0.0-beta.0", - "vue-highlightjs": "^1.3.3", - "vue-image-crop-upload": "^2.5.0", - "vue-router": "3.0.2", - "vue-splitpane": "1.0.4", - "vuedraggable": "2.20.0", - "vuex": "3.1.0", - "wangeditor": ">=3.0.0", - "xlsx": "^0.14.1" - }, - "devDependencies": { - "@babel/core": "7.0.0", - "@babel/parser": "^7.7.4", - "@babel/register": "7.0.0", - "@vue/cli-plugin-babel": "3.5.3", - "@vue/cli-plugin-eslint": "^3.9.1", - "@vue/cli-plugin-unit-jest": "3.5.3", - "@vue/cli-service": "3.5.3", - "@vue/test-utils": "1.0.0-beta.29", - "autoprefixer": "^9.5.1", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "23.6.0", - "babel-plugin-dynamic-import-node": "2.3.0", - "babel-plugin-transform-remove-console": "^6.9.4", - "chalk": "2.4.2", - "chokidar": "2.1.5", - "connect": "3.6.6", - "eslint": "5.15.3", - "eslint-plugin-vue": "5.2.2", - "html-webpack-plugin": "3.2.0", - "http-proxy-middleware": "^0.19.1", - "husky": "1.3.1", - "lint-staged": "8.1.5", - "plop": "2.3.0", - "runjs": "^4.3.2", - "sass": "^1.26.10", - "sass-loader": "^7.1.0", - "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "0.7.2", - "serve-static": "^1.13.2", - "svg-sprite-loader": "4.1.3", - "svgo": "1.2.0", - "vue-template-compiler": "2.6.10" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +{ + "name": "eladmin-web", + "version": "2.5.0", + "description": "分发系统", + "author": "", + "license": "", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", + "new": "plop" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "repository": { + "type": "git", + "url": "https://github.com/elunez/eladmin-web.git" + }, + "bugs": { + "url": "https://github.com/elunez/eladmin/issues" + }, + "dependencies": { + "@riophae/vue-treeselect": "0.4.0", + "axios": "0.18.1", + "better-scroll": "^1.8.1", + "clipboard": "^2.0.4", + "codemirror": "^5.49.2", + "connect": "3.6.6", + "echarts": "^4.2.1", + "echarts-gl": "^1.1.1", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.13.2", + "file-saver": "1.3.8", + "fuse.js": "3.4.4", + "js-beautify": "^1.10.2", + "js-cookie": "2.2.0", + "jsencrypt": "^3.0.0-rc.1", + "jszip": "3.1.5", + "mavon-editor": "^2.7.0", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "qrcode": "^1.5.1", + "qs": "^6.9.1", + "screenfull": "4.2.0", + "sortablejs": "1.8.4", + "vant": "^2.12.48", + "vue": "2.6.10", + "vue-aplayer": "^1.6.1", + "vue-count-to": "1.0.13", + "vue-cropper": "0.4.9", + "vue-echarts": "^5.0.0-beta.0", + "vue-highlightjs": "^1.3.3", + "vue-image-crop-upload": "^2.5.0", + "vue-router": "3.0.2", + "vue-splitpane": "1.0.4", + "vuedraggable": "2.20.0", + "vuex": "3.1.0", + "wangeditor": ">=3.0.0", + "xlsx": "^0.14.1" + }, + "devDependencies": { + "@babel/core": "7.0.0", + "@babel/parser": "^7.7.4", + "@babel/register": "7.0.0", + "@vue/cli-plugin-babel": "3.5.3", + "@vue/cli-plugin-eslint": "^3.9.1", + "@vue/cli-plugin-unit-jest": "3.5.3", + "@vue/cli-service": "3.5.3", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "^9.5.1", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "23.6.0", + "babel-plugin-dynamic-import-node": "2.3.0", + "babel-plugin-transform-remove-console": "^6.9.4", + "chalk": "2.4.2", + "chokidar": "2.1.5", + "connect": "3.6.6", + "eslint": "5.15.3", + "eslint-plugin-vue": "5.2.2", + "html-webpack-plugin": "3.2.0", + "http-proxy-middleware": "^0.19.1", + "husky": "1.3.1", + "lint-staged": "8.1.5", + "plop": "2.3.0", + "runjs": "^4.3.2", + "sass": "^1.26.10", + "sass-loader": "^7.1.0", + "script-ext-html-webpack-plugin": "2.1.3", + "script-loader": "0.7.2", + "serve-static": "^1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.0", + "vue-template-compiler": "2.6.10" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] +} diff --git a/src/utils/auth.js b/src/utils/auth.js index b643e73..eb171a3 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,18 +1,18 @@ -import Cookies from 'js-cookie' -import Config from '@/settings' - -const TokenKey = Config.TokenKey - -export function getToken() { - return Cookies.get(TokenKey) -} - -export function setToken(token, rememberMe) { - if (rememberMe) { - return Cookies.set(TokenKey, token, { expires: Config.tokenCookieExpires }) - } else return Cookies.set(TokenKey, token) -} - -export function removeToken() { - return Cookies.remove(TokenKey) -} +import Cookies from 'js-cookie' +import Config from '@/settings' + +const TokenKey = Config.TokenKey + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token, rememberMe) { + if (rememberMe) { + return Cookies.set(TokenKey, token, { expires: Config.tokenCookieExpires }) + } else return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/src/views/dy/commentSOP.vue b/src/views/dy/commentSOP.vue index 6d29079..1fe5b42 100644 --- a/src/views/dy/commentSOP.vue +++ b/src/views/dy/commentSOP.vue @@ -1,1400 +1,1405 @@ - - - - - - - + + + + + + + diff --git a/src/views/dy/hotCommentSOP.vue b/src/views/dy/hotCommentSOP.vue index e92b8b6..729f4be 100644 --- a/src/views/dy/hotCommentSOP.vue +++ b/src/views/dy/hotCommentSOP.vue @@ -1,1312 +1,1318 @@ - - - - - - - + + + + + + +