Mike vor 8 Jahren
Ursprung
Commit
31145fece7

+ 1 - 1
miaomiao/www/js/config/config.js

xqd
@@ -1,7 +1,7 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-        server: 'http://q8.9026.com/',
+        server: 'http://localhost:8092/',
         imgServer: 'http://q8.9026.com/attachment/'
     });
 })(angular.module('app'));

+ 1 - 1
server/app/Http/Controllers/Api/V1/Controller.php

xqd
@@ -20,7 +20,7 @@ class Controller extends BaseController
 
     public function getUser()
     {
-        $this->user = UserInfoModel::where('tel','13880642880')->first();
+        $this->user = UserInfoModel::where('phone','13880642880')->first();
         return $this->user;
     }
 

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

xqd
@@ -178,7 +178,7 @@ class DreamController extends Controller
         $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);
+        $dream = DreamInfoModel::with(['imgs','user'])->find($id);
 //            $imgs = DreamImages::where('dream_id',$id)->orderBy('id','desc')->get();
 //        $info = SupportDreamModel::where('dream_id',$id)->get();
         $top3 = [] ;

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

xqd xqd
@@ -71,7 +71,7 @@ class HomeController extends Controller
         $dreams = $user->UserDream;
 
         foreach ($dreams as $dream){
-            $dream->dream_imgs = $dream->dreamImgs;
+            $dream->dream_imgs = $dream->imgs;
         }
 
         $user->score = 1000;//自定义 算法
@@ -83,7 +83,7 @@ class HomeController extends Controller
         $sup_dreams = $user->supDream;
 
         foreach ($sup_dreams as $sup_dream){
-            $sup_dream->pics = $sup_dream->dreamImgs;
+            $sup_dream->pics = $sup_dream->imgs;
         }
 
         return $this->api(compact('user','near_dream','sup_dreams','all_imgs','dreams','score'));

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

xqd xqd
@@ -386,7 +386,7 @@ class IndexController extends Controller
     public function dreams($dreams)
     {
         foreach ($dreams as $k => $dream) {
-            $dream->dream_user =  $dream->dreamUser;
+            $dream->dream_user =  $dream->user;
 //            计算被关注总人数
             $user_id =  $dream->user_id;
             $data = UserCareDream::where('dream_id',$dream->id)->get();
@@ -394,7 +394,7 @@ class IndexController extends Controller
             $dream->dream_imgs_first = $dream->dreamImgsFirst?$dream->dreamImgsFirst->pic:'';
 //            梦想详情  detailed  图片 ,评论 ,回复
             $arr = [] ;
-            $arr['dream_imgs'] = $dream->dreamImgs;
+            $arr['dream_imgs'] = $dream->imgs;
             $dream->dream_detailed = $arr;
         }
     }

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

xqd
@@ -43,12 +43,12 @@ class DreamInfoModel extends BaseModel
     protected $hidden = ['score','deleted_at','mark'];
 
 
-    public function dreamUser()
+    public function user()
     {
         return $this->hasOne('App\Models\UserInfoModel','id','user_id');
     }
 
-    public function Imgs()
+    public function imgs()
     {
         return $this->hasMany('App\Models\DreamImages','dream_id');
     }

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

xqd
@@ -61,7 +61,7 @@ class UserInfoModel extends Authenticatable
     }
     public function UserCareDream()
     {
-        return $this->belongsToMany('App\Models\DreamInfoModel','user_care_dream','user_id','dream_id')->with(['dreamUser'])->withPivot('interaction_number','dream_user_id')->orderBy('updated_at');
+        return $this->belongsToMany('App\Models\DreamInfoModel','user_care_dream','user_id','dream_id')->with(['user'])->withPivot('interaction_number','dream_user_id')->orderBy('updated_at');
     }