From 22c9b94be213ff93064d7c463d82344023ffab1c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:35:29 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/carousel/prop-card/index.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 0088328..bf810fa 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -147,15 +147,15 @@
if (config.$time) {
if (!this.loaded) {
Api.getLCacheConfig(config.uuid, config.$time).then(res => {
- if (!res && config.setting.onload === 'true') {
+ if (!res.valid && config.setting.onload === 'true') {
setTimeout(() => {
this.loadData()
}, config.setting.delay || 0)
}
- if (!res || this.loaded) return
+ if (!res.data || this.loaded) return
- let _data = res[0] || {$$empty: true}
+ let _data = res.data[0] || {$$empty: true}
_data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({data: _data})
@@ -166,9 +166,9 @@
} else {
if (!this.loaded) {
Api.getLCacheConfig(config.uuid, 0).then(res => {
- if (!res || this.loaded) return
+ if (!res.data || this.loaded) return
- let _data = res[0] || {$$empty: true}
+ let _data = res.data[0] || {$$empty: true}
_data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({data: _data})
--
Gitblit v1.8.0