Merge remote-tracking branch 'origin/master' into feature/tongji-endless-game

# Conflicts:
#	TUICallKit-Vue3/tongji/endless-game/README.md
#	TUICallKit-Vue3/tongji/endless-game/index.vue
#	TUICallKit-Vue3/vite.config.ts
This commit is contained in:
大哥大哥的大哥哥
2026-07-18 11:24:59 +08:00
338 changed files with 1029 additions and 681 deletions
+29 -9
View File
@@ -98,15 +98,27 @@
<view v-if="chartUseMockData" class="st-chart-foot">
<text class="st-chart-mock-hint">示例数据累计记录满 7 天后显示您的真实趋势</text>
</view>
<view class="st-game-entry st-game-entry--in-card" @click="goGamePage" style="margin: 0 20rpx 0 20rpx;">
<view class="st-game-entry-icon">
<TongjiIcon name="activity" size="sm" color="#006c49" />
<view class="st-game-entry-list">
<view class="st-game-entry st-game-entry--in-card" @click="goSugarRaidGamePage">
<view class="st-game-entry-icon">
<TongjiIcon name="activity" size="sm" color="#006c49" />
</view>
<view class="st-game-entry-body">
<text class="st-game-entry-title">识糖小课堂</text>
<text class="st-game-entry-sub">认一认哪些食物含糖高</text>
</view>
<TongjiIcon name="chevron-right" size="sm" color="#64748b" />
</view>
<view class="st-game-entry-body">
<text class="st-game-entry-title">识糖小课堂</text>
<text class="st-game-entry-sub">认一认哪些食物含糖高</text>
<view class="st-game-entry st-game-entry--in-card" @click="goEndlessGamePage">
<view class="st-game-entry-icon">
<TongjiIcon name="sparkles" size="sm" color="#006c49" />
</view>
<view class="st-game-entry-body">
<text class="st-game-entry-title">控糖消消乐</text>
<text class="st-game-entry-sub">无尽消除挑战控糖高分</text>
</view>
<TongjiIcon name="chevron-right" size="sm" color="#64748b" />
</view>
<TongjiIcon name="chevron-right" size="sm" color="#64748b" />
</view>
</view>
<view class="st-training-section">
@@ -1512,15 +1524,23 @@ async function goMorePage() {
uni.navigateTo({ url: buildMorePageUrl() })
}
function goGamePage() {
function openGamePage(url) {
uni.navigateTo({
url: '/tongji/endless-game/index',
url,
fail() {
uni.showToast({ title: '暂时无法打开游戏', icon: 'none' })
}
})
}
function goSugarRaidGamePage() {
openGamePage('/tongji/pages/game')
}
function goEndlessGamePage() {
openGamePage('/tongji/endless-game/index')
}
function navToUser() {
uni.redirectTo({ url: '/pages/user/user' })
}