 JinxChen
|
e5bbdf959a
|
Merge branch 'develop' into test
|
pirms 1 gada |
|
JinxChen
|
c26ac538ea
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
469701ae4d
|
update
- alarmDetails
- 增加 进入/离开状态显示
|
pirms 1 gada |
|
JinxChen
|
16c632573e
|
Merge branch 'develop' into test
|
pirms 1 gada |
|
JinxChen
|
7ff334f788
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
5fc70d6cd2
|
修改 微信支付弹窗显示文字
|
pirms 1 gada |
|
JinxChen
|
277caf7cbf
|
Merge branch 'develop' into test
|
pirms 1 gada |
|
JinxChen
|
12135c1da5
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
0d21fcdecb
|
update
- alarmDetails
- 修改 详情地址转化方式
- packageList
- 修改 微信支付方式
|
pirms 1 gada |
|
JinxChen
|
d64c56095f
|
Merge branch 'develop' into test
|
pirms 1 gada |
|
JinxChen
|
8ed74e0e27
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
JinxChen
|
54086abe35
|
update
- 增加 debug按钮
|
pirms 1 gada |
|
JinxChen
|
fc1afc22ae
|
Merge branch 'develop' into test
|
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
|
eec95158c8
|
Merge branch 'develop' into test
|
pirms 1 gada |
|
JinxChen
|
6c73f286c7
|
Merge branch 'feat-water-area' into develop
|
pirms 1 gada |
|
JinxChen
|
21cf17a94f
|
update
- alarmDetails
- 修改 弹窗显示文字
|
pirms 1 gada |
|
JinxChen
|
d3efafedb1
|
Merge branch 'develop' into test
|
pirms 1 gada |
|
JinxChen
|
4ca964218e
|
Merge branch 'feat-water-area' into develop
|
pirms 1 gada |
|
JinxChen
|
470699ed3e
|
update
- alarmDetails
- 修改 标题显示文字
|
pirms 1 gada |
|
JinxChen
|
366a1a7d4a
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
133d97ca43
|
Merge branch 'feat-water-area' into develop
|
pirms 2 gadiem |
|
JinxChen
|
1aebfaaf30
|
feature
- alarmDetails
- 增加 误报功能，设置该设备IMEI与该水域告警poi_id不做任何报警信息处理
|
pirms 2 gadiem |
|
JinxChen
|
6b2b4e70bf
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
df38251b60
|
Merge branch 'feat-water-area' into develop
|
pirms 2 gadiem |
|
JinxChen
|
fe61c20302
|
feature
- alarmDetails
- 增加 涉水区域告警页面
- amap.js
- 增加 高德地图js
|
pirms 2 gadiem |
|
JinxChen
|
58c5f15002
|
Merge branch 'rel-master'
|
pirms 2 gadiem |
|
JinxChen
|
23096fe3a8
|
merge develop
|
pirms 2 gadiem |
|
JinxChen
|
b9a16a3d08
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
1abe570fbd
|
Merge branch 'feat-package' into develop
|
pirms 2 gadiem |
|
JinxChen
|
ea02ad6722
|
feat
- packageList，packageBuy
- 增加 下单接口iccid参数
|
pirms 2 gadiem |
|
JinxChen
|
40c0903883
|
Merge branch 'rel-master'
|
pirms 2 gadiem |
|
JinxChen
|
7ad388cd80
|
merge develop
|
pirms 2 gadiem |
|
JinxChen
|
f1cb0766e1
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
1fa1357e7e
|
Merge branch 'feat-package' into develop
|
pirms 2 gadiem |
|
JinxChen
|
5d40819716
|
feat
- cardInfo
- 增加 物联网卡套餐信息查询页面
- 增加 加油包合基础套餐购买页面
|
pirms 2 gadiem |
|
JinxChen
|
ec2c35644e
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
b38a3d1de8
|
Merge branch 'feat-package' into develop
|
pirms 2 gadiem |
|
JinxChen
|
5d051969ac
|
修改 微信支付参数
|
pirms 2 gadiem |
|
JinxChen
|
ad21528e47
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
45b3ad297c
|
Merge branch 'feat-package' into develop
|
pirms 2 gadiem |
|
JinxChen
|
44130adb8c
|
feat
- 增加 套餐列表从接口获取
|
pirms 2 gadiem |
|
JinxChen
|
75efa567f0
|
Merge branch 'rel-master'
|
pirms 2 gadiem |
|
JinxChen
|
433a767b5d
|
update
- 修改 正式环境金额
|
pirms 2 gadiem |
|
JinxChen
|
712200fba6
|
Merge branch 'develop' into test
|
pirms 2 gadiem |
|
JinxChen
|
b59670f0a9
|
修改 套餐列表布局
|
pirms 2 gadiem |
|
JinxChen
|
a8e508637a
|
Merge branch 'rel-master'
|
pirms 2 gadiem |
|
JinxChen
|
782d631eec
|
修改 套餐列表布局
|
pirms 2 gadiem |
|
JinxChen
|
afb51c4aad
|
Merge branch 'rel-master'
|
pirms 2 gadiem |
