wlikett
|
1ab6209482
|
change
|
2023-12-05 20:50:06 +08:00 |
 songyang
|
74bd26c254
|
Merge branch 'dev-songyang'
|
2023-12-05 19:17:05 +08:00 |
|
songyang
|
a86e78fa55
|
个人中心修改
|
2023-12-05 19:16:16 +08:00 |
|
wlikett
|
5d5333c3ed
|
change
|
2023-12-05 17:25:00 +08:00 |
|
songyang
|
7284d749cf
|
个人中心
|
2023-12-05 17:05:54 +08:00 |
|
songyang
|
054edc96ff
|
Merge branch 'dev-songyang'
|
2023-12-05 09:48:45 +08:00 |
|
songyang
|
09a7095df6
|
**
|
2023-12-05 09:48:11 +08:00 |
|
wlikett
|
7a847933cf
|
Merge branch 'dev-wangyiming'
# Conflicts:
# src/views/AppMain.vue
# src/views/equip/detail.vue
# src/views/equip/list.vue
|
2023-12-05 09:47:17 +08:00 |
|
wlikett
|
1dc9468dbf
|
change
|
2023-12-05 09:45:01 +08:00 |
|
songyang
|
dcbe6c4037
|
更新个人中心
|
2023-12-05 09:43:57 +08:00 |
|
songyang
|
d62ef9084e
|
个人中心模块更新
|
2023-12-04 17:42:11 +08:00 |
|
songyang
|
bd0290dcf8
|
登录接口正常
|
2023-12-04 13:10:38 +08:00 |
|
songyang
|
2e4af49963
|
冲突合并
|
2023-12-04 10:37:49 +08:00 |
|
songyang
|
9d8fa9f63c
|
登录页接口调试完成
|
2023-12-04 10:33:27 +08:00 |
|
wlikett
|
51d905c7f0
|
http change
|
2023-12-04 10:26:00 +08:00 |
|
wlikett
|
70145bc733
|
list change
|
2023-12-04 10:20:00 +08:00 |
|
wlikett
|
021b63bc2a
|
list change
|
2023-12-04 10:19:21 +08:00 |
|
wlikett
|
efb48126f8
|
Merge branch 'main' into dev-wangyiming
# Conflicts:
# components.d.ts
# src/router/index.ts
|
2023-12-04 09:16:05 +08:00 |
|
wlikett
|
652a5b9d9d
|
list change
|
2023-12-04 09:15:31 +08:00 |
|
songyang
|
147bb863dd
|
首页路由修改
|
2023-12-04 09:12:38 +08:00 |
|
songyang
|
eaeae3f207
|
更新首页
|
2023-12-03 10:41:32 +08:00 |
|
songyang
|
6e2e4592dd
|
更新
|
2023-12-02 18:10:19 +08:00 |
|
songyang
|
0976efbce2
|
首页以及个人中心页更新
|
2023-12-02 18:05:58 +08:00 |
|
songyang
|
5a28fcd3b8
|
首页更新
|
2023-12-02 14:18:00 +08:00 |
|
songyang
|
f6365299c1
|
Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal
|
2023-12-01 17:02:31 +08:00 |
|
songyang
|
5d56b88081
|
商城提交
|
2023-12-01 17:02:05 +08:00 |
|
wlikett
|
60323f19e1
|
Merge branch 'main' into dev-wangyiming
# Conflicts:
# components.d.ts
|
2023-12-01 16:57:48 +08:00 |
|
wlikett
|
9e865c1741
|
list change
|
2023-12-01 16:57:11 +08:00 |
|
songyang
|
d5459591c6
|
Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal
|
2023-12-01 15:02:58 +08:00 |
|
songyang
|
fd53b0b049
|
更新首页
|
2023-12-01 15:02:27 +08:00 |
|
wlikett
|
69654e610a
|
width change
|
2023-12-01 15:00:37 +08:00 |
|
songyang
|
6a998c8220
|
Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal
|
2023-12-01 14:50:14 +08:00 |
|
songyang
|
b89ed460b7
|
首页更新
|
2023-12-01 14:48:58 +08:00 |
|
wlikett
|
298f4c1c17
|
equipCard add
|
2023-12-01 14:45:16 +08:00 |
|
songyang
|
e704f1f28b
|
Merge branch 'dev-songyang'
|
2023-12-01 14:03:45 +08:00 |
|
songyang
|
d8223d64f2
|
更新首页
|
2023-12-01 14:03:26 +08:00 |
|
songyang
|
497685a361
|
冲突合并
|
2023-12-01 13:02:32 +08:00 |
|
songyang
|
8485050ecd
|
提交首页
|
2023-12-01 13:00:16 +08:00 |
|
wlikett
|
64b1cb5529
|
Merge branch 'dev-wangyiming'
|
2023-12-01 12:22:03 +08:00 |
|
wlikett
|
0f636f2be8
|
icon
|
2023-12-01 12:21:43 +08:00 |
|
wlikett
|
e545c01f55
|
增加icon
|
2023-12-01 11:29:33 +08:00 |
|
songyang
|
6c0409ac0a
|
商城首页和个人信息
|
2023-12-01 11:22:09 +08:00 |
|
wlikett
|
4ac47c8940
|
chang samething
|
2023-11-30 19:32:11 +08:00 |
 13218645326
|
3e39850a22
|
初始化
|
2023-11-30 10:57:31 +08:00 |
|
13218645326
|
50448d9581
|
项目初始化
|
2023-11-30 10:49:45 +08:00 |