add

miaomiao/www/js/controllers/account.js

@@ -3,7 +3,7 @@
         function ($scope,userService,$ionicNavBarDelegate, storage, $state, msg, $http, util) {
              //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
-                var scope = "snsapi_userinfo", state = "_" + (+new Date());
+                /*var scope = "snsapi_userinfo", state = "_" + (+new Date());
                  Wechat.auth(scope, state, function (response) {
                      // alert("response:"+JSON.stringify(response));
                      // var response={code:1231};
@@ -28,8 +28,8 @@
                     }
                  }, function (error) {
                     console.log("Failed: " + JSON.stringify(error));
-                 })
-                //$state.go("loginAccount",{wechat:1231});
+                 })*/
+                $state.go("loginAccount",{wechat:1231});
             }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

miaomiao/www/js/controllers/home.js

@@ -467,19 +467,6 @@
                 $scope.dream.interactions[index].showmore = true;
             }
         }
-<<<<<<< HEAD
-            $scope.replay = function ($event, name, index) {
-                $event.stopPropagation();
-                    $scope.input.focus = true;
-                    $scope.input.show = true;
-                    angular.forEach($scope.dream.interactions, function (item) {
-                        item.show = false;
-                    });
-                    $scope.dream.interactions[index].show = true;
-                    $scope.input.placeholder = "评论" + name+":";
-                    $scope.vm.title='';
-                };
-=======
         $scope.replay = function ($event, name, index) {
             $event.stopPropagation();
             $scope.input.focus = true;
@@ -493,7 +480,6 @@
             $scope.vm.title='';
             $scope.vm.comment='';
         }
->>>>>>> f2571e20d6179699190a3d56c9be92ec756fa1ef
         $scope.replayOther = function ($event, name, index,currentindex) {
             $event.stopPropagation();
             if($scope.dream.interactions[index].comments[currentindex].user_id!=$scope.user.id){

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

@@ -19,13 +19,8 @@
             <div ng-if="timer!='已结束'&& 100*dream.get_coin/dream.coin<100" class="col dreamButton">
                 <button class="button button-calm" ng-click="support($event)">支持</button>
             </div>
-<<<<<<< HEAD
             <div ng-if="codeBtn && user.id==dream.top3user[0].id" class="col dreamButton">
                 <button ng-click="openCode($event)" class="button button-calm" style="border: 1px solid #00C3DA">
-=======
-            <div ng-if="timer=='已结束'|| 100*dream.get_coin/dream.coin>=100" class="col dreamButton">
-                <button ng-click="openCode()" class="button button-calm" style="border: 1px solid #00C3DA">
->>>>>>> f2571e20d6179699190a3d56c9be92ec756fa1ef
                     二维码
                 </button>
             </div>