张田田 před 8 měsíci
rodič
revize
2171053fab

+ 3 - 1
miniprogram/module/article/components/diet-card/diet-card.scss

@@ -48,6 +48,8 @@
     width: 100%;
     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%, 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%);
+
   }
 }

+ 2 - 1
miniprogram/module/article/components/science-card/science-card.scss

@@ -48,6 +48,7 @@
     width: 100%;
     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%, 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%);
   }
 }

+ 1 - 1
miniprogram/module/article/pages/add-address/add-address.scss

@@ -238,7 +238,7 @@
 }
 // 智能识别地址失焦时的样式
 .smart-paste-input-blur {
-  height: 50px !important;
+  height: 70px !important;
 }
 .smart-paste-input {
   font-size: 15rpx !important;

+ 21 - 4
miniprogram/module/article/pages/order-detail/order-detail.ts

@@ -41,6 +41,7 @@ Page({
   },
   // 订单支付
   async payment() {
+    console.log(this.data.id, "立即支付");
     try {
       const res = await orderPayMethod(this.data.id);
       console.log(res, "订单支付");
@@ -48,7 +49,11 @@ Page({
         url: "/module/article/pages/success-page/success-page?title=订单支付成功",
       });
     } catch (error: any) {
-      getTickleContext.call(this).showWarnMessage(error.errMsg);
+      // getTickleContext.call(this).showWarnMessage(error.errMsg);
+      wx.showToast({
+        title: error.errMsg,
+        icon: "none",
+      });
     }
   },
   statusType(status: string) {
@@ -95,7 +100,11 @@ Page({
         this.setData({ totalPrice });
       }
     } catch (error: any) {
-      getTickleContext.call(this).showWarnMessage(error.errMsg);
+      // getTickleContext.call(this).showWarnMessage(error.errMsg);
+      wx.showToast({
+        title: error.errMsg,
+        icon: "none",
+      });
     }
     wx.hideLoading();
   },
@@ -126,7 +135,11 @@ Page({
         url: "/module/article/pages/success-page/success-page?title=订单取消成功",
       });
     } catch (error: any) {
-      getTickleContext.call(this).showWarnMessage(error.errMsg);
+      // getTickleContext.call(this).showWarnMessage(error.errMsg);
+      wx.showToast({
+        title: error.errMsg,
+        icon: "none",
+      });
     }
   },
   // 取消订单
@@ -171,7 +184,11 @@ Page({
       //   url: "/module/article/pages/confirm-receiving/confirm-receiving",
       // });
     } catch (error: any) {
-      getTickleContext.call(this).showWarnMessage(error.errMsg);
+      // getTickleContext.call(this).showWarnMessage(error.errMsg);
+      wx.showToast({
+        title: error.errMsg,
+        icon: "none",
+      });
     }
   },
   onShow() {

+ 3 - 3
miniprogram/module/care/pages/careDetail/careDetail.ts

@@ -124,7 +124,7 @@ Page({
               item.carouselMediaList.push({
                 type: "image",
                 src: item.conditioningProgramDetail?.photo,
-                title: "商品图片",
+                // title: "商品图片",
               });
             }
             // 添加itemImgFirst
@@ -132,7 +132,7 @@ Page({
               item.carouselMediaList.push({
                 type: "image",
                 src: item.conditioningProgramDetail?.itemImgFirst,
-                title: "操作图片",
+                // title: "操作图片",
               });
             }
 
@@ -141,7 +141,7 @@ Page({
               item.carouselMediaList.push({
                 type: "video",
                 src: item.conditioningProgramDetail?.itemVideoFirst,
-                title: "操作视频",
+                // title: "操作视频",
               });
             }
 

+ 10 - 9
miniprogram/pages/home/home.ts

@@ -28,6 +28,7 @@ import { useLocation } from "../../lib/use/use-location";
 
 Page({
   data: {
+    isShowComplete: false,
     careList: [],
     displayList: [] as {
       id: number;
@@ -118,7 +119,7 @@ Page({
           item.carouselMediaList.push({
             type: "image",
             src: item.photo,
-            title: "商品图片",
+            // title: "商品图片",
           });
         }
 
@@ -127,7 +128,7 @@ Page({
           item.carouselMediaList.push({
             type: "image",
             src: item.itemImgFirst,
-            title: "操作图片",
+            // title: "操作图片",
           });
         }
 
@@ -136,8 +137,8 @@ Page({
           item.carouselMediaList.push({
             type: "video",
             src: item.itemVideoFirst,
-            poster: item.photo || item.itemImgFirst, // 使用photo或itemImgFirst作为视频封面
-            title: "操作视频",
+            poster: item.photo || item.itemImgFirst, 
+            // title: "操作视频",
           });
         }
 
@@ -145,13 +146,11 @@ Page({
         if (item.carouselMediaList.length === 0) {
           item._mediaLoaded = true;
         } else {
-          // 模拟加载过程,3秒后自动标记为已加载(防止一直显示加载状态)
           setTimeout(() => {
             if (!item._mediaLoaded) {
               this.setData({
                 [`careList[${index}]._mediaLoaded`]: true,
               });
-              // 同时更新 displayList
               const displayIndex = this.data.displayList.findIndex(
                 (displayItem: any) => displayItem.id === item.id
               );
@@ -170,14 +169,11 @@ Page({
         careList: res,
       });
 
-      // 然后更新 displayList,确保 carouselMediaList 的变化能被监听到
       await this.updateDisplayList();
 
-      // 强制触发一次 carouselMediaList 的更新,确保 observer 被调用
       setTimeout(() => {
         res.forEach((item: any, index: number) => {
           if (item.carouselMediaList && item.carouselMediaList.length > 0) {
-            // 通过 setData 重新设置 carouselMediaList,触发 observer
             this.setData({
               [`careList[${index}].carouselMediaList`]: [
                 ...item.carouselMediaList,
@@ -455,6 +451,11 @@ Page({
       this.setData({
         statusList: arr2,
       });
+      if(!data?.healthAnalysisReportId){
+        this.setData({
+          isShowComplete: true,
+        });
+      }
     } catch (error) {
       this.setData({
         "healthReport.data": [],

+ 1 - 1
miniprogram/pages/home/home.wxml

@@ -47,7 +47,7 @@
           </view>
         </view>
       </view>
-       <view class="healthyAnalyze" bindtap="goHealthAnalyze" wx:else >
+       <view class="healthyAnalyze" bindtap="goHealthAnalyze" wx:if="{{isShowComplete}}"  >
    请完成健康评估
      </view>
       <view class="report-container" bind:tap="toReportPage" wx:if="{{healthReport.data.reportTime}}">

+ 3 - 1
miniprogram/themes/t.cell.scss

@@ -5,7 +5,9 @@
     border-bottom: none !important;
     height: 1px;
     transform: translateY(-1px);
-    background: #E7E7E7;
+    // 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%);
   }
 }