Merge branch 'v1' of http://git.yuzhankeji.cn/xuanchen/new_ine into v1

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\ConfirmsPasswords;
+
+class ConfirmPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Confirm Password Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password confirmations and
+    | uses a simple trait to include the behavior. You're free to explore
+    | this trait and override any functions that require customization.
+    |
+    */
+
+    use ConfirmsPasswords;
+
+    /**
+     * Where to redirect users when the intended url fails.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+}

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+
+class ForgotPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+}

app/Http/Controllers/Auth/LoginController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+
+class LoginController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */
+
+    use AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest')->except('logout');
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use App\User;
+use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+
+class RegisterController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
+
+    use RegistersUsers;
+
+    /**
+     * Where to redirect users after registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array  $data
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'string', 'min:8', 'confirmed'],
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param  array  $data
+     * @return \App\User
+     */
+    protected function create(array $data)
+    {
+        return User::create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'password' => Hash::make($data['password']),
+        ]);
+    }
+}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+}

app/Http/Controllers/Auth/VerificationController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\VerifiesEmails;
+
+class VerificationController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Email Verification Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling email verification for any
+    | user that recently registered with the application. Emails may also
+    | be re-sent if the user didn't receive the original email message.
+    |
+    */
+
+    use VerifiesEmails;
+
+    /**
+     * Where to redirect users after verification.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware('signed')->only('verify');
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
+}

app/Models/ArticleCategoryInfo.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+class ArticleCategoryInfo extends Model
+{
+
+    public $table = 'article_categories';
+
+}

public/assets/index/css/style.css

@@ -116,6 +116,11 @@ body {
 .Footer-tips-label {
     opacity: .9;
     line-height: 28px;
+    display: flex;
+    flex-wrap: wrap;
+}
+.Footer-tips-label span:nth-child(2){
+    margin-left: 100px;
 }
 
 .FooterBottom {
@@ -3097,7 +3102,7 @@ body {
 }
 
 .lightBox-description .lightBox-btn{
-  top:0; */
+  top:0; 
   display: inline-block;
   height: 100%;
   width:50%;
@@ -3146,3 +3151,112 @@ body {
   width:100px;
   height: 40px;
 }
+.mobile{
+    display: none;
+}
+
+/* 手机端 start */
+
+@media (max-width: 1198px) {
+    .pc{
+        display: none;
+    }
+    .mobile{
+        display: block;
+    }
+    .navHead-search{
+        margin-top: 0;
+    }
+    .banner {
+        margin-bottom: 12px;
+    }
+    .modularFive-top{
+        margin-top: 20px;
+    }
+    .publicTab-ul li{
+        font-size: 12px;
+    }
+    .publicTab-ul li img{
+        vertical-align: -9px;
+    }
+    .modularThree-list {
+        margin: 1rem 0;
+    }
+    .modularThree-list-text{
+        font-size: 1rem;
+    }
+    .mobile_module{
+        padding: 1rem 0;
+    }
+    .modularOne-label{
+        margin: 1rem 0;
+    }
+    .Link{
+        margin-top: 30px;
+    }
+    .modularEight-label,.modularServe-label{
+        margin: .5rem 0;
+    }
+    .modularSix-padding:nth-child(1) .modularServe-label, .modularSix-padding:nth-child(2) .modularServe-label, .modularSix-padding:nth-child(3) .modularServe-label{
+        margin-bottom: .5rem;
+    }
+    .mobile-nav{
+        display: none;
+        position: absolute;
+        z-index: 9999;
+        background-color: #449942;
+        color: #fff;
+        right: 0;
+        top: 4.2rem;
+        width: 50%;
+    }
+    .mobile-nav>li{
+        text-align: center;
+        font-size: 17px;
+    }
+    .mobile-nav>li:active{
+        background-color: #007900;
+    }
+    .mbLogo-nav{
+        background-color: #449942;
+        margin-left: .4rem;
+        border-radius: .5rem;
+    }
+    .partyVideo-text{
+        position: relative;
+        background-position: center;
+        background-repeat: no-repeat;
+    }
+    .briefSurvey-cont{
+        width: 100%;
+    }
+    .modularTwo-list-name{
+        font-size: 12px;
+    }
+    .FooterBottom{
+        height: 100%;
+    }
+    .srRrends-list-name{
+        font-size: 12px;
+    }
+    .srRrends-list-text{
+        width: 100%;
+    }
+    .srRrends-list-time{
+        white-space: nowrap;
+        font-size: 12px;
+    }
+    /* 二级导航 */
+    .levelLeft{
+        padding-bottom: 0;
+        margin-bottom: 20px;
+    }
+    .levelLeft-tips{
+        display: none;
+    }
+    .Footer-tips-label span:nth-child(2){
+        margin-left: 0;
+        white-space: nowrap;
+    }
+}
+/* 手机端 end */

resources/views/layouts/footer.blade.php

@@ -23,6 +23,7 @@
                     <ul class="Footer-tips">
                         <div class="Footer-tips-label">
                             <span>地址：{{  config('address') }}</span>
+                            <span>纪检监督邮箱：ZRS_jw@163.com</span>
                         </div>
                         <div class="Footer-tips-label">
                             {{--                        <span>邮件：{{  config('email') }}</span>--}}