diff --git a/src/main/java/xuan/controller/LiuYaoController.java b/src/main/java/xuan/controller/LiuYaoController.java index 52ea263..ee1e0c2 100644 --- a/src/main/java/xuan/controller/LiuYaoController.java +++ b/src/main/java/xuan/controller/LiuYaoController.java @@ -90,8 +90,11 @@ public class LiuYaoController { data.put("hourGanZhi", liuYao.getHourGanZhi()); data.put("shangGuaName", liuYao.getShangGuaName()); + data.put("shangGuaAs", liuYao.getShangGuaAs()); data.put("xiaGuaName", liuYao.getXiaGuaName()); + data.put("xiaGuaAs", liuYao.getXiaGuaAs()); data.put("benGuaName", liuYao.getBenGuaName()); + data.put("benGuaType", liuYao.getBenGuaType()); data.put("bianGuaName", liuYao.getBianGuaName()); data.put("huGuaName", liuYao.getHuGuaName()); data.put("cuoGuaName", liuYao.getCuoGuaName()); @@ -106,6 +109,58 @@ public class LiuYaoController { data.put("benGuaLiuYaoLiuQin", liuYao.getBenGuaLiuYaoLiuQin()); data.put("benGuaLiuYaoLiuShen", liuYao.getBenGuaLiuYaoLiuShen()); + data.put("benGuaAs", liuYao.getBenGuaAs()); + data.put("bianGuaAs", liuYao.getBianGuaAs()); + data.put("huGuaAs", liuYao.getHuGuaAs()); + data.put("cuoGuaAs", liuYao.getCuoGuaAs()); + data.put("zongGuaAs", liuYao.getZongGuaAs()); + data.put("fuGuaAs", liuYao.getFuGuaAs()); + + data.put("benGuaGuaShen", liuYao.getBenGuaGuaShen()); + data.put("bianGuaGuaShen", liuYao.getBianGuaGuaShen()); + data.put("huGuaGuaShen", liuYao.getHuGuaGuaShen()); + data.put("cuoGuaGuaShen", liuYao.getCuoGuaGuaShen()); + data.put("zongGuaGuaShen", liuYao.getZongGuaGuaShen()); + data.put("fuGuaGuaShen", liuYao.getFuGuaGuaShen()); + + data.put("benGuaLiuYaoAs", liuYao.getBenGuaLiuYaoAs()); + data.put("bianGuaLiuYaoAs", liuYao.getBianGuaLiuYaoAs()); + data.put("huGuaLiuYaoAs", liuYao.getHuGuaLiuYaoAs()); + data.put("cuoGuaLiuYaoAs", liuYao.getCuoGuaLiuYaoAs()); + data.put("zongGuaLiuYaoAs", liuYao.getZongGuaLiuYaoAs()); + data.put("fuGuaLiuYaoAs", liuYao.getFuGuaLiuYaoAs()); + + data.put("benGuaLiuYaoGanZhi", liuYao.getBenGuaLiuYaoGanZhi()); + data.put("bianGuaLiuYaoGanZhi", liuYao.getBianGuaLiuYaoGanZhi()); + data.put("huGuaLiuYaoGanZhi", liuYao.getHuGuaLiuYaoGanZhi()); + data.put("cuoGuaLiuYaoGanZhi", liuYao.getCuoGuaLiuYaoGanZhi()); + data.put("zongGuaLiuYaoGanZhi", liuYao.getZongGuaLiuYaoGanZhi()); + data.put("fuGuaLiuYaoGanZhi", liuYao.getFuGuaLiuYaoGanZhi()); + + data.put("benGuaLiuYaoWuXing", liuYao.getBenGuaLiuYaoWuXing()); + data.put("bianGuaLiuYaoWuXing", liuYao.getBianGuaLiuYaoWuXing()); + data.put("huGuaLiuYaoWuXing", liuYao.getHuGuaLiuYaoWuXing()); + data.put("cuoGuaLiuYaoWuXing", liuYao.getCuoGuaLiuYaoWuXing()); + data.put("zongGuaLiuYaoWuXing", liuYao.getZongGuaLiuYaoWuXing()); + data.put("fuGuaLiuYaoWuXing", liuYao.getFuGuaLiuYaoWuXing()); + + data.put("benGuaLiuYaoNaYin", liuYao.getBenGuaLiuYaoNaYin()); + data.put("bianGuaLiuYaoNaYin", liuYao.getBianGuaLiuYaoNaYin()); + data.put("huGuaLiuYaoNaYin", liuYao.getHuGuaLiuYaoNaYin()); + data.put("cuoGuaLiuYaoNaYin", liuYao.getCuoGuaLiuYaoNaYin()); + data.put("zongGuaLiuYaoNaYin", liuYao.getZongGuaLiuYaoNaYin()); + data.put("fuGuaLiuYaoNaYin", liuYao.getFuGuaLiuYaoNaYin()); + + data.put("benGuaLiuYaoYaoCi", liuYao.getBenGuaLiuYaoYaoCi()); + data.put("bianGuaLiuYaoYaoCi", liuYao.getBianGuaLiuYaoYaoCi()); + data.put("huGuaLiuYaoYaoCi", liuYao.getHuGuaLiuYaoYaoCi()); + data.put("cuoGuaLiuYaoYaoCi", liuYao.getCuoGuaLiuYaoYaoCi()); + data.put("zongGuaLiuYaoYaoCi", liuYao.getZongGuaLiuYaoYaoCi()); + data.put("fuGuaLiuYaoYaoCi", liuYao.getFuGuaLiuYaoYaoCi()); + + data.put("benGuaGuaShen", liuYao.getBenGuaGuaShen()); + data.put("bianGuaGuaShen", liuYao.getBianGuaGuaShen()); + return data; } diff --git a/xuan-deduct-uniapp/src/pages.json b/xuan-deduct-uniapp/src/pages.json index b5e1490..5a03b7e 100644 --- a/xuan-deduct-uniapp/src/pages.json +++ b/xuan-deduct-uniapp/src/pages.json @@ -73,22 +73,6 @@ "navigationBarTextStyle": "white" } }, - { - "path": "pages/mine/permissions", - "style": { - "navigationBarTitleText": "小程序已获取的信息", - "navigationBarBackgroundColor": "#10B981", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/mine/permission-logs", - "style": { - "navigationBarTitleText": "个人信息与权限使用记录", - "navigationBarBackgroundColor": "#10B981", - "navigationBarTextStyle": "white" - } - }, { "path": "pages/mine/feedback", "style": { diff --git a/xuan-deduct-uniapp/src/pages/bazi/bazi.vue b/xuan-deduct-uniapp/src/pages/bazi/bazi.vue index 1270abb..fb96733 100644 --- a/xuan-deduct-uniapp/src/pages/bazi/bazi.vue +++ b/xuan-deduct-uniapp/src/pages/bazi/bazi.vue @@ -149,52 +149,6 @@ export default { return } - const userInfoStr = uni.getStorageSync('userInfo') - const vipLevel = uni.getStorageSync('vipLevel') || 0 - - console.log('=== 金币检查 ===') - console.log('userInfoStr:', userInfoStr) - console.log('vipLevel:', vipLevel) - - if (vipLevel === 0) { - let coins = uni.getStorageSync('userCoins') - if (!coins) coins = 10 - else coins = parseInt(coins) - - console.log('当前金币数:', coins) - - if (coins < 1) { - uni.showModal({ - title: '金币不足', - content: '您的金币不足,请前往任务中心获取金币或开通会员', - confirmText: '去获取', - cancelText: '取消', - success: (res) => { - if (res.confirm) { - uni.navigateTo({ url: '/pages/mine/coins' }) - } - } - }) - return - } - - coins -= 1 - uni.setStorageSync('userCoins', coins) - console.log('扣除后金币数:', coins) - - if (userInfoStr) { - try { - const userInfo = JSON.parse(userInfoStr) - console.log('更新服务器金币, userId:', userInfo.userId) - await api.userApi.updateCoins(userInfo.userId, coins) - } catch (e) { - console.error('更新金币失败:', e) - } - } - } else { - console.log('会员用户,无需扣除金币') - } - this.loading = true uni.showLoading({ @@ -204,13 +158,20 @@ export default { try { const dateStr = this.solarDate + ' ' + this.birthTime + ':00' - - const result = await api.baziApi.paiPan({ + const payload = { name: this.name.trim(), sex: this.gender === '男' ? 1 : 0, date: dateStr, dateType: this.dateType - }) + } + + try { + uni.setStorageSync('baziRequest', JSON.stringify(payload)) + } catch (e) { + console.error('缓存八字请求失败:', e) + } + + const result = await api.baziApi.paiPan(payload) console.log('=== 测算页面 - API返回结果 ===') console.log('原始result:', result) @@ -232,7 +193,16 @@ export default { console.log('resultData.baZi:', resultData.baZi) console.log('保存到globalData之前') - getApp().globalData.baziResult = resultData + const app = getApp() + if (!app.globalData) { + app.globalData = {} + } + app.globalData.baziResult = resultData + try { + uni.setStorageSync('baziResult', JSON.stringify(resultData)) + } catch (e) { + console.error('缓存八字结果失败:', e) + } console.log('保存到globalData之后') console.log('getApp().globalData.baziResult:', getApp().globalData.baziResult) diff --git a/xuan-deduct-uniapp/src/pages/bazi/result.vue b/xuan-deduct-uniapp/src/pages/bazi/result.vue index d2ce89c..596e42c 100644 --- a/xuan-deduct-uniapp/src/pages/bazi/result.vue +++ b/xuan-deduct-uniapp/src/pages/bazi/result.vue @@ -1,39 +1,5 @@