wjd
/
rui-neng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://git-online.zhco.com/wjd/rui-neng

master
peijunlei 2 weeks ago
parent
5adc91a8f0 0a1dca9c31
commit
958faefd16
3 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/service/ContentService.php
  2. 2
      public/themes/website/1/en/demo/about.html
  3. 2
      public/themes/website/1/zh/demo/about.html

2
app/service/ContentService.php
View File

@ -802,7 +802,7 @@ class ContentService {
public function indexContent($param): \think\response\Json
{
$Cate = new Category();
$cate = $Cate->getAllCustomArrayData(['seller_id'=>$param['seller_id'],'website_id'=>$param['website_id'],'lang'=>$param['lang']],'id asc','id,title,parent_id')['data'];
$cate = $Cate->getAllCustomArrayData(['seller_id'=>$param['seller_id'],'website_id'=>$param['website_id'],'lang'=>$param['lang']],'sort asc,id asc','id,title,parent_id')['data'];
if(empty($cate)){
return json(['code' => 0, 'msg' => 'ok', 'count' => 0, 'data' => []]);
}

2
public/themes/website/1/en/demo/about.html
View File

@ -230,7 +230,7 @@
<div class="ab-members__panels-swiper swiper">
<div class="ab-members__panels swiper-wrapper">
{php}$member_idx = 0;{/php}
{hcTaglib:content cid="$vo.id" moduleId="1" name="contentList" item="case_top" limit="50" mainField="id,url,title,sub_title,content,thumbnail" sort="sort desc" subField="" onlyData="2"}
{hcTaglib:content cid="$vo.id" moduleId="1" name="contentList" item="case_top" limit="50" mainField="id,url,title,sub_title,content,thumbnail" sort="sort asc" subField="" onlyData="2"}
<div class="ab-members__panel swiper-slide" id="ab-member-panel-{$case_top.id}" data-index="{$member_idx}">
<div class="ab-members__content">
<div>

2
public/themes/website/1/zh/demo/about.html
View File

@ -230,7 +230,7 @@
<div class="ab-members__panels-swiper swiper">
<div class="ab-members__panels swiper-wrapper">
{php}$member_idx = 0;{/php}
{hcTaglib:content cid="$vo.id" moduleId="1" name="contentList" item="case_top" limit="50" mainField="id,url,title,sub_title,content,thumbnail" sort="sort desc" subField="" onlyData="2"}
{hcTaglib:content cid="$vo.id" moduleId="1" name="contentList" item="case_top" limit="50" mainField="id,url,title,sub_title,content,thumbnail" sort="sort asc" subField="" onlyData="2"}
<div class="ab-members__panel swiper-slide" id="ab-member-panel-{$case_top.id}" data-index="{$member_idx}">
<div class="ab-members__content">
<div>

Write Preview
Loading…
Cancel
Save