Merge branch 'test' into feat-prac
This commit is contained in:
+29
-28
@@ -68,28 +68,29 @@ onShow(async () => {
|
||||
const token = uni.getStorageSync(`${env}_token`);
|
||||
|
||||
if (!user.value.id && !token) {
|
||||
try {
|
||||
const wxResult = await uni.login({provider: "weixin"});
|
||||
const bindResult = await checkUserBindAPI(wxResult.code);
|
||||
if (bindResult.binded) {
|
||||
const newResult = await uni.login({provider: "weixin"});
|
||||
const silentResult = await silentLoginAPI(newResult.code);
|
||||
if (silentResult.user) updateUser(silentResult.user);
|
||||
const devices = await getMyDevicesAPI();
|
||||
if (devices.bindings && devices.bindings.length) {
|
||||
updateDevice(
|
||||
devices.bindings[0].deviceId,
|
||||
devices.bindings[0].deviceName
|
||||
);
|
||||
const data = await getDeviceBatteryAPI();
|
||||
updateOnline(data.online);
|
||||
}
|
||||
} else {
|
||||
showModal.value = true;
|
||||
}
|
||||
} catch (e) {
|
||||
console.log("检查绑定状态失败", e);
|
||||
}
|
||||
// showModal.value = true;
|
||||
// try {
|
||||
// const wxResult = await uni.login({provider: "weixin"});
|
||||
// const bindResult = await checkUserBindAPI(wxResult.code);
|
||||
// if (bindResult.binded) {
|
||||
// const newResult = await uni.login({provider: "weixin"});
|
||||
// const silentResult = await silentLoginAPI(newResult.code);
|
||||
// if (silentResult.user) updateUser(silentResult.user);
|
||||
// const devices = await getMyDevicesAPI();
|
||||
// if (devices.bindings && devices.bindings.length) {
|
||||
// updateDevice(
|
||||
// devices.bindings[0].deviceId,
|
||||
// devices.bindings[0].deviceName
|
||||
// );
|
||||
// const data = await getDeviceBatteryAPI();
|
||||
// updateOnline(data.online);
|
||||
// }
|
||||
// } else {
|
||||
// showModal.value = true;
|
||||
// }
|
||||
// } catch (e) {
|
||||
// console.log("检查绑定状态失败", e);
|
||||
// }
|
||||
}
|
||||
|
||||
const promises = [getScoreRankList(undefined, 1, 10)];
|
||||
@@ -159,10 +160,10 @@ onShareTimeline(() => {
|
||||
<Container :isHome="true" :showBackToGame="true">
|
||||
<view class="container">
|
||||
<view class="top-theme">
|
||||
<image
|
||||
<!-- <image
|
||||
src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
|
||||
mode="widthFix"
|
||||
/>
|
||||
/> -->
|
||||
</view>
|
||||
<UserHeader showRank :onSignin="() => (showModal = true)"/>
|
||||
<view :style="{ padding: '12px 10px' }">
|
||||
@@ -178,7 +179,7 @@ onShareTimeline(() => {
|
||||
v-else
|
||||
src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
|
||||
mode="widthFix"
|
||||
@click="() => toPage('/pages/my-device')"
|
||||
@click="$clickSound(() => toPage('/pages/my-device'))"
|
||||
/>
|
||||
<block v-if="user.id">
|
||||
<text v-if="!device.deviceId">绑定我的智能弓</text>
|
||||
@@ -200,7 +201,7 @@ onShareTimeline(() => {
|
||||
<view @click="() => toPage('/pages/training/index')">
|
||||
<image src="../static/my-practise.png" mode="widthFix"/>
|
||||
</view>
|
||||
<view @click="() => toPage('/pages/friend-battle')">
|
||||
<view @click="$clickSound(() => toPage('/pages/friend-battle'))">
|
||||
<image src="../static/friend-battle.png" mode="widthFix"/>
|
||||
</view>
|
||||
</view>
|
||||
@@ -212,7 +213,7 @@ onShareTimeline(() => {
|
||||
/>
|
||||
<button
|
||||
class="into-btn"
|
||||
@click="() => toPage('/pages/ranking')"
|
||||
@click="$clickSound(() => toPage('/pages/ranking'))"
|
||||
hover-class="none"
|
||||
></button>
|
||||
<view class="ranking-players" @click="toRankListPage">
|
||||
@@ -476,7 +477,7 @@ onShareTimeline(() => {
|
||||
|
||||
.top-theme {
|
||||
position: absolute;
|
||||
display: flex;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
|
||||
Reference in New Issue
Block a user