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

9e627e8a92 邓洁 : 修改细节邓洁 2023-11-13 22:00:38 +08:00
c639b24e9c Merge pull request '邓洁:删除首页及地图上方搜索框' (#36) from djj into master odjbin 2023-11-11 16:34:03 +00:00
55b0af8713 邓洁:删除首页及地图上方搜索框邓洁 2023-11-12 00:33:37 +08:00
79655e3474 Merge pull request '罗世杰：成交案例页面完成' (#34) from lj into master luojie 2023-11-11 14:49:53 +00:00
a8fbef6966 罗世杰：fix：成交案例页面样式调整，SearchShopListItem.vue支持显示成交案例 LuoShijie 2023-11-11 22:47:47 +08:00
f97c558fa0 罗世杰：临时提交 LuoShijie 2023-11-10 21:19:38 +08:00
6cbb0a4e08 Merge pull request 'lh' (#33) from lh into master Hot7z 2023-11-10 03:35:30 +00:00
4c9e08509d 梁航：个人页跳转完善 hot777zz 2023-11-10 11:32:55 +08:00
60fdfde03d Merge branch 'master' into lh hot777zz 2023-11-10 10:58:35 +08:00
8bb43518c7 Merge pull request '罗世杰：完成了Dropdown组件和两个page，初始化了主页导航' (#32) from lj into master luojie 2023-11-09 15:11:54 +00:00
5c391aae6e 罗世杰：feat：初始化主页导航跳转 LuoShijie 2023-11-09 22:18:24 +08:00
10802093b5 罗世杰：feat：完成Dropdown组件的封装 fix：更改了pubulishSlide的样式bug LuoShijie 2023-11-09 21:32:48 +08:00
ab0626c395 梁航：发布页样式bug修复 hot777zz 2023-11-09 19:57:00 +08:00
5f2df3da76 梁航：成功合伙人和发布页样式完成 hot777zz 2023-11-09 19:36:42 +08:00
fb0f606ffc Merge branch 'test' LuoShijie 2023-11-09 14:15:01 +08:00
87c0c73cf5 罗世杰：fix：修改样式 LuoShijie 2023-11-09 14:10:42 +08:00
0a50a04cfb Merge pull request '邓洁:首页定位' (#31) from dengjie into master odjbin 2023-11-08 06:19:43 +00:00
02f57c1827 邓洁:首页定位 dengj 2023-11-08 14:19:13 +08:00
b9a196a32d Merge pull request '邓洁：地理位置' (#30) from dengjie into master odjbin 2023-11-08 03:23:05 +00:00
52fe2a05fc 邓洁：地理位置邓洁 2023-11-08 11:22:19 +08:00
0d9a94e350 Merge pull request '邓洁：位置定位' (#29) from dengjie into master odjbin 2023-11-08 01:39:47 +00:00
61d5b72bee Merge pull request 'lh' (#28) from lh into master odjbin 2023-11-08 01:39:34 +00:00
c97b2f9f91 Merge pull request '罗世杰：feat：商铺列表和搜索列表组件完善转让和选择页面初始化' (#27) from lj into master luojie 2023-11-07 16:26:32 +00:00
1c784ea35a Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer LuoShijie 2023-11-08 00:20:20 +08:00
c443043533 罗世杰：faet：店铺转让、店铺选址页面初始化 LuoShijie 2023-11-08 00:19:10 +08:00
415b8db32b 梁航：更新发布页 hot777zz 2023-11-07 23:31:07 +08:00
9d701e7442 罗世杰：faet：SearchShopList组件支持第二种样式 LuoShijie 2023-11-07 21:41:15 +08:00
e8523c3909 梁航：个人匹配和发布页样式调整 hot777zz 2023-11-07 19:34:33 +08:00
2a5bbb1e2a 邓洁：位置定位 dengj 2023-11-07 10:55:04 +08:00
55502e18a9 Merge pull request '罗世杰：feat：商铺展示列表提供删除和编辑按钮' (#26) from lj into master luojie 2023-11-06 16:24:49 +00:00
bfb9decb93 Merge branch 'test' LuoShijie 2023-11-07 00:19:42 +08:00
b7a4fad4f6 罗世杰：feat：商铺展示列表提供删除和编辑按钮 LuoShijie 2023-11-07 00:17:38 +08:00
0b040928b2 Merge pull request 'lh' (#25) from lh into master odjbin 2023-11-06 15:55:06 +00:00
330d747f3f 梁航：完善个人页面样式 hot777zz 2023-11-06 22:23:37 +08:00
4b0035c6de Merge remote-tracking branch 'remotes/origin/master' into lh hot777zz 2023-11-06 18:05:12 +08:00
fb2e86db85 Merge pull request '罗世杰：feat：商铺展示列表提供两种样式' (#24) from lj into master luojie 2023-11-06 09:52:50 +00:00
7523e0e262 罗世杰：feat：商铺展示列表提供两种样式 LuoShijie 2023-11-06 13:33:46 +08:00
1849b6e8be 梁航：个人匹配跳转 hot777zz 2023-11-06 11:08:36 +08:00
8d04619c2b 梁航：表单更新 hot777zz 2023-11-06 11:08:09 +08:00
fe193fff99 Merge pull request '罗世杰：合并首页修改' (#23) from lj into master luojie 2023-11-05 16:30:11 +00:00
df7e5efb90 罗世杰：fixed：错误的一次提交 LuoShijie 2023-11-06 00:24:50 +08:00
cea61cd269 罗世杰：分支合并：首页商铺列表和找店列表完成，notice完善，navbar完成 LuoShijie 2023-11-06 00:16:42 +08:00
237f2451b8 罗世杰：feat：初始化统计色块，完成店铺列表和找店列表的切换，完成首页导航 LuoShijie 2023-11-06 00:08:37 +08:00
9fc20954ab Merge pull request 'lh' (#22) from lh into master Hot7z 2023-11-05 15:31:25 +00:00
0aee427f48 Merge branch 'lh' of http://git.feashow.cn/odjbin/city-store-transfer into lh hot777zz 2023-11-05 23:22:30 +08:00
2c0c758a9c Merge branch 'master' into lh hot777zz 2023-11-05 23:20:49 +08:00
791683ec69 重命名 hot777zz 2023-11-05 23:01:50 +08:00
76c3110e95 更新 'components/TabBar/TabBar.vue' Hot7z 2023-11-05 14:41:15 +00:00
6a29614854 梁航：发布店铺转让表单更新 hot777zz 2023-11-05 21:52:55 +08:00
79d26d70cf 罗世杰：fix: TabBar.vue 的遮挡问题修复 LuoShijie 2023-11-05 11:36:46 +08:00
859d834cc7 Merge pull request '邓洁 : 地图' (#20) from dengjie into master odjbin 2023-11-04 17:37:14 +00:00
273fb7909d 邓洁 : 地图邓洁 2023-11-05 01:36:24 +08:00
5010fb8538 罗世杰：feat&fix：修复notice处的bug，完成商铺展示列表 LuoShijie 2023-11-04 22:43:39 +08:00
3032a67ccf Merge pull request '邓洁 page: 地图' (#18) from dengjie into master odjbin 2023-11-04 14:10:26 +00:00
50722af798 邓洁 page: 地图邓洁 2023-11-04 21:57:57 +08:00
9421abb41b 梁航：修改个人样式，复用list组件 hot777zz 2023-11-04 14:01:41 +08:00
9694ac9a63 梁航：修改发布组件样式 hot777zz 2023-11-04 13:23:11 +08:00
b94ebd5486 罗世杰：style；主页样式修改 LuoShijie 2023-11-04 12:50:55 +08:00
6ce3b66029 Merge pull request '罗世杰：商铺展示组件' (#16) from lj into master luojie 2023-11-04 04:32:42 +00:00
0cb065122f Merge branch 'lj' LuoShijie 2023-11-04 12:29:00 +08:00
5011e5b22e 罗世杰：feat：简单完成商铺展示列表 LuoShijie 2023-11-04 11:49:11 +08:00
11cfc1acfc 罗世杰：feat：商铺列表项组件 LuoShijie 2023-11-04 11:16:12 +08:00
fd08f42bf9 Merge pull request '邓洁: 修改页面细节' (#15) from dengjie into master odjbin 2023-11-03 16:34:06 +00:00
e4119a7bcf 邓洁: 修改页面细节邓洁 2023-11-04 00:32:49 +08:00
b5a66caa5c Merge pull request 'lh' (#13) from lh into master odjbin 2023-11-03 15:14:53 +00:00
50102d422d 梁航：发布悬浮卡片组件样式修复 hot777zz 2023-11-03 18:13:43 +08:00
73f4bdf1e2 梁航：更新悬浮选项组件及子页面 hot777zz 2023-11-03 16:58:22 +08:00
13fe47ac06 Merge pull request 'lh' (#12) from lh into master odjbin 2023-11-03 08:06:42 +00:00
839a49f1c7 罗世杰：feat：商铺列表初始化 LuoShijie 2023-11-02 22:49:10 +08:00
849ea07b08 梁航：发布页面pages hot777zz 2023-11-02 18:06:34 +08:00
90fe5def4c 梁航：发布页面搭建完成 hot777zz 2023-11-02 18:04:29 +08:00
d20c8ecb49 梁航：个人页面跳转及传标题 hot777zz 2023-11-02 18:03:47 +08:00
11b98f4082 梁航：详情页完成 hot777zz 2023-11-02 18:02:40 +08:00
da8a0a5de9 Merge pull request '罗世杰：首页PR' (#11) from lj into master luojie 2023-11-01 15:05:44 +00:00
3e81148948 罗世杰：fix：取消了配置项的修改 LuoShijie 2023-11-01 23:02:13 +08:00
a5eeb83385 梁航：更新个人主页背景bug hot777zz 2023-11-01 22:50:50 +08:00
f05c5413a4 Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer LuoShijie 2023-11-01 22:43:46 +08:00
b30196c92a 罗世杰：店铺列表组件初始化 LuoShijie 2023-11-01 22:40:12 +08:00
c30a25d632 Merge pull request 'lh' (#8) from lh into master Hot7z 2023-11-01 14:05:30 +00:00
f5271dbc92 梁航：更新详情页 hot777zz 2023-11-01 21:59:51 +08:00
80a2007ea8 Merge branch 'dj' into lh hot777zz 2023-11-01 12:07:12 +08:00
af09d06203 梁航：个人主页和详情页的更新 hot777zz 2023-11-01 11:44:06 +08:00
d87806e488 Merge pull request '邓洁：修改组件bug' (#7) from dj into master odjbin 2023-11-01 01:54:09 +00:00
425b618db3 邓洁：修改组件bug 邓洁 2023-11-01 09:53:50 +08:00
1af2c63dda Merge pull request '邓洁：修改bug' (#6) from dj into master odjbin 2023-11-01 01:48:11 +00:00
3588760e70 邓洁：修改bug 邓洁 2023-11-01 09:46:55 +08:00
f418c91de4 罗世杰：首页合并，移除搜索框，App引入了uview.scss LuoShijie 2023-11-01 08:54:15 +08:00
284fc39203 罗世杰：refactor：暂时删除header luojie 2023-10-31 19:42:43 +08:00
6ea0c2f048 个人 hot777zz 2023-10-31 18:34:42 +08:00
529d64d200 Merge pull request '邓洁 : 自定义tabbar' (#3) from dj into master odjbin 2023-10-31 09:47:41 +00:00
c9b285e4e9 邓洁 : 自定义tabbar dengj 2023-10-31 17:46:59 +08:00
cd6cff1cd7 Merge pull request '邓洁 : 输入框及轮播图封装' (#2) from dj into master odjbin 2023-10-31 08:29:42 +00:00
8c3655cfcb 邓洁 : 输入框及轮播图封装 dengj 2023-10-31 16:27:32 +08:00
312666c186 罗世杰：feat：通知条初始化、导航卡片完成 luojie 2023-10-30 20:06:48 +08:00
50a12d9ccb 罗世杰：feat：搜索框定位文本 luojie 2023-10-30 10:30:07 +08:00
23b65d18f2 罗世杰：首页头：搜索框、轮播图初步完成 luojie 2023-10-28 16:30:52 +08:00
f9266cdd8f 罗世杰：测试uview样式 luojie 2023-10-27 14:22:24 +08:00
10de25984b test hot777zz 2023-10-25 22:53:10 +08:00
1f0a6d881b test for push luojie 2023-10-19 15:00:06 +08:00
73ba000ac1 Merge pull request 'dj' (#1) from dj into master odjbin 2023-10-19 01:56:21 +00:00