gp/cakuns_st_pc.git

沙特股票pc

parent: dbf09c8b | patch | commit | show whitespace

Merge branch 'master' of http://124.156.157.155:8060/r/gp/cakuns_st_pc

jhzh

2025-04-24 8a5fae20aeeb98a2babecc5d04493427e8b3a464

Merge branch 'master' of http://124.156.157.155:8060/r/gp/cakuns_st_pc

# Conflicts:
#	.gitignore
#	src/utils/request.js

3 files modified

1 files deleted

	.gitignore	2 ●●●●● patch \| view \| raw \| blame \| history
	.husky/.gitignore	1 ●●●●● patch \| view \| raw \| blame \| history
	src/api/login.js	2 ●●●●● patch \| view \| raw \| blame \| history
	src/utils/request.js	1 ●●●●● patch \| view \| raw \| blame \| history

 .gitignore

@@ -1,4 +1,4 @@
node_modules
dist
*.zip
.rar
*.rar

 .husky/.gitignore

File was deleted

 src/api/login.js

@@ -10,7 +10,7 @@
  SendSms: '/account/sms',
  SendSmsErr: '/account/sms_err',
  // get my info
  UserInfo: '/api/user/info',
  UserInfo: '/api/admin/login.do',
  UserMenu: '/user/nav'
}


 src/utils/request.js

@@ -8,7 +8,6 @@
// 创建 axios 实例
const request = axios.create({
  // API 请求的默认前缀
  // baseURL: 'http://192.168.10.8:8091/',
  baseURL: 'https://api.fidelityio.com/',
  // baseURL: process.env.VUE_APP_API_BASE_URL,
  // content-type: application/x-www-form-urlencoded

			@@ -10,7 +10,7 @@
			SendSms: '/account/sms',
			SendSmsErr: '/account/sms_err',
			// get my info
			UserInfo: '/api/user/info',
			UserInfo: '/api/admin/login.do',
			UserMenu: '/user/nav'
			}

			@@ -8,7 +8,6 @@
			// 创建 axios 实例
			const request = axios.create({
			// API 请求的默认前缀
			// baseURL: 'http://192.168.10.8:8091/',
			baseURL: 'https://api.fidelityio.com/',
			// baseURL: process.env.VUE_APP_API_BASE_URL,
			// content-type: application/x-www-form-urlencoded