LuoShijie
|
f6396f65df
|
Merge branch 'lj'
|
2023-11-19 23:14:11 +08:00 |
|
LuoShijie
|
d32d2fa4a7
|
罗世杰：fixed：列表展示标题字段超出隐藏
|
2023-11-19 23:10:45 +08:00 |
|
odjbin
|
20420ad5f1
|
Merge pull request '邓洁 : 首页icon页面渲染' (#89) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/89
|
2023-11-19 15:05:45 +00:00 |
|
邓洁
|
e302fcb477
|
邓洁 : 首页icon页面渲染
|
2023-11-19 23:05:10 +08:00 |
|
odjbin
|
249cf5aeb8
|
Merge pull request '邓洁 : 编辑接口' (#88) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/88
|
2023-11-19 14:28:00 +00:00 |
|
邓洁
|
6eb6756796
|
邓洁 : 编辑接口
|
2023-11-19 22:27:47 +08:00 |
|
odjbin
|
7fd9354a2e
|
Merge pull request '罗世杰：店铺转让、找店地址触底加载和下拉query' (#87) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/87
|
2023-11-19 12:09:56 +00:00 |
|
LuoShijie
|
8b8f821817
|
罗世杰：店铺转让、找店地址触底加载和下拉query
|
2023-11-19 19:37:22 +08:00 |
|
odjbin
|
f7abaf847e
|
Merge pull request '邓洁 : "我的"模块删除功能' (#86) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/86
|
2023-11-19 10:46:56 +00:00 |
|
邓洁
|
0f268fb419
|
邓洁 : "我的"模块删除功能
|
2023-11-19 18:46:42 +08:00 |
|
odjbin
|
f9f65064a7
|
Merge pull request '邓洁 : 修改shopListItem细节' (#85) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/85
|
2023-11-19 09:27:44 +00:00 |
|
邓洁
|
676638c370
|
邓洁 : 修改shopListItem细节
|
2023-11-19 17:27:24 +08:00 |
|
odjbin
|
97dce3e6cf
|
Merge pull request '邓洁 : "我的" 模块接口对接' (#84) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/84
|
2023-11-19 08:58:21 +00:00 |
|
邓洁
|
07c0aa4090
|
邓洁 : "我的" 模块接口对接
|
2023-11-19 16:57:56 +08:00 |
|
odjbin
|
a2d61d0497
|
Merge pull request '邓洁 : 首页分页加载' (#83) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/83
|
2023-11-19 07:37:41 +00:00 |
|
邓洁
|
11ef55cc68
|
邓洁 : 首页分页加载
|
2023-11-19 15:37:23 +08:00 |
|
luojie
|
1e55804db9
|
Merge pull request '罗世杰：feat：完成店铺转让下拉框api' (#82) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/82
|
2023-11-19 07:22:26 +00:00 |
|
odjbin
|
ff9bca46be
|
Merge pull request '罗世杰：fixed：修改列表组件发送网络请求的位置' (#81) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/81
|
2023-11-19 07:17:33 +00:00 |
|
LuoShijie
|
6ab6eaed9d
|
罗世杰：feat：完成店铺转让下拉框api
|
2023-11-19 15:16:41 +08:00 |
|
LuoShijie
|
ae5b700362
|
罗世杰：fixed：修改列表组件发送网络请求的位置
|
2023-11-19 14:24:58 +08:00 |
|
Hot7z
|
210023ee6e
|
Merge pull request '梁航：获取个人发布的信息接口' (#80) from lh into master
|
2023-11-18 16:52:57 +00:00 |
|
hot777zz
|
e45d8775d6
|
梁航：获取个人发布的信息接口
|
2023-11-19 00:51:58 +08:00 |
|
odjbin
|
28763a8e28
|
Merge pull request '邓洁 : 发布店铺出租,项目招商接口' (#79) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/79
|
2023-11-18 15:44:13 +00:00 |
|
邓洁
|
8feccdd6eb
|
邓洁 : 发布店铺出租,项目招商接口
|
2023-11-18 23:44:06 +08:00 |
|
luojie
|
0734453782
|
Merge pull request 'lj' (#78) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/78
|
2023-11-18 15:09:42 +00:00 |
|
LuoShijie
|
5c0b5d1ede
|
Merge branch 'lj'
# Conflicts:
# service/request.js
|
2023-11-18 23:07:21 +08:00 |
|
LuoShijie
|
875ff342f2
|
罗世杰：Dropdown生成query
|
2023-11-18 23:00:12 +08:00 |
|
odjbin
|
1c59c15276
|
Merge pull request '邓洁 : 发布找店地址接口' (#77) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/77
|
2023-11-18 14:55:58 +00:00 |
|
邓洁
|
90a0ab46cb
|
邓洁 : 发布找店地址接口
|
2023-11-18 22:53:52 +08:00 |
|
odjbin
|
7f29dc0e20
|
Merge pull request '邓洁 : 发布店铺转让接口' (#76) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/76
|
2023-11-18 13:52:31 +00:00 |
|
邓洁
|
ed9078f912
|
邓洁 : 发布店铺转让接口
|
2023-11-18 21:52:08 +08:00 |
|
Hot7z
|
8b771ad72b
|
Merge pull request 'lh' (#75) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/75
|
2023-11-18 13:30:29 +00:00 |
|
hot777zz
|
41fe9b1392
|
Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer into lh
# Conflicts:
# pages/publish/publishTransfer/publishTransfer.vue
|
2023-11-18 21:29:16 +08:00 |
|
hot777zz
|
00f1078277
|
梁航：重新合并
|
2023-11-18 21:28:01 +08:00 |
|
hot777zz
|
1e68012289
|
梁航：合并冲突
|
2023-11-18 21:22:21 +08:00 |
|
hot777zz
|
1cc7b4beec
|
梁航：冲突合并
|
2023-11-18 21:12:33 +08:00 |
|
hot777zz
|
2fa63fa1e9
|
梁航：冲突合并
|
2023-11-18 21:07:30 +08:00 |
|
hot777zz
|
2383b1a612
|
梁航：发布接口绑定
|
2023-11-18 20:46:43 +08:00 |
|
hot777zz
|
7689a13b19
|
梁航：本地合并
|
2023-11-18 19:59:39 +08:00 |
|
odjbin
|
ef17a70639
|
Merge pull request '邓洁 : 招募合伙接口' (#73) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/73
|
2023-11-18 10:36:33 +00:00 |
|
邓洁
|
cbe7bdf60a
|
邓洁 : 招募合伙接口
|
2023-11-18 18:35:59 +08:00 |
|
LuoShijie
|
fbb6b00cba
|
罗世杰修改ShopList和SearchList的api
|
2023-11-18 18:07:01 +08:00 |
|
Hot7z
|
de898c613b
|
Merge pull request 'lh' (#72) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/72
|
2023-11-18 09:06:11 +00:00 |
|
hot777zz
|
9b70973246
|
梁航：合并冲突
|
2023-11-18 17:05:01 +08:00 |
|
hot777zz
|
9f4cd40ff1
|
Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer
# Conflicts:
# pages/publish/publishTransfer/publishTransfer.vue
|
2023-11-18 16:55:48 +08:00 |
|
hot777zz
|
b2cc582bba
|
梁航：合并冲突
|
2023-11-18 16:41:52 +08:00 |
|
hot777zz
|
2ad16186de
|
梁航：处理冲突
|
2023-11-18 16:36:37 +08:00 |
|
hot777zz
|
066470b4e6
|
梁航：处理合并冲突
|
2023-11-18 16:34:18 +08:00 |
|
hot777zz
|
13861d2343
|
梁航：个人页处理冲突
|
2023-11-18 16:28:26 +08:00 |
|
hot777zz
|
a1ed1ec45d
|
梁航：发布店铺转让接口
|
2023-11-18 16:19:40 +08:00 |
|