فهرست منبع

问答系统修改

任敬轩 3 سال پیش
والد
کامیت
8795732e38

+ 60 - 64
app/Http/Controllers/Account/ProfileController.php

@@ -22,38 +22,38 @@ class ProfileController extends Controller
     public function anyBase(Request $request)
     {
         $user = $request->user();
-        if($request->isMethod('POST')){
+        if ($request->isMethod('POST')) {
             $request->flash();
             $validateRules = [
                 'name' => 'required|max:128',
                 'title' => 'sometimes|max:128',
                 'description' => 'sometimes|max:9999',
             ];
-            $this->validate($request,$validateRules);
+            $this->validate($request, $validateRules);
             $user->name = $request->input('name');
             $user->gender = $request->input('gender');
-            if($request->input('birthday')){
+            if ($request->input('birthday')) {
                 $user->birthday = $request->input('birthday');
             }
             $user->title = $request->input('title');
             $user->description = $request->input('description');
             $user->province = $request->input('province');
             $user->city = $request->input('city');
-            if($request->hasFile('qrcode')){
+            if ($request->hasFile('qrcode')) {
                 $validateRules = [
-                    'qrcode' => 'required|image|max:'.config('tipask.upload.image_size'),
+                    'qrcode' => 'required|image|max:' . config('tipask.upload.image_size'),
                 ];
-                $this->validate($request,$validateRules);
+                $this->validate($request, $validateRules);
                 $file = $request->file('qrcode');
                 $extension = $file->getClientOriginalExtension();
-                $filePath = 'qrcodes/'.gmdate("Y")."/".gmdate("m")."/".uniqid(str_random(8)).'.'.$extension;
-                Storage::disk('local')->put($filePath,File::get($file));
-                Image::make(storage_path('app/'.$filePath))->resize(320,435)->save();
-                $user->qrcode = str_replace("/","-",$filePath);
+                $filePath = 'qrcodes/' . gmdate("Y") . "/" . gmdate("m") . "/" . uniqid(str_random(8)) . '.' . $extension;
+                Storage::disk('local')->put($filePath, File::get($file));
+                Image::make(storage_path('app/' . $filePath))->resize(320, 435)->save();
+                $user->qrcode = str_replace("/", "-", $filePath);
             }
 
             $user->save();
-            return $this->success(route('auth.profile.base'),'个人资料修改成功');
+            return $this->success(route('auth.profile.base'), '个人资料修改成功');
 
         }
         $provinces = Area::provinces();
@@ -63,7 +63,7 @@ class ProfileController extends Controller
             'cities' => $cities,
         ];
 
-        return view('theme::profile.base')->with('data',$data);
+        return view('theme::profile.base')->with('data', $data);
     }
 
     function upload_image($path, $file, $drive = 'oss')
@@ -84,30 +84,29 @@ class ProfileController extends Controller
     {
 
 
-
         $validateRules = [
             'user_avatar' => 'required|image',
         ];
 
-        if($request->hasFile('user_avatar')){
-            $this->validate($request,$validateRules);
+        if ($request->hasFile('user_avatar')) {
+            $this->validate($request, $validateRules);
             $user_id = $request->user()->id;
             $file = $request->file('user_avatar');
             $avatarDir = User::getAvatarDir($user_id);
             $extension = strtolower($file->getClientOriginalExtension());
             $extArray = array('png', 'gif', 'jpeg', 'jpg');
 
-            if(in_array($extension, $extArray)){
+            if (in_array($extension, $extArray)) {
 //	            if($extension != 'jpg'){
 //                    Image::make(File::get($file))->save(storage_path('app/'.User::getAvatarPath($user_id,'origin')));
 //                    Image::make(File::get($file))->save(app('path.public').'/static/uploads/user_origin_'.$user_id.'.jpg');
-                    $path = 'avatar/' . date("Ym/d", time());
-                    $data['qrcode'] = $this->upload_image($path, $request->user_avatar);
-                    DB::table('users')->where('id','=',$user_id)->update($data);
+                $path = 'avatar/' . date("Ym/d", time());
+                $data['qrcode'] = $this->upload_image($path, $request->user_avatar);
+                DB::table('users')->where('id', '=', $user_id)->update($data);
 //                }else{
 //                    Storage::disk('local')->put($avatarDir.'/'.User::getAvatarFileName($user_id,'origin').'.'.$extension,File::get($file));
 //                }
-            }else{
+            } else {
                 return response('error');
             }
 
@@ -117,7 +116,7 @@ class ProfileController extends Controller
             ));
         }
 
-        if($request->isMethod('POST')){
+        if ($request->isMethod('POST')) {
             $x = intval($request->input('x'));
             $y = intval($request->input('y'));
             $width = intval($request->input('width'));
@@ -133,14 +132,14 @@ class ProfileController extends Controller
 //            Image::make(storage_path('app/'.User::getAvatarPath($user_id,'origin')))->crop($width,$height,$x,$y)->resize(24,24)->save(storage_path('app/'.User::getAvatarPath($user_id,'small')));
 //            $path = 'avatar/' . date("Ym/d", time());
 //            $data['qrcode'] = $this->upload_image($path, $request->user_avatar);
-            File::delete(app('path.public').'/static/uploads/user_big_'.$user_id.'.jpg');
-            File::delete(app('path.public').'/static/uploads/user_middle_'.$user_id.'.jpg');
-            File::delete(app('path.public').'/static/uploads/user_small_'.$user_id.'.jpg');
-            Image::make(storage_path('app/'.User::getAvatarPath($user_id,'origin')))->crop($width,$height,$x,$y)->resize(128,128)->save(app('path.public').'/static/uploads/user_big_'.$user_id.'.jpg');
-            Image::make(storage_path('app/'.User::getAvatarPath($user_id,'origin')))->crop($width,$height,$x,$y)->resize(64,64)->save(app('path.public').'/static/uploads/user_middle_'.$user_id.'.jpg');
-            Image::make(storage_path('app/'.User::getAvatarPath($user_id,'origin')))->crop($width,$height,$x,$y)->resize(24,24)->save(app('path.public').'/static/uploads/user_small_'.$user_id.'.jpg');
-            $data['qrcode'] = '/static/uploads/user_big_'.$user_id.'.jpg';
-            DB::table('users')->where('id','=',$user_id)->update($data);
+            File::delete(app('path.public') . '/static/uploads/user_big_' . $user_id . '.jpg');
+            File::delete(app('path.public') . '/static/uploads/user_middle_' . $user_id . '.jpg');
+            File::delete(app('path.public') . '/static/uploads/user_small_' . $user_id . '.jpg');
+            Image::make(storage_path('app/' . User::getAvatarPath($user_id, 'origin')))->crop($width, $height, $x, $y)->resize(128, 128)->save(app('path.public') . '/static/uploads/user_big_' . $user_id . '.jpg');
+            Image::make(storage_path('app/' . User::getAvatarPath($user_id, 'origin')))->crop($width, $height, $x, $y)->resize(64, 64)->save(app('path.public') . '/static/uploads/user_middle_' . $user_id . '.jpg');
+            Image::make(storage_path('app/' . User::getAvatarPath($user_id, 'origin')))->crop($width, $height, $x, $y)->resize(24, 24)->save(app('path.public') . '/static/uploads/user_small_' . $user_id . '.jpg');
+            $data['qrcode'] = '/static/uploads/user_big_' . $user_id . '.jpg';
+            DB::table('users')->where('id', '=', $user_id)->update($data);
             return response()->json(array(
                 'status' => 1,
                 'msg' => '头像截剪成功'
@@ -155,23 +154,23 @@ class ProfileController extends Controller
      */
     public function anyPassword(Request $request)
     {
-        if($request->isMethod('POST')){
+        if ($request->isMethod('POST')) {
             $validateRules = [
                 'old_password' => 'required|min:6|max:16',
                 'password' => 'required|min:6|max:16',
-                'password_confirmation'=>'same:password',
+                'password_confirmation' => 'same:password',
                 'captcha' => 'required|captcha',
 
             ];
-            $this->validate($request,$validateRules);
+            $this->validate($request, $validateRules);
 
             $user = $request->user();
 
-            if(Hash::check($request->input('old_password'),$user->password)){
+            if (Hash::check($request->input('old_password'), $user->password)) {
                 $user->password = Hash::make($request->input('password'));
                 $user->save();
                 Auth()->logout();
-                return $this->success(route('auth.user.login'),'密码修改成功,请重新登录');
+                return $this->success(route('auth.user.login'), '密码修改成功,请重新登录');
             }
 
             return redirect(route('auth.profile.password'))
@@ -185,31 +184,30 @@ class ProfileController extends Controller
     /*修改邮箱*/
     public function anyEmail(Request $request)
     {
-        if($request->isMethod('POST'))
-        {
+        if ($request->isMethod('POST')) {
             $validateRules = [
-                'email' => 'required|email|unique:users,email,'.$request->user()->id,
+                'email' => 'required|email|unique:users,email,' . $request->user()->id,
                 'captcha' => 'required|captcha',
             ];
-            $this->validate($request,$validateRules);
+            $this->validate($request, $validateRules);
 
-            if($request->input('email') !== $request->user()->email){
+            if ($request->input('email') !== $request->user()->email) {
                 $request->user()->email = $request->input('email');
                 $request->user()->status = 0;
                 $request->user()->save();
                 $emailToken = EmailToken::create([
-                    'email' =>$request->input('email'),
+                    'email' => $request->input('email'),
                     'action' => 'verify',
                     'token' => EmailToken::createToken(),
                 ]);
 
-                if($emailToken){
-                    $subject = '欢迎注册'.Setting()->get('website_name').',请激活您注册的邮箱!';
-                    $content = "「".$request->user()->name."」您好,请激活您在 ".Setting()->get('website_name')." 的注册邮箱!<br /> 请在1小时内点击该链接激活注册账号 → ".route('auth.email.verifyToken',['action'=>$emailToken->action,'token'=>$emailToken->token])."<br />如非本人操作,请忽略此邮件!";
-                    $this->sendEmail($emailToken->email,$subject,$content);
+                if ($emailToken) {
+                    $subject = '欢迎注册' . Setting()->get('website_name') . ',请激活您注册的邮箱!';
+                    $content = "「" . $request->user()->name . "」您好,请激活您在 " . Setting()->get('website_name') . " 的注册邮箱!<br /> 请在1小时内点击该链接激活注册账号 → " . route('auth.email.verifyToken', ['action' => $emailToken->action, 'token' => $emailToken->token]) . "<br />如非本人操作,请忽略此邮件!";
+                    $this->sendEmail($emailToken->email, $subject, $content);
                 }
 
-                return $this->success(route('auth.profile.email'),'邮箱修改成功!一封验证邮件已经发到您的邮箱'.$request->user()->email.',请登陆邮箱进行验证!');
+                return $this->success(route('auth.profile.email'), '邮箱修改成功!一封验证邮件已经发到您的邮箱' . $request->user()->email . ',请登陆邮箱进行验证!');
             }
 
         }
@@ -219,19 +217,19 @@ class ProfileController extends Controller
 
     public function anyMobile(Request $request)
     {
-        if($request->isMethod('post')){
+        if ($request->isMethod('post')) {
             $validateRules = [
-                'mobile' => 'required|max:11,'.$request->user()->id,
+                'mobile' => 'required|max:11,' . $request->user()->id,
                 'code' => 'required|min:4|max:10',
             ];
 
-            $this->validate($request,$validateRules);
+            $this->validate($request, $validateRules);
 
             $mobile = $request->input('mobile');
             $code = $request->input('code');
 
-            if(!SmsService::verifySmsCode($mobile,$code)){
-                return $this->error(route('auth.profile.mobile'),"短信验证码错误,请重新验证");
+            if (!SmsService::verifySmsCode($mobile, $code)) {
+                return $this->error(route('auth.profile.mobile'), "短信验证码错误,请重新验证");
             }
 
             $request->user()->mobile = $mobile;
@@ -239,14 +237,12 @@ class ProfileController extends Controller
             $request->user()->save();
             $request->user()->userData->mobile_status = 1;
             $request->user()->userData->save();
-            return $this->success(route('auth.profile.mobile'),'手机号码绑定成功!');
+            return $this->success(route('auth.profile.mobile'), '手机号码绑定成功!');
         }
         return view('theme::profile.mobile');
     }
 
 
-
-
     /*第三方系统账号绑定*/
     public function anyOauth()
     {
@@ -257,25 +253,25 @@ class ProfileController extends Controller
     /*消息通知设置*/
     public function anyNotification(Request $request)
     {
-        if($request->isMethod('post')){
-            $siteNotifications = $request->input('site_notifications','');
-            $emailNotifications = $request->input('email_notifications','');
+        if ($request->isMethod('post')) {
+            $siteNotifications = $request->input('site_notifications', '');
+            $emailNotifications = $request->input('email_notifications', '');
             $request->user()->site_notifications = '';
-            if($siteNotifications){
-                $request->user()->site_notifications = implode(",",$siteNotifications);
+            if ($siteNotifications) {
+                $request->user()->site_notifications = implode(",", $siteNotifications);
             }
             $request->user()->email_notifications = '';
-            if($emailNotifications){
-                $request->user()->email_notifications = implode(",",$emailNotifications);
+            if ($emailNotifications) {
+                $request->user()->email_notifications = implode(",", $emailNotifications);
             }
 
             $request->user()->save();
-            return $this->success(route('auth.profile.notification'),'通知提醒策略设置成功');
+            return $this->success(route('auth.profile.notification'), '通知提醒策略设置成功');
 
         }
-        $siteNotifications = explode(",",$request->user()->site_notifications);
-        $emailNotifications = explode(",",$request->user()->email_notifications);
-        return view('theme::profile.notification')->with(compact('siteNotifications','emailNotifications'));
+        $siteNotifications = explode(",", $request->user()->site_notifications);
+        $emailNotifications = explode(",", $request->user()->email_notifications);
+        return view('theme::profile.notification')->with(compact('siteNotifications', 'emailNotifications'));
 
     }
 

+ 20 - 13
app/Http/Controllers/Admin/RecommendationController.php

@@ -6,6 +6,8 @@ use App\Models\Recommendation;
 use Illuminate\Http\Request;
 use App\Http\Requests;
 use Illuminate\Support\Facades\Config;
+use DB;
+use App\Http\Controllers\Account\ProfileController;
 
 class RecommendationController extends AdminController
 {
@@ -54,17 +56,19 @@ class RecommendationController extends AdminController
         $request->flash();
         $this->validate($request,$this->validateRules);
         $recommendation = Recommendation::create($request->all());
-        if($request->hasFile('logo')){
-            $savePath = storage_path('app/recommendations');
+        if ($request->hasFile('logo')) {
             $file = $request->file('logo');
-            $fileName = uniqid(str_random(8)).'.'.$file->getClientOriginalExtension();
-            $target = $file->move($savePath,$fileName);
-            if($target){
-                $recommendation->logo = 'recommendations-'.$fileName;
+            $extension = strtolower($file->getClientOriginalExtension());
+            $extArray = array('png', 'gif', 'jpeg', 'jpg');
+            $upload = new ProfileController();
+            if (in_array($extension, $extArray)) {
+                $path = 'avatar/' . date("Ym/d", time());
+                $recommendation->logo = $upload->upload_image($path, $request->logo);
                 $recommendation->save();
+            } else {
+                return response('error');
             }
         }
-
         return $this->success(route('admin.recommendation.index'),'推荐添加成功');
 
     }
@@ -104,13 +108,16 @@ class RecommendationController extends AdminController
         $recommendation->url = $request->input('url');
         $recommendation->sort = $request->input('sort');
         $recommendation->status = $request->input('status');
-        if($request->hasFile('logo')){
-            $savePath = storage_path('app/recommendations');
+        if ($request->hasFile('logo')) {
             $file = $request->file('logo');
-            $fileName = uniqid(str_random(8)).'.'.$file->getClientOriginalExtension();
-            $target = $file->move($savePath,$fileName);
-            if($target){
-                $recommendation->logo = 'recommendations-'.$fileName;
+            $extension = strtolower($file->getClientOriginalExtension());
+            $extArray = array('png', 'gif', 'jpeg', 'jpg');
+            $upload = new ProfileController();
+            if (in_array($extension, $extArray)) {
+                $path = 'avatar/' . date("Ym/d", time());
+                $recommendation->logo = $upload->upload_image($path, $request->logo);
+            } else {
+                return response('error');
             }
         }
         $recommendation->save();

+ 19 - 12
app/Http/Controllers/Admin/TagController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Controllers\Account\ProfileController;
 use App\Models\Category;
 use App\Models\Tag;
 use Illuminate\Http\Request;
@@ -78,13 +79,16 @@ class TagController extends AdminController
         $request->flash();
         $this->validate($request,$this->validateRules);
         $data = $request->all();
-        if($request->hasFile('logo')){
-            $savePath = storage_path('app/tags/'.gmdate('ym'));
+        if ($request->hasFile('logo')) {
             $file = $request->file('logo');
-            $fileName = uniqid(str_random(8)).'.'.$file->getClientOriginalExtension();
-            $target = $file->move($savePath,$fileName);
-            if($target){
-                $data['logo'] = 'tags-'.gmdate('ym').'-'.$fileName;
+            $extension = strtolower($file->getClientOriginalExtension());
+            $extArray = array('png', 'gif', 'jpeg', 'jpg');
+            $upload = new ProfileController();
+            if (in_array($extension, $extArray)) {
+                $path = 'avatar/' . date("Ym/d", time());
+                $data['logo'] = $upload->upload_image($path, $request->logo);
+            } else {
+                return response('error');
             }
         }
         Tag::create($data);
@@ -137,13 +141,16 @@ class TagController extends AdminController
         $tag->category_id = $request->input('category_id');
         $tag->summary = $request->input('summary');
         $tag->description = $request->input('description');
-        if($request->hasFile('logo')){
-            $savePath = storage_path('app/tags/'.gmdate('ym'));
+        if ($request->hasFile('logo')) {
             $file = $request->file('logo');
-            $fileName = uniqid(str_random(8)).'.'.$file->getClientOriginalExtension();
-            $target = $file->move($savePath,$fileName);
-            if($target){
-                $tag->logo = 'tags-'.gmdate('ym').'-'.$fileName;
+            $extension = strtolower($file->getClientOriginalExtension());
+            $extArray = array('png', 'gif', 'jpeg', 'jpg');
+            $upload = new ProfileController();
+            if (in_array($extension, $extArray)) {
+                $path = 'avatar/' . date("Ym/d", time());
+                $tag->logo = $upload->upload_image($path, $request->logo);
+            } else {
+                return response('error');
             }
         }
         $tag->save();

+ 9 - 6
app/Http/Controllers/IndexController.php

@@ -69,10 +69,7 @@ class IndexController extends Controller
                 return redirect()->to(route('website.index'));
             }
         }
-
-
-        if(isset($_COOKIE['token']) && Auth()->guest()==true){
-
+        if(isset($_COOKIE['token'])){// && Auth()->guest()==true 加上切换账号问答系统不更换账号
             $_COOKIE['token'] = base64_decode($_COOKIE['token']);
             $data['email'] = explode(',',$_COOKIE['token'])[0];
             $data['_token'] = csrf_token();
@@ -84,6 +81,11 @@ class IndexController extends Controller
             if($user == null){
                 $this->zhuce($data);
             }else{
+                //换密码了修改一下密码
+                if(!Hash::check($data['password'],$user->password)){
+                    $res['password'] = Hash::make($data['password']);
+                    DB::table('users')->where('email',$data['email'])->update($res);
+                }
                 $this->denglu($data);
             }
         }
@@ -99,18 +101,19 @@ class IndexController extends Controller
         $hotExperts = Cache::remember('index_hot_experts',Setting()->get('website_cache_time',1),function(){
             return  Authentication::hottest(8);
         });
+
         $hotUsers = Cache::remember('index_hot_users',30,function() {
             return  UserData::hottest(20);
         });
 
         /*热门问题*/
         $newestQuestions = Cache::remember('index_newest_questions',Setting()->get('website_cache_time',1),function() {
-            return  Question::newest(0,12);
+            return  Question::newest(0,5);
         });
 
         /*悬赏问题*/
         $rewardQuestions = Cache::remember('index_reward_questions',Setting()->get('website_cache_time',1),function() {
-            return  Question::reward(0,12);
+            return  Question::reward(0,5);
         });
 
         /*热门文章*/

+ 13 - 0
config/database.php

@@ -58,6 +58,19 @@ return [
             'dump_using_single_transaction' => true,
         ],
 
+        'mysql_test' => [
+            'driver' => 'mysql',
+            'host' => env('DB_HOST_TEST', 'colliery.nxjiewei.com'),
+            'port' => env('DB_PORT_TEST', '3306'),
+            'database' => env('DB_DATABASE_TEST', 'nxjiewei'),
+            'username' => env('DB_USERNAME_TEST', 'nxjiewei'),
+            'password' => env('DB_PASSWORD_TEST', 'Jwkj123456'),
+            'charset' => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix' => '',
+            'strict' => false,
+        ],
+
         'pgsql' => [
             'driver' => 'pgsql',
             'host' => env('DB_HOST', '127.0.0.1'),

+ 7 - 7
resources/views/admin/public/layout.blade.php

@@ -129,13 +129,13 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- User image -->
-                            <li class="user-header">
-                                <img src="{{ get_user_avatar(Auth()->user()->id,'middle') }}" class="img-circle" alt="User Image" />
-                                <p>
-                                    {{ Auth()->user()->name }}
-                                    <small>{{ Auth()->user()->title }}</small>
-                                </p>
-                            </li>
+{{--                            <li class="user-header">--}}
+{{--                                <img src="{{ get_user_avatar(Auth()->user()->id,'middle') }}" class="img-circle" alt="User Image" />--}}
+{{--                                <p>--}}
+{{--                                    {{ Auth()->user()->name }}--}}
+{{--                                    <small>{{ Auth()->user()->title }}</small>--}}
+{{--                                </p>--}}
+{{--                            </li>--}}
                             <!-- Menu Footer-->
                             <li class="user-footer">
                                 {{--<div class="pull-left">--}}

+ 1 - 1
resources/views/admin/recommendation/edit.blade.php

@@ -37,7 +37,7 @@
                                 <label>logo图片</label>
                                 <input type="file" name="logo" />
                                 <div style="margin-top: 10px;">
-                                    <img src="{{ route('website.image.show',['image_name'=>$recommendation->logo]) }}" />
+                                    <img src="{{ old('url',$recommendation->logo) }}" style="width:20%;"/>
                                 </div>
                             </div>
                             <div class="form-group">

+ 1 - 1
resources/views/admin/tag/edit.blade.php

@@ -33,7 +33,7 @@
                                 <input type="file" name="logo" />
                                 @if($tag->logo)
                                 <div style="margin-top: 10px;">
-                                    <img src="{{ route('website.image.show',['image_name'=>$tag->logo]) }}" />
+                                    <img src="{{ old('name',$tag->logo) }}" />
                                 </div>
                                 @endif
                             </div>

+ 1 - 1
resources/views/admin/tag/index.blade.php

@@ -65,7 +65,7 @@
                                             <td><input type="checkbox" name="id[]" value="{{ $tag->id }}"/></td>
                                             <td>{{ $tag->id }}</td>
                                             <td> @if($tag->logo)
-                                                    <img src="{{ route('website.image.show',['image_name'=>$tag->logo]) }}"  style="width: 27px;"/>
+                                                    <img src="{{ $tag->logo }}"  style="width: 27px;"/>
                                                 @endif
                                             </td>
                                             <td><a href="{{ route('ask.tag.index',['id'=>$tag->id,'source_type'=>'questions']) }}" target="_blank">{{ $tag->name }}</a></td>

+ 3 - 3
resources/views/themes/default/home/index.blade.php

@@ -14,7 +14,7 @@
             <div class="widget-box mb-10">
                 <h4 class="widget-box-title">最新推荐</h4>
                 <div class="job-list-item row">
-                    <div class="col-md-6">
+                    <div class="col-md-12">
                         <div id="carousel-recommendation" class="carousel slide" data-ride="carousel">
                             <!-- Indicators -->
                             <ol class="carousel-indicators">
@@ -26,8 +26,8 @@
                             <div class="carousel-inner" role="leftmodbox">
                                 @foreach($recommendItems as $key=> $recommendItem)
                                 @if($key<3)
-                                <div @if($key===0) class="item active" @else class="item" @endif>
-                                    <a href="{{ $recommendItem->url }}" target="_blank"><img src="{{ route('website.image.show',['image_name'=>$recommendItem->logo]) }}" alt="{{ $recommendItem->subject }}"></a>
+                                <div @if($key===0) class="item active" @else class="item" @endif style="height:300px;">
+                                    <a href="{{ $recommendItem->url }}" target="_blank"><img src="{{ $recommendItem->logo }}" alt="{{ $recommendItem->subject }}" style="width:100%;"></a>
                                     <div class="carousel-caption">
                                         <h4>{{ $recommendItem->subject }}</h4>
                                     </div>

+ 1 - 1
resources/views/themes/default/layout/public.blade.php

@@ -58,7 +58,7 @@
                                     <li><a href="{{ route('website.experts') }}">专家</a></li>
                                     <li><a href="{{ route('website.topic') }}">话题</a></li>
                                     <li><a href="{{ route('auth.top.coins') }}">财富榜</a></li>
-                                    <li><a href="{{ route('website.shop') }}">商城</a></li>
+{{--                                    <li><a href="{{ route('website.shop') }}">商城</a></li>--}}
                                     @if(Auth()->check())
                                     <li><a href="{{ route('auth.user.logout') }}">退出</a></li>
                                     @endif