Merge remote-tracking branch 'origin/main'

This commit is contained in:
那些花儿
2025-06-11 10:44:24 +08:00
3 changed files with 10 additions and 10 deletions
@@ -334,7 +334,7 @@ public class SysHomeController {
return Result.success(results); return Result.success(results);
} catch (Exception e) { } catch (Exception e) {
log.error(e); log.error(e);
return Result.error(); return Result.success();
} }
} }
} }
@@ -1,14 +1,14 @@
const news = { const news = {
template: /*language=HTML*/ ` template: /*language=HTML*/ `
<div class="home-news"> <div class="home-news">
<el-tabs v-model="activeName"> <!-- <el-tabs v-model="activeName">-->
<el-tab-pane v-for="(item,index) in newsData" :key="index" :label="item.label" :name="item.label" v-if="item.value.length > 0"> <!-- <el-tab-pane v-for="(item,index) in newsData" :key="index" :label="item.label" :name="item.label" v-if="item.value.length > 0">-->
<div v-for="(n,i) in item.value" :key="i" @click="openUrl(n.href)"> <!-- <div v-for="(n,i) in item.value" :key="i" @click="openUrl(n.href)">-->
<span v-if="n.time" class="news_time">{{ n.time }}</span> <!-- <span v-if="n.time" class="news_time">{{ n.time }}</span>-->
<span class="news_text">{{ n.text }}</span> <!-- <span class="news_text">{{ n.text }}</span>-->
</div> <!-- </div>-->
</el-tab-pane> <!-- </el-tab-pane>-->
</el-tabs> <!-- </el-tabs>-->
</div> </div>
`, `,
data() { data() {
@@ -6,7 +6,7 @@ const quickEntry = {
<div class="quickEntries"> <div class="quickEntries">
<div v-for="item in quickEntries" :key="item.id" @click="$store.dispatch('pjaxRoute',item.href)" class="quickEntryItem"> <div v-for="item in quickEntries" :key="item.id" @click="$store.dispatch('pjaxRoute',item.href)" class="quickEntryItem">
<svg-icon :name="item.icon" :size="40" style="color: var(--color-primary)"></svg-icon> <svg-icon :name="item.icon" :size="40" style="color: var(--color-primary)"></svg-icon>
<span style="white-space: nowrap">{{item.name}}</span> <span>{{item.name}}</span>
</div> </div>
</div> </div>
</el-card> </el-card>