From 3268d551fb375a465689f3f90279bf4a922db0f1 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 01 九月 2025 16:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_tide_mom' into dev
---
src/views/tideLogin.vue | 26 +++++++++-----------------
src/store/modules/user.js | 4 ++--
src/main.js | 2 +-
index.html | 6 +++---
.env.production | 4 ++--
vite.config.js | 2 +-
6 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/.env.production b/.env.production
index 708d2b7..666be0e 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 鍩烘櫤娌逛簳绠＄悊绯荤粺
+VITE_APP_TITLE = MOM锛堝埗閫犺繍钀ョ鐞嗙郴缁燂級
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'production'
-# 鍩烘櫤娌逛簳绠＄悊绯荤粺/鐢熶骇鐜
+# MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級/鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/index.html b/index.html
index 68fd1bf..b9fd2a5 100644
--- a/index.html
+++ b/index.html
@@ -6,8 +6,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <link rel="icon" href="/JZYJico.ico">
- <title>鍩烘櫤娌逛簳绠＄悊绯荤粺</title>
+ <link rel="icon" href="/favicon.ico">
+ <title>MOM锛堝埗閫犺繍钀ョ鐞嗙郴缁燂級</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
html,
@@ -212,4 +212,4 @@
<script type="module" src="/src/main.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main.js b/src/main.js
index ef6b2a4..b63769d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -76,7 +76,7 @@
app.config.globalProperties.addDateRange = addDateRange;
app.config.globalProperties.selectDictLabel = selectDictLabel;
app.config.globalProperties.selectDictLabels = selectDictLabels;
-app.config.globalProperties.javaApi = "http://114.132.189.42:7004";
+app.config.globalProperties.javaApi = "http://10.136.12.71:8014";
app.config.globalProperties.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1c0d1d2..d52efa6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -109,12 +109,12 @@
})
})
},
- TideLogin({ commit }, code) {
+ TideLogin(code) {
return new Promise((resolve, reject) => {
tideLogin(code)
.then((res) => {
setToken(res.token);
- commit("SET_TOKEN", res.token);
+ this.token = res.token
Vue.prototype.uploadHeader = {
Authorization: "Bearer " + res.token,
};
diff --git a/src/views/tideLogin.vue b/src/views/tideLogin.vue
index a96165e..e4a82f7 100644
--- a/src/views/tideLogin.vue
+++ b/src/views/tideLogin.vue
@@ -1,23 +1,15 @@
<template>
<div></div>
</template>
-<script>
-import store from "@/store";
-export default {
- data() {
- return {}
- },
- created() {
- this.goLogin()
- },
- computed: {},
- methods: {
- goLogin() {
- store.dispatch('TideLogin', {code : this.$route.query.code}).then(() => {
- this.$router.push({ path: this.redirect || "/" }).catch(() => { });
- })
- }
- }
+<script setup>
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
+let { proxy } = getCurrentInstance()
+function goLogin() {
+ userStore.TideLogin({code : proxy.$route.query.code}).then(() => {
+ proxy.$router.push({ path: redirect || "/" }).catch(() => { });
+ })
}
+goLogin()
</script>
<style scoped></style>
diff --git a/vite.config.js b/vite.config.js
index f7cae21..f2c352e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -9,7 +9,7 @@
const baseUrl =
VITE_APP_ENV == "development"
? "http://192.168.1.147:7003" // 寮�鍙戠幆澧冨悗绔帴鍙�
- : "http://10.136.12.71:7003"; // 鐢熶骇鐜鍚庣鎺ュ彛
+ : "http://10.136.12.71:8014"; // 鐢熶骇鐜鍚庣鎺ュ彛
return {
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
--
Gitblit v1.9.3