diff --git a/README.md b/README.md index 7b9fe9f..aa0d30c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -154,4 +154,13 @@ FIX `2021年1月7日` FIX - 修改 登录过期提示 -- 修改 登录过期提示一 \ No newline at end of file +- 修改 登录过期提示一 + + +## v1.1.9F +`2021年1月8日` +FIX +- 修改 登录过期提示 +- 增加 ie10,11兼容 //todo 需后端修改下nginx配置 +- 取消 通用例外显示方式 +- 取消 用户例外转通用类别的显示 \ No newline at end of file diff --git a/babel.config.js b/babel.config.js index fb82b27..5e613a1 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,7 +1,15 @@ +/* + * @Date: 2021-11-30 15:35:16 + * @LastEditors: JinxuChen + * @LastEditTime: 2022-01-08 15:26:58 + * @FilePath: \GpsCardAdmin\babel.config.js + * @description: + */ module.exports = { presets: [ // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app - '@vue/cli-plugin-babel/preset' + '@vue/cli-plugin-babel/preset', + /* ["@vue/app", {useBuiltIns: "entry",}] */ ], 'env': { 'development': { diff --git a/package.json b/package.json index 029240d..f634d28 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "babel-eslint": "10.1.0", "babel-jest": "23.6.0", "babel-plugin-dynamic-import-node": "2.3.3", + "babel-polyfill": "^6.26.0", "chalk": "2.4.2", "connect": "3.6.6", "eslint": "6.7.2", diff --git a/src/main.js b/src/main.js index 497c65f..c3dd66e 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ /* * @Date: 2021-11-30 15:35:16 * @LastEditors: JinxuChen - * @LastEditTime: 2021-12-15 16:30:23 + * @LastEditTime: 2022-01-08 15:36:12 * @FilePath: \GpsCardAdmin\src\main.js * @description: */ @@ -11,7 +11,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' -import locale from 'element-ui/lib/locale/lang/en' // lang i18n +/* import locale from 'element-ui/lib/locale/lang/en' */ // lang i18n import '@/styles/index.scss' // global css @@ -19,6 +19,9 @@ import App from './App' import store from './store' import router from './router' import localStore from './store/localStore' +import 'babel-polyfill'; +import 'core-js/stable'; +import 'regenerator-runtime/runtime' import '@/icons' // icon import '@/permission' // permission control diff --git a/src/utils/model.js b/src/utils/model.js index d4779cb..54e6960 100644 --- a/src/utils/model.js +++ b/src/utils/model.js @@ -1,8 +1,8 @@ /* * @Date: 2021-11-30 15:09:25 * @LastEditors: JinxuChen - * @LastEditTime: 2022-01-07 15:00:20 + * @LastEditTime: 2022-01-08 15:34:50 * @FilePath: \GpsCardAdmin\src\utils\model.js * @description: 版本号 */ -export const VersionModel = '1.1.8'; \ No newline at end of file +export const VersionModel = '1.1.9'; \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 5d5b473..c839893 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,7 +1,7 @@ /* * @Date: 2021-12-08 15:59:46 * @LastEditors: JinxuChen - * @LastEditTime: 2022-01-07 15:15:13 + * @LastEditTime: 2022-01-08 16:36:58 * @FilePath: \GpsCardAdmin\src\utils\request.js * @description: */ @@ -75,7 +75,7 @@ service.interceptors.response.use( setTimeout(() => { store.dispatch('user/resetToken').then(() => { Message({ - message:/* res.message || */ 'token过期,请重新登录', + message: 'token过期,请重新登录', type: 'error', duration: 1500 }) @@ -84,7 +84,7 @@ service.interceptors.response.use( }, 1500) return Promise.reject(new Error('token过期,请重新登录')) } - return Promise.reject(new Error(res.message)) + /* return Promise.reject(new Error(res.message)) */ } else { return res } diff --git a/src/views/off-limits-manage/common-exception/index.vue b/src/views/off-limits-manage/common-exception/index.vue index ec84b1a..245fbfa 100644 --- a/src/views/off-limits-manage/common-exception/index.vue +++ b/src/views/off-limits-manage/common-exception/index.vue @@ -1,7 +1,7 @@ @@ -81,8 +81,8 @@ label-position="left" label-width="70px" > - - + + @@ -140,9 +140,9 @@ export default { model: "", searchValue: "", columns: [ - { prop: "type", title: "类型", fixed: 'left'}, - { prop: "model", title: "类别" }, - { prop: "content", title: "内容名称" }, + /* { prop: "type", title: "类型", }, + { prop: "model", title: "类别" }, */ + { prop: "content", title: "内容名称", fixed: 'left'}, { prop: "createTime", title: "创建时间" }, { prop: "status", title: "状态" }, { @@ -222,7 +222,7 @@ export default { this.searchValue = ''; let reqBody = { id: 0, - categoryId: this.form.categoryId, + categoryId: /* this.form.categoryId */'1639028957414', //todo 需求暂时隐藏类别,使用默认的类别 keyword: this.form.content, status: this.checkoutStatusToNum(this.form.status), glat: 0, diff --git a/src/views/off-limits-manage/user-exception/index.vue b/src/views/off-limits-manage/user-exception/index.vue index ef74694..95f11de 100644 --- a/src/views/off-limits-manage/user-exception/index.vue +++ b/src/views/off-limits-manage/user-exception/index.vue @@ -1,7 +1,7 @@ @@ -103,11 +103,11 @@ -

请选择要转换的类别:

+ - - + --> 取消 确认 @@ -142,7 +142,7 @@ export default { components: { TTable, Pagination }, data() { return { - model: "", //下拉框的值 + model: '1639028957414', //下拉框的值 content: "", //内容 modelOptions: [], searchValue: "", @@ -342,7 +342,7 @@ export default { onTransConfirm() { let reqBody = { id: 0, - categoryId: this.model, + categoryId: this.model, //todo 需求暂时隐藏类别,使用默认的类别 keyword: this.content, status: this.form.status, glat: 0, diff --git a/vue.config.js b/vue.config.js index c533378..4f5e9e1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -59,7 +59,7 @@ module.exports = { include: 'initial' } ]) - + config.entry.app = ["babel-polyfill", "./src/main.js"]; // when there are many pages, it will cause too many meaningless requests config.plugins.delete('prefetch')