|
|
@@ -61,10 +61,24 @@
|
|
|
<text class="tp-footer-text">{{ weeklyTip }}</text>
|
|
|
</view>
|
|
|
|
|
|
- <!-- 查看详情入口 -->
|
|
|
- <view class="tp-detail-btn" @click="goDetail">
|
|
|
- <text class="tp-detail-text">查看家庭天盘详情 →</text>
|
|
|
- </view>
|
|
|
+ <!-- 今日宜忌提示 -->
|
|
|
+ <view class="tp-advice-section">
|
|
|
+ <view class="tp-advice-item">
|
|
|
+ <text class="tp-advice-icon">♦</text>
|
|
|
+ <text class="tp-advice-label">宜:</text>
|
|
|
+ <text class="tp-advice-text">{{ getAdvice(true) }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="tp-advice-item">
|
|
|
+ <text class="tp-advice-icon">✖</text>
|
|
|
+ <text class="tp-advice-label">忌:</text>
|
|
|
+ <text class="tp-advice-text">{{ getAdvice(false) }}</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 查看详情入口 -->
|
|
|
+ <view class="tp-detail-btn" @click="goDetail">
|
|
|
+ <text class="tp-detail-text">查看家庭天盘详情 →</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -200,6 +214,43 @@ export default {
|
|
|
url: '/pages/mind-detail/family-dashboard'
|
|
|
})
|
|
|
},
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取当日宜忌建议
|
|
|
+ * @param {boolean} isGood - 是否获取宜(true)或忌(false)
|
|
|
+ */
|
|
|
+ getAdvice: function(isGood) {
|
|
|
+ const advice = {
|
|
|
+ 木: {
|
|
|
+ good: '植树种花、亲近自然,交友聚会增进感情,制定计划规划未来',
|
|
|
+ bad: '冲动消费、盲目扩张,长期熬夜、透支健康,与人争执失和气'
|
|
|
+ },
|
|
|
+ 火: {
|
|
|
+ good: '社交活动、表达感想,旅行出游、放松心情,运动健身、增强活力',
|
|
|
+ bad: '过度劳累、身体透支,情绪激动、失去理智,暴饮暴食、饮酒无度'
|
|
|
+ },
|
|
|
+ 土: {
|
|
|
+ good: '规律作息、健康管理,家务整理、创造舒适,学习充电、稳固提升',
|
|
|
+ bad: '情绪压抑、独自忍耐,忽视身体、健康警讯,盲目保守、错失机会'
|
|
|
+ },
|
|
|
+ 金: {
|
|
|
+ good: '整理环境、创造秩序,专注工作、提升效率,投资理财、稳健收益',
|
|
|
+ bad: '过度拘谨、缺乏变通,忽略情感、人情冷漠,欲望过多、贪求不满'
|
|
|
+ },
|
|
|
+ 水: {
|
|
|
+ good: '阅读思考、拓展思维,社交活动、增进人脉,创意思考、寻找机遇',
|
|
|
+ bad: '犹豫不决、错过良机,过度幻想、缺乏行动,沉迷游戏、浪费时光'
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 默认值(如果五行未知或未提供)
|
|
|
+ if (!this.fortune || !this.fortune.dominantElement) {
|
|
|
+ return isGood ? '保持心情愉悦,积极面对每一天' : '避免负面情绪,不过度劳累'
|
|
|
+ }
|
|
|
+
|
|
|
+ const element = this.fortune.dominantElement
|
|
|
+ return advice[element][isGood ? 'good' : 'bad']
|
|
|
+ },
|
|
|
|
|
|
initCanvas: function() {
|
|
|
var self = this
|
|
|
@@ -535,6 +586,41 @@ export default {
|
|
|
flex: 1;
|
|
|
}
|
|
|
|
|
|
+/* ===== 今日宜忌 ===== */
|
|
|
+.tp-advice-section {
|
|
|
+ margin: 20rpx 0;
|
|
|
+ padding: 16rpx;
|
|
|
+ background-color: rgba(255, 255, 255, 0.7);
|
|
|
+ border-radius: 16rpx;
|
|
|
+}
|
|
|
+.tp-advice-item {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: row;
|
|
|
+ align-items: center;
|
|
|
+ margin-bottom: 10rpx;
|
|
|
+}
|
|
|
+.tp-advice-item:last-child {
|
|
|
+ margin-bottom: 0;
|
|
|
+}
|
|
|
+.tp-advice-icon {
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #FF6B9D;
|
|
|
+ margin-right: 12rpx;
|
|
|
+}
|
|
|
+.tp-advice-label {
|
|
|
+ font-size: 22rpx;
|
|
|
+ font-weight: 600;
|
|
|
+ color: #FF6B9D;
|
|
|
+ margin-right: 12rpx;
|
|
|
+ min-width: 60rpx;
|
|
|
+}
|
|
|
+.tp-advice-text {
|
|
|
+ font-size: 22rpx;
|
|
|
+ color: #374151;
|
|
|
+ flex: 1;
|
|
|
+ line-height: 1.4;
|
|
|
+}
|
|
|
+
|
|
|
/* ===== 查看详情按钮 ===== */
|
|
|
.tp-detail-btn {
|
|
|
margin-top: 16rpx;
|