Commit Graph

347 Commits

Author SHA1 Message Date
zhangsir
e247780528 修改项目名称显示隐藏 2024-02-27 09:31:10 +08:00
joshen
847fffa520 Merge branch 'zcwy-zsx' into 'master'
添加弹窗

See merge request !36
2024-02-23 10:02:28 +08:00
zhangsir
50f00fdeaf 修改弹窗语句 2024-02-23 09:21:03 +08:00
zhangsir
92116b7e99 Merge remote-tracking branch 'zcwyboe/dev0731' into dev0731
# Conflicts:
#	src/App.vue
#	src/api/ThirdApi.js
2024-02-22 16:03:54 +08:00
zhangsir
832a6d8f3b Merge branch 'zcwy-zsx' into dev0731 2024-02-22 15:52:48 +08:00
zhangsir
ffacb1c048 添加弹窗 2024-02-22 15:45:15 +08:00
joshen
b0a0f5811a Merge branch 'zcwyny0221' into 'master'
调试

See merge request !35
2024-02-21 15:25:46 +08:00
qinshengcheng
99e875f409 调试 2024-02-21 15:24:58 +08:00
joshen
b0d18f9722 Merge branch 'zcwyny0221' into 'master'
调试

See merge request !34
2024-02-21 15:20:57 +08:00
qinshengcheng
56a1d39680 调试 2024-02-21 15:19:08 +08:00
joshen
feebb8dd44 Merge branch 'zcwyny0221' into 'master'
调试

See merge request !33
2024-02-21 15:13:59 +08:00
qinshengcheng
42b2c2f51f 调试 2024-02-21 15:13:21 +08:00
670788339
f0e12d0657 验证537问题 2024-02-21 14:56:15 +08:00
qinshengcheng
7fa4eaeaed 测试调试 2024-02-21 14:45:20 +08:00
qinshengcheng
12e489660a 测试调试 2024-02-21 14:41:21 +08:00
joshen
b4a53c305b Merge branch 'dev0731' into 'zcwyny0220'
# Conflicts:
#   src/api/ThirdApi.js
2024-02-21 14:15:30 +08:00
joshen
1869226fca Update App.vue
修改生产环境权限认证
2024-02-21 14:14:33 +08:00
joshen
d76ff4aca3 Update ThirdApi.js
修改api接口路径
2024-02-21 14:07:31 +08:00
joshen
ebb2b2d89e Update ThirdApi.js
修改用户中心api
2024-02-20 15:20:52 +08:00
joshen
70fba9d74e Update ThirdApi.js
修改旧用户中心api调用
2024-02-20 15:09:22 +08:00
zhangsir
227f0e35b5 添加跳转 2024-02-06 16:32:49 +08:00
zhangsir
b791a915e7 项目评估 2024-02-02 16:19:41 +08:00
zhangsir
eab1525632 评估修改 2024-02-02 15:46:59 +08:00
zhangsir
4840a91aab 开课名称 2024-02-02 09:38:40 +08:00
zhangsir
ed22744975 评估显示开课名称 2024-01-29 17:58:48 +08:00
449427055
0ae12de8a2 Merge branch 'hotfix_yjc_0824' into 'master'
修改环境配置文件

See merge request !30
2023-08-24 10:24:51 +08:00
yujicun
f9abb5958f 修改环境配置文件 2023-08-24 10:23:50 +08:00
BOE\10867418
0e8f7e3a61 Merge branch 'user-modify' into dev0731 2023-07-31 17:05:37 +08:00
BOE\10867418
fbbf05204f Merge branch 'dongwu-master' 2023-07-13 10:47:43 +08:00
yuping
cf5da4d6ed 报名bug 2023-07-13 10:46:30 +08:00
yuping
dd57665079 user-modify 2023-07-03 10:56:22 +08:00
yujicun
abc70851f7 Merge remote-tracking branch 'origin/master' 2023-05-16 14:39:03 +08:00
yuping
d6db80dbae --fix bug 2023-05-15 16:55:47 +08:00
yuping
d50c9595ad Merge branch 'develop' 2023-05-15 16:55:31 +08:00
yuping
aa3fa30436 --fix bug 2023-05-15 14:14:23 +08:00
BOE\10867418
a16f2ad55d Merge branch 'dongwu-master' 2023-04-23 17:45:16 +08:00
于平
7e7ac28030 Merge branch 'develop' into 'master'
Develop

See merge request !2
2023-04-23 06:23:19 +00:00
yuping
387363fbd8 --fix bug 2023-04-21 12:11:17 +08:00
yuping
e8804329ce --fix bug 2023-04-20 17:27:00 +08:00
yuping
b98afdb3db --fix bug 2023-04-20 16:01:00 +08:00
yuping
f2f2f688ee --fix 版本号 2023-04-20 11:11:30 +08:00
yuping
d1128bb967 --fix bug 路径图列表 2023-04-20 11:09:53 +08:00
BOE\10867418
448b2114e9 Merge branch 'dongwu-master' 2023-04-17 15:12:37 +08:00
yuping
1af82608ab --fix 版本号 2023-04-17 11:24:23 +08:00
yuping
8b90e1c2a8 --fix bug 路径图 2023-04-13 15:27:21 +08:00
BOE\10867418
288aa975c4 Merge branch 'dongwu-master' 2023-04-11 10:17:32 +08:00
yuping
948a16f35a --fix bug 2023-04-10 16:51:10 +08:00
yuping
4c51ccab68 Merge branch 'develop'
# Conflicts:
#	src/App.vue
2023-04-10 16:45:42 +08:00
wyx
41a1a58fdc fix:修改版本号 2023-04-03 17:11:40 +08:00
yuping
cb84e10f37 --fix bug 2023-04-03 15:48:40 +08:00