Просмотр исходного кода

用户统一以及健康档案页面优化

张田田 8 месяцев назад
Родитель
Сommit
99e6d81026
26 измененных файлов с 233 добавлено и 209 удалено
  1. 22 54
      .idea/workspace.xml
  2. 3 2
      miniprogram/module/article/pages/order-detail/order-detail.json
  3. 44 19
      miniprogram/module/article/pages/order-detail/order-detail.scss
  4. 7 6
      miniprogram/module/article/pages/order-detail/order-detail.wxml
  5. 1 1
      miniprogram/module/article/pages/order-list/order-list.scss
  6. 12 67
      miniprogram/module/article/pages/order-list/order-list.ts
  7. BIN
      miniprogram/module/health/assets/image/card_title_bg@2x.png
  8. 11 2
      miniprogram/module/health/components/care-record/care-record.scss
  9. 3 2
      miniprogram/module/health/components/care-record/care-record.wxml
  10. 11 2
      miniprogram/module/health/components/care-scheme/care-scheme.scss
  11. 5 3
      miniprogram/module/health/components/care-scheme/care-scheme.wxml
  12. 10 2
      miniprogram/module/health/components/follow-evaluation/follow-evaluation.scss
  13. 3 1
      miniprogram/module/health/components/follow-evaluation/follow-evaluation.wxml
  14. 13 3
      miniprogram/module/health/components/follow-record/follow-record.scss
  15. 3 1
      miniprogram/module/health/components/follow-record/follow-record.wxml
  16. 11 2
      miniprogram/module/health/components/nodrug-therapy/nodrug-therapy.scss
  17. 3 2
      miniprogram/module/health/components/nodrug-therapy/nodrug-therapy.wxml
  18. 8 0
      miniprogram/module/health/components/report-health-index/report-health-index.scss
  19. 1 1
      miniprogram/module/health/components/report-health-index/report-health-index.wxml
  20. 1 1
      miniprogram/module/health/components/report-health-scheme/report-health-scheme.scss
  21. 3 0
      miniprogram/module/health/components/report-health-status/report-health-status.scss
  22. 9 1
      miniprogram/module/user/pages/user-certification/user-certification.ts
  23. 31 9
      miniprogram/pages/home/home.ts
  24. 16 26
      miniprogram/pages/home/vertical-steps/index.ts
  25. 1 1
      miniprogram/pages/mine/mine.scss
  26. 1 1
      miniprogram/pages/mine/mine.wxml

+ 22 - 54
.idea/workspace.xml

@@ -5,47 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/miniprogram/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/app.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/components/tabbar/tabbar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/components/tabbar/tabbar.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/lib/request/create.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/lib/request/create.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/lib/use/use-phone.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/lib/use/use-phone.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/article/components/science-card/science-card.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/article/components/science-card/science-card.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/charts/record-index/chalk.theme.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/charts/record-index/chalk.theme.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/charts/record-index/record-index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/charts/record-index/record-index.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/charts/record-index/record-index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/charts/record-index/record-index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/charts/record-index/record-index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/charts/record-index/record-index.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/charts/record-index/request.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/charts/record-index/request.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/chats/components/message-system/message-system.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/chats/components/message-system/message-system.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/card-analysis/card-analysis-content.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/card-analysis/card-analysis-content.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/card-analysis/card-analysis-content.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/card-analysis/card-analysis-content.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/card-analysis/card-analysis-content.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/card-analysis/card-analysis-content.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/follow-evaluation/follow-evaluation.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/follow-evaluation/follow-evaluation.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-index/report-health-index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-index/report-health-index.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-index/report-health-index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-index/report-health-index.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-patient/report-health-patient.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-patient/report-health-patient.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.json" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/components/report-health-status/report-health-status.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/model/health.model.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/model/health.model.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/pages/home/home.json" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/pages/home/home.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/pages/home/home.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/pages/home/home.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/pages/home/home.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/pages/home/home.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/pages/report/report.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/pages/report/report.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/health/request.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/health/request.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/user/pages/user-certification/user-certification.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/user/pages/user-certification/user-certification.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/user/pages/user-certification/user-certification.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/user/pages/user-certification/user-certification.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/module/user/request.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/user/request.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/pages/home/home.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/pages/home/home.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/pages/home/home.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/pages/home/home.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/pages/home/home.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/pages/home/home.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/pages/home/request.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/pages/home/request.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/pages/mine/mine.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/pages/mine/mine.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/pages/mine/mine.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/pages/mine/mine.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/themes/card.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/themes/card.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/themes/page.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/themes/page.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/utils/util.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/utils/util.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tsconfig.json" beforeDir="false" afterPath="$PROJECT_DIR$/tsconfig.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/miniprogram/app.config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/app.config.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -63,20 +24,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;feature/register__branch&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "release/2.0.1",
+    "junie.onboarding.icon.badge.shown": "true",
+    "last_opened_file_path": "/Users/zhangtiantian/Desktop/six-health.applet",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
@@ -93,6 +57,7 @@
       <updated>1749202493163</updated>
       <workItem from="1749202494220" duration="720000" />
       <workItem from="1749523832830" duration="2478000" />
+      <workItem from="1754882475936" duration="7606000" />
     </task>
     <servers />
   </component>
@@ -108,4 +73,7 @@
       </list>
     </option>
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="com.intellij.fileTypeFactory" implementationName="*.wxml" />
+  </component>
 </project>

+ 3 - 2
miniprogram/module/article/pages/order-detail/order-detail.json

@@ -6,6 +6,7 @@
     "t-button": "tdesign-miniprogram/button/button",
     "t-empty": "tdesign-miniprogram/empty/empty",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
-    "t-tag": "tdesign-miniprogram/tag/tag"
+    "t-tag": "tdesign-miniprogram/tag/tag",
+    "t-divider": "tdesign-miniprogram/divider/divider"
   }
-}
+}

+ 44 - 19
miniprogram/module/article/pages/order-detail/order-detail.scss

@@ -2,19 +2,30 @@
 @import "../../searc-list.scss";
 /* module/diet/pages/diet-info/diet-info.wxss */
 
-
+.page-scroll__container{
+  background-color: white;
+}
 .order-box {
   background: #ffffff;
   width: 100%;
-  border-radius: 10px 10px 0 0;
+  border-radius: 25px 25px 0 0;
   padding-top: 15px;
+  margin-top: -70px;
 }
 
 .order-detail-scroll {
   padding: 0 20rpx 120rpx 20rpx;
   // background: #f7f7f7;
 }
-
+// .follow-container{
+//   background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/07/11/WechatIMG637_20250711120303A498.jpg');
+//   background-repeat: no-repeat;
+//   width: 100%;
+//   background-size: cover;
+//   background-position: center;
+//   position: relative;
+//   padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+// }
 .info-box {
   // background: red;
   // border-radius: 20rpx;
@@ -22,8 +33,9 @@
   padding: 24rpx;
   background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/07/11/WechatIMG637_20250711120303A498.jpg');
   background-size: cover;
-  background-position: center;
+  background-position: initial;
   background-repeat: no-repeat;
+  height: 150px;
 }
 
 .order-no {
@@ -33,7 +45,7 @@
 }
 
 .address-card {
-  background: #fff;
+  background: rgba(255,255,255,0.8);
   border-radius: 20rpx;
   margin: 24rpx 0;
   padding: 24rpx;
@@ -44,7 +56,7 @@
   display: flex;
   align-items: center;
   gap: 16rpx;
-  margin-bottom: 8rpx;
+  margin-bottom: 14rpx;
 }
 
 .address-name {
@@ -54,8 +66,9 @@
 }
 
 .address-phone {
-  color: #888;
-  font-size: 26rpx;
+  // color: #888;
+  font-weight: 500;
+  font-size: 28rpx;
 }
 
 .address-tag {
@@ -77,27 +90,31 @@
 }
 
 .service-img {
-  width: 150rpx;
-  height: 170rpx;
-  border-radius: 12rpx;
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 8rpx;
   margin-right: 15rpx;
 }
 
 .service-info {
   flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 }
 
 .service-title {
-  font-size: 30rpx;
-  font-weight: 600;
+  font-size: 32rpx;
+  font-weight: 500;
   margin-bottom: 8rpx;
 }
 
 .service-doctor,
 .service-time {
   font-size: 26rpx;
-  color: #888;
+  // color: #888;
   margin-bottom: 4rpx;
+  display: flex;
 }
 
 .item-table {
@@ -111,8 +128,10 @@
 
 .service-date {
   font-size: 30rpx;
-  color: 8C8C8C;
+  color: #8c8c8c;
   margin-bottom: 20rpx;
+  margin-top: 30rpx;
+  font-weight: 500;
 }
 
 
@@ -125,7 +144,7 @@
 .table-header {
   font-weight: 600;
   color: #333;
-  background: #f7f7f7;
+  background: #EEEEEE;
   border-bottom: 1px solid #eee;
 }
 
@@ -162,9 +181,10 @@
 }
 
 .order-amount-value {
-  color: #e53e3e;
-  font-weight: 600;
+  color: #D54941;
+  font-weight: 500;
   margin-left: 12rpx;
+  font-size: 32rpx;
 }
 
 .float-badge {
@@ -199,5 +219,10 @@
 }
 
 .table-row-alt {
-  background: #EEEEEE !important;
+  background: #F9F9F9 !important;
+}
+.total-title{
+  font-weight: 500;
+  font-size: 28rpx;
+  color: black;
 }

+ 7 - 6
miniprogram/module/article/pages/order-detail/order-detail.wxml

@@ -24,11 +24,12 @@
     <t-image src="{{orderDetail.photo}}" class="service-img" wx:if="{{orderDetail.photo}}" />
     <view class="service-info">
       <view class="service-title">{{orderDetail.conditioningWrapName}}</view>
-      <view class="service-doctor" wx:if="{{orderDetail.operateBy}}">开具医生:{{orderDetail.operateBy}}</view>
-      <view class="service-time" wx:if="{{orderDetail.operateTime}}">开具时间:{{orderDetail.operateTime}}</view>
+      <view class="service-doctor" wx:if="{{orderDetail.operateBy}}"><text style=" color: #888;">开具医生:</text>{{orderDetail.operateBy}}</view>
+      <view class="service-time" wx:if="{{orderDetail.operateTime}}"><text style=" color: #888;">开具时间:</text>{{orderDetail.operateTime}}</view>
   
     </view>
   </view>
+  <t-divider />
     <view class="service-date" wx:if="{{orderDetail.estimatedStartDate}}">开始日期:{{orderDetail.estimatedStartDate}}</view>
   <!-- 项目明细表格 -->
   <view class="item-table">
@@ -40,18 +41,18 @@
     <view class="table-row {{idx % 2 === 1 ? 'table-row-alt' : ''}}" wx:for="{{orderDetail.items}}" wx:for-index="idx" wx:key="name">
       <text class="table-cell">{{item.conditioningProgramDetail.name}}</text>
       <text class="table-cell">{{item.frequencyType==='不限'?'不限':item.totalMeasure}}{{item.conditioningProgramDetail.cpFixedPricingRule.pricingUnit}}</text>
-      <text class="table-cell">{{item.totalPrice}}</text>
+      <text class="table-cell">{{item.totalPrice}}</text>
     </view>
     <view class="table-row table-total">
-      <text class="table-cell">合计</text>
+      <text class="table-cell total-title">合计</text>
       <text class="table-cell"></text>
-      <text class="table-cell">{{totalPrice}}</text>
+      <text class="table-cell total-title">{{totalPrice}}</text>
     </view>
   </view>
 
   <!-- 订单金额 -->
   <view class="order-amount">
-    <text>订单金额</text>
+    <text>订单金额</text>
     <text class="order-amount-value">¥{{totalPrice}}</text>
   </view>
   </view>

+ 1 - 1
miniprogram/module/article/pages/order-list/order-list.scss

@@ -63,7 +63,7 @@
 .order-status.status-pending { color: #D54941; }
 .order-status.status-received { color: #1D6FF6; }
 .order-status.status-completed { color: #2BA471; }
-.order-status.status-closed { color: #999; }
+.order-status.status-closed { color: #909399; }
 
 .order-user {
   color: #888;

+ 12 - 67
miniprogram/module/article/pages/order-list/order-list.ts

@@ -14,75 +14,14 @@ Page({
   data: {
     showConfirm: false,
     currentTab: "all", // 当前选中的标签
-    orders: [
-      // {
-      //   orderId: "0038532223",
-      //   contact: "待付款 159****3314",
-      //   address:
-      //     "北京市海淀区永丰产业基地永丰路与翠湖南路交汇处南240米路西3-302",
-      //   servicePackage: "肿瘤术后中医调理服务包",
-      //   doctor: "余医生",
-      //   time: "2025-02-03 12:00:22",
-      //   imgUrl:
-      //     "https://pic.nximg.cn/file/20190718/28170468_214109363000_2.jpg",
-      //   amount: 1000,
-      //   status: "pending", // pending, received, completed, closed
-      //   statusText: "待付款",
-      //   statusClass: "status-pending",
-      // },
-      // {
-      //   orderId: "0038532223",
-      //   contact: "待收货 159****3314",
-      //   address:
-      //     "北京市海淀区永丰产业基地永丰路与翠湖南路交汇处南240米路西3-302",
-      //   servicePackage: "肿瘤术后中医调理服务包",
-      //   doctor: "余医生",
-      //   time: "2025-02-03 12:00:22",
-      //   imgUrl:
-      //     "https://pic.nximg.cn/file/20190718/28170468_214109363000_2.jpg",
-      //   amount: 1000,
-      //   status: "received", // pending, received, completed, closed
-      //   statusText: "待收货",
-      //   statusClass: "status-received",
-      // },
-      // {
-      //   orderId: "0038532223",
-      //   contact: "交易完成 159****3314",
-      //   address:
-      //     "北京市海淀区永丰产业基地永丰路与翠湖南路交汇处南240米路西3-302",
-      //   servicePackage: "肿瘤术后中医调理服务包",
-      //   doctor: "余医生",
-      //   time: "2025-02-03 12:00:22",
-      //   imgUrl:
-      //     "https://pic.nximg.cn/file/20190718/28170468_214109363000_2.jpg",
-      //   amount: 1000,
-      //   status: "completed", // pending, received, completed, closed
-      //   statusText: "交易完成",
-      //   statusClass: "status-completed",
-      // },
-      // {
-      //   orderId: "0038532223",
-      //   contact: "交易关闭 159****3314",
-      //   address:
-      //     "北京市海淀区永丰产业基地永丰路与翠湖南路交汇处南240米路西3-302",
-      //   servicePackage: "肿瘤术后中医调理服务包",
-      //   doctor: "余医生",
-      //   time: "2025-02-03 12:00:22",
-      //   imgUrl:
-      //     "https://pic.nximg.cn/file/20190718/28170468_214109363000_2.jpg",
-      //   amount: 1000,
-      //   status: "closed", // 新增 closed 状态
-      //   statusText: "交易关闭",
-      //   statusClass: "status-closed",
-      // },
-    ],
+    orders: [],
     filteredOrders: [], // 用于存储过滤后的订单
     patientId: 0,
     id: "",
     statusObj: {
       0: "待付款",
       6: "待收货",
-      345: "交易成",
+      345: "交易成功",
       2: "交易关闭",
     },
     statusClassObj: {
@@ -131,8 +70,12 @@ Page({
     if (res && res.data) {
       res.data.forEach((item: any) => {
         item.address = `${item.provinceName}${item.cityName}${item.areaName}${item.detailAddress}`;
-        item.liaison = (item.liaison !== null && item.liaison !== undefined) ? item.liaison : '';
-        item.phone = (item.phone !== null && item.phone !== undefined) ? item.phone : '';
+        item.liaison =
+          item.liaison !== null && item.liaison !== undefined
+            ? item.liaison
+            : "";
+        item.phone =
+          item.phone !== null && item.phone !== undefined ? item.phone : "";
       });
       this.setData({ orders: res.data });
     }
@@ -173,7 +116,7 @@ Page({
         url: "/module/article/pages/success-page/success-page?title=订单支付成功",
       });
     } catch (error: any) {
-      this.setData({ paying: false }); 
+      this.setData({ paying: false });
       getTickleContext.call(this).showWarnMessage(error.errMsg);
     }
   },
@@ -197,7 +140,9 @@ Page({
     // 根据订单状态判断是否可以切换地址. 待支付状态下可以切换地址
     if (orderStatus === "0") {
       wx.navigateTo({
-        url: "/module/article/pages/manage-address/manage-address?type=orderList&orderId=" +id,
+        url:
+          "/module/article/pages/manage-address/manage-address?type=orderList&orderId=" +
+          id,
       });
     }
   },

BIN
miniprogram/module/health/assets/image/card_title_bg@2x.png


+ 11 - 2
miniprogram/module/health/components/care-record/care-record.scss

@@ -9,7 +9,7 @@
 .constitution-container {
   border-radius: 20rpx;
   background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);
-  padding: 0px 10px 10px 10px;
+  // padding: 0px 10px 10px 10px;
 }
 
 .text-title {
@@ -21,7 +21,8 @@
 .card-title {
   display: flex;
   align-items: center;
-  margin-bottom: 10rpx;
+  margin-bottom: 20rpx;
+  margin-left: 30rpx;
 }
 
 .icon-title {
@@ -75,3 +76,11 @@
     }
   }
 }
+.constitution-box{
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
+}
+.table-box{
+  padding: 0px 10px 10px 10px;
+}

+ 3 - 2
miniprogram/module/health/components/care-record/care-record.wxml

@@ -4,7 +4,7 @@
 <!--module/health/components/care-record/care-record.wxml-->
 <view class="card-wrapper">
   <view class="constitution-container">
-    <view class="card-header">
+    <view class="card-header constitution-box">
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <view class="card-title">
         <view><image src="../../assets/icon/icon_record@2x.png" class="icon-title" /></view>
@@ -12,6 +12,7 @@
       </view>
       <slot name="extra"></slot>
     </view>
+    <view class="table-box">
     <view class="table">
       <view class="table-row header">
         <view class="table-cell">开具时间</view>
@@ -24,5 +25,5 @@
     </view>
   </view>
 </view>
-
+</view>
 

+ 11 - 2
miniprogram/module/health/components/care-scheme/care-scheme.scss

@@ -11,7 +11,7 @@
   margin-top: 15px;
   border-radius: 20rpx;
   background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);
-  padding: 0px 10px 10px 10px;
+  // padding: 0px 10px 10px 10px;
 }
 
 .text-title {
@@ -24,7 +24,8 @@
   display: flex;
   align-items: center;
   margin-bottom: 10rpx;
-  padding-left: 4px;
+  // padding-left: 4px;
+  margin-left: 30rpx;
 }
 
 .icon-title {
@@ -122,4 +123,12 @@
   margin: auto;
   // border-top: 1px solid #E7E7E7;
   padding: 10px 0 10px 0;
+}
+.constitution-box{
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
+}
+.table-box{
+  padding: 0px 10px 10px 10px;
 }

+ 5 - 3
miniprogram/module/health/components/care-scheme/care-scheme.wxml

@@ -4,7 +4,7 @@
 <!--module/health/components/care-scheme/care-scheme.wxml-->
 <view class="card-wrapper">
   <view class="constitution-container">
-    <view class="card-header">
+    <view class="card-header constitution-box">
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <view class="card-title">
         <view><image src="../../assets/icon/icon_record@2x.png" class="icon-title" /></view>
@@ -13,6 +13,8 @@
       <slot name="extra"></slot>
     </view>
    
+
+   <view class="table-box">
  <view class="care-scheme-card"  style="margin:0" wx:if="{{careRecordList.length>0}}" >
  <view wx:if="{{careRecordList && careRecordList[0].items.length>0}}" bind:tap="goDetail" data-id="{{careRecordList[0].id}}">
     <view class="scheme-title-row">
@@ -29,12 +31,12 @@
     <view wx:else class="empty-data" >
 暂无数据
 </view>
-  </view>
 
+</view>
 <view wx:else class="empty-data">
 暂无数据
 </view>
-
+  </view>
   </view>
 </view>
 

+ 10 - 2
miniprogram/module/health/components/follow-evaluation/follow-evaluation.scss

@@ -9,9 +9,16 @@
 .constitution-container {
   border-radius: 20rpx;
   background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);
+  // padding: 0px 10px 10px 10px;
+}
+.constitution-box{
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
+}
+.table-box{
   padding: 0px 10px 10px 10px;
 }
-
 .text-title {
   font-size: 16px;
   color: black;
@@ -21,7 +28,8 @@
 .card-title {
   display: flex;
   align-items: center;
-  margin-bottom: 10rpx;
+  margin-bottom: 20rpx;
+  margin-left: 30rpx;
 }
 
 .icon-title {

+ 3 - 1
miniprogram/module/health/components/follow-evaluation/follow-evaluation.wxml

@@ -4,7 +4,7 @@
 <!--module/health/components/follow-evaluation/follow-evaluation.wxml-->
 <view class="card-wrapper">
   <view class="constitution-container">
-    <view class="card-header">
+    <view class="card-header constitution-box">
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <view class="card-title">
         <view>
@@ -14,6 +14,7 @@
       </view>
       <slot name="extra"></slot>
     </view>
+    <view class="table-box">
     <view class="table">
       <view class="table-row header">
         <view class="table-cell">评估时间</view>
@@ -27,4 +28,5 @@
       </view>
     </view>
   </view>
+</view>
 </view>

+ 13 - 3
miniprogram/module/health/components/follow-record/follow-record.scss

@@ -2,14 +2,19 @@
 @import "../../report-common.scss";
 @import "../../../../themes/card.scss";
 /* module/health/components/follow-evaluation/follow-evaluation.wxss */
+.constitution-box{
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
+}
 .card-wrapper {
   margin: 0;
 }
 
 .constitution-container {
   border-radius: 20rpx;
-  background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);
-  padding: 0px 10px 10px 10px;
+
+  // padding: 0px 10px 10px 10px;
 }
 
 .text-title {
@@ -21,7 +26,8 @@
 .card-title {
   display: flex;
   align-items: center;
-  margin-bottom: 10rpx;
+  margin-bottom: 20rpx;
+  margin-left: 30rpx;
 }
 
 .icon-title {
@@ -36,6 +42,7 @@
   justify-content: space-between;
   margin-bottom: 10rpx;
   padding: 20px 0 0px 0 !important;
+
 }
 
 .table {
@@ -75,3 +82,6 @@
     }
   }
 }
+.table-box{
+  padding: 0px 10px 10px 10px;
+}

+ 3 - 1
miniprogram/module/health/components/follow-record/follow-record.wxml

@@ -4,7 +4,7 @@
 <!--module/health/components/follow-evaluation/follow-evaluation.wxml-->
 <view class="card-wrapper">
   <view class="constitution-container">
-    <view class="card-header">
+    <view class="card-header constitution-box">
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <view class="card-title">
         <view>
@@ -14,6 +14,7 @@
       </view>
       <slot name="extra"></slot>
     </view>
+    <view class="table-box">
     <view class="table">
       <view class="table-row header">
         <view class="table-cell">随访时间</view>
@@ -25,6 +26,7 @@
         <view class="table-cell">{{item.followupPlanName}}</view>
         <view class="table-cell">{{item.progress==='1'?'未完成':item.progress==='2'?'已完成':item.progress==='0'?'未开始':''}}</view>
       </view>
+      </view>
     </view>
   </view>
 </view>

+ 11 - 2
miniprogram/module/health/components/nodrug-therapy/nodrug-therapy.scss

@@ -8,7 +8,7 @@
 .constitution-container {
   border-radius: 20rpx;
   background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);
-  padding: 0px 0px 10px 10px;
+  // padding: 0px 0px 10px 10px;
 }
 
 .text-title {
@@ -20,7 +20,8 @@
 .card-title {
   display: flex;
   align-items: center;
-  margin-bottom: 10rpx;
+  margin-bottom: 20rpx;
+  margin-left: 30rpx;
 }
 
 .icon-title {
@@ -103,3 +104,11 @@
   border-top: 1px solid #E7E7E7;
   padding-top: 10px;
 }
+.constitution-box{
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
+}
+.table-box{
+  padding: 0px 10px 10px 10px;
+}

+ 3 - 2
miniprogram/module/health/components/nodrug-therapy/nodrug-therapy.wxml

@@ -4,7 +4,7 @@
 <!--module/health/components/care-scheme/care-scheme.wxml-->
 <view class="card-wrapper">
   <view class="constitution-container">
-    <view class="card-header">
+    <view class="card-header constitution-box">
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <view class="card-title">
         <view>
@@ -18,6 +18,7 @@
       </view>
       <slot name="extra"></slot>
     </view>
+    <view class="table-box">
     <view class="nodrug-therapy-list" wx:if="{{offlineTreatmentList.length>0}}">
       <block wx:for="{{offlineTreatmentList}}" wx:key="id">
         <view class="therapy-card">
@@ -36,6 +37,6 @@
     <view wx:else class="empty-data">
       暂无数据
     </view>
-
+</view>
   </view>
 </view>

+ 8 - 0
miniprogram/module/health/components/report-health-index/report-health-index.scss

@@ -6,6 +6,14 @@
   border-radius: 20rpx 20rpx 0 0;
   background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);
   margin: 0  !important;
+  // padding: 0px 10px 10px 10px;
+}
+.constitution-box{
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
+}
+.table-box{
   padding: 0px 10px 10px 10px;
 }
 .text-title{

+ 1 - 1
miniprogram/module/health/components/report-health-index/report-health-index.wxml

@@ -1,7 +1,7 @@
 <!--module/health/components/report-health-index/report-health-index.wxml-->
 <view>
   <view class="card-wrapper constitution-container">
-    <view class="card-header" style="background:transparent;padding: 15px 0px 0 5px;">
+    <view class="card-header constitution-box">
       <block slot="title">
         <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
         <view class="card-title">

+ 1 - 1
miniprogram/module/health/components/report-health-scheme/report-health-scheme.scss

@@ -53,4 +53,4 @@
       color: #37B473;
     }
   }
-}
+}

+ 3 - 0
miniprogram/module/health/components/report-health-status/report-health-status.scss

@@ -41,6 +41,9 @@
   height: 30px;
   justify-content: space-between;
   padding: 10px;
+  background-image: url('https://wx.hzliuzhi.com:4433/manager/file/statics/2025/08/21/WechatIMG731_20250821155626A830.jpg');
+  background-size: cover;
+  background-position: center;
 }
 .report-data-wrapper {
   // background: linear-gradient(180deg, #D6E4F5 0%, #F3F4F6 100%);

+ 9 - 1
miniprogram/module/user/pages/user-certification/user-certification.ts

@@ -18,6 +18,7 @@ Component({
   behaviors: [PageContainerBehavior, DictionariesBehavior, tickleBehavior],
   lifetimes: {
     attached() {
+    
       const channel = this.getOpenerEventChannel();
       channel.on("navigateBack", (data) => {
         this.setData(data);
@@ -31,6 +32,7 @@ Component({
   },
   properties: {
     hide: { type: Boolean, value: false },
+    type: { type: String, value: "" },
   },
   data: {
     loading: false,
@@ -150,7 +152,13 @@ Component({
         //   url: `/pages/home/home`,
         // });
         // 回到相应的页面
-        wx.navigateBack();
+        if (this.data.type === "home") {
+          wx.navigateTo({
+            url: '/pages/home/home',
+          })
+        } else {
+          wx.navigateBack();
+        }
       } catch (error) {
         // 请求失败时恢复按钮状态
         if (submitBtn) {

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

@@ -140,7 +140,7 @@ Page({
             title: "操作视频",
           });
         }
-    
+
         // 如果没有媒体内容,直接标记为已加载,避免一直显示加载状态
         if (item.carouselMediaList.length === 0) {
           item._mediaLoaded = true;
@@ -169,26 +169,30 @@ Page({
       this.setData({
         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]
+              [`careList[${index}].carouselMediaList`]: [
+                ...item.carouselMediaList,
+              ],
             });
-            
+
             // 同时更新 displayList
             const displayIndex = this.data.displayList.findIndex(
               (displayItem: any) => displayItem.id === item.id
             );
             if (displayIndex !== -1) {
               this.setData({
-                [`displayList[${displayIndex}].carouselMediaList`]: [...item.carouselMediaList]
+                [`displayList[${displayIndex}].carouselMediaList`]: [
+                  ...item.carouselMediaList,
+                ],
               });
             }
           }
@@ -205,7 +209,23 @@ Page({
   },
   async onShow() {
     wx.showShareMenu({ withShareTicket: true, menus }).then();
-    this.load();
+    await this.load();
+    // console.log(this.data.patient, "获取用户信息patient");
+    // 如果用户没有手机号每次进入页面都提示  点击跳到注册页补充
+    // todo 要先判断用户有没有手机号 isPerfectInfo是true 就出来弹窗提示用户
+    if (this.data.patient?.isPerfectInfo) {
+      wx.showModal({
+        title: "提示",
+        content: "手机号为空,请补充",
+        success: (res) => {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: "/module/user/pages/user-certification/user-certification?type=home",
+            });
+          }
+        },
+      });
+    }
   },
   onHide() {
     wx.hideShareMenu({ menus }).then();
@@ -412,7 +432,9 @@ Page({
           },
           {
             title: "表现",
-            value: data?.willillFunctionName ? `${data?.willillFunctionName}` : "",
+            value: data?.willillFunctionName
+              ? `${data?.willillFunctionName}`
+              : "",
           },
         ],
         [
@@ -781,5 +803,5 @@ Page({
       url: `/module/chats/pages/index/index?component=guide&isShowGuide=true`,
     });
     wx.setStorageSync("isAnalysis", 3);
-  }
+  },
 });

+ 16 - 26
miniprogram/pages/home/vertical-steps/index.ts

@@ -2,27 +2,25 @@ Component({
   properties: {
     statusList: {
       type: Array,
-      value: []
+      value: [],
     },
     dataset: { type: Object },
-
   },
 
   data: {
-    dashedCounts: []
+    dashedCounts: [],
   },
 
   lifetimes: {
     ready() {
       this.calcAllDashes();
-    }
+    },
   },
 
   methods: {
-    onBodyModel(event:any) {
-      // console.log(event,"bind:tap=onBodyModel")
-      const position = event.mark?.position
-      if (position) this.triggerEvent('position', { position });
+    onBodyModel(event: any) {
+      const position = event.mark?.position;
+      if (position) this.triggerEvent("position", { position });
     },
     calcAllDashes() {
       const query = wx.createSelectorQuery().in(this);
@@ -33,15 +31,9 @@ Component({
       for (let i = 0; i < itemCount; i++) {
         query.select(`#item-${i}`).boundingClientRect();
       }
-      query.exec(rects => {
+      query.exec((rects) => {
         if (rects) {
-          // if(rects.length > 0 && rects[0] && rects[0].height){
-          //     rects[0].height = rects[0].height + 30; 
-          // }
-          // console.log("rects", rects);
-          rects.forEach((rect:any, i:number) => {
-            // rect[0].height = rect[0].height + 30;
-            // console.log("rect1111", rect);
+          rects.forEach((rect: any, i: number) => {
             if (rect) {
               // 换算成 rpx
               const heightRpx = rect.height / rpx2px;
@@ -50,23 +42,21 @@ Component({
               const dashHeight = 10;
               const gap = 4;
               let count = Math.floor(lineHeight / (dashHeight + gap));
-              // console.log("count", count);
               if (count < 1) count = 1;
-              dashedCounts[i] = Array.from({length: count}, (_, j) => j);
-            } 
-            else {
-              dashedCounts[i] = Array.from({length: 10}, (_, j) => j);
+              dashedCounts[i] = Array.from({ length: count }, (_, j) => j);
+            } else {
+              dashedCounts[i] = Array.from({ length: 10 }, (_, j) => j);
             }
           });
           this.setData({ dashedCounts });
         }
       });
-    }
+    },
   },
 
   observers: {
-    'statusList': function() {
+    statusList: function () {
       this.calcAllDashes();
-    }
-  }
-}) 
+    },
+  },
+});

+ 1 - 1
miniprogram/pages/mine/mine.scss

@@ -55,7 +55,7 @@ background-color: #F5F6F7;
 }
 .phone{
   font-size: 28rpx;
-  color: #8C8C8C;
+  color: rgba(0,0,0,0.45);
 }
 
 .head-container {

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

@@ -4,7 +4,7 @@
   <scroll-view class="page-scroll__container mine-box" type="list" scroll-y style="height: calc(100vh - 180rpx); padding-bottom: calc(100rpx + env(safe-area-inset-bottom));">
     <view class="head-container">
       <view class="head-box">
-        <t-avatar class="avatar-example" size="70px">W</t-avatar>
+        <t-avatar class="avatar-example" size="64px">W</t-avatar>
         <view class="name-box">
           <view class="name">{{patient ? patient.name : '未登录'}}</view>
           <view class="phone" wx:if="{{phone}}">{{phone}}</view>