Merge branch 'master' of ssh://git.9026.com:2212/baimeng/wuliu into dev

wl/platforms/android/AndroidManifest.xml

@@ -2,16 +2,14 @@
 <manifest android:hardwareAccelerated="true" android:versionCode="1" android:versionName="0.0.1" package="net.yihankeji.demo" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" android:supportsRtl="true">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
             <intent-filter android:label="@string/launcher_name">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

wl/platforms/android/res/xml/config.xml

@@ -4,6 +4,9 @@
     <feature name="ActionSheet">
         <param name="android-package" value="nl.xservices.plugins.actionsheet.ActionSheet" />
     </feature>
+    <feature name="RareloopAppVersion">
+        <param name="android-package" value="com.rareloop.cordova.appversion.RareloopAppVersion" />
+    </feature>
     <feature name="Camera">
         <param name="android-package" value="org.apache.cordova.camera.CameraLauncher" />
     </feature>
@@ -33,9 +36,6 @@
         <param name="android-package" value="io.ionic.keyboard.IonicKeyboard" />
         <param name="onload" value="true" />
     </feature>
-    <feature name="RareloopAppVersion">
-        <param name="android-package" value="com.rareloop.cordova.appversion.RareloopAppVersion" />
-    </feature>
     <icon density="ldpi" src="resources/android/icon/icon.png" />
     <icon density="mdpi" src="resources/android/icon/icon.png" />
     <icon density="hdpi" src="resources/android/icon/icon.png" />
@@ -47,7 +47,7 @@
     <author email="you@example.com" href="http://example.com.com/">
       Your Name Here
     </author>
-    <content original-src="index.html" src="http://192.168.1.101:8100" />
+    <content src="index.html" />
     <access launch-external="yes" origin="tel:*" />
     <access origin="*" />
     <allow-navigation href="*" />

wl/platforms/platforms.json

@@ -1,4 +1,4 @@
 {
-    "ios": "3.9.2",
-    "android": "4.1.1"
+    "android": "5.1.1",
+    "ios": "3.9.2"
 }

wl/plugins/android.json

@@ -16,9 +16,6 @@
         "cordova-plugin-camera": {
             "PACKAGE_NAME": "net.yihankeji.demo"
         },
-        "cordova-plugin-compat": {
-            "PACKAGE_NAME": "net.yihankeji.demo"
-        },
         "cordova-plugin-console": {
             "PACKAGE_NAME": "net.yihankeji.demo"
         },
@@ -44,5 +41,9 @@
             "PACKAGE_NAME": "net.yihankeji.demo"
         }
     },
-    "dependent_plugins": {}
+    "dependent_plugins": {
+        "cordova-plugin-compat": {
+            "PACKAGE_NAME": "net.yihankeji.demo"
+        }
+    }
 }

wl/www/js/controllers/goods.js

@@ -27,6 +27,7 @@
                 var more = (result.data.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;
                 $scope.items = $scope.items.concat(result.data.data);
+              
                 if (init) {
                     $scope.$broadcast('scroll.refreshComplete');
                 } else {

wl/www/templates/car/index.html

@@ -39,7 +39,7 @@
                 <div class="list">
                     <a class="item item-thumbnail-left"  ng-repeat="item in items" ng-click="detail(item)">
                         <img src="img/demo/defaultcar.png" />
-                        <h2 style="white-space:normal">【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】<span style="color:gray;">({{item.title}})</span></h2>
+                        <h2 style="white-space:normal">【{{item.begin_address }}】-【{{item.end_address }}】<span style="color:gray;">({{item.title}})</span></h2>
                         <p><span style="float:left"><b style="color:orangered">￥{{item.price}}</b><em style="padding-left:3px;font-size:0.75em">起</em></span></p>
                         <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
                     </a>

wl/www/templates/goods/index.html

@@ -36,7 +36,7 @@
                 </div>          
                 <div class="list">
                     <a class="item" ng-repeat="item in items" ng-click="detail(item)">
-                        <h2>【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】</h2>
+                        <h2>【{{item.begin_address}}】-【{{item.end_address}}】</h2>
                         <p>
                             <span style="float:left"><b style="color:orangered">￥{{item.price}}</b><em style="padding-left:3px;font-size:0.75em">起</em></span>
                             <span style="float:right">途经：{{item.midway_address | shortAddress}}</span>