Merge branch 'develop' of https://github.com/zcz-GitHub/Yinji into de…

…velop
canzhen · Jun 18, 2016 · 2240cda · 2240cda
2 parents 4130ee6 + 3064bc2
commit 2240cda
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/public/images/create_records/cloud_05.jpg b/public/images/create_records/cloud_05.jpg
diff --git a/public/js/record/re_checkRecord.js b/public/js/record/re_checkRecord.js
@@ -5,7 +5,9 @@ yinjiApp.controller('checkRecordCtrl',
     function($scope,$http){
         $scope.records = {};
         $scope.recordDetail = {};
+        $scope.ifShow = false;
         var tempDetail = {};
+
         //分页
         $scope.start        = 0;
         $scope.showLimit    = 10;
@@ -14,16 +16,18 @@ yinjiApp.controller('checkRecordCtrl',
         $http.get("/album_create_records/select")
         .success(function (response)
         {
-            $scope.records = response;
-
-            for(var i=0;i<$scope.records.length;i++){
-                var paths=$scope.records[i].picPath;
-                var tmparrPath=paths.split(';');
-                var arrPath=new Array(tmparrPath.length-1);
-                for(var j=0;j<(tmparrPath.length-1);j++){
-                    arrPath[j]=tmparrPath[j];
+            if (response !=null && response.length > 0){
+                $scope.ifShow = true;
+                $scope.records = response
+                for(var i=0;i<$scope.records.length;i++){
+                    var paths=$scope.records[i].picPath;
+                    var tmparrPath=paths.split(';');
+                    var arrPath=new Array(tmparrPath.length-1);
+                    for(var j=0;j<(tmparrPath.length-1);j++){
+                        arrPath[j]=tmparrPath[j];
+                    }
+                    $scope.records[i].arr_path=arrPath;
                 }
-                $scope.records[i].arr_path=arrPath;
             }
         });
 

diff --git a/resources/views/create_records/album_records.blade.php b/resources/views/create_records/album_records.blade.php
@@ -19,6 +19,9 @@
 			  <p class="datep" ng-bind="x.showTime"></p>
 			  <p class="diary" ng-bind="x.description"></p>
 			  <p name="comPath"></p>
+			  <p ng-show="!ifShow" style="padding-left: 15%;padding-top:3%;">
+				  您目前还没有任何记录哦，单击<a href="/album_create_records">添加</a>，添加您的第一条记录吧~
+			  </p>
 			  <div class="divpic">
 				  <div ng-repeat="y in x.arr_path">
 					  <img class="mypic" src="@{{y}}" name="imgview" onload="DrawImage(this);"/>
@@ -30,9 +33,11 @@
 				  <input  class="button button-pill button-tiny" type="submit" value="删除" ng-click="deleteRecord(x)">
 			  </div>
 			  <br/>
+
 		  </div>
 
 
+
 		  <div class="modal fade" id="recordDetailModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
 			  <div class="modal-dialog" role="document">
 				  <div class="modal-content"><!--modal的内容-->