 JinxChen
|
48e6184ab7
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
f995f96fe9
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
56fc60baf7
|
修改 测试环境的appId
|
1 ano atrás |
|
JinxChen
|
dcdc6f44a1
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
8f02fc6a73
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
2f611db4c4
|
update
- packageList
- 增加 微信授权code调用方式，在缓存的基础上在路由增加一个code
- packageHome
- 增加 微信授权code调用方式，缓存没有则从路由获取
- appId
- 修改 测试环境appId
|
1 ano atrás |
|
JinxChen
|
007e51ca02
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
d2a8d392e9
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
6ed492b4eb
|
update
- packageList
- 修复 购买套餐时接口返回数据类型不一致导致购买异常的问题
- 注释 获取微信jssdk接口
|
1 ano atrás |
|
JinxChen
|
79126640e9
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
ae4caba73a
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
e621e99cca
|
update
- packageHome
- 修改 appId获取的方式，本地配置文件固定配置，不再从url路由获取
|
1 ano atrás |
|
JinxChen
|
be2f3216b9
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
b6ca9521e2
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
a03c0336c6
|
update
- appId
- 修改 正式环境的appid
- packageList
- 修改正式环境 代理商用户的userId
|
1 ano atrás |
|
JinxChen
|
6e3476597b
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
77637391a8
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
2c7e25f179
|
修改 正式环境的appId
|
1 ano atrás |
|
JinxChen
|
d65b3351ba
|
Merge branch 'test' of http://183.238.195.77:10081/chenJinxu/TelpoH5FrontendWeb into test
|
1 ano atrás |
|
JinxChen
|
408a7a1786
|
拉取 develop分支代码
|
1 ano atrás |
|
JinxChen
|
657e229c74
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
17b10add83
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
62a4041e1e
|
修复 params reqUrl参数获取错误的问题
|
1 ano atrás |
|
JinxChen
|
af7383545d
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
deb10abf9e
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
b68ccefb59
|
update
- packageHome
- 增加 进入首页判断是否存在redUrl的逻辑
|
1 ano atrás |
|
JinxChen
|
e5bbdf959a
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
c26ac538ea
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
469701ae4d
|
update
- alarmDetails
- 增加 进入/离开状态显示
|
1 ano atrás |
|
JinxChen
|
16c632573e
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
7ff334f788
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
5fc70d6cd2
|
修改 微信支付弹窗显示文字
|
1 ano atrás |
|
JinxChen
|
277caf7cbf
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
12135c1da5
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
0d21fcdecb
|
update
- alarmDetails
- 修改 详情地址转化方式
- packageList
- 修改 微信支付方式
|
1 ano atrás |
|
JinxChen
|
d64c56095f
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
8ed74e0e27
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
54086abe35
|
update
- 增加 debug按钮
|
1 ano atrás |
|
JinxChen
|
fc1afc22ae
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
66f16d7070
|
Merge branch 'feat' into develop
|
1 ano atrás |
|
JinxChen
|
9fe9e2c23f
|
update
- alarmDetails
- 增加 坐标通过高德逆地理编码解析中文地址
- packageList
- 修改 微信支付的方式，不使用jssdk，使用微信内置WeixinJSBridge对象
- appId
- 修改 微信测试环境appId
|
1 ano atrás |
|
JinxChen
|
eec95158c8
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
6c73f286c7
|
Merge branch 'feat-water-area' into develop
|
1 ano atrás |
|
JinxChen
|
21cf17a94f
|
update
- alarmDetails
- 修改 弹窗显示文字
|
1 ano atrás |
|
JinxChen
|
d3efafedb1
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
4ca964218e
|
Merge branch 'feat-water-area' into develop
|
1 ano atrás |
|
JinxChen
|
470699ed3e
|
update
- alarmDetails
- 修改 标题显示文字
|
1 ano atrás |
|
JinxChen
|
366a1a7d4a
|
Merge branch 'develop' into test
|
1 ano atrás |
|
JinxChen
|
133d97ca43
|
Merge branch 'feat-water-area' into develop
|
1 ano atrás |
|
JinxChen
|
1aebfaaf30
|
feature
- alarmDetails
- 增加 误报功能，设置该设备IMEI与该水域告警poi_id不做任何报警信息处理
|
1 ano atrás |
