Commit 9eb4b6d6 authored by martin's avatar martin

官网英文版错误2次修改

parent 1c840fe2
Pipeline #59 failed with stages
......@@ -98,10 +98,11 @@ class AudioController extends Controller
$type = $request->get('type');
$page = $request->get('page');
$data = IndexVideoUrl::getDataById($language_type,$request->get('num'));
$data = IndexVideoUrl::getDataById(0,$request->get('num'));
// var_dump($data->title);exit;
$list = IndexVideoUrl::query()
->where('status',0)
->where(['type'=>$type,'language_type'=>$language_type])
// ->where(['type'=>$type,'language_type'=>$language_type])
->limit(3)->paginate(3, ['*'], 'page', $page);
$navigation = IndexNavigation::query()
......
......@@ -52,25 +52,25 @@ class GoodsItemController extends Controller
}
$data5 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',5)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
$data6 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',6)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
$data7 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',7)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
return view('Index.goods_item.index')
->with(compact('data5'))
->with(compact('data6'))
......@@ -205,25 +205,25 @@ class GoodsItemController extends Controller
}
$data5 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',5)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
$data6 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',6)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
$data7 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',7)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
return view('Index.goods_item.maodian21')
->with(compact('data5'))
......@@ -272,28 +272,28 @@ class GoodsItemController extends Controller
->toArray();
$v['children'] = $children;
}
//var_dump($language_type);exit;
$data5 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',5)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
$data6 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',6)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
$data7 = IndexBanner::query()
->where('language_type','=',$language_type)
// ->where('language_type','=',$language_type)
->where('type','=',7)
->where('delete_time','=',0)
->limit(4)
->orderBy('id','desc')->get();
->orderBy('id','asc')->get();
// dump($data7);exit;
return view('Index.goods_item.maodian22')
->with(compact('data5'))
->with(compact('data6'))
......
......@@ -105,7 +105,7 @@
<div class="container1">
<div class="about-item3-t">
@if($language_type == 1)
<h1>Shenzhen fashion commercial real estate Group Co. Ltd<span>Founder / Chairman</span></h1>
<h1>fashiongroup<span>Founder / Chairman</span></h1>
@else
<h1>深圳时尚商业地产集团股份有限公司<span>创始人/董事长</span></h1>
@endif
......@@ -142,7 +142,7 @@
<span style="color: rgb(147, 137, 83); font-family: 微软雅黑, &#39;Microsoft YaHei&#39;;">
@if($language_type == 1)
Early in his life, Mr. Guo used to be a professor of art at college.
In 1988, he started his business, and had been involved in decoration and later commercial property development. In 2003, he founded Fashion Group, and started the strategical investments in domestic commercial real estate projects across the country. In 2007, he began to invest in tourist real estate properties, and became a trailblazer for underground malls and creative modes for tourist properties in China. In 2015, he began to support the Global Youth Entrepreneurship Initiative, and he aspires to become the torchbearer for young entrepreneurs.
<p>In 1988, he started his business, and had been involved in decoration and later commercial property development. In 2003, he founded Fashion Group, and started the strategical investments in domestic commercial real estate projects across the country. In 2007, he began to invest in tourist real estate properties, and became a trailblazer for underground malls and creative modes for tourist properties in China. In 2015, he began to support the Global Youth Entrepreneurship Initiative, and he aspires to become the torchbearer for young entrepreneurs.</p>
@else
1988年投身商海先后从事装饰工程和商业地产于2003年组建时尚集团全面布局国内商业地产战略投资
2007年开始进军旅游地产领域是中国地下商业中心开发运营的探路者旅游地产新模式的创想家
......@@ -214,7 +214,7 @@
<li>
@if($language_type == 1)
<a href="{{ route('engroup_strategy') }}">
<p>Group Strategy</p>
<p>Corporate Strategy</p>
<img src="{{asset('images/700542be867d675690813ed99b257b88.jpg')}}">
</a>
@else
......@@ -228,7 +228,7 @@
<li>
@if($language_type == 1)
<a href="{{ route('encore_strengths') }}">
<p>Core Strengths</p>
<p>Key Advantages</p>
<img src="{{asset('images/be3ae8904e02d25e672e6c6eef3706bd.jpg')}}">
</a>
@else
......@@ -242,7 +242,7 @@
<li>
@if($language_type == 1)
<a href="{{ route('endev_history') }}">
<p>development History</p>
<p>Development History</p>
<img src="{{asset('images/26c3c2527bd2534b6d30293b8420b76a.jpg')}} ">
</a>
@else
......@@ -256,7 +256,7 @@
@if($language_type == 1)
<a href="{{ route('enachievement') }}">
<p>Awards Achievements</p>
<p>Awards and Achievements</p>
<img src="{{asset('images/4ce0cf079c452a5983b40e42ab90ea1a.jpg')}} ">
</a>
@else
......
......@@ -20,7 +20,7 @@
<div class="about-all-t">
<p>
@if($language_type == 1)
<strong><span style="font-size: 20px;font-family: 微软雅黑, sans-serif;color: rgb(192, 0, 0);">Fashion, wealth</span></strong>
<strong><span style="font-size: 20px;font-family: 微软雅黑, sans-serif;color: rgb(192, 0, 0);">Where there is Fashion, there is fortune. </span></strong>
@else
时尚所在,财富所在
@endif
......
......@@ -46,7 +46,6 @@
@endif
@if($language_type == 1)
With unique site selection experience and mature development and operation mode, fashion group has built a perfect business combination of fashion art, bringing ultimate experience to consumers and making unique contributions to optimizing urban space, improving urban functions and upgrading urban taste.
@else
<p>
时尚集团以独到选址经验和成熟开发运营模式,构筑潮流艺术的完美商业结合体,
......
......@@ -63,7 +63,7 @@
<img src="{{asset($data->img_path)}}">
<p class="ell1">
@if($language_type == 1)
Fashion group brand album
Fashion group brand
@else
时尚集团品牌画册
@endif
......
......@@ -20,9 +20,22 @@
</div>
<div class="brand-item1" id="maodian104">
<div class="container1">
<div class="brand-item1-info">
<div class="brand-item1-info" >
@if($language_type == 1)
<small style="color: #cda971">MISSION</small>
<h1>VISION<small style="color: #cda971">VISION</small></h1>
<p>To do the most vitality of first-class commercial real estate and real estate development operators In the world, the best companies, not the biggest, but the last.</p>
<p>This is the fashion group for the success of the attitude and the attitude of the enterprise, and as a chi, the pursuit of long-term sustainable development of enterprises and the contribution and value of the community.</p>
@else
<h1>愿景<small>VISION</small></h1>
<p>做最有生命力的一流商业地产和旅游地产开发运营商</p>
<p>在全世界那些最好的企业不是最大的而是最长久的</p>
<p>这是时尚集团对于成功企业的态度和观点并以此为志追求企业长久的可持续发展及对社会的贡献和价值</p>
@endif
</div>
<div class="brand-item1-info" style="margin-top:-30px;">
@if($language_type == 1)
<h1>MISSION<small style="color: #cda971">MISSION</small></h1>
<p>Let fashion change the life so that fashion fusion art to create the possibility of fashion
Deep attention to the field of commercial real estate, the comprehensive use efficiency of continuing efforts to improve city core resources;</p>
<p>Adhere to the vision of the art of carving, so that every product has become a fashion boutique;
......@@ -36,32 +49,17 @@
<p>致力搭建平台为拥有财富梦想创业梦想职业梦想的人创造实现的可能</p>
@endif
</div>
<div class="brand-item1-info">
@if($language_type == 1)
<small style="color: #cda971">VISION</small>
<p>To do the most vitality of first-class commercial real estate and real estate development operators
In the world, the best companies, not the biggest, but the last.</p>
<p>This is the fashion group for the success of the attitude and the attitude of the enterprise, and as a chi, the pursuit of long-term sustainable development of enterprises and the contribution and value of the community.</p>
@else
<h1>愿景<small>VISION</small></h1>
<p>做最有生命力的一流商业地产和旅游地产开发运营商</p>
<p>在全世界那些最好的企业不是最大的而是最长久的</p>
<p>这是时尚集团对于成功企业的态度和观点并以此为志追求企业长久的可持续发展及对社会的贡献和价值</p>
@endif
</div>
</div>
</div>
<div class="brand-item2" id="maodian107">
<img src="{{asset('images/b4a13fdc979f8835294788eb8b38fa00.jpg')}} " >
<img src="{{asset('images/983e747635cfaf830019d9ecbb9bd0ae.jpg')}} " >
</div>
<div class="brand-item3" style="background-image: url(images/c887af714e6fe7911567afc043d5e8e4.png);" id="maodian108">
<div class="container1">
<div class="video-t">
<h1><img src="{{asset('images/04f6deebc88c3b10c77f6075a0642df5.png')}}"></h1>
<h1><img src="{{asset('images/97c1c6f567afcf6bc0a1e1064e09034e.png')}}"></h1>
</div>
<div class="brand-item3-b">
<ul class="clearfix">
......@@ -158,7 +156,7 @@
<div class="culture-item-t">
<h1>
@if($language_type == 1)
Download Zone
Downloads
@else
下载专区
@endif
......@@ -170,7 +168,7 @@
@if($language_type == 1)
<a href="{{ route('endownload') }}">
<img src="{{asset('images/2536974b87fed7bc17e799bc490c8cc9.jpg')}}">
<img src="{{asset('images/da7df3b075f8ad172215866ea59e06c1.png')}}">
<p class="ell1">Fashion group brand</p>
</a>
@else
......
......@@ -168,7 +168,7 @@
<div class="container1">
<div class="video-t">
@if($language_type == 1)
<h1>Space landscape</h1>
<h1>Event Operations</h1>
@else
<h1>空间景观</h1>
@endif
......@@ -230,7 +230,7 @@
<div class="container1">
<div class="video-t">
@if($language_type == 1)
<h1>Art block</h1>
<h1>Activity operation</h1>
@else
<h1>艺术街区</h1>
@endif
......@@ -262,7 +262,7 @@
<div class="container1">
<div class="video-t">
@if($language_type == 1)
<h1>cooperative partner</h1>
<h1>Partners</h1>
@else
<h1>合作伙伴</h1>
@endif
......
......@@ -166,7 +166,7 @@
<div class="container1">
<div class="video-t">
@if($language_type == 1)
<h1>Art block</h1>
<h1>Artistic Blocks</h1>
@else
<h1>艺术街区</h1>
@endif
......@@ -198,7 +198,7 @@
<div class="container1">
<div class="video-t">
@if($language_type == 1)
<h1>cooperative partner</h1>
<h1>Partners</h1>
@else
<h1>合作伙伴</h1>
@endif
......
......@@ -30,8 +30,8 @@
@if($language_type == 1)
<h1>2015 Annual Report</h1>
<h2>The current guidance>></h2>
<p>●Fashion creates infinite possibilities</p>
<p>●China Merchants real estate,the green body temperature,the red service in the end</p>
<p>● Enterprise temperature</p>
<p>● China Merchants real estate, the green body temperature, the red service in the end</p>
@else
<h1>时尚集团年报</h1>
<h2>本期导读>></h2>
......
......@@ -14,7 +14,7 @@
<div class="container1">
<div class="culture-item-t">
@if($language_type == 1)
<h1>Social Responsibility</h1>
<h1>Social responsibility</h1>
@else
<h1>社会责任</h1>
@endif
......@@ -40,7 +40,7 @@
<div class="container1">
<div class="culture-item-t">
@if($language_type == 1)
<h1>Cultural System</h1>
<h1>Cultural system</h1>
@else
<h1>文化体系</h1>
@endif
......@@ -56,7 +56,7 @@
<div class="container1">
<div class="culture-item-t">
@if($language_type == 1)
<h1>Annual Reports</h1>
<h1>Annual reports</h1>
@else
<h1>企业年报</h1>
@endif
......@@ -68,7 +68,7 @@
@if($language_type == 1)
<a href="{{ route('endownload_report') }}">
<img src="{{asset('images/45394a7c53fba09fe7a3baa2b8b065c2.jpg')}}">
<p class="ell1">Fashion Group annual report</p>
<p class="ell1">时尚集团年报</p>
</a>
@else
<a href="{{ route('download_report') }}">
......
......@@ -26,7 +26,7 @@
<div class="container1">
<div class="join-t">
@if($language_type == 1)
<h1>Careees</h1>
<h1>Careers</h1>
@else
<h1>就业岗位</h1>
@endif
......@@ -38,7 +38,7 @@
<a>
<img src="{{asset('images/7b0a07b77781b4cd80d1fe5948aac33e.jpg')}} " id="maodian34">
@if($language_type == 1)
<h1 class="ell1">Internship opportunities</h1>
<h1 class="ell1">Internship Opportunities</h1>
<p>
For many years, Fashion Group has nurtured a lot of professional talents for industries and trained many merit young people for the society. The internship program of Fashion Group provides internship opportunities for college graduates who are full of vigor and crave success, so that more young people may have in-depth understanding about Fashion Group and the industry of commercial real estate through their personal experiences. If you are interested in becoming an intern at Fashion Group, you may make a phone call to the branch companies of Fashion Group and contact the human resources department for detailed inquiries.
</p>
......@@ -57,12 +57,12 @@
@if($language_type == 1)
<a href="{{route('enjob_social')}}">
<img src="{{asset('images/e21b15899c0b443bc1ff2eb67f191be2.jpg')}} ">
<h1 class="ell1">Jobs</h1>
<h1 class="ell1">Careers</h1>
<p>
Employees are the most important assets for Fashion Group. Besides considerable salaries, Fashion Group also provides each excellent employee with a fair advancement channel and career developmental platform as business partner. Thanks to these outstanding manpower thoughts mechanisms, Fashion Group always owns a stable management and employee team. Currently, 70% of the intermediate and senior managers are promoted from junior positions internally. The average service time at Fashion Group for senior executives is more than five years. If you are prepared to face the challenges and pursue your career ideals, we welcome you to join Fashion Group!
<strong>
<span style="color: rgb(255, 0, 0);width:auto;height:auto;background:none;margin:0;padding:0">
(Click to get more jobs)</span>
{{-- <span style="color: rgb(255, 0, 0);width:auto;height:auto;background:none;margin:0;padding:0">--}}
{{-- (Click to get more jobs)</span>--}}
</strong>
</p>
</a>
......@@ -88,14 +88,14 @@
<h2>Contact us</h2>
<p>Shenzhen fashion commercial real estate group Limited by Share Ltd</p>
<p>Address: Shenzhen City, Futian District Jintian Road, great China International Exchange Square 2301</p>
<p>Telephone:<a href="tel:">0755-82839309</a></p>
<p>Tel:<a href="tel:">0755-82839309</a></p>
<p>Website:<a href="http://www.fashiongroup.com.cn">http://www.fashiongroup.com.cn</a></p>
<span></span>
<strong>Inland cities</strong>
<p>Shenzhen City, a super business operations limited liability company</p>
<p>Shenzhen City Super commercial operations limited liability company</p>
<p>Address: Shenzhen City, Futian District Huaqiang North Metro line three (Longgang line) Huaxin station A port</p>
<p>Telephone:<a href="tel:">0755-83225879</a></p>
<p>Tel:<a href="tel:">0755-83225879</a></p>
<p><a href="{{url('en/index')}}/#page11" class="more">See more contacts</a></p>
@else
<h2>联系我们</h2>
......
......@@ -128,7 +128,7 @@
<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
......
......@@ -104,80 +104,82 @@
</div>
</div>
{{-- <div class="news-item2">--}}
{{-- <div class="news-item2-t">--}}
{{-- <h1>--}}
{{-- @if($language_type == 1)--}}
{{-- Group news--}}
{{-- @else--}}
{{-- 集团新闻--}}
{{-- @endif--}}
{{-- </h1>--}}
{{-- </div>--}}
{{-- <div class="news-item2-b clearfix">--}}
{{-- @foreach($group_news2 as $v)--}}
{{-- <div class="news-item2-l">--}}
{{-- <div class="news-item2-all">--}}
{{-- <div class="news-yue">--}}
{{-- <strong>{{date('d',$v->release_time)}}</strong>--}}
{{-- <p>{{date('m',$v->release_time)}}--}}
{{-- @if($language_type == 0)--}}
{{-- 月--}}
{{-- @endif--}}
{{-- </p>--}}
{{-- </div>--}}
{{-- <div class="news-info">--}}
{{-- <h1 class="ell1">{{$v->title}}</h1>--}}
{{-- <p></p>--}}
{{-- <p class="p-img"><img src="{{$v->url}}{{$v->img_path}}"></p>--}}
{{-- </div>--}}
{{-- <div class="news-more">--}}
{{-- @if($language_type == 1)--}}
{{-- <a href="{{route('enarticle',['num'=>$v->num,'type'=>2])}}">Continue reading >></a>--}}
{{-- @else--}}
{{-- <a href="{{route('article',['num'=>$v->num,'type'=>2])}}">继续阅读 >></a>--}}
{{-- @endif--}}
@if($language_type == 0)
<div class="news-item2">
<div class="news-item2-t">
<h1>
@if($language_type == 1)
Group news
@else
集团新闻
@endif
</h1>
</div>
<div class="news-item2-b clearfix">
@foreach($group_news2 as $v)
<div class="news-item2-l">
<div class="news-item2-all">
<div class="news-yue">
<strong>{{date('d',$v->release_time)}}</strong>
<p>{{date('m',$v->release_time)}}
@if($language_type == 0)
@endif
</p>
</div>
<div class="news-info">
<h1 class="ell1">{{$v->title}}</h1>
<p></p>
<p class="p-img"><img src="{{$v->url}}{{$v->img_path}}"></p>
</div>
<div class="news-more">
@if($language_type == 1)
<a href="{{route('enarticle',['num'=>$v->num,'type'=>2])}}">Continue reading >></a>
@else
<a href="{{route('article',['num'=>$v->num,'type'=>2])}}">继续阅读 >></a>
@endif
{{-- </div>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- @endforeach--}}
</div>
</div>
</div>
@endforeach
{{-- <div class="news-item2-r">--}}
{{-- <div class="news-check">--}}
{{-- @if($language_type == 1)--}}
{{-- <a href="{{route("enarticle_list",['type'=>2])}}"> View all>></a>--}}
{{-- @else--}}
{{-- <a href="{{route("article_list",['type'=>2])}}"> 查看全部>></a>--}}
{{-- @endif--}}
<div class="news-item2-r">
<div class="news-check">
@if($language_type == 1)
<a href="{{route("enarticle_list",['type'=>2])}}"> View all>></a>
@else
<a href="{{route("article_list",['type'=>2])}}"> 查看全部>></a>
@endif
{{-- </div>--}}
{{-- <div class="news-item2-r-b">--}}
{{-- <ul>--}}
{{-- @foreach($group_news as $va)--}}
{{-- <li>--}}
{{-- @if($language_type == 1)--}}
{{-- <a href="{{route('enarticle',['num'=>$va->num])}}">--}}
{{-- <span>{{date('Y-m-d',$va->release_time)}}</span>--}}
{{-- <h1 class="ell1">{{$va->title}}</h1>--}}
{{-- <p></p>--}}
{{-- </a>--}}
{{-- @else--}}
{{-- <a href="{{route('article',['num'=>$va->num])}}">--}}
{{-- <span>{{date('Y-m-d',$va->release_time)}}</span>--}}
{{-- <h1 class="ell1">{{$va->title}}</h1>--}}
{{-- <p></p>--}}
{{-- </a>--}}
{{-- @endif--}}
{{-- </li>--}}
{{-- @endforeach--}}
{{-- </ul>--}}
{{-- </div>--}}
{{-- </div>--}}
</div>
<div class="news-item2-r-b">
<ul>
@foreach($group_news as $va)
<li>
@if($language_type == 1)
<a href="{{route('enarticle',['num'=>$va->num])}}">
<span>{{date('Y-m-d',$va->release_time)}}</span>
<h1 class="ell1">{{$va->title}}</h1>
<p></p>
</a>
@else
<a href="{{route('article',['num'=>$va->num])}}">
<span>{{date('Y-m-d',$va->release_time)}}</span>
<h1 class="ell1">{{$va->title}}</h1>
<p></p>
</a>
@endif
</li>
@endforeach
</ul>
</div>
</div>
{{-- </div>--}}
{{-- </div>--}}
</div>
</div>
@endif
<div class="news-item2">
<div class="news-item2-t">
<h1>
......
......@@ -63,7 +63,7 @@
</button>
@if($language_type == 1)
<a class="language" style="cursor: pointer" href="{{url('')}}">
<span class="zh">中文</span>
<span class="zh">CN</span>
</a>
@else
<a class="language" style="cursor: pointer" href="{{url('en/index')}}">
......
......@@ -69,7 +69,7 @@
</button>
@if($language_type == 1)
<a class="language" style="cursor: pointer" href="{{$zh}}">
<span class="zh">中文</span>
<span class="zh">CN</span>
</a>
@else
<a class="language" style="cursor: pointer" href="{{$en}}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment