 JinxChen
|
a156e70b56
|
Merge branch 'merge-master'
|
pirms 1 gada |
|
JinxChen
|
e9b244d845
|
修改 appid
|
pirms 1 gada |
|
JinxChen
|
b45ecace6e
|
Merge branch 'merge-master'
|
pirms 1 gada |
|
JinxChen
|
7c4f4e6ffb
|
Merge branch 'develop' into merge-master
|
pirms 1 gada |
|
JinxChen
|
408a7a1786
|
拉取 develop分支代码
|
pirms 1 gada |
|
JinxChen
|
17b10add83
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
62a4041e1e
|
修复 params reqUrl参数获取错误的问题
|
pirms 1 gada |
|
JinxChen
|
deb10abf9e
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
b68ccefb59
|
update
- packageHome
- 增加 进入首页判断是否存在redUrl的逻辑
|
pirms 1 gada |
|
JinxChen
|
c26ac538ea
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
469701ae4d
|
update
- alarmDetails
- 增加 进入/离开状态显示
|
pirms 1 gada |
|
JinxChen
|
7ff334f788
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
5fc70d6cd2
|
修改 微信支付弹窗显示文字
|
pirms 1 gada |
|
JinxChen
|
12135c1da5
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
0d21fcdecb
|
update
- alarmDetails
- 修改 详情地址转化方式
- packageList
- 修改 微信支付方式
|
pirms 1 gada |
|
JinxChen
|
8ed74e0e27
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
54086abe35
|
update
- 增加 debug按钮
|
pirms 1 gada |
|
JinxChen
|
66f16d7070
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
9fe9e2c23f
|
update
- alarmDetails
- 增加 坐标通过高德逆地理编码解析中文地址
- packageList
- 修改 微信支付的方式，不使用jssdk，使用微信内置WeixinJSBridge对象
- appId
- 修改 微信测试环境appId
|
pirms 1 gada |
|
JinxChen
|
6c73f286c7
|
Merge branch 'feat-water-area' into develop
|
pirms 1 gada |
|
JinxChen
|
21cf17a94f
|
update
- alarmDetails
- 修改 弹窗显示文字
|
pirms 1 gada |
|
JinxChen
|
4ca964218e
|
Merge branch 'feat-water-area' into develop
|
pirms 1 gada |
|
JinxChen
|
470699ed3e
|
update
- alarmDetails
- 修改 标题显示文字
|
pirms 1 gada |
|
JinxChen
|
133d97ca43
|
Merge branch 'feat-water-area' into develop
|
pirms 1 gada |
|
JinxChen
|
1aebfaaf30
|
feature
- alarmDetails
- 增加 误报功能，设置该设备IMEI与该水域告警poi_id不做任何报警信息处理
|
pirms 1 gada |
|
JinxChen
|
df38251b60
|
Merge branch 'feat-water-area' into develop
|
pirms 1 gada |
|
JinxChen
|
fe61c20302
|
feature
- alarmDetails
- 增加 涉水区域告警页面
- amap.js
- 增加 高德地图js
|
pirms 1 gada |
|
JinxChen
|
58c5f15002
|
Merge branch 'rel-master'
|
pirms 1 gada |
|
JinxChen
|
23096fe3a8
|
merge develop
|
pirms 1 gada |
|
JinxChen
|
1abe570fbd
|
Merge branch 'feat-package' into develop
|
pirms 1 gada |
|
JinxChen
|
ea02ad6722
|
feat
- packageList，packageBuy
- 增加 下单接口iccid参数
|
pirms 1 gada |
|
JinxChen
|
40c0903883
|
Merge branch 'rel-master'
|
pirms 1 gada |
|
JinxChen
|
7ad388cd80
|
merge develop
|
pirms 1 gada |
|
JinxChen
|
1fa1357e7e
|
Merge branch 'feat-package' into develop
|
pirms 1 gada |
|
JinxChen
|
5d40819716
|
feat
- cardInfo
- 增加 物联网卡套餐信息查询页面
- 增加 加油包合基础套餐购买页面
|
pirms 1 gada |
|
JinxChen
|
b38a3d1de8
|
Merge branch 'feat-package' into develop
|
pirms 1 gada |
|
JinxChen
|
5d051969ac
|
修改 微信支付参数
|
pirms 1 gada |
|
JinxChen
|
45b3ad297c
|
Merge branch 'feat-package' into develop
|
pirms 1 gada |
|
JinxChen
|
44130adb8c
|
feat
- 增加 套餐列表从接口获取
|
pirms 1 gada |
|
JinxChen
|
75efa567f0
|
Merge branch 'rel-master'
|
pirms 1 gada |
|
JinxChen
|
433a767b5d
|
update
- 修改 正式环境金额
|
pirms 1 gada |
|
JinxChen
|
b59670f0a9
|
修改 套餐列表布局
|
pirms 1 gada |
|
JinxChen
|
a8e508637a
|
Merge branch 'rel-master'
|
pirms 1 gada |
|
JinxChen
|
782d631eec
|
修改 套餐列表布局
|
pirms 1 gada |
|
JinxChen
|
afb51c4aad
|
Merge branch 'rel-master'
|
pirms 1 gada |
|
JinxChen
|
1bb810bcc7
|
调整页面样式
|
pirms 1 gada |
|
JinxChen
|
be5ee8ea01
|
Merge branch 'rel-master'
|
pirms 1 gada |
|
JinxChen
|
764565b840
|
修复 iccid获取错误的问题
|
pirms 1 gada |
|
JinxChen
|
6c354bd814
|
修改 正式环境价格
|
pirms 1 gada |
|
JinxChen
|
5ed670c8b9
|
Merge branch 'rel-master'
|
pirms 1 gada |
