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 |
|
hot777zz
|
5417975723
|
梁航：发布店铺转让接口
|
2023-11-18 16:15:14 +08:00 |
|
hot777zz
|
3ea952742a
|
梁航：店铺转让接口
|
2023-11-18 15:49:18 +08:00 |
|
hot777zz
|
7d26156f15
|
梁航：发布转让接口绑定
|
2023-11-18 15:48:27 +08:00 |
|
odjbin
|
b6c7a91af6
|
Merge pull request '邓洁 : 地图商铺展示细节' (#67) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/67
|
2023-11-18 06:55:30 +00:00 |
|
邓洁
|
bfc5ce6565
|
邓洁 : 地图商铺展示细节
|
2023-11-18 14:55:02 +08:00 |
|
odjbin
|
9e106d9fdb
|
Merge pull request '邓洁 : 地图接口' (#66) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/66
|
2023-11-18 06:43:14 +00:00 |
|
邓洁
|
b055905bc4
|
邓洁 : 地图接口
|
2023-11-18 14:42:53 +08:00 |
|
LuoShijie
|
f3cec1461e
|
罗世杰：店铺列表字段绑定
|
2023-11-18 00:17:41 +08:00 |
|
luojie
|
cda654b717
|
Merge pull request 'lj' (#65) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/65
|
2023-11-17 14:37:58 +00:00 |
|
LuoShijie
|
022da2f0d0
|
罗世杰：商铺列表数据绑定
|
2023-11-17 22:36:02 +08:00 |
|
odjbin
|
df2c7fdb2c
|
Merge pull request '邓洁 : 修改细节' (#64) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/64
|
2023-11-17 14:08:54 +00:00 |
|
邓洁
|
c655390941
|
邓洁 : 修改细节
|
2023-11-17 22:08:19 +08:00 |
|
LuoShijie
|
007445f1d8
|
Merge branch 'lj'
# Conflicts:
# service/request.js
|
2023-11-17 20:15:31 +08:00 |
|
Hot7z
|
58ec503e11
|
Merge pull request '梁航：发布页信息整理' (#63) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/63
|
2023-11-17 10:09:22 +00:00 |
|
hot777zz
|
95d2903e30
|
梁航：发布页信息整理
|
2023-11-17 18:06:25 +08:00 |
|
odjbin
|
e849fe0367
|
Merge pull request '邓洁 : 详情界面及接口对接' (#62) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/62
|
2023-11-17 09:57:53 +00:00 |
|
dengj
|
789dc3c1fb
|
邓洁 : 详情界面及接口对接
|
2023-11-17 17:51:22 +08:00 |
|