Commit Graph

55 Commits

Author SHA1 Message Date
e416e4fddb 新增flv的webview访问页面 2020-07-02 13:03:55 +08:00
0bc207bda3 处理冲突 2020-06-30 20:13:12 +08:00
1d012450af 处理冲突 2020-06-30 20:06:34 +08:00
cf4ca95e0f 处理冲突 2020-06-30 20:06:34 +08:00
9d98d767a0 处理冲突 2020-06-30 20:03:05 +08:00
8792375b65 新闻详情,点播列表 2020-06-30 19:38:22 +08:00
Renpc-kilig
673d63e6eb Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-30 17:28:24 +08:00
Renpc-kilig
4330df4f11 添加分页,修改bug 2020-06-30 17:27:58 +08:00
4f82d9fd00 直播列表 2020-06-30 11:24:06 +08:00
9a0df17f17 直播点播 2020-06-28 20:16:24 +08:00
dong_bo0602
b390b9bc71 直播列表 2020-06-27 19:22:12 +08:00
dong_bo0602
b01171bab8 直播列表 2020-06-27 19:21:38 +08:00
Renpc-kilig
7e0eb907a0 添加活动评论列表功能 2020-06-27 18:16:22 +08:00
6f01f7b5ee 提交 2020-06-27 15:57:16 +08:00
Renpc-kilig
21145d88e0 修改请求路径 2020-06-27 15:47:58 +08:00
Renpc-kilig
98fc9efd12 Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-27 15:37:36 +08:00
Renpc-kilig
09628b0ed8 接口对接 2020-06-27 15:37:07 +08:00
dong_bo0602
9947500647 距离样式修改 2020-06-27 14:18:42 +08:00
dong_bo0602
2b9d951b5f Merge refs/remotes/origin/master into refs/heads/master 2020-06-27 14:04:03 +08:00
dong_bo0602
951ed48400 场馆订单列表、订单详情 2020-06-27 14:04:03 +08:00
wans
3d95902156 Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-27 13:39:47 +08:00
wans
f85d1434b8 Merge branch 'master' of https://github.com/wanggeng888/xz_mini
# Conflicts:
#	project.config.json
2020-06-27 13:39:26 +08:00
dong_bo0602
1d33e61c0b 首页直播状态、场馆预定 2020-06-27 13:36:12 +08:00
wans
e3c8bcf8f0 添加忽略文件 2020-06-27 13:34:38 +08:00
0334854f3e Merge branch 'master' of github.com:wanggeng888/xz_mini 2020-06-27 13:33:20 +08:00
dong_bo0602
51c90735c1 直播状态 2020-06-27 13:25:40 +08:00
58ec16a0c2 1 2020-06-27 13:24:30 +08:00
dong_bo0602
e71537a41e 直播状态 2020-06-27 13:19:24 +08:00
dong_bo0602
b72dfd34b3 提交 2020-06-27 13:02:13 +08:00
dong_bo0602
37dcacc937 提交 2020-06-27 13:01:40 +08:00
275b8a5758 处理直播列表 2020-06-27 12:53:37 +08:00
6420cdb6ff 修改appid 2020-06-27 12:04:54 +08:00
96f941052c 完善首页 2020-06-26 19:32:52 +08:00
3cb1681230 完善首页、新闻,直播列表 2020-06-26 19:32:52 +08:00
Renpc-kilig
92417388f2 Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-26 18:51:50 +08:00
Renpc-kilig
3cd7d19b77 修改请求方式 2020-06-26 18:51:28 +08:00
dong_bo0602
12f991a21b Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-26 18:44:20 +08:00
dong_bo0602
7269c49254 我的、活动日志、团队详情 2020-06-26 18:43:33 +08:00
wans
4fddb0da7d 下拉刷新关闭动画效果调整 2020-06-26 16:00:22 +08:00
wans
fab71abd17 Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-26 15:34:57 +08:00
wans
14aa5fa88e 提交 2020-06-26 15:34:31 +08:00
e49c9055e9 上传头像 2020-06-26 15:29:45 +08:00
wans
29c6690080 修改请求方法, app.json添加获取定位时的默认提示框 2020-06-26 15:28:31 +08:00
dong_bo0602
16d10ea8fb Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-26 15:20:01 +08:00
dong_bo0602
fe5648367b 头像1 2020-06-26 15:19:04 +08:00
Renpc-kilig
3acc1cd9e4 代码合并 2020-06-26 15:07:48 +08:00
dong_bo0602
e50f5ff3a3 头像 2020-06-26 15:02:58 +08:00
dong_bo0602
ec45edf43f 提交头像 2020-06-26 15:00:36 +08:00
Renpc-kilig
8efd16995d 新增活动项目地址和志愿者项目地址 2020-06-26 14:26:47 +08:00
Renpc-kilig
44a1cd1264 Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-06-26 14:14:59 +08:00