add baojinginfo list and fix the lnglat of gps to cover2gaode lnglat

pages/amap/amap.js

@@ -120,23 +120,49 @@
 					// 	  'Heading: '           + position.coords.heading           + '\n' +
 					// 	  'Speed: '             + position.coords.speed             + '\n' +
                     // 	  'Timestamp: '         + position.timestamp                + '\n');
-                    var lnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
-                    startEnd.start = lnglat;
-                    userMarker.setPosition(lnglat);
-                    userMarker.setMap(mainMap);
-                    if(locationFlag){
-                        if(latlngSign){
-                            mainMap.setFitView([vehicleMarker, userMarker]);
-                        }else{
-                            mainMap.setFitView([userMarker]);
+                    var gps = [position.coords.longitude, position.coords.latitude];
+                    AMap.convertFrom(gps, 'gps', function (status, result) {
+                        if (result.info === 'ok') {
+                          var lnglats = result.locations; // Array.<LngLat>
                         }
-                        locationFlag = false;
-                    }else{
-                        if(latlngSign){
-                            mainMap.setFitView([vehicleMarker]);
+                        // var lnglat = lnglats[0]
+                        var lnglat = new AMap.LngLat(lnglats[0].lng, lnglats[0].lat);
+                        startEnd.start = lnglat;
+                        userMarker.setPosition(lnglat);
+                        userMarker.setMap(mainMap);
+                        if(locationFlag){
+                            if(latlngSign){
+                                mainMap.setFitView([vehicleMarker, userMarker]);
+                            }else{
+                                mainMap.setFitView([userMarker]);
+                            }
+                            locationFlag = false;
+                        }else{
+                            if(latlngSign){
+                                mainMap.setFitView([vehicleMarker]);
+                            }
+                            locationFlag = true;
                         }
-                        locationFlag = true;
-                    }
+                        // alert(lnglat)
+                      });
+                    //   var lnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
+                    //   alert(lnglat)
+                    // startEnd.start = lnglat;
+                    // userMarker.setPosition(lnglat);
+                    // userMarker.setMap(mainMap);
+                    // if(locationFlag){
+                    //     if(latlngSign){
+                    //         mainMap.setFitView([vehicleMarker, userMarker]);
+                    //     }else{
+                    //         mainMap.setFitView([userMarker]);
+                    //     }
+                    //     locationFlag = false;
+                    // }else{
+                    //     if(latlngSign){
+                    //         mainMap.setFitView([vehicleMarker]);
+                    //     }
+                    //     locationFlag = true;
+                    // }
 				};
 			 
 				// onError Callback receives a PositionError object

pages/amap/navigation/navigation.js

@@ -53,9 +53,20 @@
 					// 	  'Heading: '           + position.coords.heading           + '\n' +
 					// 	  'Speed: '             + position.coords.speed             + '\n' +
                     // 	  'Timestamp: '         + position.timestamp                + '\n');
-                    presentLnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
-                    userMarker.setPosition(presentLnglat);
-                    userMarker.setMap(map);
+                    var gps = [position.coords.longitude, position.coords.latitude];
+                    AMap.convertFrom(gps, 'gps', function (status, result) {
+                        if (result.info === 'ok') {
+                          var lnglats = result.locations; // Array.<LngLat>
+                        }
+
+                        presentLnglat = new AMap.LngLat(lnglats[0].lng, lnglats[0].lat);
+                        userMarker.setPosition(presentLnglat);
+                        userMarker.setMap(map);
+                    });
+
+                    // presentLnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
+                    // userMarker.setPosition(presentLnglat);
+                    // userMarker.setMap(map);
 				};
 			 
 				// onError Callback receives a PositionError object

pages/baojinginfo/baojinginfo.js

@@ -2,10 +2,91 @@
 	var page = {
         isScroll: false,
         init: function ($page,param) {
+			var url = '/?s=api/get_baojing_info&plate=';
+			var pageobj = $('#gaojinginfo').lrpagination({
+				lclass: "lr-list",
+				rows: 10,
+				
+				// 每页行数
+				getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+				// param:   page: 当前页,rows:行数
+					setTimeout(function () {
+						var data = [];
+						var count = 0;
+						var page = param.page-1;
+						renlian.httpget(config.webapi + url + userinfo.baseinfo.plate+'&pagesize='+param.rows+'&page='+page+'&cityid='+userinfo.baseinfo.cityid, {}, function(res) {
+							var length = 0;
+							if(res.success == true){
+								length = res.data.length;
+								for (var i = 0; i < length; i++) {
+								// $.each(res.data, function (_index, _item) {
+									data.push({ ID: res.data[i].ID,AddTime: res.data[i].AddTime,LicensePlate: res.data[i].LicensePlate,DeviceNumber:res.data[i].DeviceNumber, Title:res.data[i].Title})
+								// })
+									count  = (param.page-1) * param.rows + i + 1;
+								}
+								
+							}
+							// console.log(data);
+							if(page === 0 && data.length === 0){
+								$('#no-message').show();
+							}else{
+								$('#no-message').hide();
+							}
+							callback(data, count+1);
+						})
+
+					}, 1000);
+				},
+				renderData: function (_index, _item) {// 渲染数据模板
+					var _msg_html_list = '';
+					_msg_html_list+= '\
+								<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
+									<h4 id="time">'+ _item.AddTime +'</h4>\
+									<p class="lr-ellipsis">'+ _item.LicensePlate +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ (_item.DeviceNumber || "无标签") +'</span></p>\
+									<a class="lr-nav-right" id="gaojingdetail'+_item.AddTime+'">'+_item.Title+'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
+								</div>';
+
+					// $('#gaojingdetail'+_item.AddTime).on('tap', function () {	
+					// 	renlian.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"addtime":"'+_item.Addtime+'"}'});
+					// });
+
+					return _msg_html_list;
+				},
+				click: function(item, $item){
+						renlian.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"ID":"'+item.ID+'"}'});
+				},
+				down: {
+					contentinit: '下拉可以刷新',
+					contentdown: '下拉可以刷新',
+					contentover: '释放立即刷新',
+					contentrefresh: '正在刷新...'
+				},
+				up: {
+					contentinit: '上拉显示更多',
+					contentdown: '上拉显示更多',
+					contentrefresh: '正在加载...',
+					contentnomore: '没有更多数据了'
+				}
+			});
+
 
+			var pullrefresh = function(index){
+
+				if(Number(index) === 0){
+					url = '/?s=api/get_baojing_info&plate=';
+				}else{
+					url = '/?s=api/get_gonggao_info&plate=';
+					// url = '/?s=api/get_baojing_info&plate=';
+				}
+				console.log(url);
+				pageobj.reload();
+
+				console.log(pageobj);
+				// return pageobj;
+			}
 
 			userinfo = renlian.storage.get('userinfo');
-            $page.find('#toptab').rltoptab(['告警', '公告']).each(function (index) {
+            $page.find('#toptab').rltoptab(['告警', '公告'], pullrefresh ).each(function (index) {
                 var $this = $(this);
                 switch (index) {
                     case 0:
@@ -50,74 +131,11 @@
 						// //msg_html += '';
 						// //刷新
 							
-							var pageobj = $('#gaojinginfo').lrpagination({
-								lclass: "lr-list",
-								rows: 5,
-								
-	                            // 每页行数
-								getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
-								// param:   page: 当前页,rows:行数
-									setTimeout(function () {
-										var data = [];
-										var count = 0;
-										var page = param.page-1;
-										renlian.httpget(config.webapi + "/?s=api/get_baojing_info&plate="+userinfo.baseinfo.plate+'&pagesize='+param.rows+'&page='+page, {}, function(res) {
-											var length = 0;
-											if(res.success == true){
-												length = res.data.length;
-												for (var i = 0; i < length; i++) {
-												// $.each(res.data, function (_index, _item) {
-													data.push({ ID: res.data[i].ID,AddTime: res.data[i].AddTime,LicensePlate: res.data[i].LicensePlate,DeviceNumber:res.data[i].DeviceNumber, Title:res.data[i].Title})
-												// })
-													count  = (param.page-1) * param.rows + i + 1;
-												}
-												
-												// count = (param.page-1) * param.rows + i + 1;
-											}
-											if($.isArray(data) && data.length === 0){
-												$('#no-message').show();
-											}else{
-												$('#no-message').hide();
-											}
-											callback(data, count+1);
-										})
-										
-									}, 1000);
-								},
-								renderData: function (_index, _item) {// 渲染数据模板
-									var _msg_html_list = '';
-									_msg_html_list+= '\
-												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
-													<h4 id="time">'+ _item.AddTime +'</h4>\
-													<p class="lr-ellipsis">'+ _item.LicensePlate +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.DeviceNumber +'</span></p>\
-													<a class="lr-nav-right" id="gaojingdetail'+_item.AddTime+'">'+_item.Title+'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
-												</div>';
 
-									// $('#gaojingdetail'+_item.AddTime).on('tap', function () {	
-									// 	renlian.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"addtime":"'+_item.Addtime+'"}'});
-									// });
-
-									return _msg_html_list;
-								},
-								click: function(item, $item){
-										renlian.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"ID":"'+item.ID+'"}'});
-								},
-								down: {
-									contentinit: '下拉可以刷新',
-									contentdown: '下拉可以刷新',
-									contentover: '释放立即刷新',
-									contentrefresh: '正在刷新...'
-								},
-								up: {
-									contentinit: '上拉显示更多',
-									contentdown: '上拉显示更多',
-									contentrefresh: '正在加载...',
-									contentnomore: '没有更多数据了'
-								}
-							});
 						//刷新结束
                         break;
                     case 1:
+						// console.log('test');
                         // var msg_html = '';
 						// var msg_html = '';
 						// msg_html += '\
@@ -161,7 +179,8 @@
                 }
                 $this = null;
             });
-        }
+		}
+		
 		
     };
     return page;

pages/my/my.css

@@ -27,8 +27,8 @@
     }
 
     .lr-my-page .userinfo .subname {
-        border-radius: 35px;
-        font-size: 12px;
+        border-radius: 8px;
+        font-size: 14px;
         background-color: #c6c6c6;
         padding: 0 5px;
     }

pages/my/my.html

@@ -3,7 +3,7 @@
         <img alt="" src="images/on-boy.jpg">
         <div class="content">
             <div class="name"></div>
-            <span class="subname"></span>
+            <span class="subname">gps设备号:<span id="my-gpsNumber"></span> </span>
         </div>
     </div>
     <div class="lr-list">

pages/my/my.js

@@ -43,6 +43,7 @@
                 renlian.nav.go({ path: 'my/userInfo', title: '个人信息', type: 'right' });
             });
 
+            $('#my-gpsNumber').text(userinfo.baseinfo.gpsNumber);
         },
         reload: function ($page, pageinfo) {
             // 获取登录者信息

pages/my/mybaodan/mybaodan.css

@@ -0,0 +1,9 @@
+.lr-contactInfo-list .lr-list-item {
+    text-align: right;
+}
+
+.lr-contactInfo-list .lr-list-item > div {
+    position: absolute;
+    top: 0;
+    left: 14px;
+}

pages/my/mybaodan/mybaodan.html

@@ -1,5 +1,17 @@
 <div class="lr-my-page">
-    <div style="width: 100%;height: 100%;">
+<!--     <div style="width: 100%;height: 100%;">
         <img style="max-width: 100%!important;max-height: 100%!important;width: auto;height: auto;" src="./images/developing.jpg" alt="">
-    </div>  
+    </div>  --> 
+    <div class="lr-list lr-contactInfo-list">
+    <div class="lr-list-item"><div>保险套餐</div><span class="insuranceName"></span></div>
+    <div class="lr-list-item"><div>开始日期</div><span class="startTime"></span></div>
+    <div class="lr-list-item"><div>结束日期</div><span class="endTime"></span></div>
+    <div class="lr-list-item" style="text-align: center;font-size: 20px;font-weight:bold;" id="detailList">套餐包含</div>
+<!--     <div class="lr-list-item"><div style="font-weight: bold;">险种1</div></div>
+    <div class="lr-list-item"><div>险种名称</div><span class="weChat">111111</span></div>
+    <div class="lr-list-item"><div>保单编号</div><span class="oICQ">1111111</span></div>
+    <div class="lr-list-item"><div style="font-weight: bold;">险种2</div></div>
+    <div class="lr-list-item"><div>险种名称</div><span class="weChat">2222222</span></div>
+    <div class="lr-list-item"><div>保单编号</div><span class="oICQ">222222222</span></div> -->
+    </div>
 </div>

pages/my/mybaodan/mybaodan.js

@@ -0,0 +1,43 @@
+(function () {
+    var page = {
+        isScroll: true,
+        init: function ($page) {
+            var userinfo = renlian.storage.get('userinfo');
+            console.log(userinfo);
+            var postdata = {
+                    token: userinfo.baseinfo.token,
+                    loginMark: renlian.deviceId(),                  
+                    plate: userinfo.baseinfo.plate
+            };
+            renlian.http.post(config.webapi + "/?s=api/get_insurance_detail", postdata, function(res) {
+                 console.log(res);
+                 var str = '';
+                 $('.insuranceName').text(res.data.insuranceName);
+                 $('.startTime').text(res.data.insureInfo.StartDate);
+                 $('.endTime').text(res.data.insureInfo.EndDate);
+                 for (var i = 0; i < res.data.insuranceDetailInfo.length; i++) {
+                  str += ' <div class="lr-list-item"><div style="font-weight: bold;">险种'+ (i+1) + '</div></div><div class="lr-list-item"><div>险种名称</div><span class="weChat">' + res.data.insuranceDetailInfo[i].InsuranceTypeName + '</span></div><div class="lr-list-item"><div>保单编号</div><span class="oICQ">'
+                    + res.data.insuranceDetailInfo[i].InsuranceTypeNo + '</span></div>';
+                 }
+                 $('#detailList').after(str);
+         });
+        }
+    };
+    return page;
+})();
+
+
+
+
+  // <div class="lr-list-item"><div style="font-weight: bold;">险种1</div></div>
+  //   <div class="lr-list-item"><div>险种名称</div><span class="weChat">111111</span></div>
+  //   <div class="lr-list-item"><div>保单编号</div><span class="oICQ">1111111</span></div>
+
+
+
+
+
+
+
+
+

pages/my/userInfo/userInfo.html

@@ -5,6 +5,7 @@
         <img alt="" src="images/on-boy.jpg">
     </div>
     <div class="lr-list-item"><div>账号</div><span class="account"></span></div>
+    <div class="lr-list-item"><div>车牌</div><span class="my-plate"></span></div>
     <div class="lr-list-item"><div>工号</div><span class="enCode"></span></div>
     <div class="lr-list-item"><div>姓名</div><span class="realName"></span></div>
     <div class="lr-list-item"><div>性别</div><span class="gender"></span></div>
@@ -12,4 +13,5 @@
     <div class="lr-list-item"><div>部门</div><span class="department"></span></div>
     <div class="lr-list-item"><div>岗位</div><span class="post"></span></div>
     <div class="lr-list-item"><div>角色</div><span class="role"></span></div>
+    
 </div>

pages/my/userInfo/userInfo.js

@@ -12,6 +12,7 @@
 			}
 
             $page.find('.account').text(baseinfo.account);
+            $page.find('.my-plate').text(baseinfo.plate);
             $page.find('.enCode').text(baseinfo.enCode);
             $page.find('.realName').text(baseinfo.realName);
             $page.find('.gender').text(baseinfo.gender == 1 ? '男' : '女');

scripts/rlmuidebug.js

@@ -5090,10 +5090,13 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
                     g.find('[data-value="' + k + '"]').addClass("f-active");
                     var j = i[0].callback;
                     j && j(k)
+                    // console.log(j(k));
+                    console.log('aa')
                 }
+                console.log('bb')
                 h = null;
                 i = null;
-                g = null
+                g = null;
             });
             return d.find(".f-toptab-content-item")
         }