Commit Graph

74 Commits

Author SHA1 Message Date
LuoShijie
eb7324bd67 Merge branch 'test' 2023-11-15 21:01:07 +08:00
LuoShijie
3eb1f80045 罗世杰:绑定数据分析 2023-11-15 20:39:47 +08:00
dengj
aef4ba9e7a 邓洁 : 修改细节 2023-11-15 17:53:45 +08:00
dengj
830b5482f0 邓洁 : 地址转为经纬度函数 2023-11-15 17:43:52 +08:00
dengj
f7537b0b82 邓洁 : 修改细节 2023-11-15 17:15:10 +08:00
dengj
eaf7fbfee1 邓洁 : 修改细节 2023-11-15 15:51:15 +08:00
dengj
d9d7cb36de 邓洁 : 区域下拉框数据获取及完善定位功能 2023-11-15 15:49:30 +08:00
dengj
dd05376541 邓洁 : 登录功能及拦截 2023-11-15 12:51:37 +08:00
odjbin
b93daa7c35 Merge pull request '罗世杰:feat:轮播图,分析统计、轮播消息接口接入' (#41) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/41
2023-11-15 01:40:31 +00:00
LuoShijie
db21651d44 罗世杰:feat:轮播图,分析统计、轮播消息接口接入 2023-11-14 23:11:39 +08:00
hot777zz
63d39a021e 梁航:detail样式调整 2023-11-14 21:02:31 +08:00
odjbin
11fb217967 Merge pull request '梁航:表单与个人样式,表单验证测试' (#39) from lh into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/39
2023-11-14 01:45:06 +00:00
LuoShijie
c21816d077 罗世杰:完成首页数据分析、客服悬浮 2023-11-14 00:33:31 +08:00
hot777zz
13d7ba738b 梁航:表单与个人样式,表单验证测试 2023-11-13 23:43:03 +08:00
邓洁
55b0af8713 邓洁:删除首页及地图上方搜索框 2023-11-12 00:33:37 +08:00
luojie
79655e3474 Merge pull request '罗世杰:成交案例页面完成' (#34) from lj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/34
2023-11-11 14:49:53 +00:00
LuoShijie
a8fbef6966 罗世杰:fix:成交案例页面样式调整,SearchShopListItem.vue支持显示成交案例 2023-11-11 22:47:47 +08:00
LuoShijie
f97c558fa0 罗世杰:临时提交 2023-11-10 21:19:38 +08:00
hot777zz
4c9e08509d 梁航:个人页跳转完善 2023-11-10 11:32:55 +08:00
hot777zz
60fdfde03d Merge branch 'master' into lh 2023-11-10 10:58:35 +08: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
邓洁
52fe2a05fc 邓洁:地理位置 2023-11-08 11:22:19 +08: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
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
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