diff --git a/.env.production b/.env.production index 1242f7f..895daab 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 扫码连网 ENV = 'production' # 扫码连网/生产环境 -VUE_APP_BASE_API = 'http://39.101.188.84:9038' +VUE_APP_BASE_API = 'https://www.jichuanglanhai.com:9038' diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 59fdfcd..985232e 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -110,7 +110,8 @@ export default { }) .then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/index"; + // location.href = "/index"; + this.$router.replace("/login"); }); }) .catch(() => {}); diff --git a/src/router/index.js b/src/router/index.js index 757e74b..ae2dc23 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -178,7 +178,7 @@ Router.prototype.replace = function push(location) { }; export default new Router({ - mode: "history", // 去掉url中的# + // mode: "history", // 去掉url中的# scrollBehavior: () => ({ y: 0 }), routes: constantRoutes, }); diff --git a/src/utils/request.js b/src/utils/request.js index 2ceba58..0af5a92 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,7 +6,7 @@ import errorCode from "@/utils/errorCode"; import { tansParams, blobValidate } from "@/utils/ruoyi"; import cache from "@/plugins/cache"; import { saveAs } from "file-saver"; - +import router from "@/router"; let downloadLoadingInstance; // 是否显示重新登录 export let isRelogin = { show: false }; @@ -120,7 +120,8 @@ service.interceptors.response.use( .then(() => { isRelogin.show = false; store.dispatch("LogOut").then(() => { - location.href = "/index"; + // location.href = "/index"; + router.replace("/login"); }); }) .catch(() => { diff --git a/src/views/register.vue b/src/views/register.vue index 0c14a31..520a433 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -125,6 +125,14 @@ export default { uuid: "", }, registerRules: { + posName: [ + { required: true, trigger: "blur", message: "请输入商户名称" }, + ], + city: [{ required: true, trigger: "blur", message: "请输入城市" }], + address: [{ required: true, trigger: "blur", message: "请输入地址" }], + nickName: [ + { required: true, trigger: "blur", message: "请输入联系人" }, + ], username: [ { required: true, trigger: "blur", message: "请输入您的账号" }, { diff --git a/vue.config.js b/vue.config.js index 89b9526..e4bb722 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,7 +18,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/demo/netEwm/" : "/", // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) outputDir: "dist", // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)