Commit Graph

170 Commits

Author SHA1 Message Date
LuoShijie
fbb6b00cba 罗世杰修改ShopList和SearchList的api 2023-11-18 18:07:01 +08:00
LuoShijie
f3cec1461e 罗世杰:店铺列表字段绑定 2023-11-18 00:17:41 +08:00
LuoShijie
022da2f0d0 罗世杰:商铺列表数据绑定 2023-11-17 22:36:02 +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
hot777zz
dd95d7bee0 梁航:个人信息动态展示 2023-11-15 23:40:11 +08:00
hot777zz
9f449b6766 梁航:动态展示用户信息 2023-11-15 23:37:28 +08:00
hot777zz
febea6c9bc 梁航:合并冲突,个人信息修改 2023-11-15 23:29:20 +08:00
hot777zz
0ebd9ea050 Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer 2023-11-15 23:20:09 +08:00
hot777zz
88e2d6542b 梁航:修改页面 2023-11-15 23:16:26 +08:00
luojie
3b422a959d Merge pull request '罗世杰:fixed:项目招商,出租信息修改,客服按钮完成' (#49) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/49
2023-11-15 15:10:37 +00:00
LuoShijie
dfb74d02af 罗世杰:fixed:项目招商,出租信息修改,客服按钮完成 2023-11-15 23:10:11 +08:00
luojie
1a90bc4c67 Merge pull request '罗世杰:合并首页部分api' (#48) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/48
2023-11-15 13:52:58 +00:00
LuoShijie
eb7324bd67 Merge branch 'test' 2023-11-15 21:01:07 +08:00
LuoShijie
3eb1f80045 罗世杰:绑定数据分析 2023-11-15 20:39:47 +08:00
odjbin
96ec919cb6 Merge pull request '邓洁 : 修改细节' (#47) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/47
2023-11-15 09:54:10 +00:00
dengj
aef4ba9e7a 邓洁 : 修改细节 2023-11-15 17:53:45 +08:00
odjbin
59b314a81a Merge pull request '邓洁 : 地址转为经纬度函数' (#46) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/46
2023-11-15 09:45:19 +00:00
dengj
830b5482f0 邓洁 : 地址转为经纬度函数 2023-11-15 17:43:52 +08:00
odjbin
010edbff8e Merge pull request '邓洁 : 修改细节' (#45) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/45
2023-11-15 09:30:20 +00:00
dengj
f7537b0b82 邓洁 : 修改细节 2023-11-15 17:15:10 +08:00