Commit 395df0c4 by xiexiaoqin

feat:首页添加刷新

parent 7dcbc113
...@@ -51,7 +51,6 @@ export default async function login() { ...@@ -51,7 +51,6 @@ export default async function login() {
async function waitLockRelease(retry) { async function waitLockRelease(retry) {
for (let i = 0; i < retry; i++) { for (let i = 0; i < retry; i++) {
if (lock == false) { if (lock == false) {
console.log(i);
return; return;
} }
await sleep(100); await sleep(100);
......
...@@ -14,17 +14,16 @@ export default function xFetch({ url, method, data, type }) { ...@@ -14,17 +14,16 @@ export default function xFetch({ url, method, data, type }) {
method: method, method: method,
dataType: "json", dataType: "json",
data: data, data: data,
// timeout: 280, timeout: 10000,
success: function (res) { success: function (res) {
if (res.data.code == 0) { if (res.data.code == 0) {
resolve(res); resolve(res);
} else { } else {
rejects(res); rejects({ ...res.data, refresh: true });
dd.alert({ dd.alert({
content: res.data.msg || "请求数据异常", content: res.data.msg || "请求数据异常",
buttonText: "确定" buttonText: "确定"
}); });
} }
}, },
fail: function (err) { fail: function (err) {
......
...@@ -10,4 +10,14 @@ view { ...@@ -10,4 +10,14 @@ view {
.addPaddingBottom { .addPaddingBottom {
padding-bottom: 68rpx; padding-bottom: 68rpx;
}
.btn {
font-size: 32rpx;
height: 72rpx;
line-height: 72rpx;
border-radius: 48rpx;
text-align: center;
color: #fff;
background: rgba(234, 12, 40, 1);
} }
\ No newline at end of file
@import "../../template/loading/loading.acss"; @import "../../template/loading/loading.acss";
@import "../../template/affairBlank/index.acss"; @import "../../template/affairBlank/index.acss";
@import "../../template/fullScreen/fullScreen.acss"; @import "../../template/fullScreen/fullScreen.acss";
@import "../../template/refresh/index.acss";
.dynamicBox { .dynamicBox {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
...@@ -100,6 +101,7 @@ ...@@ -100,6 +101,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-direction: column;
} }
.scroll-lock { .scroll-lock {
......
<import src="../../template/loading/loading.axml"/> <import src="../../template/loading/loading.axml"/>
<import src="../../template/fullScreen/fullScreen.axml"/> <import src="../../template/fullScreen/fullScreen.axml"/>
<view a:if='{{refresh}}' onTap="onLoad">连接超时,请重试,刷新按钮</view> <import src="../../template/refresh/index.axml"/>
<template is="refresh" a:if='{{refresh}}' ></template>
<block a:else> <block a:else>
<view hidden="{{$data.tabBarIndex === '1'}}"> <view hidden="{{$data.tabBarIndex === '1'}}">
<import src="../../template/affairBlank/index.axml"/> <import src="../../template/affairBlank/index.axml"/>
......
...@@ -85,12 +85,16 @@ create.Page({ ...@@ -85,12 +85,16 @@ create.Page({
this.update(); this.update();
} }
}, },
onLoad(event) { refresh() {
if (JSON.stringify(event) != "{}") { this.onLoad()
},
onLoad(query) {
console.log(query);
if (query && JSON.stringify(query) !== '{}') {
this.setData({ this.setData({
listLoading: false listLoading: false
}); });
const scheduleItem = JSON.parse(Object.keys(event)[0].split("=")[1]); const scheduleItem = JSON.parse(Object.keys(query)[0].split("=")[1]);
dd.navigateTo({ dd.navigateTo({
url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent( url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent(
JSON.stringify(scheduleItem) JSON.stringify(scheduleItem)
...@@ -184,11 +188,11 @@ create.Page({ ...@@ -184,11 +188,11 @@ create.Page({
callBack(); callBack();
} }
}).catch(err => { }).catch(err => {
// if (err && err.refresh) { if (err && err.refresh) {
// this.setData({ this.setData({
// refresh: true refresh: true
// }) })
// } }
}); });
}, },
//动态置顶 //动态置顶
...@@ -290,6 +294,12 @@ create.Page({ ...@@ -290,6 +294,12 @@ create.Page({
endTime: "2025-12-30 23:59:59" endTime: "2025-12-30 23:59:59"
}).then(res => { }).then(res => {
this.getScheduleList(res.data.data); this.getScheduleList(res.data.data);
}).catch(err => {
if (err && err.refresh) {
this.setData({
refresh: true
})
}
}); });
}, },
//生成DateMap值 //生成DateMap值
......
.refresh-bg {
position: fixed;
left: 0;
top: 0;
background: #FFFFFF;
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
.refresh-btn {
padding: 0 48rpx;
margin-top: 32rpx;
}
\ No newline at end of file
<template name="refresh">
<view class="refresh-bg">
<view>您的网络好像不给力,请重试</view>
<button class="btn refresh-btn" onTap="refresh">刷新</button>
</view>
</template>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment