Commit Graph

42 Commits

Author SHA1 Message Date
hot777zz
330d747f3f 梁航:完善个人页面样式 2023-11-06 22:23:37 +08:00
hot777zz
4b0035c6de Merge remote-tracking branch 'remotes/origin/master' into lh 2023-11-06 18:05:12 +08:00
hot777zz
1849b6e8be 梁航:个人匹配跳转 2023-11-06 11:08:36 +08:00
hot777zz
8d04619c2b 梁航:表单更新 2023-11-06 11:08:09 +08:00
LuoShijie
cea61cd269 罗世杰:分支合并:首页商铺列表和找店列表完成,notice完善,navbar完成
# Conflicts:
#	pages/index/index.vue
2023-11-06 00:16:42 +08:00
LuoShijie
237f2451b8 罗世杰:feat:初始化统计色块,完成店铺列表和找店列表的切换,完成首页导航 2023-11-06 00:08:37 +08:00
hot777zz
2c0c758a9c Merge branch 'master' into lh
# Conflicts:
#	components/publishSlide/publishSlide.vue
2023-11-05 23:20:49 +08:00
hot777zz
6a29614854 梁航:发布店铺转让表单更新 2023-11-05 21:52:55 +08:00
邓洁
273fb7909d 邓洁 : 地图 2023-11-05 01:36:24 +08:00
LuoShijie
5010fb8538 罗世杰:feat&fix:修复notice处的bug,完成商铺展示列表 2023-11-04 22:43:39 +08:00
邓洁
50722af798 邓洁 page: 地图 2023-11-04 22:00:00 +08:00
hot777zz
9421abb41b 梁航:修改个人样式,复用list组件 2023-11-04 14:01:41 +08:00
LuoShijie
b94ebd5486 罗世杰:style;主页样式修改 2023-11-04 12:50:55 +08: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
邓洁
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
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
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
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
hot777zz
f5271dbc92 梁航:更新详情页 2023-11-01 21:59:51 +08:00
hot777zz
af09d06203 梁航:个人主页和详情页的更新 2023-11-01 11:44:06 +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
dengj
c9b285e4e9 邓洁 : 自定义tabbar 2023-10-31 17:46:59 +08: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
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