jsasg/orico-official-website-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
jsasg
2025-04-11 11:45:56 +08:00
parent ec7ee48be8 92fc444cd8
commit ba4a2211c6
9 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/ReceiveSync.php
View File

@@ -54,7 +54,7 @@ class ReceiveSync extends Base
}
$mp = $query->name('product_tco_category')
->field(['id', 'category_id', 'sync_time'])
->field(['id', 'tco_id', 'category_id', 'sync_time'])
->where('erp_code', '=', $record['erp_code'])
->where('country_code', '=', $record['country_code'])
->find();

2
app/index/view/tops_nas/beta.phtml
View File

@@ -226,7 +226,7 @@
</div>
<div class="nztbzyj">
<a href="https://alidocs.dingtalk.com/notable/share/form/v013M0Oz5Xz1Xv8qzeE_vQkCkLg_cMm6AQO" target="_blank">意见反馈</a>
<a href="https://www.orico.com.cn/mobile/tops_nas/helper.html" target="_blank">帮助中心</a>
<a href="https://www.orico.com.cn/index/tops_nas/helper.html" target="_blank">帮助中心</a>
</div>
</div>
</div>

7
app/index/view/tops_nas/helper.phtml
View File

@@ -6,6 +6,9 @@
<title>帮助中心</title>
{include file='include/head-nas' /}
<style>
[class*=' icon-'] {
color: #000;
}
.narshelpCenterPc {
display: flex;
flex-direction: column;
@@ -316,9 +319,9 @@
</style>
</head>
<body>
<div class="narshelpCenterPc">
<!-- 顶部导航 -->
{include file='include/top-header-nas'/}
<div class="narshelpCenterPc">
<!-- banner-搜索-->
<div class="pagetopbg">
<img src="__PUBLIC__/m_web/images/nas/help/banner.jpg" class="hpbgimg" />
@@ -395,7 +398,7 @@
</a>
{/if}
{if condition="$banners_size > 3"}
<a href="{$banners[3]['link']}" class="nhlplxwmit nhlplxwmit-w2 target="_blank"">
<a href="{$banners[3]['link']}" class="nhlplxwmit nhlplxwmit-w2" target="_blank">
<img src="__PUBLIC__/m_web/images/nas/help/nhlp-lx4.png" class="lximg" />
{if condition="!empty($banners[3]['picture']) && $banners[3]['picture'] != '/uploads/nopic.jpg'"}
<img src="{$banners[3]['picture']}" class="lxewmimg">

6
app/index/view/tops_nas/helper_detail.phtml
View File

@@ -6,6 +6,9 @@
<title>帮助中心</title>
{include file='include/head-nas' /}
<style>
[class*=' icon-'] {
color: #000;
}
.narshelpdetailPc {
display: flex;
flex-direction: column;
@@ -167,6 +170,9 @@
overflow-y: auto;
position: relative;
}
.narshelpdetailPc .nars-help-content .nars-hlpdt-mm img{
max-width: 100%;
}
/* .narshelpdetailPc .nars-help-content .nars-hlpdt-mm img{*/
/* width: -webkit-fill-available;*/
/*}*/

1
app/index/view/tops_nas/index.phtml
View File

@@ -4,7 +4,6 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>元创官网</title>
{include file='include/head-nas'/}
</head>

3
app/mobile/controller/TopsNas.php
View File

@@ -147,7 +147,7 @@ class TopsNas extends BaseController
'id',
'pid',
'name',
'picture',
'picture'
])
->where('isshow', '=', 1)
->where('country_code', '=', $this->country_code)
@@ -264,7 +264,6 @@ class TopsNas extends BaseController
return $this->fetch();
}
// 根据分类获取文章
private function getArticleByCategory($categorys, $limit = null)
{

3
app/mobile/view/tops_nas/beta.phtml
View File

@@ -11,6 +11,9 @@
</style>
{include file='include/head-nas'/}
<style type="text/css">
[class*=' icon-'] {
color: #000;
}
.narsZTPC {
width: 100%;
height: 100vh;

3
app/mobile/view/tops_nas/download.phtml
View File

@@ -6,6 +6,9 @@
<title>元创官网</title>
{include file='include/head-nas'/}
<style type="text/css">
.icon-menu-svg,.icon-search-svg,.icon-lag-svg{
color: #000 !important;
}
.header {
color: #fff;
}