优化

miniprogram/components/calendar/index.scss

@@ -240,17 +240,19 @@
   color: #222;
 }
 .grid.today .date {
+  background: #eaf4ff;
+  color: #2e7fff;
+  font-weight: 600;
+}
+.grid.choosed .date {
   background: #2e7fff;
   color: #fff;
   font-weight: bold;
+  box-shadow: 0 0 8rpx #2e7fff66;
   border-radius: 50%;
   border: none;
-  box-shadow: 0 0 8rpx #2e7fff66;
-}
-.grid.choosed .date {
-  background: #eaf4ff;
-  color: #2e7fff;
-  font-weight: 600;
+
+ 
 }
 .dot-self-unchecked {
   background: #ff9800;

miniprogram/module/article/components/diet-card/diet-card.scss

@@ -49,7 +49,7 @@
     height: 1px;
     transform: translateY(-1px);
     // background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%, var(--primary-color, #38FF6E) 50%, rgba(15, 34, 38, 0) 100%);
-    background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%,  #1D6FF6 50%, rgba(15, 34, 38, 0) 100%);
+    background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%,  #E7E7E7 50%, rgba(15, 34, 38, 0) 100%);
 
   }
 }

miniprogram/module/article/components/science-card/science-card.scss

@@ -49,6 +49,6 @@
     height: 1px;
     transform: translateY(-1px);
     // background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%, var(--primary-color, #E7E7E7) 50%, rgba(15, 34, 38, 0) 100%);
-    background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%,  #1D6FF6 50%, rgba(15, 34, 38, 0) 100%);
+    background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%,  #E7E7E7 50%, rgba(15, 34, 38, 0) 100%);
   }
 }

miniprogram/module/article/pages/diet-info/diet-info.wxml

@@ -7,7 +7,7 @@
     <view class="box-wrapper">{{dataset.book}}</view>
   </view> -->
   <view class="diet-box">
-  <view class="diet-title">{{title}}</view>
+  <view class="diet-title">{{dataset.name}}</view>
   <view class="list-wrapper">
     <view class="list-title">中医功效</view>
     <view class="box-wrapper">{{dataset.effectText}}</view>

miniprogram/module/article/pages/foot-print/foot-print.ts

@@ -45,7 +45,7 @@ Page({
   goDetail(e: any) {
     const type = e.currentTarget.dataset.type;
     const item = e.currentTarget.dataset.item;
-    // type 1 中医科普 2 药膳 3 茶饮
+    // type 1 中医科普 2 药膳 4 茶饮
     // 药膳详情
     console.log(type, "详情");
     if (type === "1") {
@@ -54,15 +54,13 @@ Page({
       }).then((res) => {
         res.eventChannel.emit("load", item);
       });
-    } else if (type === "2") {
+    } else if (type === "2" || type === "4") {
       wx.navigateTo({
         url: `/module/article/pages/diet-info/diet-info?id=${item.sourceId}`,
       }).then((res) => {
         res.eventChannel.emit("load", item);
       });
-    } else if (type === "3") {
-      console.log("茶饮");
-    }
+    } 
   },
   async load() {
     wx.showLoading({ title: "加载中" });

miniprogram/module/article/pages/science-info/science-info.json

@@ -1,11 +1,6 @@
 {
   "renderer": "webview",
-  "navigationBarTextStyle": "white",
-  "navigationBarBackgroundColor": "#0f2226",
-  "backgroundColor": "#0f2226",
-  "backgroundColorContent": "#0f2226",
-  "backgroundColorTop": "#0f2226",
-  "backgroundColorBottom": "#0f2226",
+ 
   "component": true,
   "usingComponents": {}
 }

miniprogram/module/chats/components/guide/guide.scss

@@ -15,7 +15,7 @@
 
 .steward-wrapper .t-cell.cell-border-gradient {
   .t-cell__title {
-    color: #1D6FF6 !important;
+    color: #E7E7E7 !important;
   }
 }
 

miniprogram/pages/home/home.scss

@@ -458,7 +458,12 @@ $scale: 0.5;
   border-bottom: 1px solid #f0f0f0;
   padding: 24rpx 20rpx;
 }
-
+.detail-box{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
 .item-main {
   display: flex;
   align-items: center;
@@ -526,9 +531,9 @@ $scale: 0.5;
   line-height: 1.7;
   border-top: 1px solid #f0f0f0;
   display: flex;
-  justify-content: center;
+  justify-content: space-between;
   align-items: center;
-  flex-direction: column;
+  // flex-direction: column;
 }
 .item-detail text[style*="color:#2ec4b6"] {
   font-weight: bold;
@@ -540,17 +545,20 @@ $scale: 0.5;
 .item-box {
   display: flex;
   flex-direction: column;
-  align-items: center;
+  // align-items: center;
   justify-content: center;
   padding-top: 10px;
 }
 .verify-record{
   cursor: pointer;
   color:#1976d2;
-  margin-left:20px;
+  // margin-left:20px;
   border: 1px solid #1976d2;
-  padding: 5rpx 20px;
+  padding: 7rpx 20px;
   border-radius: 10rpx;
+  width: 15%;
+  text-align: center;
+  margin-right: 10px;
 }
 
 // 轮播组件样式
@@ -559,7 +567,7 @@ $scale: 0.5;
   border-radius: 16rpx;
   overflow: hidden;
   height: 200rpx;
-  width: 50%;
+  width: 100%;
   position: relative;
   
   .media-carousel {

miniprogram/pages/home/home.ts

@@ -137,7 +137,7 @@ Page({
           item.carouselMediaList.push({
             type: "video",
             src: item.itemVideoFirst,
-            poster: item.photo || item.itemImgFirst, 
+            poster: item.photo || item.itemImgFirst,
             // title: "操作视频",
           });
         }
@@ -451,7 +451,7 @@ Page({
       this.setData({
         statusList: arr2,
       });
-      if(!data?.healthAnalysisReportId){
+      if (!data?.healthAnalysisReportId) {
         this.setData({
           isShowComplete: true,
         });
@@ -805,6 +805,18 @@ Page({
     });
     wx.setStorageSync("showGuideActive", 1);
     wx.setStorageSync("isAnalysis", 3);
-
+  },
+  isGoPunchcard(e: any) {
+    const { id, signintime } = e.currentTarget.dataset;
+    // 已经打卡了
+    console.log("signinTime=>>>",signintime);
+    if (signintime) {
+      // 已打卡 跳转到打卡页面
+      wx.navigateTo({
+        url: `/module/article/pages/punch-card/punch-card?id=${id}`,
+      });
+    } else {
+      //  todo 打卡
+    }
   },
 });

miniprogram/pages/home/home.wxml

@@ -81,6 +81,8 @@
               </view>
               <!-- 这里放详细内容 -->
               <view class="item-detail" wx:if="{{item.expanded}}">
+        
+                <view style="width: 60%;">
                 <!-- 轮播媒体容器 -->
                 <view class="carousel-container" wx:if="{{item.carouselMediaList && item.carouselMediaList.length > 0}}">
                   <!-- 轮播组件 -->
@@ -102,22 +104,23 @@
                     <text class="loading-text">加载中...</text>
                   </view>
                 </view>
-                 <!--   <image src="{{item.photo}}" class="detail-image" wx:if="{{item.photo}}" /> -->
                 <view class="item-box">
                   <view class="flex" wx:if="{{item.arrangeDate}}"><text>下一次时间：</text><text>{{item.arrangeDate}}</text></view>
                   <view class="flex">
                   <text wx:if="{{item.isOffline==='Y'}}">已完成：<text style="color:#2ec4b6">{{item.finishCount}}次</text><text style="margin:0 5px">/</text>
                   {{item.totalMeasure}}次</text>
                     <view catchtap="onRecord" data-id="{{item.id}}" wx:if="{{item.isOffline==='Y'}}" class="verify-record">核销记录</view>
-                    <view  data-id="{{item.id}}" wx:else class="verify-record">{{
-                      item.signinTime?'已打卡':'打卡'
-                    }}</view>
                   </view>
                   <view>频次：每{{item.frequencyType}}天{{item.frequencyMeasure}}{{item.convertUnit}}</view>
                   <view>开具医生：{{item.operateBy}}</view>
                   <view wx:if="{{item.conditioningProgramSupplierName}}">机构：{{item.conditioningProgramSupplierName}}</view>
                 </view>
-              </view>
+</view>
+<view  data-id="{{item.id}}" wx:if="{{item.isOffline==='N'}}" class="verify-record" bindtap="isGoPunchcard" 
+                    data-signinTime="{{item.signinTime}}">{{
+                      item.signinTime?'已打卡':'打卡'
+                    }}</view>
+  </view>
             </view>
           </block>
         </view>

miniprogram/themes/page.scss

@@ -1,9 +1,11 @@
 page {
-  --primary-color: #38ff6e;
+  --primary-color: #fbfbfc;
+  // --primary-color: #38ff6e;
   --td-text-color-primary: #000000;
   --td-text-color-secondary: #929292;
   --td-bg-color-container: #fbfbfc;
-  --td-bg-color-secondarycontainer: #1b4f34;
+  --td-bg-color-secondarycontainer:#fbfbfc;
+  // --td-bg-color-secondarycontainer: #1b4f34;
   // --td-cell-note-color: #fff;
   // --td-cell-right-icon-color: #fff;
   --td-cell-note-color: #000;

miniprogram/themes/t.cell.scss

@@ -5,8 +5,8 @@
     border-bottom: none !important;
     height: 1px;
     transform: translateY(-1px);
-    // background: #E7E7E7;
-    background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%,  #1D6FF6 50%, rgba(15, 34, 38, 0) 100%);
+    background: #E7E7E7;
+    // background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%,  #1D6FF6 50%, rgba(15, 34, 38, 0) 100%);
 
     // background: linear-gradient(90deg, rgba(15, 34, 38, 0) 0%, var(--primary-color, #E7E7E7) 50%, rgba(15, 34, 38, 0) 100%);
   }