add

miaomiao/www/js/controllers/account.js

@@ -3,64 +3,34 @@
         function ($scope,userService,$ionicNavBarDelegate, storage, $state, msg, $http, util) {
             //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
-<<<<<<< HEAD
                 //var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                //Wechat.auth(scope, state, function (response) {
-                //    // alert("response:"+JSON.stringify(response));
-                //    // var response={code:1231};
-                //   if(response.code){
-                //       //msg.loading('登录中...');
-                //       msg.loading();
-                //       userService.wechat_login(response.code).then(function(result){
-                //           msg.hide();
-                //            // alert("wechat_login success: " + JSON.stringify(result));
-                //           if(result.data.data){
-                //               storage.setObject('user', result.data.data.user);
-                //               storage.set('token', result.data.data.token);
-                //               $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                //               $scope.user=storage.getObject('user');
-                //               $state.go('app.home');
-                //           }else{
-                //               $state.go("loginAccount",{wechat:response.code})
-                //           }
-                //       },function(error){
-                //            console.log("loginbywx Failed: " + JSON.stringify(error));
-                //           $state.go("loginAccount",{wechat:$scope.wecaht});
-                //       });
-                //   }
-                //}, function (error) {
-                //   console.log("Failed: " + JSON.stringify(error));
-                //})
-                 $state.go("loginAccount",{wechat:1231});
-=======
-                var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                 Wechat.auth(scope, state, function (response) {
-                     // alert("response:"+JSON.stringify(response));
-                     // var response={code:1231};
-                    if(response.code){
-                        msg.loading('登录中...');
-                        userService.wechat_login(response.code).then(function(result){
-                            msg.hide();
-                             // alert("wechat_login success: " + JSON.stringify(result));
-                            if(result.data.data.user){
-                                storage.setObject('user', result.data.data.user);
-                                storage.set('token', result.data.data.token);
-                                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                                $scope.user=storage.getObject('user');
-                                $state.go('app.home');
-                            }else{
-                                $state.go("loginAccount",{wechat:result.data.data.openid})
-                            }
-                        },function(error){
-                             console.log("loginbywx Failed: " + JSON.stringify(error));
-                            $state.go("loginAccount");
-                        });
-                    }
-                 }, function (error) {
-                    console.log("Failed: " + JSON.stringify(error));
-                 })
-                // $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
->>>>>>> 12e5208308dc8fe23ee8e47511e275104dcc5c77
+                // Wechat.auth(scope, state, function (response) {
+                //     // alert("response:"+JSON.stringify(response));
+                //     // var response={code:1231};
+                //    if(response.code){
+                //        msg.loading('登录中...');
+                //        userService.wechat_login(response.code).then(function(result){
+                //            msg.hide();
+                //             // alert("wechat_login success: " + JSON.stringify(result));
+                //            if(result.data.data.user){
+                //                storage.setObject('user', result.data.data.user);
+                //                storage.set('token', result.data.data.token);
+                //                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                //                $scope.user=storage.getObject('user');
+                //                $state.go('app.home');
+                //            }else{
+                //                $state.go("loginAccount",{wechat:result.data.data.openid})
+                //            }
+                //        },function(error){
+                //             console.log("loginbywx Failed: " + JSON.stringify(error));
+                //            $state.go("loginAccount");
+                //        });
+                //    }
+                // }, function (error) {
+                //    console.log("Failed: " + JSON.stringify(error));
+                // })
+                 $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+
             }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

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

@@ -157,7 +157,7 @@
                         </a>
                     </div>
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                        <div ng-click="replay($event,dream.user.nickname,$index)">
+                        <div ng-click="replay($event,dream.user.nickname,dream.user.id,$index)">
                             <img class="head" ng-src="{{dream.user.avatar | avator}}" />
                             <span class="utitle">{{dream.user.nickname}}</span>
                             <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->