Commit Graph

261 Commits

Author SHA1 Message Date
hot777zz
7042c7e5d0 梁航:表单二级联动 2023-11-27 10:25:14 +08:00
hot777zz
105aecb255 梁航:行业与业态两级联动 2023-11-26 17:14:22 +08:00
hot777zz
e440312dbf 梁航:解决冲突 2023-11-25 18:42:21 +08:00
hot777zz
8187141ac9 梁航:合并及数字键盘 2023-11-25 18:41:14 +08:00
hot777zz
d409ff770b 梁航:数字键盘 2023-11-25 18:39:53 +08:00
odjbin
bcd878f09a Merge pull request '邓洁 : 分页' (#103) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/103
2023-11-22 02:49:23 +00:00
dengj
9498bbef86 邓洁 : 分页 2023-11-22 10:47:49 +08:00
odjbin
fa6dcffcae Merge pull request '邓洁 : 修改搜索框bug' (#102) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/102
2023-11-22 02:43:15 +00:00
dengj
4bd637e4e9 邓洁 : 修改搜索框bug 2023-11-22 10:41:43 +08:00
odjbin
424d0bb7fa Merge pull request '邓洁:轮播图' (#101) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/101
2023-11-22 01:31:01 +00:00
邓洁
fead9fb1d2 邓洁:轮播图 2023-11-22 09:25:04 +08:00
odjbin
fa8f90d1f9 Merge pull request '邓洁 : 修改细节' (#100) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/100
2023-11-21 03:24:30 +00:00
dengj
37969e1d2a 邓洁 : 修改细节 2023-11-21 11:23:07 +08:00
odjbin
b7ffbd477d Merge pull request '邓洁 : 修改key' (#99) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/99
2023-11-20 15:57:24 +00:00
邓洁
03de98bbf6 邓洁 : 修改key 2023-11-20 23:57:04 +08:00
odjbin
25b2e367aa Merge pull request '邓洁 : 修改细节' (#98) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/98
2023-11-20 14:03:27 +00:00
邓洁
59d1134d66 邓洁 : 修改细节 2023-11-20 22:03:05 +08:00
odjbin
226d24e383 Merge pull request '邓洁 : 提示定位框' (#97) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/97
2023-11-20 13:33:29 +00:00
邓洁
60c235f503 邓洁 : 提示定位框 2023-11-20 21:33:14 +08:00
odjbin
81c3873354 Merge pull request '邓洁 : 定位框只显示确认按钮' (#96) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/96
2023-11-20 13:29:52 +00:00
邓洁
75ce1ab591 邓洁 : 定位框只显示确认按钮 2023-11-20 21:14:35 +08:00
odjbin
0d4dd4aa22 Merge pull request '邓洁 : 取消下拉刷新' (#95) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/95
2023-11-20 12:12:00 +00:00
邓洁
aaee754194 邓洁 : 取消下拉刷新 2023-11-20 20:11:38 +08:00
odjbin
770fc4137a Merge pull request 'dj' (#94) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/94
2023-11-20 06:15:34 +00:00
dengj
33f2943eef 邓洁 : 下拉框筛选数据和重置数据 2023-11-20 14:14:10 +08:00
dengj
354369fba0 邓洁 : 找店地址下拉刷新重置数据 2023-11-20 13:54:08 +08:00
odjbin
54f62175a4 Merge pull request '邓洁 : 店铺转让下拉刷新重置数据' (#93) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/93
2023-11-20 05:34:35 +00:00
dengj
495cd0dc07 邓洁 : 店铺转让下拉刷新重置数据 2023-11-20 13:34:16 +08:00
odjbin
7dd511513a Merge pull request '邓洁 : 详情头像' (#91) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/91
2023-11-19 15:59:04 +00:00
邓洁
a552316da4 邓洁 : 详情头像 2023-11-19 23:58:36 +08:00
luojie
f90e67fcc9 Merge pull request '罗世杰:fixed:列表展示标题字段超出隐藏' (#90) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/90
2023-11-19 15:16:14 +00:00
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