Skip to content

Commit

Permalink
fix: 修复启动时偶现一直处于“加载中”的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
foliet committed Dec 24, 2023
1 parent acbb95f commit 94499dd
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 50 deletions.
93 changes: 49 additions & 44 deletions src/components/DebugPanel.vue
Original file line number Diff line number Diff line change
@@ -1,51 +1,56 @@
<template>
<view
v-if="!isDebugOn"
:class="
'button ' + (backendEnv === BackendEnv.Product ? 'green' : 'orange')
"
@click="setIsDebugOn(true)"
>{{ laneName !== "" ? laneName : "基准" }}
</view>
<view v-else class="panel">
<view class="header">
<view class="title">泳道设置</view>
<view class="clickable" @click="setIsDebugOn(false)">最小化</view>
<view style="position: relative; z-index: 999">
<view
v-if="!isDebugOn"
:class="
'button ' + (backendEnv === BackendEnv.Product ? 'green' : 'orange')
"
@click="setIsDebugOn(true)"
>{{ laneName !== "" ? laneName : "基准" }}
</view>
<view class="env">
<view
:class="
'toggle green ' + (backendEnv === BackendEnv.Product ? 'current' : '')
"
@click="setEnv(BackendEnv.Product)"
>正式环境
</view>
<view
:class="
'toggle orange ' + (backendEnv === BackendEnv.Test ? 'current' : '')
"
@click="setEnv(BackendEnv.Test)"
>测试环境
<view v-else class="panel">
<view class="header">
<view class="title">泳道设置</view>
<view class="clickable" @click="setIsDebugOn(false)">最小化</view>
</view>
</view>
<view class="lane">
<view class="label">当前泳道</view>
<input
v-model="laneName"
:class="'laneInput ' + (laneInputEditable ? 'editable' : '')"
:disabled="!laneInputEditable"
placeholder="基准"
type="text"
/>
<view
v-if="laneInputEditable"
class="clickable"
style="transform: translateX(2vw)"
@click="emptyInputValue()"
>清空
<view class="env">
<view
:class="
'toggle green ' +
(backendEnv === BackendEnv.Product ? 'current' : '')
"
@click="setEnv(BackendEnv.Product)"
>正式环境
</view>
<view
:class="
'toggle orange ' + (backendEnv === BackendEnv.Test ? 'current' : '')
"
@click="setEnv(BackendEnv.Test)"
>测试环境
</view>
</view>
<view class="clickable" @click="setLaneInputEditable(!laneInputEditable)"
>{{ laneInputEditable ? "确认" : "修改" }}
<view class="lane">
<view class="label">当前泳道</view>
<input
v-model="laneName"
:class="'laneInput ' + (laneInputEditable ? 'editable' : '')"
:disabled="!laneInputEditable"
placeholder="基准"
type="text"
/>
<view
v-if="laneInputEditable"
class="clickable"
style="transform: translateX(2vw)"
@click="emptyInputValue()"
>清空
</view>
<view
class="clickable"
@click="setLaneInputEditable(!laneInputEditable)"
>{{ laneInputEditable ? "确认" : "修改" }}
</view>
</view>
</view>
</view>
Expand Down
20 changes: 14 additions & 6 deletions src/pages/first-page/first-page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,20 @@ import { Pages } from "@/utils/url";
uni.showLoading({
title: "初始化中"
});
init().then(() => {
uni.hideLoading();
uni.reLaunch({
url: Pages.Community
});
});
const task = () => {
init()
.then(() => {
uni.hideLoading();
uni.reLaunch({
url: Pages.Community
});
})
.catch((err) => {
console.error("初始化失败", err);
setTimeout(task, 3000);
});
};
task();
</script>

<style scoped></style>

0 comments on commit 94499dd

Please sign in to comment.