Commit Graph

115 Commits

Author SHA1 Message Date
odjbin
4f19baab50 Merge pull request '首页产品列表按上架时间或点赞量排列以及上拉加载更多数据' (#53) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/53
2023-01-16 13:34:17 +00:00
clay
2d08416f5e 首页产品列表按上架时间或点赞量排列以及上拉加载更多数据 2023-01-16 21:33:14 +08:00
odjbin
29b8a6056e Merge pull request '1' (#52) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/52
2023-01-16 08:09:34 +00:00
clay
b6d023d528 1 2023-01-16 15:59:47 +08:00
1171906056
d966269444 Merge pull request '需求发布接口对接' (#51) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/51
2023-01-12 14:10:57 +00:00
”chenxuelian“
68cc38f14f Merge branch 'dev' into chenxuelian 2023-01-12 22:08:33 +08:00
”chenxuelian“
7db25b96b9 需求发布接口对接 2023-01-12 22:02:41 +08:00
odjbin
2a7ad3dd9a Merge pull request '商品详情. 新闻详情和厂家详情登录拦截' (#50) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/50
2023-01-11 14:12:49 +00:00
clay
201037eeb6 商品详情. 新闻详情和厂家详情登录拦截 2023-01-11 22:08:59 +08:00
1171906056
c834416b98 Merge pull request '需求发布' (#49) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/49
2023-01-10 01:27:14 +00:00
”chenxuelian“
7b474b06ef 需求发布 2023-01-10 09:26:31 +08:00
odjbin
780175e3de Merge pull request 'dengjie commit : 代码完善' (#48) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/48
2023-01-09 10:07:02 +00:00
clay
c906a7d33a dengjie commit : 代码完善 2023-01-09 18:05:36 +08:00
1171906056
b010cba9fc Merge pull request '登录组件' (#47) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/47
2023-01-08 12:08:11 +00:00
”chenxuelian“
e561054b6f 登录组件 2023-01-08 20:07:37 +08:00
1171906056
9c0477da5c Merge pull request '登录组件封装' (#46) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/46
2023-01-06 14:20:15 +00:00
”chenxuelian“
d42219873d 登录组件封装 2023-01-06 22:19:31 +08:00
1171906056
7c1373624f Merge pull request 'chenxuelian' (#45) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/45
2023-01-06 12:53:20 +00:00
”chenxuelian“
91b8f57154 冲突解决 2023-01-06 20:49:54 +08:00
”chenxuelian“
bc9b2b8e9c 首页与分类页参数传递 2023-01-06 20:44:35 +08:00
1171906056
74c5cbb605 Merge pull request '分类页接口对接' (#44) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/44
2023-01-06 12:18:30 +00:00
”chenxuelian“
ce9d241d05 分类页接口对接 2023-01-06 20:17:38 +08:00
odjbin
98081352ea Merge pull request '产品列表, 按上架时间和点赞量排序' (#43) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/43
2023-01-06 12:04:28 +00:00
clay
a02de3a20f 产品列表, 按上架时间和点赞量排序 2023-01-06 18:25:12 +08:00
odjbin
5eff8c483c Merge pull request '创意发布&需求发布列表接口初步完成' (#42) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/42
2023-01-06 06:29:24 +00:00
clay
7e594aa3cb 创意发布&需求发布列表接口初步完成 2023-01-06 11:29:35 +08:00
odjbin
c60967cd4a Merge pull request 'DJ' (#41) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/41
2023-01-06 01:08:33 +00:00
clay
e0fc034998 个人信息接口初次对接完毕 2023-01-06 09:07:30 +08:00
clay
458f5a2562 dengjie commit : 我的页面部分接口 2023-01-05 21:57:51 +08:00
odjbin
0a5054efc1 Merge pull request 'token已存入Storage, 认证厂家详情接口初步完成' (#40) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/40
2023-01-04 12:58:40 +00:00
clay
2417d8fe28 token已存入Storage, 认证厂家详情接口初步完成 2023-01-04 20:58:04 +08:00
odjbin
3f96938143 Merge pull request 'DJ' (#39) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/39
2023-01-04 08:47:47 +00:00
clay
27787d3300 1 2023-01-04 16:46:46 +08:00
clay
56bf10b47f 当获取首页产品列表时,返回数据length为0时取消发送请求 2022-12-29 09:48:45 +08:00
odjbin
3a08058467 Merge pull request 'dengjie commit : 首页产品列表下拉刷新分页展示产品' (#38) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/38
2022-12-28 16:14:22 +00:00
clay
0c3e8de069 dengjie commit : 首页产品列表下拉刷新分页展示产品 2022-12-29 00:13:33 +08:00
odjbin
98d3fdb3c3 Merge pull request '首页图片获取,行业报告中行业新闻及详情页和新品发布及详情页接口对接完毕' (#37) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/37
2022-12-28 14:18:33 +00:00
clay
b3b0b620bf 首页图片获取,行业报告中行业新闻及详情页和新品发布及详情页接口对接完毕 2022-12-28 22:15:56 +08:00
1171906056
8c63db07ab Merge pull request '登录' (#36) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/36
2022-12-27 11:30:00 +00:00
”chenxuelian“
1a379ca8e9 登录 2022-12-27 19:29:16 +08:00
odjbin
9ab67b2af5 Merge pull request 'dengjie commit : 发布日期格式解决' (#35) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/35
2022-12-26 14:20:23 +00:00
clay
ff682aedc3 dengjie commit : 发布日期格式解决 2022-12-26 22:19:45 +08:00
1171906056
4dfac221e1 Merge pull request 'chenxuelian' (#34) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/34
2022-12-26 13:28:27 +00:00
”chenxuelian“
aef226d3ab 分类页部分接口对接 2022-12-26 21:27:22 +08:00
”chenxuelian“
3fd749fd2f 解决冲突 2022-12-26 20:27:26 +08:00
”chenxuelian“
4c62c9b1ec 解决冲突 2022-12-26 20:24:29 +08:00
”chenxuelian“
3d04398b7c 分类接口对接 2022-12-26 20:16:44 +08:00
odjbin
3c5e239985 Merge pull request '新增搜索出的产品列表' (#33) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/33
2022-12-25 08:50:33 +00:00
clay
d3c83c4c7d 新增搜索出的产品列表 2022-12-25 16:49:38 +08:00
odjbin
ae137c498a Merge pull request '首页初次对接口' (#32) from DJ into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/32
2022-12-25 08:07:12 +00:00