Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/js/controllers/add.js

@@ -46,6 +46,7 @@
                 })
             };
             $scope.deletevideo = function (file) {
+                $scope.video = {};
                 common.deletefile(file).then(function () {
                 })
             };

miaomiao/www/js/controllers/home.js

@@ -742,6 +742,7 @@
                 common.chooseVideo().then(function (file) {
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
+                        $scope.video.server = response.data.file;
                         var file = config.imgServer+response.data.file;
                         $scope.video.isOK = true;
                         $scope.video.file = response.data.file;
@@ -754,6 +755,7 @@
                 });
             };
             $scope.deletevideo = function (file) {
+                $scope.video = {};
                 common.deletefile(file).then(function (res) {
                 },function(erro){
                     alert(JSON.stringify(erro));

miaomiao/www/templates/add/index.html

@@ -26,7 +26,7 @@
                 </a>
                 <div class="img-file-up" ng-if="video.isOK">
                     <div style="position:relative;">
-                        <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
+                        <em ng-click="deletevideo(video.server)" class="ion-ios-close-outline"></em>
                         <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>

miaomiao/www/templates/home/dream-detail.html

@@ -323,7 +323,7 @@
                 </a>
                 <div class="img-file-up" ng-if="video.isOK">
                     <div style="position:relative;">
-                        <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
+                        <em ng-click="deletevideo(video.server)" class="ion-ios-close-outline"></em>
                         <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>