fix(mini): 修复设置页绑定漂移并新增 WXML-JS 一致性检查
Publish Mini Program Dev Version / publish (push) Successful in 1m5s
Publish Mini Program Dev Version / publish (push) Successful in 1m5s
settings.js 同步绑定名 loggedIn→logged、login→wxLogin、navTo→navigateTo,恢复登录按钮与全部菜单项响应;npm test 接入新增 ci/check-bindings.cjs 门禁;calendar/wish-detail 各 1 处历史遗留漂移登记为仅告警另行跟进
This commit is contained in:
@@ -5,7 +5,7 @@ const birthProfile = require('../../utils/birth-profile.js');
|
||||
Page({
|
||||
data: {
|
||||
userInfo: null,
|
||||
loggedIn: false,
|
||||
logged: false,
|
||||
logging: false,
|
||||
// 菜单角标
|
||||
profileCount: 0,
|
||||
@@ -25,7 +25,7 @@ Page({
|
||||
refreshUser() {
|
||||
const token = wx.getStorageSync('token');
|
||||
const userInfo = wx.getStorageSync('lunar-user-info');
|
||||
this.setData({ loggedIn: !!token, userInfo: userInfo || null });
|
||||
this.setData({ logged: !!token, userInfo: userInfo || null });
|
||||
},
|
||||
|
||||
refreshCounts() {
|
||||
@@ -39,7 +39,7 @@ Page({
|
||||
|
||||
// ==================== 登录 ====================
|
||||
|
||||
login() {
|
||||
wxLogin() {
|
||||
if (this.data.logging) return;
|
||||
this.setData({ logging: true });
|
||||
wx.login({
|
||||
@@ -57,7 +57,7 @@ Page({
|
||||
if (res && res.code === 0 && res.data && res.data.token) {
|
||||
wx.setStorageSync('token', res.data.token);
|
||||
wx.setStorageSync('lunar-user-info', res.data.user);
|
||||
this.setData({ userInfo: res.data.user, loggedIn: true, logging: false });
|
||||
this.setData({ userInfo: res.data.user, logged: true, logging: false });
|
||||
wx.showToast({ title: '登录成功', icon: 'success' });
|
||||
// 登录后拉取云端生辰档案,保证菜单计数准确
|
||||
birthProfile.syncFromServer().then(() => this.refreshCounts()).catch(() => {});
|
||||
@@ -85,13 +85,13 @@ Page({
|
||||
if (!res.confirm) return;
|
||||
wx.removeStorageSync('token');
|
||||
wx.removeStorageSync('lunar-user-info');
|
||||
this.setData({ userInfo: null, loggedIn: false });
|
||||
this.setData({ userInfo: null, logged: false });
|
||||
wx.showToast({ title: '已退出', icon: 'success' });
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
navTo(e) {
|
||||
navigateTo(e) {
|
||||
const url = e.currentTarget.dataset.url;
|
||||
// tabBar 页面必须用 switchTab 打开
|
||||
const tabPages = ['/pages/home/home', '/pages/wish-tree/wish-tree', '/pages/bazi/bazi', '/pages/wiki/wiki', '/pages/settings/settings'];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<view class="container">
|
||||
<!-- 登录与账号 -->
|
||||
<view class="card">
|
||||
<view class="flex items-center justify-between" wx:if="{{loggedIn}}">
|
||||
<view class="flex items-center justify-between" wx:if="{{logged}}">
|
||||
<view class="flex items-center gap-2">
|
||||
<image src="{{userInfo.avatar}}" class="avatar" mode="aspectFill" wx:if="{{userInfo.avatar}}"/>
|
||||
<view class="avatar avatar-placeholder" wx:else>
|
||||
@@ -24,28 +24,28 @@
|
||||
<text class="text-xs text-muted block">登录后生辰档案云端同步,换设备不丢失</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn-primary btn-sm" bindtap="login">{{logging ? '登录中…' : '授权登录'}}</view>
|
||||
<view class="btn-primary btn-sm" bindtap="wxLogin">{{logging ? '登录中…' : '授权登录'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 我的数据 -->
|
||||
<view class="card">
|
||||
<view class="section-title">我的数据</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/birth-profiles/birth-profiles">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/birth-profiles/birth-profiles">
|
||||
<text class="menu-label">生辰管理</text>
|
||||
<view class="menu-right">
|
||||
<text class="menu-count">{{profileCount}}/{{maxFree}}</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/bookmarks/bookmarks">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/bookmarks/bookmarks">
|
||||
<text class="menu-label">我的收藏</text>
|
||||
<view class="menu-right">
|
||||
<text class="menu-count" wx:if="{{bookmarkCount > 0}}">{{bookmarkCount}}</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/preferences/preferences">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/preferences/preferences">
|
||||
<text class="menu-label">设置</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
@@ -54,19 +54,19 @@
|
||||
<!-- 功能 -->
|
||||
<view class="card">
|
||||
<view class="section-title">功能</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/fortune/fortune">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/fortune/fortune">
|
||||
<text class="menu-label">每日运势</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/divination/divination">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/divination/divination">
|
||||
<text class="menu-label">占卜</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/solar-terms/solar-terms">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/solar-terms/solar-terms">
|
||||
<text class="menu-label">二十四节气</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
<view class="menu-item" bindtap="navTo" data-url="/pages/calendar/calendar">
|
||||
<view class="menu-item" bindtap="navigateTo" data-url="/pages/calendar/calendar">
|
||||
<text class="menu-label">月历视图</text>
|
||||
<text class="menu-arrow">›</text>
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user