+ From 8acfba3a3b7b47bfd99060b5ebe8012d5977f475 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Thu, 17 Apr 2025 15:59:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=93=81=E7=89=8C=E9=87=8C=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/AboutUs.php | 73 +++++++++++++ app/index/controller/Brand.php | 43 -------- app/index/lang/en-us.php | 7 +- app/index/lang/zh-cn.php | 7 +- app/index/route/route.php | 8 +- app/index/view/about_us/mileage.html | 96 ++++++++++++++++++ app/index/view/{brand => about_us}/story.html | 0 app/index/view/brand/mileage.html | 0 public/static/index/css/achievement.css | 33 ++---- public/static/index/images/Achievement.png | Bin 0 -> 329672 bytes public/static/index/images/greyline.png | Bin 0 -> 132 bytes public/static/index/images/greyyuandian.png | Bin 0 -> 654 bytes public/static/index/images/lichengbei.png | Bin 0 -> 721 bytes public/static/index/images/yaundian.png | Bin 0 -> 556 bytes 14 files changed, 196 insertions(+), 71 deletions(-) create mode 100644 app/index/controller/AboutUs.php delete mode 100644 app/index/controller/Brand.php create mode 100644 app/index/view/about_us/mileage.html rename app/index/view/{brand => about_us}/story.html (100%) delete mode 100644 app/index/view/brand/mileage.html create mode 100755 public/static/index/images/Achievement.png create mode 100755 public/static/index/images/greyline.png create mode 100755 public/static/index/images/greyyuandian.png create mode 100755 public/static/index/images/lichengbei.png create mode 100755 public/static/index/images/yaundian.png diff --git a/app/index/controller/AboutUs.php b/app/index/controller/AboutUs.php new file mode 100644 index 00000000..5f3ce815 --- /dev/null +++ b/app/index/controller/AboutUs.php @@ -0,0 +1,73 @@ + $this->lang_id, + 'unique_label' => 'BANNER_67ff632a5f7aa' + ]) + ->type('image') + ->enabled(true) + ->visible(['id', 'title', 'title_txt_color', 'image', 'desc', 'desc_txt_color', 'link']) + ->order(['sort' => 'asc', 'id' => 'desc']) + ->select(); + View::assign('banners', $banners); + + return View::fetch('story'); + } + + /** + * 品牌里程 + */ + public function mileage() + { + $achievement = []; + $events = []; + $development = []; + + // 获取品牌里程banner + $banner = SysBannerModel::with(['items']) + ->uniqueLabel([ + 'BANNER_67ff786dc9c8d', + 'BANNER_67ff7ef1354cf', + 'BANNER_67ff7f37a0b67', + ]) + ->language($this->lang_id) + ->enabled(true) + ->select(); + if (!$banner->isEmpty()) { + $banner_map = []; + foreach ($banner as $v) { + $banner_map[$v->unique_label] = $v; + } + $achievement = $banner_map['BANNER_67ff786dc9c8d']->items->where('status', '=', 1)->toArray(); + $events = $banner_map['BANNER_67ff7ef1354cf']->items->where('status', '=', 1)->toArray(); + $development = $banner_map['BANNER_67ff7f37a0b67']->items->where('status', '=', 1)->toArray(); + // 排序(避免关联方法使用order排序bug) + array_multisort(array_column($achievement, 'sort'), SORT_ASC, array_column($achievement, 'id'), SORT_DESC, $achievement); + array_multisort(array_column($events, 'sort'), SORT_ASC, array_column($events, 'id'), SORT_DESC, $events); + array_multisort(array_column($development, 'sort'), SORT_ASC, array_column($development, 'id'), SORT_DESC, $development); + } + View::assign('achievement', $achievement); + View::assign('events', $events); + View::assign('development', $development); + + return View::fetch('mileage'); + } +} diff --git a/app/index/controller/Brand.php b/app/index/controller/Brand.php deleted file mode 100644 index 6cf7fd5d..00000000 --- a/app/index/controller/Brand.php +++ /dev/null @@ -1,43 +0,0 @@ - $this->lang_id, - 'unique_label' => 'BANNER_67ff632a5f7aa' - ]) - ->type('image') - ->enabled(true) - ->visible(['id', 'title', 'title_txt_color', 'image', 'desc', 'desc_txt_color', 'link']) - ->order(['sort' => 'asc', 'id' => 'desc']) - ->select(); - View::assign('banners', $banners); - - return View::fetch('story'); - } - - /** - * 品牌里程 - */ - public function mileage() - { - - return View::fetch('mileage'); - } -} diff --git a/app/index/lang/en-us.php b/app/index/lang/en-us.php index 27d361d4..b4d3c7dd 100644 --- a/app/index/lang/en-us.php +++ b/app/index/lang/en-us.php @@ -40,5 +40,10 @@ return [ 'search_placeholder' => 'Search model', 'no_data' => 'No Result!', 'no_video' => 'No Video!', - ] + ], + 'mileage' => [ + 'achievement' => 'Our Achievement', + 'events' => 'Brand Events', + 'development' => 'Tech Development', + ], ]; \ No newline at end of file diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php index f7c9a628..7d05af86 100644 --- a/app/index/lang/zh-cn.php +++ b/app/index/lang/zh-cn.php @@ -40,5 +40,10 @@ return [ 'search_placeholder' => '搜索型号', 'no_data' => '查询无结果!', 'no_video' => '查询无此视频!', - ] + ], + 'mileage' => [ + 'achievement' => 'ORICO荣耀', + 'events' => '品牌里程', + 'development' => '品牌活动', + ], ]; \ No newline at end of file diff --git a/app/index/route/route.php b/app/index/route/route.php index f349a2d7..335ac018 100644 --- a/app/index/route/route.php +++ b/app/index/route/route.php @@ -48,12 +48,12 @@ Route::group('faq', function() { Route::get('index', 'Faq/index'); }); -// 品牌 -Route::group('brand', function() { +// 关于我们 +Route::group('aboutus', function() { // 品牌故事 - Route::get('story', 'Brand/story'); + Route::get('story', 'AboutUs/story'); // 品牌里程 - Route::get('mileage', 'Brand/mileage'); + Route::get('mileage', 'AboutUs/mileage'); }); // 数据迁移 diff --git a/app/index/view/about_us/mileage.html b/app/index/view/about_us/mileage.html new file mode 100644 index 00000000..e8ada267 --- /dev/null +++ b/app/index/view/about_us/mileage.html @@ -0,0 +1,96 @@ +{extend name="public/base" /} +{block name="style"} + +{/block} +{block name="main"} +
+
+ >o@?E7L{<&ZGkE4E@U*>_5xFr9?oM)5J
z(?LjIuUD}|e>y0nAYvbgtLV|)UdoMT9DPnfuw|l3nM9b_G+P?%XxL50;y#c|1jJ(H
zlpw@58GetbYqSK~{;37n8`5S<{Mmq9MI|dk6eWqHDmTnXVOxWJ@LP0658e QB`s(!Vfi%t!$ND?{d29ur`a!a(^@ZL9z
z2k{Y2zZ)b`l~hFaKO6#--y#iAR8#x@AEv%BIMR0OI!-5<*qPY2ZQHhO+t$RkZJQHL
zY-3_uU!L>4=hXM3tE>9Q-BsQD+E{C^b%mxuqjFl}pu6jpUmg|Eg1MYB$3ymGZrAS0
zGKe*`>rk68X;a%b=JD8rH{uum@XW?rrb3u;@0$(0`ws$&Z@?Ds6h9S
z9qz&K4%i(jkF(PhOmBbP85A4Fb|?PMY%jlNsw}iA*VbuDPXu(OdmV=)_DLa#gJhy)
zRPTT3+7!ibXbk65H1ixq@zJGnqOVf9l9`+==Drk^$|$EvF
zRQ**D?R+#7^nGdKZHl0c!b
z6CX@2M~$M|5j=;YxrCxdcsN~8T$
79dAOrRflXgeka;!wy@T0tfFu1U=-;$F-)$C!!S(58gq;P1Cfa@h
z+?*qyr-e!p@7>#{S-B!5&EmYiFYU5Qtq&p)3Cb1|h&kPkHsCMR!x|873tbd`AwIPf
zNnbV041aAHA!un65OsI03_}tc;4ZR87^(hx?LWjo2uqqza|*>z_Ad_f;(8m{tVKqU
z{w3jaUx7Z6u~AuP?{MPg*NaeX*t=@dx0cpk$Lh91bg|;yDkfp9mCIx8euf5xJXf9jd)XPaUE?jgHs+Y7nj{gA6K1x0o&)lEe_)un
zG*mT5seJa5`3N6!dY==&HW!HqYjB$m%SCBQDQJ!pL3zhp^c%R!?$lI2J$>&g^Zy{mGxcsyFeV!YY*Wg%U6PQF4Osl4po6AuMJM9a9#|5w-)
z3$MXN23OWxhpcmuH*1JqJr$g_XvN2(9qo&U(T~^c=d^AU+xzplKWe6m~zg1>!K$p+eNH4VR+;D(rA0)QQRpPdyxRmjM|Z-1Q^fT-Oh#)s
z2Zse$g-KGF^Q51M8a+vb={tKboL-`heP5}F)Z1<4F?h&-99Tco>fJe#e
zm+-$+RUXbTAt6`hQe9r(4QOQ4v{rHj$!7u