wans
|
fd7af2eb10
|
Merge branch 'master' of https://github.com/wanggeng888/xz_mini
# Conflicts:
# pages/book/book.js
|
2020-10-13 16:19:05 +08:00 |
|
dong_bo0602
|
edcf529ee0
|
1013
|
2020-10-13 16:15:57 +08:00 |
|
dong_bo0602
|
3439858af5
|
template
|
2020-10-12 18:03:02 +08:00 |
|
dong_bo0602
|
5ae1687061
|
resource
|
2020-10-09 16:57:41 +08:00 |
|
dong_bo0602
|
1931c2cbf6
|
0929
|
2020-09-29 17:05:43 +08:00 |
|
wans
|
4aaac4e997
|
Merge branch 'master' of https://github.com/wanggeng888/xz_mini
|
2020-09-15 16:34:17 +08:00 |
|
dong_bo0602
|
805ad24d28
|
video
|
2020-09-15 16:03:51 +08:00 |
|
wans
|
d852aa5b66
|
Merge refs/remotes/origin/master into refs/heads/master
|
2020-09-15 15:33:49 +08:00 |
|
Renpc-kilig
|
fb7fcc998c
|
修改请求路径为线上路径
|
2020-08-28 17:07:32 +08:00 |
|
Renpc-kilig
|
34403444df
|
志愿者注册新增字段
|
2020-08-28 17:06:00 +08:00 |
|
wans
|
5922287025
|
修改haders丢失问题
|
2020-08-27 15:06:43 +08:00 |
|
dong_bo0602
|
73ac796b79
|
更新
|
2020-08-27 09:57:24 +08:00 |
|
dong_bo0602
|
e65fedb769
|
去掉console
|
2020-08-18 14:37:12 +08:00 |
|
|
|
e83ab4f51b
|
取消直播
|
2020-08-13 18:17:11 +08:00 |
|
dong_bo0602
|
ba005bc892
|
修改
|
2020-08-13 14:45:16 +08:00 |
|
wans
|
9b5f913489
|
Merge branch 'master' of https://github.com/wanggeng888/xz_mini
|
2020-08-12 11:24:30 +08:00 |
|
wans
|
628e131678
|
修改场馆列表页全部按钮标记
|
2020-08-12 11:23:07 +08:00 |
|
Renpc-kilig
|
b5308a265b
|
活动添加报名倒计时
|
2020-08-06 17:03:10 +08:00 |
|
Renpc-kilig
|
98883495ed
|
活动报名添加验证码倒计时
|
2020-08-06 16:59:51 +08:00 |
|
Renpc-kilig
|
7349052c2e
|
Merge branch 'master' of https://github.com/wanggeng888/xz_mini
|
2020-08-06 16:57:08 +08:00 |
|
dong_bo0602
|
ab303eb256
|
修改地址
|
2020-08-06 16:56:59 +08:00 |
|
Renpc-kilig
|
6a356bdbad
|
系统优化
|
2020-08-06 16:55:58 +08:00 |
|
dong_bo0602
|
c0aa5adfa0
|
选择区域
|
2020-08-06 16:54:34 +08:00 |
|
dong_bo0602
|
872cdfbfb3
|
选择地区
|
2020-08-06 16:51:52 +08:00 |
|
dong_bo0602
|
cd5bbba85d
|
选择地区
|
2020-08-06 16:49:55 +08:00 |
|
Renpc-kilig
|
8555f8c2cd
|
系统优化
|
2020-08-06 14:57:56 +08:00 |
|
Renpc-kilig
|
4b92002e83
|
修改地区相关接口
|
2020-07-29 16:35:24 +08:00 |
|
Renpc-kilig
|
5837de0c13
|
修改地区相关信息接口
|
2020-07-29 16:34:04 +08:00 |
|
|
|
91a7d7d44b
|
处理问题
|
2020-07-17 11:16:44 +08:00 |
|
|
|
d24a633c38
|
Merge refs/remotes/origin/master into refs/heads/master
|
2020-07-16 19:42:16 +08:00 |
|
|
|
5f37f9cba5
|
处理登录问题
处理手机绑定用户问题
|
2020-07-16 19:42:16 +08:00 |
|
wans
|
2986d857b2
|
添加场馆分类选择全部
|
2020-07-16 19:23:00 +08:00 |
|
wans
|
4d9ec42cdc
|
修复绑定手机号
|
2020-07-16 16:29:47 +08:00 |
|
wans
|
fbea281f16
|
订单页面样式调整
|
2020-07-16 14:35:30 +08:00 |
|
wans
|
40cd44b118
|
修改场馆没有项目信息显示直接到场按钮
|
2020-07-16 12:26:50 +08:00 |
|
wans
|
cc28c968d9
|
富文本图片显示
|
2020-07-16 11:33:23 +08:00 |
|
|
|
bc3720b99d
|
处理非遗问题
列表图片不显示，详情传承人问题
|
2020-07-16 10:05:06 +08:00 |
|
Renpc-kilig
|
72a7a813fe
|
修改冲突
|
2020-07-15 17:41:54 +08:00 |
|
Renpc-kilig
|
5e7ef3bf1f
|
修改活动相关
|
2020-07-15 17:28:20 +08:00 |
|
Renpc-kilig
|
98a4feffd7
|
修改bug，修改活动相关
|
2020-07-15 17:13:45 +08:00 |
|
|
|
36b60563b6
|
处理问题
|
2020-07-15 14:45:24 +08:00 |
|
|
|
42ba6dd036
|
新增新闻分类
|
2020-07-15 14:07:26 +08:00 |
|
dong_bo0602
|
6d7a054d66
|
首页样式
|
2020-07-15 11:26:33 +08:00 |
|
dong_bo0602
|
861a5d9150
|
文化地图
|
2020-07-14 19:01:25 +08:00 |
|
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 |
|
