提交 · 755caee6bf712d0f3125ed845e90357854ba9af0 · miniprogram / winebook

2019-08-07

5 次提交

1
755caee6

朱振飞在
2019-08-07 17:20:50 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian into Branch_zhu
f1b22826

朱振飞在
2019-08-07 17:02:46 +0800
提交浏览文件
11
463275f1

朱振飞在
2019-08-07 17:02:35 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian ...
1c104eb0
```
# Conflicts:
#	pages/mine/mine.wxml
```
lihongjuan 在
2019-08-07 17:00:14 +0800
提交浏览文件
345324
1548543a

lihongjuan 在
2019-08-07 16:59:27 +0800
提交浏览文件

2019-07-23

8 次提交

合并分支 'Branch_zhu' 到 'master' ...
57eca259
```
Branch zhu



查看合并请求 !4
```
朱振飞在
2019-07-23 09:14:04 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian into Branch_zhu
df47ae95

朱振飞在
2019-07-23 09:13:30 +0800
提交浏览文件
1245
af11a271

朱振飞在
2019-07-23 09:13:20 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian ...
405efc29
```
# Conflicts:
#	app.wxss
#	pages/findblock/niangjiushi/niangjiushi.wxml
#	pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml
#	pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss
#	project.config.json
```
lihongjuan 在
2019-07-23 09:00:55 +0800
提交浏览文件
酒字典
f4ba853e

lihongjuan 在
2019-07-23 08:43:10 +0800
提交浏览文件
合并分支 'Branch_zhu' 到 'master' ...
eef4760f
```
Branch zhu



查看合并请求 !3
```
朱振飞在
2019-07-23 08:41:38 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian into Branch_zhu
3bea68ad

朱振飞在
2019-07-23 08:39:27 +0800
提交浏览文件
121
16c4cd06

朱振飞在
2019-07-23 08:38:54 +0800
提交浏览文件

2019-07-22

3 次提交

合并分支 'Branch_zhu' 到 'master' ...
c076373f
```
Branch zhu



查看合并请求 !2
```
朱振飞在
2019-07-22 20:31:08 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian into Branch_zhu ...
aed28a20
```
# Conflicts:
#	app.json
#	project.config.json
```
朱振飞在
2019-07-22 20:30:17 +0800
提交浏览文件
1213
1352eb20

朱振飞在
2019-07-22 20:27:51 +0800
提交浏览文件

2019-07-18

9 次提交

3343
0610edee

lihongjuan 在
2019-07-18 14:21:36 +0800
提交浏览文件

Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian into Branch_zhu ...

ae13e986

# Conflicts:
#	app.json
#	pages/homeblock/shuxing/shuxing.js
#	pages/homeblock/shuxing/shuxing.json
#	pages/homeblock/shuxing/shuxing.wxml
#	pages/homeblock/shuxing/shuxing.wxss
#	pages/homeblock/video/video.js
#	pages/homeblock/video/video.wxml
#	pages/homeblock/video/video.wxss
#	pages/myblock/jifenjilu/jifenjilu.json
#	pages/myblock/jifenjilu/jifenjilu.wxml
#	pages/myblock/jifenjilu/jifenjilu.wxss
#	pages/myblock/niangjiulist/niangjiulist.js
#	pages/myblock/niangjiulist/niangjiulist.json
#	pages/myblock/niangjiulist/niangjiulist.wxml
#	pages/myblock/niangjiulist/niangjiulist.wxss
#	pages/myblock/pingjia/pingjia.js
#	pages/myblock/pingjia/pingjia.json
#	pages/myblock/pingjia/pingjia.wxml
#	pages/myblock/pingjia/pingjia.wxss
#	pages/myblock/shezhimima/shezhimima.js
#	pages/myblock/shezhimima/shezhimima.json
#	pages/myblock/shezhimima/shezhimima.wxml
#	pages/myblock/shezhimima/shezhimima.wxss

在

2019-07-18 09:06:02 +0800

提交浏览文件

123
56ed4d5d

朱振飞在
2019-07-18 08:52:03 +0800
提交浏览文件
22
a8156c0b

lihongjuan 在
2019-07-18 08:49:36 +0800
提交浏览文件
2323
03d08a12

lihongjuan 在
2019-07-18 08:49:21 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian
55650dfe

lihongjuan 在
2019-07-18 08:49:04 +0800
提交浏览文件
酒字典
27fe0004

lihongjuan 在
2019-07-18 08:48:55 +0800
提交浏览文件
Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian ...
b06108d8
```
# Conflicts:
#	app.json
#	pages/homapage/homepage.wxml
#	pages/homeblock/search/search.wxss
#	pages/homeblock/shipaiimg/shipaiimg.wxml
#	project.config.json
```
朱振飞在
2019-07-18 08:43:34 +0800
提交浏览文件
页面修改
0627ec27

朱振飞在
2019-07-18 08:41:32 +0800
提交浏览文件

2019-07-17

2 次提交

Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian ...
7d6bc4c1
```
# Conflicts:
#	app.wxss
#	pages/homeblock/zhinengselect/zhinengselect.wxml
#	project.config.json
```
lihongjuan 在
2019-07-17 11:29:00 +0800
提交浏览文件
378324
0b6ba07b

lihongjuan 在
2019-07-17 11:21:54 +0800
提交浏览文件

2019-07-15

2 次提交

Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian
2c753ceb

朱振飞在
2019-07-15 10:53:50 +0800
提交浏览文件
个人中心及部分切图
53790957

朱振飞在
2019-07-15 10:53:36 +0800
提交浏览文件

2019-07-12

4 次提交

修改酒字典
f8ca61f4

lihongjuan 在
2019-07-12 16:35:39 +0800
提交浏览文件
13133
fd52187d

朱振飞在
2019-07-12 14:07:08 +0800
提交浏览文件
3233
d9699c3b

lihongjuan 在
2019-07-12 13:21:10 +0800
提交浏览文件
上传
08a038e4

lihongjuan 在
2019-07-12 10:08:50 +0800
提交浏览文件

miniprogram / winebook · 提交

GitLab

2019-08-07

2019-07-23

2019-07-22

2019-07-18

2019-07-17

2019-07-15

2019-07-12