city-store-transfer

odjbin/city-store-transfer

Fork 0

Commit Graph

Select branches

Hide Pull Requests

dj

lh

lj

master

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

875ff342f2 罗世杰：Dropdown生成query LuoShijie 2023-11-18 23:00:12 +08:00
1c59c15276 Merge pull request '邓洁 : 发布找店地址接口' (#77) from dj into master odjbin 2023-11-18 14:55:58 +00:00
90a0ab46cb 邓洁 : 发布找店地址接口邓洁 2023-11-18 22:53:52 +08:00
7f29dc0e20 Merge pull request '邓洁 : 发布店铺转让接口' (#76) from dj into master odjbin 2023-11-18 13:52:31 +00:00
ed9078f912 邓洁 : 发布店铺转让接口邓洁 2023-11-18 21:52:08 +08:00
8b771ad72b Merge pull request 'lh' (#75) from lh into master Hot7z 2023-11-18 13:30:29 +00:00
41fe9b1392 Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer into lh hot777zz 2023-11-18 21:29:16 +08:00
00f1078277 梁航：重新合并 hot777zz 2023-11-18 21:28:01 +08:00
1e68012289 梁航：合并冲突 hot777zz 2023-11-18 21:22:21 +08:00
1cc7b4beec 梁航：冲突合并 hot777zz 2023-11-18 21:12:33 +08:00
2fa63fa1e9 梁航：冲突合并 hot777zz 2023-11-18 21:07:30 +08:00
2383b1a612 梁航：发布接口绑定 hot777zz 2023-11-18 20:46:43 +08:00
7689a13b19 梁航：本地合并 hot777zz 2023-11-18 19:59:39 +08:00
ef17a70639 Merge pull request '邓洁 : 招募合伙接口' (#73) from dj into master odjbin 2023-11-18 10:36:33 +00:00
cbe7bdf60a 邓洁 : 招募合伙接口邓洁 2023-11-18 18:35:59 +08:00
fbb6b00cba 罗世杰修改ShopList和SearchList的api LuoShijie 2023-11-18 18:07:01 +08:00
de898c613b Merge pull request 'lh' (#72) from lh into master Hot7z 2023-11-18 09:06:11 +00:00
9b70973246 梁航：合并冲突 hot777zz 2023-11-18 17:05:01 +08:00
9f4cd40ff1 Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer hot777zz 2023-11-18 16:55:48 +08:00
b2cc582bba 梁航：合并冲突 hot777zz 2023-11-18 16:41:52 +08:00
2ad16186de 梁航：处理冲突 hot777zz 2023-11-18 16:36:37 +08:00
066470b4e6 梁航：处理合并冲突 hot777zz 2023-11-18 16:34:18 +08:00
13861d2343 梁航：个人页处理冲突 hot777zz 2023-11-18 16:28:26 +08:00
a1ed1ec45d 梁航：发布店铺转让接口 hot777zz 2023-11-18 16:19:40 +08:00
5417975723 梁航：发布店铺转让接口 hot777zz 2023-11-18 16:15:14 +08:00
3ea952742a 梁航：店铺转让接口 hot777zz 2023-11-18 15:49:18 +08:00
7d26156f15 梁航：发布转让接口绑定 hot777zz 2023-11-18 15:48:27 +08:00
b6c7a91af6 Merge pull request '邓洁 : 地图商铺展示细节' (#67) from dj into master odjbin 2023-11-18 06:55:30 +00:00
bfc5ce6565 邓洁 : 地图商铺展示细节邓洁 2023-11-18 14:55:02 +08:00
9e106d9fdb Merge pull request '邓洁 : 地图接口' (#66) from dj into master odjbin 2023-11-18 06:43:14 +00:00
b055905bc4 邓洁 : 地图接口邓洁 2023-11-18 14:42:53 +08:00
f3cec1461e 罗世杰：店铺列表字段绑定 LuoShijie 2023-11-18 00:17:41 +08:00
cda654b717 Merge pull request 'lj' (#65) from lj into master luojie 2023-11-17 14:37:58 +00:00
022da2f0d0 罗世杰：商铺列表数据绑定 LuoShijie 2023-11-17 22:36:02 +08:00
df2c7fdb2c Merge pull request '邓洁 : 修改细节' (#64) from djj into master odjbin 2023-11-17 14:08:54 +00:00
c655390941 邓洁 : 修改细节邓洁 2023-11-17 22:08:19 +08:00
007445f1d8 Merge branch 'lj' LuoShijie 2023-11-17 20:15:31 +08:00
58ec503e11 Merge pull request '梁航：发布页信息整理' (#63) from lh into master Hot7z 2023-11-17 10:09:22 +00:00
95d2903e30 梁航：发布页信息整理 hot777zz 2023-11-17 18:06:25 +08:00
e849fe0367 Merge pull request '邓洁 : 详情界面及接口对接' (#62) from djj into master odjbin 2023-11-17 09:57:53 +00:00
789dc3c1fb 邓洁 : 详情界面及接口对接 dengj 2023-11-17 17:51:22 +08:00
46ea8e4ee9 罗世杰：招商、出租推广发布跳转 LuoShijie 2023-11-17 15:17:03 +08:00
c711718bd3 Merge pull request '邓洁 : 点击轮播图跳转到详情' (#61) from djj into master odjbin 2023-11-17 05:12:54 +00:00
1259f1a4c8 邓洁 : 点击轮播图跳转到详情 dengj 2023-11-17 13:11:30 +08:00
2e81cd5550 Merge pull request '邓洁 : 获取个人信息接口' (#60) from djj into master odjbin 2023-11-17 03:01:27 +00:00
0c1998d09e 邓洁 : 获取个人信息接口 dengj 2023-11-17 10:53:17 +08:00
b23e7c848c Merge pull request '梁航：发布页获取业态' (#59) from lh into master odjbin 2023-11-17 01:35:31 +00:00
590ffc1d46 梁航：发布页获取业态 hot777zz 2023-11-17 00:38:54 +08:00
978b3ffeb7 梁航：发布页获取行业接口 hot777zz 2023-11-16 22:59:26 +08:00
10136f43f7 罗世杰：修改Dropdown.vue的bug LuoShijie 2023-11-16 22:26:18 +08:00
ff7eaadc7c Merge pull request 'djj' (#57) from djj into master odjbin 2023-11-16 13:44:49 +00:00
dc57ab9ade 邓洁 : 修改头像大小邓洁 2023-11-16 21:44:31 +08:00
b07248d07b 邓洁 : 修改个人信息接口对接邓洁 2023-11-16 21:42:01 +08:00
00ebbba179 Merge pull request 'lj' (#56) from lj into master luojie 2023-11-16 12:52:13 +00:00
29ea1e1486 罗世杰：临时提交 LuoShijie 2023-11-16 20:51:49 +08:00
0cb26ad8be Merge pull request '邓洁 : 监听地图缩放' (#55) from djj into master odjbin 2023-11-16 12:43:32 +00:00
971bf5efa6 罗世杰：fixed修改了使用展示商铺列表组件的地方 LuoShijie 2023-11-16 20:12:02 +08:00
bd40afd360 Merge pull request 'lj' (#54) from lj into master luojie 2023-11-16 11:16:33 +00:00
e756b8e046 Merge branch 'lh' 解决冲突 LuoShijie 2023-11-16 19:14:05 +08:00
209b3cc1cd 梁航：我的匹配接口 hot777zz 2023-11-16 18:16:49 +08:00
73cb83d1ab 邓洁 : 监听地图缩放 dengj 2023-11-16 15:49:41 +08:00
97115ad6a2 Merge pull request '邓洁 : 地图接口' (#52) from djj into master odjbin 2023-11-16 04:51:33 +00:00
88dfe5760b 邓洁 : 地图接口 dengj 2023-11-16 12:50:58 +08:00
126a39edf8 梁航：发布页样式修改 hot777zz 2023-11-16 12:31:04 +08:00
d262087ec9 梁航：表单验证 hot777zz 2023-11-16 12:30:41 +08:00
e50e90c841 Merge pull request 'lh' (#50) from lh into master Hot7z 2023-11-15 16:07:55 +00:00
5b05eb8eba 梁航：合并发布页冲突 hot777zz 2023-11-15 23:59:52 +08:00
1c9a23f610 梁航：解决request合并冲突 hot777zz 2023-11-15 23:58:27 +08:00
dd95d7bee0 梁航：个人信息动态展示 hot777zz 2023-11-15 23:40:11 +08:00
9f449b6766 梁航：动态展示用户信息 hot777zz 2023-11-15 23:37:28 +08:00
febea6c9bc 梁航：合并冲突，个人信息修改 hot777zz 2023-11-15 23:29:20 +08:00
0ebd9ea050 Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer hot777zz 2023-11-15 23:20:09 +08:00
88e2d6542b 梁航：修改页面 hot777zz 2023-11-15 23:16:26 +08:00
3b422a959d Merge pull request '罗世杰:fixed：项目招商，出租信息修改，客服按钮完成' (#49) from lj into master luojie 2023-11-15 15:10:37 +00:00
dfb74d02af 罗世杰:fixed：项目招商，出租信息修改，客服按钮完成 LuoShijie 2023-11-15 23:10:11 +08:00
1a90bc4c67 Merge pull request '罗世杰：合并首页部分api' (#48) from lj into master luojie 2023-11-15 13:52:58 +00:00
eb7324bd67 Merge branch 'test' LuoShijie 2023-11-15 21:01:07 +08:00
3eb1f80045 罗世杰：绑定数据分析 LuoShijie 2023-11-15 20:39:47 +08:00
96ec919cb6 Merge pull request '邓洁 : 修改细节' (#47) from dj into master odjbin 2023-11-15 09:54:10 +00:00
aef4ba9e7a 邓洁 : 修改细节 dengj 2023-11-15 17:53:45 +08:00
59b314a81a Merge pull request '邓洁 : 地址转为经纬度函数' (#46) from dj into master odjbin 2023-11-15 09:45:19 +00:00
830b5482f0 邓洁 : 地址转为经纬度函数 dengj 2023-11-15 17:43:52 +08:00
010edbff8e Merge pull request '邓洁 : 修改细节' (#45) from dj into master odjbin 2023-11-15 09:30:20 +00:00
f7537b0b82 邓洁 : 修改细节 dengj 2023-11-15 17:15:10 +08:00
b0a49dc67d 梁航：更新页面请求和样式 hot777zz 2023-11-15 16:19:22 +08:00
e3a78be387 Merge pull request '邓洁 : 修改细节' (#44) from dj into master odjbin 2023-11-15 07:51:37 +00:00
eaf7fbfee1 邓洁 : 修改细节 dengj 2023-11-15 15:51:15 +08:00
3b1ef4b561 Merge pull request '邓洁 : 区域下拉框数据获取及完善定位功能' (#43) from dj into master odjbin 2023-11-15 07:50:01 +00:00
d9d7cb36de 邓洁 : 区域下拉框数据获取及完善定位功能 dengj 2023-11-15 15:49:30 +08:00
6796272caa Merge pull request '邓洁 : 登录功能及拦截' (#42) from dj into master odjbin 2023-11-15 04:51:56 +00:00
dd05376541 邓洁 : 登录功能及拦截 dengj 2023-11-15 12:51:37 +08:00
b93daa7c35 Merge pull request '罗世杰：feat：轮播图，分析统计、轮播消息接口接入' (#41) from lj into master odjbin 2023-11-15 01:40:31 +00:00
025aa50724 Merge pull request '梁航：detail样式调整' (#40) from lh into master odjbin 2023-11-15 01:40:12 +00:00
db21651d44 罗世杰：feat：轮播图，分析统计、轮播消息接口接入 LuoShijie 2023-11-14 23:11:39 +08:00
63d39a021e 梁航：detail样式调整 hot777zz 2023-11-14 21:02:31 +08:00
11fb217967 Merge pull request '梁航：表单与个人样式，表单验证测试' (#39) from lh into master odjbin 2023-11-14 01:45:06 +00:00
612f2ce5b4 Merge pull request '罗世杰：完成首页数据分析、客服悬浮' (#38) from lj into master odjbin 2023-11-14 01:44:51 +00:00
c21816d077 罗世杰：完成首页数据分析、客服悬浮 LuoShijie 2023-11-14 00:33:31 +08:00
13d7ba738b 梁航：表单与个人样式，表单验证测试 hot777zz 2023-11-13 23:43:03 +08:00
07396b7e54 Merge pull request '邓洁 : 修改细节' (#37) from dj1 into master odjbin 2023-11-13 14:01:58 +00:00