add

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/my/my-recharge.html

@@ -39,7 +39,7 @@
             </ion-list>
         </div>
         <div class="padding">
-            <button  class="button button-block button-calm" ng-click="testcharge(vm.number)">
+            <button  class="button button-block button-calm" ng-click="charge(vm.number)">
                 支付
             </button>
         </div>

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -89,7 +89,7 @@ class AuthController extends Controller
         $phone = $request->phone;
         $wechat = $request->wechat;
 
-        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxc5181c0d406023e6&secret=c349515d0079ccbc71f4a4f191c1621e&code=".$wechat."&grant_type=authorization_code";
+        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxc5181c0d406023e6&secret=82d15bf4c5c5baaad1e5a521cfdcf96c&code=".$wechat."&grant_type=authorization_code";
         $res = file_get_contents($url);     //file_get_contents获取指定路由返回的数据
         \Log::info($res);
         $arr = json_decode($res, true);
@@ -181,7 +181,7 @@ class AuthController extends Controller
             return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
 
 
-        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxc5181c0d406023e6&secret=c349515d0079ccbc71f4a4f191c1621e&code=".$request->wechat."&grant_type=authorization_code";
+        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxc5181c0d406023e6&secret=82d15bf4c5c5baaad1e5a521cfdcf96c&code=".$request->wechat."&grant_type=authorization_code";
         $res = file_get_contents($url);     //file_get_contents获取指定路由返回的数据
         \Log::info($res);
         $arr = json_decode($res, true);