Commit Graph

86 Commits

Author SHA1 Message Date
dong_bo0602
f581e592a4 文化地图 2020-07-14 19:01:25 +08:00
dong_bo0602
b4d0d91dc8 字体 2020-07-14 17:37:48 +08:00
c03cc669b5 调整文化动态 2020-07-13 16:10:31 +08:00
dong_bo0602
225a119a2c 新闻分类 2020-07-13 15:27:02 +08:00
f413ee3968 完善当前版本 2020-07-11 20:20:55 +08:00
8a0096d367 Merge refs/remotes/origin/master into refs/heads/master 2020-07-11 20:06:47 +08:00
dong_bo0602
d8be1215e7 富文本 2020-07-11 19:26:25 +08:00
5346f0b64a 调整内容 2020-07-11 19:03:52 +08:00
c2850f2ea6 Merge refs/remotes/origin/master into refs/heads/master 2020-07-10 16:36:24 +08:00
wans
3656764d80 订单列表和详情 2020-07-09 23:40:07 +08:00
dong_bo0602
c058795ec7 订单状态 2020-07-09 19:19:23 +08:00
wans
a5c3270d78 解决冲突 2020-07-09 13:49:52 +08:00
wans
af044d1e4e 订单列表页面 2020-07-09 13:45:12 +08:00
dong_bo0602
6e8735eb37 发布朋友圈 2020-07-09 13:05:49 +08:00
f9480ec6de Merge refs/remotes/origin/master into refs/heads/master 2020-07-08 11:01:27 +08:00
wans
22e26ccbc5 修改 2020-07-07 16:02:52 +08:00
wans
c5f090f002 添加预定页面保存及验证码获取 2020-07-07 15:56:13 +08:00
dong_bo0602
da781c88e4 订单列表、详情 2020-07-07 15:53:46 +08:00
8b85b605fb 去除目前没有的选项 2020-07-04 13:22:30 +08:00
03a2cd035f 朋友圈列表,首页 2020-07-04 13:03:39 +08:00
wans
a4012d1ebf app.json冲突解决 2020-07-03 16:57:07 +08:00
wans
297d06ad8c 添加保存方法 2020-07-03 16:51:17 +08:00
Renpc-kilig
0bac46e527 修改bug 2020-07-03 16:32:32 +08:00
dong_bo0602
3a1c600550 计时器 2020-07-03 11:02:04 +08:00
d7e913f90d 非遗列表和详情部分 2020-07-02 20:08:23 +08:00
Renpc-kilig
b7497f1066 Merge branch 'master' of https://github.com/wanggeng888/xz_mini 2020-07-02 19:07:43 +08:00
dong_bo0602
de4dd4652a 首页-绑定手机 2020-07-02 19:03:29 +08:00
dong_bo0602
f1150528fa 朋友圈 2020-07-02 18:46:07 +08:00
Renpc-kilig
a4f739375e 修改活动报名,修改创建团队时头像显示异常问题 2020-07-02 18:41:45 +08:00
wans
73b8e74e07 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	app.json
2020-07-02 16:06:37 +08:00
wans
cc98b6087b 修改 2020-07-02 15:58:07 +08:00
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