wlikett
|
5691c044ad
|
Merge branch 'dev-wangyiming'
|
2023-12-08 13:25:01 +08:00 |
|
wlikett
|
ea028383df
|
获取地址列表 和 类型列表
|
2023-12-08 13:24:09 +08:00 |
 songyang
|
93e280d3a0
|
Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal
|
2023-12-08 13:13:20 +08:00 |
|
songyang
|
74ffade539
|
热搜装备获取
|
2023-12-08 13:13:00 +08:00 |
|
wlikett
|
124b2aa4ec
|
Merge branch 'dev-wangyiming'
|
2023-12-08 13:12:12 +08:00 |
|
songyang
|
be333962e8
|
接口对接
|
2023-12-08 12:09:54 +08:00 |
|
wlikett
|
40ab96b520
|
Merge branch 'main' into dev-wangyiming
# Conflicts:
# src/http/api/equip.ts
|
2023-12-08 10:13:56 +08:00 |
|
wlikett
|
44b7c2420e
|
修改
|
2023-12-08 10:12:43 +08:00 |
|
songyang
|
fb27448f50
|
接口统一更新
|
2023-12-08 10:10:04 +08:00 |
|
wlikett
|
eaf7853193
|
Merge branch 'dev-wangyiming'
# Conflicts:
# src/views/AppMain.vue
# src/views/equip/detail.vue
|
2023-12-07 17:59:00 +08:00 |
|
songyang
|
cc90a75d85
|
冲突合并
|
2023-12-07 17:55:09 +08:00 |
|
songyang
|
d2bb94f70a
|
更新订单管理
|
2023-12-07 17:50:11 +08:00 |
|
wlikett
|
32fcf1b9a1
|
字段修改
|
2023-12-07 17:49:27 +08:00 |
|
wlikett
|
139e9b269b
|
字段修改
|
2023-12-07 17:49:10 +08:00 |
|
songyang
|
95aeb1473f
|
订单管理更新
|
2023-12-07 17:48:36 +08:00 |
 13218645326
|
85cc3f6649
|
商城
|
2023-12-07 13:34:05 +08:00 |
|
13218645326
|
99f52f3500
|
页面流程
|
2023-12-07 13:04:50 +08:00 |
|
13218645326
|
caa6a9d99d
|
样式文件移除
|
2023-12-06 17:50:42 +08:00 |
|
13218645326
|
8c240eed96
|
订单样式
|
2023-12-06 17:47:57 +08:00 |
|
wlikett
|
37b1bca405
|
Merge branch 'main' into dev-wangyiming
|
2023-12-06 16:02:39 +08:00 |
|
songyang
|
8d3fac9a3a
|
代码提交
|
2023-12-06 15:58:21 +08:00 |
|
wlikett
|
ea73748e17
|
提交租赁申请
|
2023-12-06 15:57:08 +08:00 |
|
songyang
|
0848782d52
|
冲突合并
|
2023-12-06 14:19:48 +08:00 |
|
songyang
|
d6af74672d
|
商品入驻，商品上架接口正常调通
|
2023-12-06 14:17:22 +08:00 |
|
wlikett
|
212fabf998
|
Merge branch 'dev-wangyiming'
|
2023-12-06 14:13:23 +08:00 |
|
wlikett
|
76dd1d4095
|
提交申请弹窗
|
2023-12-06 14:12:36 +08:00 |
|
13218645326
|
61eba7b1c7
|
配置优化
|
2023-12-06 13:45:03 +08:00 |
|
13218645326
|
b2f1010624
|
接口调试
|
2023-12-06 13:40:33 +08:00 |
|
13218645326
|
956a84f7b1
|
订单确认页面搭建
|
2023-12-06 11:02:12 +08:00 |
|
13218645326
|
e44e03fb39
|
上传文件优化
|
2023-12-06 10:30:41 +08:00 |
|
13218645326
|
7b06004501
|
Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal
|
2023-12-06 09:50:22 +08:00 |
|
13218645326
|
e398689720
|
进度条横向
|
2023-12-06 09:50:03 +08:00 |
|
songyang
|
79a1a6d55c
|
Merge branch 'dev-songyang'
|
2023-12-06 09:38:43 +08:00 |
|
songyang
|
93aa763064
|
商品管理更新
|
2023-12-06 09:38:11 +08:00 |
|
13218645326
|
79c5923f3a
|
Merge branch 'dev-sjf-2023-12-5'
|
2023-12-06 09:37:10 +08:00 |
|
13218645326
|
6cd6ad5f75
|
页面搭建
|
2023-12-06 09:36:45 +08:00 |
|
wlikett
|
fba797139a
|
注解
|
2023-12-05 20:57:29 +08:00 |
|
13218645326
|
561fa32a42
|
Merge branch 'main' into dev-sjf-2023-12-5
|
2023-12-05 20:52:51 +08:00 |
|
13218645326
|
0ba301fc73
|
订单详情
|
2023-12-05 20:52:24 +08:00 |
|
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 |