1

wl/platforms/android/assets/www/templates/account/login.html

@@ -1,5 +1,5 @@
 <ion-view view-title="掌上物流网">
-    <ion-content>
+    <ion-content scroll="false">
         <div  style="margin-top:20px">
             <img src="img/logo.png"  style="width: 30%;height: auto;margin-left:35%;"/>
             <img src="img/sublogo.png" style="width:100%;height:auto" />

wl/www/js/services/myservice.js

@@ -59,6 +59,14 @@
                     url: config.server + 'api/orders/' + id,
                     method: "delete"
                 })
+            },
+            resetPassword: function (model) {
+                     return $http({
+                         url: config.server + 'api/user/password',
+                    method: "put",
+                    data: model
+                })
+               
             }
         };
     }]);

wl/www/templates/my/setPassword.html

@@ -9,7 +9,7 @@
                 <div class="item-input-placeholder">
                     <input type="password" name="password" ng-model="data.password2" highlight-color="balanced" placeholder="再次输入新密码" />
                 </div>
-                <button class="button button-block  button-assertive  button-radius-full"   ng-disabled="data.isloading" type="submit">更新密码</button>
+                <button class="button button-block  button-assertive  button-radius-full"  ng-click="reset()"  ng-disabled="data.isloading" type="submit">更新密码</button>
             </div>
         </form>
     </ion-content>

wl/www/templates/my/truck-add.html

@@ -17,7 +17,7 @@
                 <span class="input-label">
                     类型<span class="mustfill">*</span>
                 </span>
-                <select ng-model="vm.type" ng-options="x.type as x.name for x in typeOpt"></select>
+                <select ng-model="vm.type" ng-options="x.value as x.name for x in typeOpt"></select>
             </label>
             <label class="item item-input ">
                 <span class="input-label">车牌号<span class="mustfill">*</span></span>