Commit Graph

186 Commits

Author SHA1 Message Date
hot777zz
2383b1a612 梁航:发布接口绑定 2023-11-18 20:46:43 +08:00
hot777zz
7689a13b19 梁航:本地合并 2023-11-18 19:59:39 +08:00
hot777zz
9b70973246 梁航:合并冲突 2023-11-18 17:05:01 +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
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
LuoShijie
46ea8e4ee9 罗世杰:招商、出租推广发布跳转 2023-11-17 15:17:03 +08:00
odjbin
c711718bd3 Merge pull request '邓洁 : 点击轮播图跳转到详情' (#61) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/61
2023-11-17 05:12:54 +00:00
dengj
1259f1a4c8 邓洁 : 点击轮播图跳转到详情 2023-11-17 13:11:30 +08:00
odjbin
2e81cd5550 Merge pull request '邓洁 : 获取个人信息接口' (#60) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/60
2023-11-17 03:01:27 +00:00
dengj
0c1998d09e 邓洁 : 获取个人信息接口 2023-11-17 10:53:17 +08:00
odjbin
b23e7c848c Merge pull request '梁航:发布页获取业态' (#59) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/59
2023-11-17 01:35:31 +00:00
hot777zz
590ffc1d46 梁航:发布页获取业态 2023-11-17 00:38:54 +08:00
LuoShijie
10136f43f7 罗世杰:修改Dropdown.vue的bug 2023-11-16 22:26:18 +08:00
odjbin
ff7eaadc7c Merge pull request 'djj' (#57) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/57
2023-11-16 13:44:49 +00:00
邓洁
dc57ab9ade 邓洁 : 修改头像大小 2023-11-16 21:44:31 +08:00
邓洁
b07248d07b 邓洁 : 修改个人信息接口对接 2023-11-16 21:42:01 +08:00
luojie
00ebbba179 Merge pull request 'lj' (#56) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/56
2023-11-16 12:52:13 +00:00
LuoShijie
29ea1e1486 罗世杰:临时提交 2023-11-16 20:51:49 +08:00
odjbin
0cb26ad8be Merge pull request '邓洁 : 监听地图缩放' (#55) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/55
2023-11-16 12:43:32 +00:00
LuoShijie
971bf5efa6 罗世杰:fixed修改了使用展示商铺列表组件的地方 2023-11-16 20:12:02 +08:00
luojie
bd40afd360 Merge pull request 'lj' (#54) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/54
2023-11-16 11:16:33 +00:00
LuoShijie
e756b8e046 Merge branch 'lh' 解决冲突
# Conflicts:
#	service/request.js
2023-11-16 19:14:05 +08:00
hot777zz
209b3cc1cd 梁航:我的匹配接口 2023-11-16 18:16:49 +08:00
dengj
73cb83d1ab 邓洁 : 监听地图缩放 2023-11-16 15:49:41 +08:00
odjbin
97115ad6a2 Merge pull request '邓洁 : 地图接口' (#52) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/52
2023-11-16 04:51:33 +00:00
dengj
88dfe5760b 邓洁 : 地图接口 2023-11-16 12:50:58 +08:00
hot777zz
126a39edf8 梁航:发布页样式修改 2023-11-16 12:31:04 +08:00
hot777zz
d262087ec9 梁航:表单验证 2023-11-16 12:30:41 +08:00
Hot7z
e50e90c841 Merge pull request 'lh' (#50) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/50
2023-11-15 16:07:55 +00:00
hot777zz
5b05eb8eba 梁航:合并发布页冲突 2023-11-15 23:59:52 +08:00
hot777zz
1c9a23f610 梁航:解决request合并冲突 2023-11-15 23:58:27 +08:00