Mike 7 years ago
parent
commit
b830ebccee

+ 8 - 4
miaomiao/www/js/controllers/home.js

xqd xqd
@@ -225,8 +225,10 @@
                 msg.hide();
                 console.log(result);
                 $scope.dream = result.data.data;
-                $scope.dream.video = config.imgServer+$scope.dream.video;
-                $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
+                if($scope.dream.video){
+                    $scope.dream.video = config.imgServer+$scope.dream.video;
+                    $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
+                }
                 var reg = new RegExp("\n", "g");
                 $scope.dream.about = $scope.dream.about.replace(reg, "<br/>");
                 var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
@@ -587,8 +589,10 @@
                     msg.hide();
                     console.log(result);
                     $scope.dream = result.data.data;
-                    $scope.dream.video = config.imgServer+$scope.dream.video;
-                    $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
+                    if($scope.dream.video){
+                        $scope.dream.video = config.imgServer+$scope.dream.video;
+                        $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
+                    }
                     var reg = new RegExp("\n", "g");
                     $scope.dream.about = $scope.dream.about.replace(reg, "<br/>");
                     var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));

+ 1 - 1
miaomiao/www/js/controllers/my.js

xqd
@@ -9,8 +9,8 @@
         });
         $scope.setAvator = function () {
             common.setAvator().then(function (result) {
-                console.log(response.data.file)
                 var response = JSON.parse(result.response);
+                console.log(response.data.file)
                 $timeout(function () {
                     $scope.user.avatar = config.imgServer + response.data.file;
                 });

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

xqd xqd
@@ -46,7 +46,7 @@
                     <ion-slides slider="data.slider">
                         <ion-slide-page ng-if="dream.video">
                             <div class="box banner">
-                                <video ng-src="{{dream.video | trustUrl}}" poster="{{dream.vpic}}" width="100%" style="max-height: 400px" class="centerme" controls="controls" ></video>
+                                <video ng-src="{{dream.video | trustUrl}}" ng-poster="{{dream.vpic}}" width="100%" style="max-height: 400px" class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >
@@ -120,7 +120,7 @@
                     </div>
                 </div>
             </div>
-            <div style="width: 152px; margin: 0 auto">
+            <div style="width: 152px; margin: 0 auto" ng-if="dream.code">
                 <img ng-src="{{dream.code}}" style="width: 150px; height: 150px">
             </div>
         </div>

+ 1 - 1
server/app/Http/Controllers/Api/V1/Controller.php

xqd
@@ -30,7 +30,7 @@ class Controller extends BaseController
         $this->middleware('auth:api', [
             'except' => [
                 'upload', 'getCode', 'reset', 'login', 'get', 'register', 'alipayNotify', 'wechatpayNotify',
-                'get', 'area', 'get_province', 'get_city', 'get_county', 'test','index/home','attachment/download/*'
+                'get', 'area', 'attachment.download', 'attachment.upload', 'test','index/home','attachment/download/*'
             ]
         ]);