Mike %!s(int64=7) %!d(string=hai) anos
pai
achega
8488cdbe98

+ 2 - 2
miaomiao/www/js/directives/directive.js

xqd
@@ -6,8 +6,8 @@
                 scope.$watch('trigger', function (value) {
                     if (value === true) {
                         $timeout(function() {
-                        element[0].focus();
-                        scope.trigger = false;
+                            element[0].focus();
+                            scope.trigger = false;
                         });
                     }
                 });

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

xqd
@@ -195,13 +195,13 @@
                             </div>
                             <div class="row">
                                 <div class="col-offset-20 col-80">
-                                    <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"关闭更多":"查看更多评论"}}</p>
+                                    <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"只看最近评论":"查看更多评论"}}</p>
                                 </div>
                             </div>
                         </div>
                         <!--<p ng-click="replay($event,dream.user.nickname,$index)" style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>-->
                         <div class="item item-input" ng-if="input.show&&interaction.show">
-                            <textarea name="comment"  focus-me="input.focus" placeholder="{{input.placeholder}}" ng-model="vm.comment" style="padding: 0 20px;"></textarea>
+                            <textarea name="comment" focus-me="input.focus" placeholder="{{input.placeholder}}" ng-model="vm.comment" style="padding: 0 20px;"></textarea>
                             <a class="button button-calm" style="margin-right:5px;line-height:35px;min-width:30px" ng-click="submitComment($index)">
                                 发送
                             </a>

+ 2 - 2
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -108,10 +108,10 @@ class AuthController extends Controller
                 'phone'=>$phone,
                 'wechat'=>$openid,
                 'jpush'=>$jpush,
+                'nickname'=>'瞄喵',
+                'status'=>1,
                 'password'=>bcrypt(123456)
             ]);
-            $user->status=1;
-            $user->save();
         }else{
             //用户已经存在,重新绑定
             $user->wechat=$wechat;