Commit Graph

147 Commits

Author SHA1 Message Date
LuoShijie
29ea1e1486 罗世杰:临时提交 2023-11-16 20:51:49 +08:00
LuoShijie
971bf5efa6 罗世杰:fixed修改了使用展示商铺列表组件的地方 2023-11-16 20:12:02 +08: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
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
hot777zz
b0a49dc67d 梁航:更新页面请求和样式 2023-11-15 16:19:22 +08:00
odjbin
e3a78be387 Merge pull request '邓洁 : 修改细节' (#44) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/44
2023-11-15 07:51:37 +00:00
dengj
eaf7fbfee1 邓洁 : 修改细节 2023-11-15 15:51:15 +08:00
odjbin
3b1ef4b561 Merge pull request '邓洁 : 区域下拉框数据获取及完善定位功能' (#43) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/43
2023-11-15 07:50:01 +00:00
dengj
d9d7cb36de 邓洁 : 区域下拉框数据获取及完善定位功能 2023-11-15 15:49:30 +08:00
odjbin
6796272caa Merge pull request '邓洁 : 登录功能及拦截' (#42) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/42
2023-11-15 04:51:56 +00:00
dengj
dd05376541 邓洁 : 登录功能及拦截 2023-11-15 12:51:37 +08:00
odjbin
b93daa7c35 Merge pull request '罗世杰:feat:轮播图,分析统计、轮播消息接口接入' (#41) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/41
2023-11-15 01:40:31 +00:00
odjbin
025aa50724 Merge pull request '梁航:detail样式调整' (#40) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/40
2023-11-15 01:40:12 +00:00
LuoShijie
db21651d44 罗世杰:feat:轮播图,分析统计、轮播消息接口接入 2023-11-14 23:11:39 +08:00
hot777zz
63d39a021e 梁航:detail样式调整 2023-11-14 21:02:31 +08:00
odjbin
11fb217967 Merge pull request '梁航:表单与个人样式,表单验证测试' (#39) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/39
2023-11-14 01:45:06 +00:00
odjbin
612f2ce5b4 Merge pull request '罗世杰:完成首页数据分析、客服悬浮' (#38) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/38
2023-11-14 01:44:51 +00:00
LuoShijie
c21816d077 罗世杰:完成首页数据分析、客服悬浮 2023-11-14 00:33:31 +08:00
hot777zz
13d7ba738b 梁航:表单与个人样式,表单验证测试 2023-11-13 23:43:03 +08:00
odjbin
07396b7e54 Merge pull request '邓洁 : 修改细节' (#37) from dj1 into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/37
2023-11-13 14:01:58 +00:00
邓洁
9e627e8a92 邓洁 : 修改细节 2023-11-13 22:00:38 +08:00
odjbin
c639b24e9c Merge pull request '邓洁:删除首页及地图上方搜索框' (#36) from djj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/36
2023-11-11 16:34:03 +00:00
邓洁
55b0af8713 邓洁:删除首页及地图上方搜索框 2023-11-12 00:33:37 +08:00
luojie
79655e3474 Merge pull request '罗世杰:成交案例页面完成' (#34) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/34
2023-11-11 14:49:53 +00:00
LuoShijie
a8fbef6966 罗世杰:fix:成交案例页面样式调整,SearchShopListItem.vue支持显示成交案例 2023-11-11 22:47:47 +08:00
LuoShijie
f97c558fa0 罗世杰:临时提交 2023-11-10 21:19:38 +08:00
Hot7z
6cbb0a4e08 Merge pull request 'lh' (#33) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/33
2023-11-10 03:35:30 +00:00