官网修改第三版

app/Http/Controllers/Index/AboutController.php

@@ -62,6 +62,7 @@ class  AboutController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;

app/Http/Controllers/Index/ArticleController.php

@@ -86,6 +86,7 @@ class ArticleController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;

app/Http/Controllers/Index/AudioController.php

@@ -62,6 +62,7 @@ class AudioController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;
@@ -103,6 +104,7 @@ class AudioController extends Controller
         $list = IndexVideoUrl::query()
             ->where('status',0)
 //            ->where(['type'=>$type,'language_type'=>$language_type])
+                ->where('type','=',$type)
             ->limit(3)->paginate(3, ['*'], 'page', $page);
 
         $navigation =  IndexNavigation::query()
@@ -119,11 +121,11 @@ class AudioController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;
         }
-
         return view('Index.audio.play',compact('data'))
             ->with('IndexNav',$navigation)
             ->with('language_type',$language_type)

app/Http/Controllers/Index/BrandCultureController.php

@@ -46,6 +46,7 @@ class BrandCultureController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;

app/Http/Controllers/Index/GoodsItemController.php

@@ -46,6 +46,7 @@ class GoodsItemController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;

app/Http/Controllers/Index/GroupCultureController.php

@@ -46,6 +46,7 @@ class GroupCultureController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;
@@ -91,7 +92,7 @@ class GroupCultureController extends Controller
             ->where('parent_id',0)
             ->where('is_show',0)
             ->where('language_type',$language_type)
-            ->orderBy('id', 'asc')
+            ->orderBy('id', 'desc')
             ->get()
             ->toArray();
 

app/Http/Controllers/Index/IndexController.php

@@ -85,7 +85,7 @@ class IndexController extends Controller
             ->where(['status'=>0])
             ->limit(4)
             ->get();
-        $events = IndexEvents::query()->where('language_type', '=', $language_type)->get();
+        $events = IndexEvents::query()->where('language_type', '=', 0)->get();
         $setting = IndexSetting::query()->first();
 
         $navigation =  IndexNavigation::query()
@@ -96,12 +96,12 @@ class IndexController extends Controller
             ->orderBy('id', 'asc')
             ->get()
             ->toArray();
-
         foreach ($navigation as $k => &$v){
             $children = IndexNavigation::query()
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;
@@ -156,6 +156,7 @@ class IndexController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;

app/Http/Controllers/Index/JoinUsController.php

@@ -39,6 +39,7 @@ class JoinUsController extends Controller
                 ->where('is_link',0)
                 ->where('is_show',0)
                 ->where('parent_id',$v['id'])
+                ->orderBy('id', 'asc')
                 ->get()
                 ->toArray();
             $v['children'] = $children;

resources/views/Index/about/about.blade.php

@@ -38,7 +38,7 @@
                     <h2><span style="font-family: 宋体, SimSun;">中国领先的商业地产开发运营商和旅游地产新模式开发运营商</span></h2>
                     <p>
                         <span style="font-family: 宋体, SimSun;">
-                            时尚集团成立于1988年，自有资产规模400多亿，2018年集团营业额780亿元，
+                            时尚集团成立于1988年，自有资产规模400多亿，2018年集团营业额近80亿元，
                             主体从事旅游商业地产、商业地产、地下商业空间开发，现于广州、深圳、南京、沈阳、阳朔等十几个城市有大型商业地产、旅游商业街投资。
                         </span>
                     </p>
@@ -106,7 +106,7 @@
                 @if($language_type == 1)
                 <h1>fashiongroup<span>Founder / Chairman</span></h1>
                 @else
-                <h1>深圳时尚商业地产集团股份有限公司<span>创始人/董事长</span></h1>
+                <h1>深圳时尚商业科技集团股份有限公司<span>创始人/董事长</span></h1>
                 @endif
 			</div>
 			<div class="about-item3-b clearfix">

resources/views/Index/index.blade.php

@@ -30,11 +30,11 @@
                 <div class="panel-more">
                     @if($language_type == 1)
                     <a href="{{route('enabout1')}}{{$val->anchor}}">
-                        <img src="{{asset('images/moreinfo.png')}}">
+                        <img src="{{asset('images/5bca7601c5c3035a2093853e118bdb17.png')}}">
                     </a>
                     @else
                     <a href="{{$val->anchor}}">
-                        <img src="{{asset('images/ea1b4947d173a224e8dcbca0549db8a2.png')}} ">
+                        <img src="{{asset('images/5bca7601c5c3035a2093853e118bdb17.png')}} ">
                     </a>
                     @endif
                 </div>
@@ -164,7 +164,7 @@
                 <div class="panel-more">
                     @if($language_type == 1)
                     <a href="{{$val->img_title}}">
-                        <img src="{{asset('images/moreinfo.png')}}">
+                        <img src="{{asset('images/5bca7601c5c3035a2093853e118bdb17.png')}}">
                     </a>
                     @else
                     <a href="{{$val->anchor}}">
@@ -186,7 +186,7 @@
                 <div class="panel-more">
                     @if($language_type == 1)
                     <a href="{{$vl->img_title}}">
-                        <img src="{{asset('images/moreinfo.png')}}">
+                        <img src="{{asset('images/5bca7601c5c3035a2093853e118bdb17.png')}}">
                     @else
                     <a href="{{$vl->anchor}}">
                         <img src="{{asset('images/ea1b4947d173a224e8dcbca0549db8a2.png')}}">
@@ -200,7 +200,7 @@
                 <div class="panel-more">
                     @if($language_type == 1)
                     <a href="{{$vl->img_title}}">
-                        <img src="{{asset('images/moreinfo.png')}}">
+                        <img src="{{asset('images/5bca7601c5c3035a2093853e118bdb17.png')}}">
                     </a>
                     @else
                     <a href="{{$vl->anchor}}">
@@ -328,7 +328,7 @@
                 <div class="panel-more">
                     @if($language_type == 1)
                     <a href="{{route('enjob_social')}}">
-                        <img src="{{asset('images/moreinfo.png')}}">
+                        <img src="{{asset('images/5bca7601c5c3035a2093853e118bdb17.png')}}">
                     </a>
                     @else
                     <a href="{{route('job_social')}}">
@@ -584,7 +584,7 @@
                         @if($language_type == 1)
                         <p><a href="http://oanew.fashiongz.com.cn/seeyon/index.jsp" target="_blank"><span></span>Group OA</a></p>
                         @else
-                        <p><a href="http://oanew.fashiongz.com.cn/seeyon/index.jsp" target="_blank"><span></span>集团OA</a></p>
+                        <p><a href="http://oa.fashiongz.com.cn/seeyon/index.jsp" target="_blank"><span></span>集团OA</a></p>
                         @endif
 
                         @if($language_type == 1)

resources/views/Index/join_us/index.blade.php

@@ -99,7 +99,7 @@
                             <p><a href="{{url('en/index')}}/#page11" class="more">See more contacts</a></p>
                         @else
                             <h2>联系我们</h2>
-                            <p>深圳时尚商业地产集团股份有限公司</p>
+                            <p>深圳时尚商业科技集团股份有限公司</p>
                             <p>地址：深圳市福田区金田南路大中华国际交易广场2301</p>
                             <p>电话：<a href="tel:">0755-82839309</a></p>
                             <p>网址：<a href="http://www.fashiongroup.com.cn">http://www.fashiongroup.com.cn</a></p>

resources/views/Index/join_us/job_social.blade.php

@@ -112,11 +112,11 @@
                                             <div class="panel-inner-b-btn">
                                                 <a href="{{$v->job_link}}" target="_blank">
                                                     @if($language_type == 1)
-                                                    I want to apply
+                                                    I want this job!
                                                     @else
                                                     我要应聘
                                                     @endif
-                                                    <span></span>
+{{--                                                    <span></span>--}}
                                                 </a>
                                             </div>
                                         </div>
@@ -132,7 +132,7 @@
                                                     @else
                                                     我要应聘
                                                     @endif
-                                                    <span></span>
+{{--                                                    <span></span>--}}
                                                 </a>
                                             </div>
                                         </div>