Mike 8 年之前
父节点
当前提交
e135addaef

+ 9 - 18
miaomiao/www/js/controllers/my.js

xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
     app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg"
         , function ($scope, $state, $http, storage, myService, common, config, msg) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
-            myService.myIndex().then(function(result){
+            myService.myInfo().then(function(result){
               console.log(result.data.data);
               $scope.user = result.data.data
             });
@@ -22,30 +22,18 @@
             $state.go('app.my_profile');
         };
 
-            //我的设置
-        $scope.setting = function(){
-            myService.setting().then(function(result){
-            });
-        };
- 
-            //修改个人信息
-            $scope.myMaterial = function(){
-                myService.myMaterial().then(function(result){
-                })
-            }
+       
+  
         }]);
 
     app.controller('profileCtrl', ["$scope", "$state","$filter", "storage", "myService", "msg", "common"
       , function ($scope, $state, $filter, storage, myService, msg, common) {
             $scope.setAvator = function () {
                 common.setAvator().then(function (result) {
-                    debugger;
                     var response = JSON.parse(result.response);
                     $timeout(function () {
                         $scope.vm.user.avatar = response.data.md5;
                     });
-                }, function (error) {
-                    msg.error(JSON.stringify(error));
                 });
             };
           
@@ -60,7 +48,7 @@
             };
             $scope.$on('$ionicView.beforeEnter', function () {
                 msg.loading();
-                myService.myIndex().then(function(result){
+                myService.myInfo().then(function(result){
                   // alert(JSON.stringify(result.data.data));
                   $scope.vm = result.data.data;
                   $scope.vm.sex = $scope.vm.sex+'';
@@ -72,7 +60,7 @@
                   msg.hide();
                 },function(error){
                   msg.hide();
-                  msg.error(error.data.message);
+                  // msg.error(error.data.message);
                 })
             });
  
@@ -117,7 +105,10 @@
     app.controller('rechargeCtrl', ["$scope", "$state", "myService", "msg"
   , function ($scope, $state, myService, msg) {
        $scope.$on('$ionicView.beforeEnter', function () {
-
+           myService.myInfo().then(function(result){
+                // alert(JSON.stringify(result.data.data));
+                $scope.vm = result.data.data;
+              })
             $scope.vm = {
                 money:"",
             }

+ 2 - 2
miaomiao/www/js/services/myservice.js

xqd
@@ -64,9 +64,9 @@
                     method:"get"
                 })
             },
-            myIndex:function(){
+            myInfo:function(){
               return $http({
-                  url:config.server + "api/my/index",
+                  url:config.server + "api/my/show",
                   method:"get"
               })
             },

+ 1 - 1
miaomiao/www/templates/my/my-recharge.html

xqd
@@ -8,7 +8,7 @@
         <div class="list">
             <div class="item" style="padding:20px">
                 <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
-                <div class="re-num">50000</div>
+                <div class="re-num">{{vm.coin}}</div>
             </div>
             <div class="item item-input">
                 <span class="input-label">金额</span>

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

xqd xqd
@@ -161,7 +161,8 @@ class DreamController extends Controller
 
         $interactios = InteractionInfo::where('dream_id',$id)->orderBy('id','desc')->get();
         foreach ($interactios as $item) {
-            $item->comments = $item->comments;
+            dd($item->comments);
+            $item->with(['comments']);
             foreach ($item->comments as $comment) {
                 $comment->pic = UserInfoModel::find($comment->user_id)->pic;
                 $comment->replay = $comment->replay;
@@ -174,7 +175,7 @@ class DreamController extends Controller
 //            梦想  图片  支持者前三    支持乘数参数    用户余额   梦想分数
 
 //            $money = $user->money;
-        $number = BaseSettingsModel::where('category','score')->select('key','value')->first();
+        $number = BaseSettingsModel::where('category','score')->select('key','value')->first()->moey;
         $a = count($number) > 0 ? $number->key : '';
         $c = count($number) > 0 ? $number->value : '';
         $dream = DreamInfoModel::with(['dreamImgs','dreamUser'])->find($id);

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

xqd xqd
@@ -16,7 +16,7 @@ use App\Services\Base\ErrorCode;
 class MyController extends Controller
 {
     /**
-     * @api {get} /api/my/index 个人首页(index)
+     * @api {get} /api/my/show 个人首页(index)
      * @apiDescription 个人首页(index)
      * @apiGroup My
      * @apiPermission Passport
@@ -57,7 +57,7 @@ class MyController extends Controller
      *      }
      *}
      */
-    public function index()
+    public function show()
     {
         $user = $this->getUser();
         /*

+ 1 - 1
server/app/Models/DreamInfoModel.php

xqd
@@ -48,7 +48,7 @@ class DreamInfoModel extends BaseModel
         return $this->hasOne('App\Models\UserInfoModel','id','user_id');
     }
 
-    public function dreamImgs()
+    public function Imgs()
     {
         return $this->hasMany('App\Models\DreamImages','dream_id');
     }

+ 3 - 3
server/routes/api.php

xqd
@@ -106,9 +106,9 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
     ]);
 
 //我的
-    $api->get('my/index', [
-        'as' => 'my.index',
-        'uses' => 'MyController@index',
+    $api->get('my/show', [
+        'as' => 'my.show',
+        'uses' => 'MyController@show',
     ]);
     $api->get('my/persona', [
         'as' => 'my.persona',