Przeglądaj źródła

fix(frontend): 修复最终审查3处Minor偏差(副标题人数/nav-icon-wrap重复/status-accepted暖蓝)

iwt 3 tygodni temu
rodzic
commit
3c072274d4

+ 4 - 2
cfc-frontend/pages/diet/index.vue

@@ -180,7 +180,9 @@ export default {
   computed: {
     heroSubtitle: function() {
       var self = this
-      return (self.isWeekend(new Date()) ? '周末' : '工作日') + ' · 全家一起吃饭'
+      var parts = this.heroMeals.filter(function(m) { return m.count && m.count !== '' })
+      var count = parts.length > 0 ? (parts[0].count || '') : ''
+      return (self.isWeekend(new Date()) ? '周末' : '工作日') + ' · ' + (count ? count : '全家一起吃饭')
     },
     heroMeals: function() {
       var defs = [
@@ -557,6 +559,7 @@ export default {
   align-items: center;
   justify-content: center;
   margin-bottom: 12rpx;
+  transition: transform 0.15s ease;
 }
 .nav-icon-green { background: linear-gradient(135deg, #FFF1E6, #FFE0C0); }
 .nav-icon-blue  { background: linear-gradient(135deg, #FFF7ED, #FFEEDD); }
@@ -564,7 +567,6 @@ export default {
 .nav-icon-purple{ background: linear-gradient(135deg, #FFE8D6, #FFD4B0); }
 .nav-icon-red   { background: linear-gradient(135deg, #E8F8F1, #C8F0E0); }
 .nav-item:active .nav-icon-wrap { transform: scale(0.92); }
-.nav-icon-wrap { transition: transform 0.15s ease; }
 .nav-icon {
   font-size: 36rpx;
 }

+ 1 - 1
cfc-frontend/pages/diet/recommendation.vue

@@ -287,7 +287,7 @@ export default {
 }
 .status-pending { background: #FFF1E6; color: #C2410C; }
 .status-accepted {
-  background-color: #E3F2FD;
+  background: #E8F1FB;
   color: #2196F3;
 }
 .status-completed {