Mike 9 anni fa
parent
commit
6b8c5ad9c3

+ 22 - 12
wl/www/js/controllers/my.js

@@ -122,13 +122,14 @@
         }
         }
     }]);
     }]);
     
     
-    app.controller('myTruckCtrl', ['$scope', '$state', 'myService', 'msg', function ($scope, $state, myService, msg) {
+    app.controller('myTruckCtrl', ['$scope', '$state', 'myService', 'msg','config', function ($scope, $state, myService, msg,config) {
         $scope.filter = {
         $scope.filter = {
             hasMore: false,
             hasMore: false,
             page: 0,
             page: 0,
             pageSize: 10,
             pageSize: 10,
         }
         }
         $scope.items = [];
         $scope.items = [];
+        $scope.host = config.server +'/upload/photo/';
         $scope.load = function (init) {
         $scope.load = function (init) {
             if (init) {
             if (init) {
                 $scope.filter.pageIndex = 1;
                 $scope.filter.pageIndex = 1;
@@ -205,7 +206,10 @@
         { name: '其他', value: '20' }];
         { name: '其他', value: '20' }];
         $scope.save = function () {
         $scope.save = function () {
             msg.loading('保存中...');
             msg.loading('保存中...');
+            console.log('id '+$scope.vm.id);
             if ($scope.vm.id>0) {
             if ($scope.vm.id>0) {
+                $scope.vm.photo = null;
+                console.log('updateTruck '+ JSON.stringify($scope.vm));
                 myService.updateTruck($scope.vm).then(function (result) {
                 myService.updateTruck($scope.vm).then(function (result) {
                     msg.hide();
                     msg.hide();
                     $state.go('wl.my_truck');
                     $state.go('wl.my_truck');
@@ -233,21 +237,27 @@
                 uploadOptions.fileName = "photo.jpg";
                 uploadOptions.fileName = "photo.jpg";
                 uploadOptions.mimeType = "image/jpeg";
                 uploadOptions.mimeType = "image/jpeg";
                 uploadOptions.httpMethod = 'post';
                 uploadOptions.httpMethod = 'post';
+                var id = '';
+                if ($scope.vm.id>0) {
+                    id = '/'+$scope.vm.id;
+                }
                 uploadOptions.chunkedMode = true;
                 uploadOptions.chunkedMode = true;
                 var token = 'Bearer ' + localStorage['token'];
                 var token = 'Bearer ' + localStorage['token'];
                 uploadOptions.headers = { "Authorization": token };
                 uploadOptions.headers = { "Authorization": token };
+                
                 var ft = new FileTransfer();
                 var ft = new FileTransfer();
-                ft.upload(imageUri, encodeURI(config.server + "api/trucks"), function (sucess) {
-                    $timeout(function () {
-                        var res = JSON.parse(sucess.response);
-                        $scope.vm.photo = res.data.photo;
-                    });
-                    console.log('上传成功'+JSON.stringify(sucess.response));
-                    //alert('上传成功'+JSON.stringify(sucess));
-                }, function (fail) {
-                    console.log('上传失败'+JSON.stringify(fail));
-                    //alert('上传失败'+JSON.stringify(fail));
-                }, uploadOptions);
+                    ft.upload(imageUri, encodeURI(config.server + "api/trucks" + id), function (sucess) {
+                        $timeout(function () {
+                            var res = JSON.parse(sucess.response);
+                            $scope.vm.id = res.data.id;
+                            $scope.vm.photo = res.data.photo;
+                        });
+                        console.log('上传成功'+JSON.stringify(sucess.response));
+                        //alert('上传成功'+JSON.stringify(sucess));
+                    }, function (fail) {
+                        console.log('上传失败'+JSON.stringify(fail));
+                        //alert('上传失败'+JSON.stringify(fail));
+                    }, uploadOptions);
             }, function (erro) {
             }, function (erro) {
                 msg.error(erro);
                 msg.error(erro);
             });
             });

+ 1 - 1
wl/www/js/services/myservice.js

@@ -19,7 +19,7 @@
             updateTruck: function (model) {
             updateTruck: function (model) {
                 return $http({
                 return $http({
                     url: config.server + 'api/trucks/'+model.id,
                     url: config.server + 'api/trucks/'+model.id,
-                    method: "put",
+                    method: "post",
                     data: model
                     data: model
                 })
                 })
             },
             },

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

@@ -17,7 +17,7 @@
                 <span class="input-label">
                 <span class="input-label">
                     类型<span class="mustfill">*</span>
                     类型<span class="mustfill">*</span>
                 </span>
                 </span>
-                <select ng-model="vm.type" ng-options="x.value 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>
             <label class="item item-input ">
             <label class="item item-input ">
                 <span class="input-label">车牌号<span class="mustfill">*</span></span>
                 <span class="input-label">车牌号<span class="mustfill">*</span></span>

+ 1 - 1
wl/www/templates/my/truck.html

@@ -12,7 +12,7 @@
         </ion-refresher>
         </ion-refresher>
         <div class="list">
         <div class="list">
             <div class="item item-thumbnail-left" ng-repeat="item in items" ng-click="detail(item)">
             <div class="item item-thumbnail-left" ng-repeat="item in items" ng-click="detail(item)">
-                <img ng-src="{{item.photo | truckPhoto}}">
+                <img ng-src="{{host}}{{item.photo | truckPhoto}}">
                 <p>车牌号:{{item.truck_no}}</p>
                 <p>车牌号:{{item.truck_no}}</p>
                 <p>类型:{{item.type}}</p>
                 <p>类型:{{item.type}}</p>
                 <p>车长:{{item.length}}(米)</p>
                 <p>车长:{{item.length}}(米)</p>