Merge branch 'master' of http://gogs.jrhost.cn:4000/zmcoding/czapp

update

index.html

@@ -26,8 +26,8 @@
         <script type="text/javascript" src="data/city.js"></script>
 		<script type="text/javascript" src="data/bjtype.js"></script>
         <script type="text/javascript" src="scripts/echarts.js"></script>
-        <!-- <script type="text/javascript" src="scripts/rlmui.js"></script> -->
-        <script type="text/javascript" src="scripts/rlmuidebug.js"></script>
+        <script type="text/javascript" src="scripts/rlmui.js"></script>
+        <!-- <script type="text/javascript" src="scripts/rlmuidebug.js"></script> -->
         <script type="text/javascript" src="scripts/rlmuiex.js"></script>
         <script type="text/javascript" src="scripts/platformOverrides.js"></script>
         <script type="text/javascript" src="config/config.js"></script>

pages/amap/navigation/navigation.js

@@ -61,7 +61,6 @@
                 renlian.layer.loading(false);
                 
             });
-
             if(!param.startEnd.start){
                 renlian.layer.toast('无法获取定位点');
             }
@@ -78,9 +77,7 @@
             } 
             //根据起终点坐标规划骑行路线
             riding.search(param.startEnd.start, param.startEnd.end, function(status, result) {
-                // result即是对应的骑行路线数据信息，相关数据结构文档请参考  https://lbs.amap.com/api/javascript-api/reference/route-search#m_RidingResult
                 if (status === 'complete') {
-                    // renlian.layer.toast('绘制骑行路线完成:');
                 } else {
                     renlian.layer.toast('骑行路线数据查询失败:' + result);
                 }
@@ -108,14 +105,8 @@
                         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
-				//
 				function onError(error) {
 					console.log('code: '    + error.code    + '\n' +
 						  'message: ' + error.message + '\n');
@@ -126,21 +117,22 @@
             
 
 
-            
+            get_mobile_gps_location();
             var locationAuto = setInterval(function(){
                 if($('.f-page').length < 2){
                     clearTimeout(locationAuto);
                 }
-                if(window.lrmui.isreal){
+                
+                if(!window.lrmui.isreal){
                     get_mobile_gps_location();
                     var lnglat = presentLnglat;
-                    // var lnglat = [113.951104,22.542902];
                     if(!geocoder){
                         geocoder = new AMap.Geocoder({
                             radius: 50 
                         });
                     }
                     origin = new Array(lnglat.lat, lnglat.lng);
+                    
                     geocoder.getAddress(lnglat, function(status, result) {
                         if (status === 'complete' && result.regeocode) {
                             var address = result.regeocode.formattedAddress;
@@ -149,7 +141,7 @@
                         }else{console.log(JSON.stringify(result))}
                     });
                 }
-            }, 2000);
+            }, 6000);
 
 
 
@@ -180,21 +172,18 @@
 					// mapList.item(4).style.display = 'block';
 				},function () {
 					mapList.item(3).style.display = 'none';
-					// mapList.item(4).style.display = 'none';
 				});
             }
 
             $('#daohang-button').rlpicker({
                 data: mapList
             },function(map){
-                renlian.layer.toast(JSON.stringify(originName));
                 appAvailability.check(map,function () {//success callback
                     if(!origin){
                         renlian.layer.toast('无法获取定位点');
+                        get_mobile_gps_location();
                         return;
                     }
-                    
-                    
 					if(map == 'com.baidu.BaiduMap'){
                         checkBaidu();
                     }

scripts/rlmui.js

@@ -796,6 +796,36 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
 (function ($, renlian, fui, window) {
     "use strict";
 
+    //任联单选择框
+    $.fn.rlpicker = function (op, call) {
+        var $this = $(this);
+        if ($this.length === 0) {
+            return $this;
+        }
+        var dfop = {
+            placeholder: '请选择',
+            data: [],
+            level: 1,
+            ivalue: 'value',
+            itext: 'text'
+        };
+        $.extend(dfop, op || {});
+        dfop.callback = function () {
+            // renlian.formblur();
+        };
+
+        setTimeout(function () {
+            $this.fpoppicker(dfop).on('change', function () {
+                var $self = $(this);
+                var text = $self[0].fop.text;
+                // $self.find('.text').text(text.replace(/,/g, '/'));
+                call($self[0].fop.value);
+            });
+        }, 100);
+
+        return $this;
+    };
+
     // 选择器(初始化)
     $.fn.lrpicker = function (op) {
         var $this = $(this);