Commit Graph

296 Commits

Author SHA1 Message Date
luojie
6ce3b66029 Merge pull request '罗世杰:商铺展示组件' (#16) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/16
2023-11-04 04:32:42 +00:00
LuoShijie
0cb065122f Merge branch 'lj'
# Conflicts:
#	manifest.json
#	pages/index/index.vue
2023-11-04 12:29:00 +08:00
LuoShijie
5011e5b22e 罗世杰:feat:简单完成商铺展示列表 2023-11-04 11:49:11 +08:00
LuoShijie
11cfc1acfc 罗世杰:feat:商铺列表项组件 2023-11-04 11:16:12 +08:00
odjbin
fd08f42bf9 Merge pull request '邓洁: 修改页面细节' (#15) from dengjie into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/15
2023-11-03 16:34:06 +00:00
邓洁
e4119a7bcf 邓洁: 修改页面细节 2023-11-04 00:32:49 +08:00
odjbin
b5a66caa5c Merge pull request 'lh' (#13) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/13
2023-11-03 15:14:53 +00:00
hot777zz
50102d422d 梁航:发布悬浮卡片组件样式修复 2023-11-03 18:13:43 +08:00
hot777zz
73f4bdf1e2 梁航:更新悬浮选项组件及子页面 2023-11-03 16:58:22 +08:00
odjbin
13fe47ac06 Merge pull request 'lh' (#12) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/12
2023-11-03 08:06:42 +00:00
LuoShijie
839a49f1c7 罗世杰:feat:商铺列表初始化 2023-11-02 22:49:10 +08:00
hot777zz
849ea07b08 梁航:发布页面pages 2023-11-02 18:06:34 +08:00
hot777zz
90fe5def4c 梁航:发布页面搭建完成 2023-11-02 18:04:29 +08:00
hot777zz
d20c8ecb49 梁航:个人页面跳转及传标题 2023-11-02 18:03:47 +08:00
hot777zz
11b98f4082 梁航:详情页完成 2023-11-02 18:02:40 +08:00
luojie
da8a0a5de9 Merge pull request '罗世杰:首页PR' (#11) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/11
2023-11-01 15:05:44 +00:00
LuoShijie
3e81148948 罗世杰:fix:取消了配置项的修改 2023-11-01 23:02:13 +08:00
hot777zz
a5eeb83385 梁航:更新个人主页背景bug 2023-11-01 22:50:50 +08:00
LuoShijie
f05c5413a4 Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer
# Conflicts:
#	pages/index/index.vue
#	pages/my/my.vue
2023-11-01 22:43:46 +08:00
LuoShijie
b30196c92a 罗世杰:店铺列表组件初始化 2023-11-01 22:40:12 +08:00
Hot7z
c30a25d632 Merge pull request 'lh' (#8) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/8
2023-11-01 14:05:30 +00:00
hot777zz
f5271dbc92 梁航:更新详情页 2023-11-01 21:59:51 +08:00
hot777zz
80a2007ea8 Merge branch 'dj' into lh 2023-11-01 12:07:12 +08:00
hot777zz
af09d06203 梁航:个人主页和详情页的更新 2023-11-01 11:44:06 +08:00
odjbin
d87806e488 Merge pull request '邓洁 : 修改组件bug' (#7) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/7
2023-11-01 01:54:09 +00:00
邓洁
425b618db3 邓洁 : 修改组件bug 2023-11-01 09:53:50 +08:00
odjbin
1af2c63dda Merge pull request '邓洁 : 修改bug' (#6) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/6
2023-11-01 01:48:11 +00:00
邓洁
3588760e70 邓洁 : 修改bug 2023-11-01 09:46:55 +08:00
LuoShijie
f418c91de4 罗世杰:首页合并,移除搜索框,App引入了uview.scss
# Conflicts:
#	App.vue
#	pages/index/index.vue
#	pages/my/my.vue
2023-11-01 08:54:15 +08:00
luojie
284fc39203 罗世杰:refactor:暂时删除header 2023-10-31 19:42:43 +08:00
hot777zz
6ea0c2f048 个人 2023-10-31 18:34:42 +08:00
odjbin
529d64d200 Merge pull request '邓洁 : 自定义tabbar' (#3) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/3
2023-10-31 09:47:41 +00:00
dengj
c9b285e4e9 邓洁 : 自定义tabbar 2023-10-31 17:46:59 +08:00
odjbin
cd6cff1cd7 Merge pull request '邓洁 : 输入框及轮播图封装' (#2) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/2
2023-10-31 08:29:42 +00:00
dengj
8c3655cfcb 邓洁 : 输入框及轮播图封装 2023-10-31 16:27:32 +08:00
luojie
312666c186 罗世杰:feat:通知条初始化、导航卡片完成 2023-10-30 20:06:48 +08:00
luojie
50a12d9ccb 罗世杰:feat:搜索框定位文本 2023-10-30 10:30:07 +08:00
luojie
23b65d18f2 罗世杰:首页头:搜索框、轮播图初步完成 2023-10-28 16:30:52 +08:00
luojie
f9266cdd8f 罗世杰:测试uview样式 2023-10-27 14:22:24 +08:00
hot777zz
10de25984b test 2023-10-25 22:53:10 +08:00
luojie
1f0a6d881b test for push 2023-10-19 15:00:06 +08:00
odjbin
73ba000ac1 Merge pull request 'dj' (#1) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/1
2023-10-19 01:56:21 +00:00
dengj
b02a7b51b9 init 2023-10-19 09:54:26 +08:00
dengj
ca0604cb20 1 2023-10-19 09:53:46 +08:00
dengj
50bbdb7974 init 2023-10-19 09:52:15 +08:00
邓洁
5ef42e5ac7 test 2023-10-18 23:18:49 +08:00