diff --git a/src/router/index.js b/src/router/index.js index 7fb67e0..653bf6d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -245,7 +245,7 @@ router.beforeEach(function(to, from, next) { // 根据路由元信息设置文档标题 window.document.title = to.meta.title || '中台'; //使用钩子函数对路由进行权限跳转 - const login = location.href.includes('192.168.31.126:') ? '/devLogin' : '/login' + const login = location.href.includes('dev.huorantech.cn') ? '/devLogin' : '/login' if (!sessionStorage.getItem('token') && to.path !== login && to.path !== '/join' && to.path !== '/success') { next(login); } else { diff --git a/src/setting.js b/src/setting.js index 9c69488..2b84faf 100644 --- a/src/setting.js +++ b/src/setting.js @@ -11,7 +11,7 @@ if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - // host = 'http://192.168.31.51:9000/'// 榕 + host = 'http://192.168.31.51:9000/'// 榕 // host = 'http://192.168.31.116:9000/'// 赓 } else if (isPro) { jumpPath = 'https://www.huorantech.cn/judgmentPoint/' @@ -49,7 +49,7 @@ const Setting = { /** * @description 默认密码 */ - initialPassword: '111aaa', + initialPassword: '1122aa', }; export default Setting; diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue index d6c7832..7b35c6f 100644 --- a/src/views/course/contentSettings.vue +++ b/src/views/course/contentSettings.vue @@ -367,14 +367,14 @@ export default { // 上传文件 beforeUpload(file) { let type = this.transferType(file.name.substring(file.name.lastIndexOf(".") + 1)); - if (type != "视频" && type != "图片" && type != "pdf" && (file.size / 1024 / 1024) > 10) { - this.$message.error("请上传10M以内的文件"); - return false; - } - if (type == "视频" && (file.size / 1024 / 1024) > 30) { - util.errorMsg("请上传30M以内的视频"); - return false; - } + // if (type != "视频" && type != "图片" && type != "pdf" && (file.size / 1024 / 1024) > 10) { + // this.$message.error("请上传10M以内的文件"); + // return false; + // } + // if (type == "视频" && (file.size / 1024 / 1024) > 30) { + // this.$message.warning('请上传30M以内的视频') + // return false; + // } this.uploading = true; this.originalFileName = file.name; if (this.isAddSection) this.sectionName = file.name.substring(0, file.name.lastIndexOf(".")); diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue index b42870e..2a8abc9 100644 --- a/src/views/order/AddOrder.vue +++ b/src/views/order/AddOrder.vue @@ -116,8 +116,8 @@