luojie
|
8bb43518c7
|
Merge pull request '罗世杰：完成了Dropdown组件和两个page，初始化了主页导航' (#32) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/32
|
2023-11-09 15:11:54 +00:00 |
|
LuoShijie
|
5c391aae6e
|
罗世杰：feat：初始化主页导航跳转
|
2023-11-09 22:18:24 +08:00 |
|
LuoShijie
|
10802093b5
|
罗世杰：feat：完成Dropdown组件的封装 fix：更改了pubulishSlide的样式bug
|
2023-11-09 21:32:48 +08:00 |
|
hot777zz
|
ab0626c395
|
梁航：发布页样式bug修复
|
2023-11-09 19:57:00 +08:00 |
|
hot777zz
|
5f2df3da76
|
梁航：成功合伙人和发布页样式完成
|
2023-11-09 19:36:42 +08:00 |
|
LuoShijie
|
fb0f606ffc
|
Merge branch 'test'
|
2023-11-09 14:15:01 +08:00 |
|
LuoShijie
|
87c0c73cf5
|
罗世杰：fix：修改样式
|
2023-11-09 14:10:42 +08:00 |
|
odjbin
|
0a50a04cfb
|
Merge pull request '邓洁:首页定位' (#31) from dengjie into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/31
|
2023-11-08 06:19:43 +00:00 |
|
dengj
|
02f57c1827
|
邓洁:首页定位
|
2023-11-08 14:19:13 +08:00 |
|
odjbin
|
b9a196a32d
|
Merge pull request '邓洁：地理位置' (#30) from dengjie into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/30
|
2023-11-08 03:23:05 +00:00 |
|
邓洁
|
52fe2a05fc
|
邓洁：地理位置
|
2023-11-08 11:22:19 +08:00 |
|
odjbin
|
0d9a94e350
|
Merge pull request '邓洁：位置定位' (#29) from dengjie into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/29
|
2023-11-08 01:39:47 +00:00 |
|
odjbin
|
61d5b72bee
|
Merge pull request 'lh' (#28) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/28
|
2023-11-08 01:39:34 +00:00 |
|
luojie
|
c97b2f9f91
|
Merge pull request '罗世杰：feat：商铺列表和搜索列表组件完善 转让和选择页面初始化' (#27) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/27
|
2023-11-07 16:26:32 +00:00 |
|
LuoShijie
|
1c784ea35a
|
Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer
|
2023-11-08 00:20:20 +08:00 |
|
LuoShijie
|
c443043533
|
罗世杰：faet：店铺转让、店铺选址页面初始化
|
2023-11-08 00:19:10 +08:00 |
|
hot777zz
|
415b8db32b
|
梁航：更新发布页
|
2023-11-07 23:31:07 +08:00 |
|
LuoShijie
|
9d701e7442
|
罗世杰：faet：SearchShopList组件支持第二种样式
|
2023-11-07 21:41:15 +08:00 |
|
hot777zz
|
e8523c3909
|
梁航：个人匹配和发布页样式调整
|
2023-11-07 19:34:33 +08:00 |
|
dengj
|
2a5bbb1e2a
|
邓洁：位置定位
|
2023-11-07 10:55:04 +08:00 |
|
luojie
|
55502e18a9
|
Merge pull request '罗世杰：feat：商铺展示列表提供删除和编辑按钮' (#26) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/26
|
2023-11-06 16:24:49 +00:00 |
|
LuoShijie
|
bfb9decb93
|
Merge branch 'test'
|
2023-11-07 00:19:42 +08:00 |
|
LuoShijie
|
b7a4fad4f6
|
罗世杰：feat：商铺展示列表提供删除和编辑按钮
|
2023-11-07 00:17:38 +08:00 |
|
odjbin
|
0b040928b2
|
Merge pull request 'lh' (#25) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/25
|
2023-11-06 15:55:06 +00:00 |
|
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 |
|
luojie
|
fb2e86db85
|
Merge pull request '罗世杰：feat：商铺展示列表提供两种样式' (#24) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/24
|
2023-11-06 09:52:50 +00:00 |
|
LuoShijie
|
7523e0e262
|
罗世杰：feat：商铺展示列表提供两种样式
|
2023-11-06 13:33:46 +08:00 |
|
hot777zz
|
1849b6e8be
|
梁航：个人匹配跳转
|
2023-11-06 11:08:36 +08:00 |
|
hot777zz
|
8d04619c2b
|
梁航：表单更新
|
2023-11-06 11:08:09 +08:00 |
|
luojie
|
fe193fff99
|
Merge pull request '罗世杰：合并首页修改' (#23) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/23
|
2023-11-05 16:30:11 +00:00 |
|
LuoShijie
|
df7e5efb90
|
罗世杰：fixed：错误的一次提交
|
2023-11-06 00:24:50 +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 |
|
Hot7z
|
9fc20954ab
|
Merge pull request 'lh' (#22) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/22
|
2023-11-05 15:31:25 +00:00 |
|
hot777zz
|
0aee427f48
|
Merge branch 'lh' of http://git.feashow.cn/odjbin/city-store-transfer into lh
|
2023-11-05 23:22:30 +08:00 |
|
hot777zz
|
2c0c758a9c
|
Merge branch 'master' into lh
# Conflicts:
# components/publishSlide/publishSlide.vue
|
2023-11-05 23:20:49 +08:00 |
|
hot777zz
|
791683ec69
|
重命名
|
2023-11-05 23:01:50 +08:00 |
|
Hot7z
|
76c3110e95
|
更新 'components/TabBar/TabBar.vue'
|
2023-11-05 14:41:15 +00:00 |
|
hot777zz
|
6a29614854
|
梁航：发布店铺转让表单更新
|
2023-11-05 21:52:55 +08:00 |
|
LuoShijie
|
79d26d70cf
|
罗世杰：fix: TabBar.vue 的遮挡问题修复
|
2023-11-05 11:36:46 +08:00 |
|
odjbin
|
859d834cc7
|
Merge pull request '邓洁 : 地图' (#20) from dengjie into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/20
|
2023-11-04 17:37:14 +00:00 |
|
邓洁
|
273fb7909d
|
邓洁 : 地图
|
2023-11-05 01:36:24 +08:00 |
|
LuoShijie
|
5010fb8538
|
罗世杰：feat&fix：修复notice处的bug，完成商铺展示列表
|
2023-11-04 22:43:39 +08:00 |
|
odjbin
|
3032a67ccf
|
Merge pull request '邓洁 page: 地图' (#18) from dengjie into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/18
|
2023-11-04 14:10:26 +00:00 |
|
邓洁
|
50722af798
|
邓洁 page: 地图
|
2023-11-04 22:00:00 +08:00 |
|
hot777zz
|
9421abb41b
|
梁航：修改个人样式，复用list组件
|
2023-11-04 14:01:41 +08:00 |
|
hot777zz
|
9694ac9a63
|
梁航：修改发布组件样式
|
2023-11-04 13:23:11 +08:00 |
|
LuoShijie
|
b94ebd5486
|
罗世杰：style；主页样式修改
|
2023-11-04 12:50:55 +08:00 |
|
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 |
|