 13218645326
|
94e0fb8ced
|
no message
|
2023-12-08 18:46:09 +08:00 |
wlikett
|
b93e5520dc
|
Merge branch 'dev-wangyiming'
|
2023-12-08 17:53:18 +08:00 |
|
13218645326
|
7d2e8c236f
|
合并冲突
|
2023-12-08 17:50:38 +08:00 |
|
wlikett
|
0300adf7d0
|
提交申请增加动态省市区
|
2023-12-08 17:49:22 +08:00 |
|
13218645326
|
223f796e30
|
上传文件
|
2023-12-08 17:49:14 +08:00 |
 songyang
|
9b644b01e9
|
冲突提交
|
2023-12-08 17:41:16 +08:00 |
|
songyang
|
852539478b
|
订单管理优化
|
2023-12-08 17:38:59 +08:00 |
|
13218645326
|
61a041c474
|
页面优化
|
2023-12-08 17:37:49 +08:00 |
|
13218645326
|
c00958a1f8
|
合并代码
|
2023-12-08 17:36:39 +08:00 |
|
13218645326
|
eb07ba7eab
|
函数优化
|
2023-12-08 17:33:41 +08:00 |
|
13218645326
|
d9cd44e4a9
|
状态值修改
|
2023-12-08 17:31:40 +08:00 |
|
wlikett
|
0e42dbf6c1
|
打包前修改
|
2023-12-08 17:09:20 +08:00 |
|
wlikett
|
211c6eed0e
|
Merge branch 'main' into dev-wangyiming
|
2023-12-08 17:08:31 +08:00 |
|
wlikett
|
56f7748f3b
|
打包前修改
|
2023-12-08 17:04:34 +08:00 |
|
13218645326
|
ab3d43f629
|
接口调用，打包配置
|
2023-12-08 17:03:26 +08:00 |
|
songyang
|
3ee01f9594
|
冲突合并
|
2023-12-08 15:31:51 +08:00 |
|
songyang
|
ba14cd12e5
|
123
|
2023-12-08 15:30:26 +08:00 |
|
wlikett
|
b527b37517
|
Merge branch 'main' into dev-wangyiming
|
2023-12-08 15:19:10 +08:00 |
|
wlikett
|
ce5beac1d1
|
获取地址列表 和 类型列表
|
2023-12-08 15:18:34 +08:00 |
|
13218645326
|
ad5d31ccbc
|
合并代码
|
2023-12-08 15:18:01 +08:00 |
|
13218645326
|
ccd9f60a79
|
合并冲突
|
2023-12-08 15:09:00 +08:00 |
|
songyang
|
88b4dde528
|
订单列表字段更新
|
2023-12-08 15:05:47 +08:00 |
|
13218645326
|
22fc1dc911
|
接口调试
|
2023-12-08 15:04:24 +08:00 |
|
songyang
|
6b88074abd
|
Merge branch 'dev-songyang'
|
2023-12-08 13:27:59 +08:00 |
|
songyang
|
114f3bd4ce
|
添加服务协议 隐私协议跳转
|
2023-12-08 13:27:28 +08:00 |
|
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 |