408a7a1
拉取 develop分支代码 by
2023-04-03 14:13:27 +0800
657e229
Merge branch 'develop' into test by
2023-04-03 11:12:31 +0800
17b10ad
Merge branch 'feat' into develop by
2023-04-03 11:12:11 +0800
62a4041
修复 params reqUrl参数获取错误的问题 by
2023-04-03 11:11:56 +0800
af73835
Merge branch 'develop' into test by
2023-04-03 11:05:42 +0800
deb10ab
Merge branch 'feat' into develop by
2023-04-03 11:05:14 +0800
b68ccef
update - packageHome - 增加 进入首页判断是否存在redUrl的逻辑 by
2023-04-03 11:04:56 +0800
e5bbdf9
Merge branch 'develop' into test by
2023-03-31 17:56:00 +0800
c26ac53
Merge branch 'feat' into develop by
2023-03-31 17:55:48 +0800
469701a
update - alarmDetails - 增加 进入/离开状态显示 by
2023-03-31 17:55:07 +0800
16c6325
Merge branch 'develop' into test by
2023-03-31 11:25:44 +0800
7ff334f
Merge branch 'feat' into develop by
2023-03-31 11:25:34 +0800
5fc70d6
修改 微信支付弹窗显示文字 by
2023-03-31 11:25:17 +0800
277caf7
Merge branch 'develop' into test by
2023-03-31 11:13:22 +0800
12135c1
Merge branch 'feat' into develop by
2023-03-31 11:13:12 +0800
0d21fcd
update - alarmDetails - 修改 详情地址转化方式 - packageList - 修改 微信支付方式 by
2023-03-31 11:12:38 +0800
d64c560
Merge branch 'develop' into test by
2023-03-30 18:34:43 +0800
8ed74e0
Merge branch 'feat' into develop by
2023-03-30 18:34:34 +0800
54086ab
update - 增加 debug按钮 by
2023-03-30 18:34:13 +0800
fc1afc2
Merge branch 'develop' into test by
2023-03-30 17:37:31 +0800
66f16d7
Merge branch 'feat' into develop by
2023-03-30 17:37:15 +0800
9fe9e2c
update - alarmDetails - 增加 坐标通过高德逆地理编码解析中文地址 - packageList - 修改 微信支付的方式,不使用jssdk,使用微信内置WeixinJSBridge对象 by
2023-03-30 17:30:53 +0800
eec9515
Merge branch 'develop' into test by
2023-03-29 10:19:12 +0800
6c73f28
Merge branch 'feat-water-area' into develop by
2023-03-29 10:19:01 +0800
21cf17a
update - alarmDetails - 修改 弹窗显示文字 by
2023-03-29 10:18:34 +0800
d3efafe
Merge branch 'develop' into test by
2023-03-29 10:08:03 +0800
4ca9642
Merge branch 'feat-water-area' into develop by
2023-03-29 10:07:39 +0800
470699e
update - alarmDetails - 修改 标题显示文字 by
2023-03-29 10:06:49 +0800
366a1a7
Merge branch 'develop' into test by
2023-03-27 16:25:04 +0800
133d97c
Merge branch 'feat-water-area' into develop by
2023-03-27 16:24:52 +0800
1aebfaa
feature - alarmDetails - 增加 误报功能,设置该设备IMEI与该水域告警poi_id不做任何报警信息处理 by
2023-03-27 16:22:47 +0800
6b2b4e7
Merge branch 'develop' into test by
2023-03-24 18:08:58 +0800
df38251
Merge branch 'feat-water-area' into develop by
2023-03-24 18:08:39 +0800
fe61c20
feature - alarmDetails - 增加 涉水区域告警页面 - amap.js - 增加 高德地图js by
2023-03-24 18:08:02 +0800
58c5f15
Merge branch 'rel-master' by
2023-03-23 15:59:56 +0800
23096fe
merge develop by
2023-03-23 15:59:21 +0800
b9a16a3
Merge branch 'develop' into test by
2023-03-23 15:50:59 +0800
1abe570
Merge branch 'feat-package' into develop by
2023-03-23 15:50:48 +0800
ea02ad6
feat - packageList,packageBuy - 增加 下单接口iccid参数 by
2023-03-23 15:50:04 +0800
40c0903
Merge branch 'rel-master' by
2023-03-20 15:04:06 +0800
7ad388c
merge develop by
2023-03-20 14:06:44 +0800
f1cb076
Merge branch 'develop' into test by
2023-03-14 15:37:23 +0800
1fa1357
Merge branch 'feat-package' into develop by
2023-03-14 15:37:10 +0800
5d40819
feat - cardInfo - 增加 物联网卡套餐信息查询页面 - 增加 加油包合基础套餐购买页面 by
2023-03-14 15:35:46 +0800
ec2c356
Merge branch 'develop' into test by
2023-03-13 18:14:05 +0800
b38a3d1
Merge branch 'feat-package' into develop by
2023-03-13 18:13:52 +0800
5d05196
修改 微信支付参数 by
2023-03-13 18:13:31 +0800
ad21528
Merge branch 'develop' into test by
2023-03-13 16:43:20 +0800
45b3ad2
Merge branch 'feat-package' into develop by
2023-03-13 16:43:06 +0800
44130ad
feat - 增加 套餐列表从接口获取 by
2023-03-13 16:41:49 +0800
75efa56
Merge branch 'rel-master' by
2023-03-13 08:56:58 +0800
433a767
update - 修改 正式环境金额 by
2023-03-13 08:55:41 +0800
712200f
Merge branch 'develop' into test by
2023-03-05 12:03:09 +0800
b59670f
修改 套餐列表布局 by
2023-03-05 12:01:25 +0800
a8e5086
Merge branch 'rel-master' by
2023-03-05 11:49:00 +0800
782d631
修改 套餐列表布局 by
2023-03-05 11:48:12 +0800
afb51c4
Merge branch 'rel-master' by
2023-03-03 17:10:27 +0800
1bb810b
调整页面样式 by
2023-03-03 17:10:03 +0800
be5ee8e
Merge branch 'rel-master' by
2023-03-03 17:06:24 +0800
764565b
修复 iccid获取错误的问题 by
2023-03-03 17:06:02 +0800
6c354bd
修改 正式环境价格 by
2023-03-03 17:05:11 +0800
5ed670c
Merge branch 'rel-master' by
2023-03-03 02:38:51 +0800
7673950
修改 正式环境套餐价格钱数 by
2023-03-03 00:42:03 +0800
36fcf2a
Merge branch 'rel-master' by
2023-03-02 22:06:29 +0800
bc811b6
修改 正式环境支付金额 by
2023-03-02 22:05:50 +0800
d00c352
Merge branch 'rel-master' by
2023-03-02 17:18:34 +0800
ab0b06a
Merge branch 'develop' into rel-master by
2023-03-02 17:18:14 +0800
4de23e1
Merge branch 'develop' into test by
2023-03-02 11:01:03 +0800
1732a61
Merge branch 'feat' into develop by
2023-03-02 11:00:50 +0800
1609f56
update - 修改 最后一步按钮文案 by
2023-03-02 11:00:14 +0800
70e94fb
Merge branch 'develop' into test by
2023-03-02 02:00:23 +0800
109d167
Merge branch 'feat' into develop by
2023-03-02 02:00:12 +0800
990f84c
修复 结果查询页面步数显示不正确的问题 by
2023-03-02 01:59:51 +0800
749fec5
Merge branch 'develop' into test by
2023-03-02 01:47:19 +0800
3020d31
Merge branch 'feat' into develop by
2023-03-02 01:47:08 +0800
2625106
修改 步数文字 by
2023-03-02 01:46:49 +0800
ed42e3c
- 增加 已购买未激活容错页面 by
2023-03-02 01:31:35 +0800
6fcdf2d
Merge branch 'develop' into test by
2023-03-02 01:16:19 +0800
77d8004
Merge branch 'feat' into develop by
2023-03-02 01:16:01 +0800
c3417f0
feature - 增加 已购买未激活容错页面 by
2023-03-02 01:15:21 +0800
834ba91
Merge branch 'develop' into test by
2023-03-02 00:54:22 +0800
4a01243
Merge branch 'feat' into develop by
2023-03-02 00:54:13 +0800
41f73bc
修改 返回首页地址 by
2023-03-02 00:53:57 +0800
613306e
Merge branch 'develop' into test by
2023-03-02 00:39:25 +0800
12dc18e
Merge branch 'feat' into develop by
2023-03-02 00:39:07 +0800
35774d2
feature - 修改 页面支付逻辑,由未激活充值购买变成已激活充值购买 by
2023-03-02 00:38:37 +0800
fd0e69b
Merge branch 'develop' into test by
2023-03-01 18:41:04 +0800
e1eb1a5
Merge branch 'feat' into develop by
2023-03-01 18:40:48 +0800
19ff114
feature - 修改 激活界面文字提示 by
2023-03-01 18:40:33 +0800
d95de58
Merge branch 'develop' into test by
2023-03-01 17:53:48 +0800
bf86b2e
Merge branch 'feat' into develop by
2023-03-01 17:53:36 +0800
08c2a2a
feature - 修复 已购买未激活未跳转容错页面的问题 by
2023-03-01 17:53:08 +0800
7d04de2
Merge branch 'develop' into test by
2023-03-01 17:10:49 +0800
4fe7256
Merge branch 'feat' into develop by
2023-03-01 17:10:35 +0800
8977b36
feature - 增加 已购买未激活容错页面 by
2023-03-01 17:10:08 +0800
be5d4a0
Merge branch 'develop' into test by
2023-02-28 18:37:38 +0800
f9fbb5c
Merge branch 'feat' into develop by
2023-02-28 18:37:29 +0800
a70e0c7
修改 查询结果失败文字大小 by
2023-02-28 18:37:05 +0800
e8770a8
Merge branch 'develop' into test by
2023-02-28 16:45:03 +0800
369355d
Merge branch 'feat' into develop by
2023-02-28 16:44:50 +0800