众测问题修改

project.private.config.json

@@ -23,13 +23,20 @@
     "miniprogram": {
       "list": [
         {
-          "name": "start",
+          "name": "患者-录入个人信息",
-          "pathName": "pages/start/index",
+          "pathName": "patient/pages/enterInfo/index",
           "query": "",
           "scene": null,
           "launchMode": "default"
         },
         {
+          "name": "start",
+          "pathName": "pages/start/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "医生-患者列表",
           "pathName": "pages/d_patient/index",
           "query": "",

src/app.json

@@ -116,8 +116,8 @@
   },
   "tabBar": {
     "custom": false,
-    "color": "rgba(105, 104, 110, 1)",
+    "color": "#69686E",
-    "selectedColor": "rgba(33, 29, 46, 1)",
+    "selectedColor": "#211D2E",
     "borderStyle": "white",
     "list": [
       {

src/app.ts

@@ -178,7 +178,7 @@ App<IAppOption>({
     }
 
     if (isLogin !== 1) {
-      if (type.includes(0) && [0, 1].includes(loginType)) {
+      if (type.includes(0) && [0, 1, 2].includes(loginType)) {
         return true
       }
       if ([0, 1].includes(loginType)) {
@@ -524,6 +524,9 @@ App<IAppOption>({
             inviteDoctorId: doctorId,
             inviteChannel: inviteChan,
           },
+        }).then(() => {
+          this.globalData.scene = {}
+          this.getZdUserInfo(self, update, callback)
         })
       }
       callback(res)

src/components/pagination/index.js

@@ -1,11 +1,12 @@
-const app = getApp();
+const app = getApp()
 
 Component({
+  externalClasses: ['external-class'],
   properties: {
     pagination: {
       type: Object,
       value() {
-        return {};
+        return {}
       },
     },
   },
@@ -14,7 +15,7 @@ Component({
   },
   methods: {
     handleTouchmove() {
-      return false;
+      return false
     },
   },
-});
+})

src/components/pagination/index.wxml

@@ -1,4 +1,4 @@
-<image class="none" src="{{imageUrl}}none.png?t={{Timestamp}}" wx:if="{{pagination.count==0}}"></image>
+<image class="none external-class" src="{{imageUrl}}none.png?t={{Timestamp}}" wx:if="{{pagination.count==0}}"></image>
 <van-divider contentPosition="center" wx:elif="{{pagination.page<pagination.pages}}">
   <van-loading />
   加载中...

src/components/toast/index.scss

@@ -2326,32 +2326,44 @@
 .popup-dedicated-doctor {
   .popup-container {
     position: relative;
-    padding: 392rpx 40rpx 0;
+    padding: 100rpx 32rpx 32rpx;
-    width: 670rpx;
+    width: 630rpx;
-    height: 496rpx;
+    height: 516rpx;
     box-sizing: border-box;
+    .title {
+      font-size: 40rpx;
+      color: #ffffff;
+      font-weight: bold;
+    }
     .content {
-      position: absolute;
+      font-size: 32rpx;
-      top: 78rpx;
+      color: #ffffff;
-      right: 20rpx;
+    }
-      width: 462rpx;
+    .container {
-      height: 122rpx;
+      margin-top: 60rpx;
-      animation: hu__hu__ infinite 2s ease-in-out;
+      font-size: 32rpx;
-      @keyframes hu__hu__ {
+      color: #211d2e;
-        50% {
+      text-align: center;
-          transform: translateY(20rpx);
+      line-height: 48rpx;
+      .line {
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
+      .high {
+        color: #b982ff;
+        font-weight: bold;
       }
     }
     .btn {
-      width: 610rpx;
+      margin-top: 32rpx;
-      height: 80rpx;
+      height: 88rpx;
       font-size: 32rpx;
       color: rgba(255, 255, 255, 1);
       text-align: center;
-      line-height: 80rpx;
+      line-height: 88rpx;
-      background: #cf5375;
+      background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
-      border-radius: 24rpx 24rpx 24rpx 24rpx;
+      border-radius: 100rpx;
     }
   }
   .close {

src/components/toast/index.wxml

@@ -680,18 +680,21 @@
       </view>
     </view>
   </view>
-  <view
+  <view class="popup-dedicated-doctor" wx:if="{{type == 'dedicatedDoctor'}}">
-    class="popup-dedicated-doctor {{theme === 'DRUG' && 'popup-dedicated-doctor-drug'}}"
-    wx:if="{{type == 'dedicatedDoctor'}}"
-  >
     <view
       class="popup-container"
-      style="background: url({{imageUrl}}za-images/2/popup-dedicated-doctor{{theme === 'DRUG'?'-drug':''}}-bg.png?t={{Timestamp}}) no-repeat top center/100%"
+      style="background: url({{imageUrl}}bg13.png?t={{Timestamp}}) no-repeat top center/100%"
     >
-      <image
+      <view class="title">感谢您的信任</view>
-        class="content"
+      <view class="content">医生可远程关注您的健康状况啦</view>
-        src="{{imageUrl}}za-images/2/popup-dedicated-doctor-content{{theme === 'DRUG'?'-drug':''}}.png?t={{Timestamp}}"
+      <view class="container">
-      ></image>
+        <view class="line">
+          您的
+          <view class="high">【专属医生互动】</view>
+          上线啦
+        </view>
+        随时咨询共同做好居家管理
+      </view>
       <view class="btn" bind:tap="handleOk">立即体验</view>
     </view>
     <image

src/pages/d_patient/index.scss

@@ -142,6 +142,7 @@ page {
         .avatar-img {
           width: 100rpx;
           height: 100rpx;
+          display: block;
           border-radius: 50%;
         }
       }
@@ -177,10 +178,10 @@ page {
       }
 
       .send {
-        padding: 8rpx 22rpx;
+        padding: 6rpx 24rpx;
-        font-size: 24rpx;
+        font-size: 28rpx;
-        color: rgba(185, 130, 255, 1);
+        color: #B982FF;
-        line-height: 1;
+        line-height: 36rpx;
         border-radius: 32rpx 32rpx 32rpx 32rpx;
         border: 2rpx solid rgba(185, 130, 255, 1);
         display: flex;

src/pages/d_patientDetail/index.scss

@@ -335,6 +335,7 @@ page {
     .row {
       padding: 32rpx;
       display: flex;
+      align-items: center;
       border-bottom: 1px solid rgba(173, 172, 178, 0.1);
       &:last-of-type {
         border: none;
@@ -347,6 +348,7 @@ page {
       .content {
         font-size: 32rpx;
         color: rgba(33, 29, 46, 1);
+        white-space: pre-line;
       }
     }
   }

src/pages/d_patientDetail/index.ts

@@ -1065,6 +1065,10 @@ Page({
       this.setData({
         ['detail.IsEDC']: this.data.detail.IsEDC == 1 ? 2 : 1,
       })
+      wx.showToast({
+        icon: 'none',
+        title: this.data.detail.IsEDC == 1 ? '已设置为EDC患者' : '已取消EDC患者',
+      })
     })
   },
 })

src/pages/d_patientDetail/index.wxml

@@ -1,5 +1,5 @@
 <navbar fixed title="患者档案" custom-style="background:{{background}}" z-index="10">
-  <van-icon name="arrow-left" slot="left" color="#000" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 
 <view
@@ -46,9 +46,9 @@
       </view>
       <view class="content">{{detail.HasTedSurgeryName}}</view>
     </view>
-    <view class="row">
+    <view class="row" wx:if="{{detail.DoctorRemark}}">
       <view class="label">备注</view>
-      <view class="content">{{detail.remark}}</view>
+      <view class="content">{{detail.DoctorRemark}}</view>
     </view>
   </view>
   <view class="edc-card" bind:tap="handleEDC" wx:if="{{userInfo.IsEDC==='1'}}">

src/pages/home/index.scss

@@ -64,6 +64,14 @@ page {
         font-size: 32rpx;
         color: rgba(33, 29, 46, 1);
         font-weight: bold;
+        display: flex;
+        align-items: baseline;
+        gap: 16rpx;
+        .sub {
+          font-size: 28rpx;
+          color: #adacb2;
+          font-weight: normal;
+        }
       }
     }
     .s-container {
@@ -76,6 +84,7 @@ page {
         background-color: #fff;
         border-radius: 24rpx;
         display: flex;
+        align-items: center;
         gap: 22rpx;
         .icon {
           width: 84rpx;
@@ -95,17 +104,20 @@ page {
             }
           }
           .num {
-            margin-top: 16rpx;
+            margin-top: 12rpx;
             font-size: 48rpx;
             color: rgba(33, 29, 46, 1);
             font-weight: bold;
+            display: flex;
+            align-items: baseline;
             .sub {
+              margin-left: 8rpx;
               font-size: 24rpx;
               color: rgba(173, 172, 178, 1);
             }
           }
           .content {
-            margin-top: 16rpx;
+            margin-top: 28rpx;
             font-size: 28rpx;
             color: rgba(173, 172, 178, 1);
           }

src/pages/home/index.wxml

@@ -145,7 +145,7 @@
   </view>
   <view class="stat" bind:tap="handlePatient">
     <view class="s-header">
-      <view class="title">统计数据截止到昨天</view>
+      <view class="title">统计数据截止到昨天 <text class="sub">每天00:05更新</text></view>
     </view>
     <view class="s-container">
       <view class="card">

src/pages/information/index.scss

@@ -28,7 +28,7 @@ page {
   }
   .card {
     margin: 0 40rpx 24rpx;
-    padding: 12rpx;
+    padding: 32rpx;
     background-color: #fff;
     border-radius: 24rpx;
     display: flex;
@@ -36,7 +36,7 @@ page {
       position: relative;
       width: 176rpx;
       height: 176rpx;
-      border-radius: 24rpx;
+      border-radius: 16rpx;
       .photo {
         flex-shrink: 0;
         width: 100%;

src/pages/information/index.wxml

@@ -2,7 +2,7 @@
 
 <view
   class="page"
-  style="background: url('{{imageUrl}}bg2.png?t={{Timestamp}}') no-repeat top center/100% 616rpx;padding-top: {{pageTop + 20}}px;"
+  style="background: url('{{imageUrl}}bg12.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top: {{pageTop + 20}}px;"
 >
   <!-- <view class="page-tags" style="background:{{background}};top:{{pageTop}}px;"> -->
   <!--   <view class="tag active">全部</view> -->

src/pages/login/index.wxml

@@ -1,5 +1,5 @@
 <navbar wx:if="{{back==='1'}}" fixed title="" custom-style="background:{{background}}" z-index="10">
-  <van-icon name="arrow-left" slot="left" color="#000" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left"  size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 
 <view
@@ -75,7 +75,7 @@
       </view>
     </view>
   </view>
-  <view wx:if="{{back!=='1'}}" class="switch" bind:tap="handlePatient">
+  <view class="switch" bind:tap="handlePatient">
     切换到患者端
     <van-icon name="arrow" />
   </view>

src/pages/my/index.scss

@@ -42,8 +42,9 @@ page {
           margin-left: 10rpx;
           display: inline-block;
           font-size: 24rpx;
+          line-height: 28rpx;
           color: rgba(255, 255, 255, 1);
-          padding: 2rpx 10rpx;
+          padding: 2rpx 8rpx;
           background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
           border-radius: 8rpx 8rpx 8rpx 8rpx;
         }
@@ -102,3 +103,7 @@ page {
     background-color: #fff;
   }
 }
+
+.van-popup--center {
+  top: 55% !important;
+}

src/pages/my/index.wxml

@@ -16,7 +16,12 @@
     </view>
     <!-- <image class="edit" src="{{imageUrl}}icon2.png?t={{Timestamp}}"></image> -->
   </view>
-  <image class="invite-card" mode="widthFix" src="{{imageUrl}}invite-card.png?t={{Timestamp}}" bind:tap="handleInvite"></image>
+  <image
+    class="invite-card"
+    mode="widthFix"
+    src="{{imageUrl}}invite-card.png?t={{Timestamp}}"
+    bind:tap="handleInvite"
+  ></image>
   <view class="list">
     <view class="list-item" bind:tap="handleUserInfo">
       <image class="icon" src="{{imageUrl}}icon51.png?t={{Timestamp}}"></image>

src/patient/pages/doctorDetail/index.scss

@@ -47,12 +47,12 @@ page {
       .tag {
         margin-right: 12rpx;
         display: inline-block;
-        flex-shrink: 0;
+        font-size: 24rpx;
-        padding: 2rpx 12rpx;
+        line-height: 28rpx;
-        font-size: 22rpx;
+        color: rgba(255, 255, 255, 1);
-        color: #fff;
+        padding: 2rpx 8rpx;
-        border-radius: 8rpx;
         background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
       }
     }
     .card {

src/patient/pages/enterInfo/index.scss

@@ -118,7 +118,7 @@
         .input-required {
           display: flex;
           justify-content: space-between;
-          align-items: flex-end;
+          align-items: center;
           &::after {
             flex-shrink: 0;
             margin-right: 60rpx;
@@ -147,7 +147,7 @@
           }
           &.active {
             color: rgba(185, 130, 255, 1);
-            background: #fff;
+            background: #FAF6FF;
             border-color: rgba(185, 130, 255, 1);
           }
         }
@@ -168,7 +168,7 @@
           &.active {
             color: rgba(185, 130, 255, 1);
             border-color: rgba(185, 130, 255, 1);
-            background-color: transparent;
+            background-color: #FAF6FF;
           }
         }
       }

src/patient/pages/index/index.scss

@@ -16,21 +16,12 @@ page {
     padding-bottom: 180rpx;
     .doctor {
       margin: $page-margin $page-margin 0;
-      padding: 16rpx 10rpx 10rpx;
+      padding: 32rpx;
       border-radius: 24rpx;
       background: linear-gradient(195deg, #ffe3fc 0%, #ecddff 100%);
-      .title {
-        padding-left: 16rpx;
-        font-size: 32rpx;
-        color: rgba(185, 130, 255, 1);
-        font-weight: bold;
-      }
       .container {
-        margin-top: 16rpx;
-        padding: 27rpx 0 27rpx 27rpx;
         display: flex;
         justify-content: space-between;
-        background: linear-gradient(351deg, #ffffff 0%, rgba(255, 255, 255, 0.78) 100%);
         border-radius: 21rpx;
         .avatar {
           width: 104rpx;
@@ -122,26 +113,16 @@ page {
             }
           }
         }
-        .btn {
-          align-self: center;
-          width: 128rpx;
-          height: 44rpx;
-          font-size: 28rpx;
-          color: #fff;
-          background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
-          border-radius: 420rpx 0 0 420rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
       }
-      &.doctor-drugs {
-        .container {
       .btn {
+        margin-top: 32rpx;
+        height: 64rpx;
+        font-size: 28rpx;
         color: #ffffff;
-            background: rgba(37, 217, 200, 1);
+        text-align: center;
-          }
+        line-height: 64rpx;
-        }
+        background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
+        border-radius: 64rpx 64rpx 64rpx 64rpx;
       }
     }
     .banner {
@@ -209,7 +190,7 @@ page {
           padding: 32rpx 0;
           background: #ffffff;
           display: flex;
-          border-bottom: 1px dotted rgba(39, 58, 101, 0.2);
+          border-bottom: 1px dotted rgba(39, 58, 101, 0.1);
           &:last-of-type {
             border: none;
           }
@@ -271,7 +252,7 @@ page {
               text-overflow: ellipsis;
               overflow: hidden;
               .line {
-                margin: 0 4rpx;
+                margin: 0 8rpx;
                 vertical-align: baseline;
                 display: inline-block;
                 width: 1px;
@@ -290,7 +271,8 @@ page {
                 color: rgba(105, 104, 110, 1);
               }
               .btn {
-                width: 128rpx;
+                min-width: 128rpx;
+                padding: 0 18rpx;
                 height: 48rpx;
                 display: flex;
                 align-items: center;
@@ -328,12 +310,13 @@ page {
       }
       .swiper {
         margin: 0 -40rpx;
-        height: 700rpx;
+        height: 780rpx;
         .swiper-item {
           padding: 32rpx 40rpx;
           box-sizing: border-box;
           .book-list {
             padding: 0 32rpx;
+            height: 100%;
             border-radius: 32rpx;
             background-color: #fff;
             box-shadow: 0 0 32rpx 1rpx rgba(0, 0, 0, 0.08);
@@ -341,6 +324,7 @@ page {
             .card {
               padding: 32rpx 0;
               display: flex;
+              border-bottom: 1px dotted rgba(39, 58, 101, 0.1);
               > view:not(:last-of-type),
               > image {
                 margin-right: 24rpx;
@@ -383,8 +367,18 @@ page {
               }
             }
 
-            .card:not(:last-of-type) {
+            .card:nth-of-type(3) {
-              border-bottom: 1rpx dotted rgba(39, 58, 101, 0.2);
+              border: none;
+            }
+            .more {
+              height: 72rpx;
+              font-size: 28rpx;
+              color: #b982ff;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              background: #f2e8ff;
+              border-radius: 100rpx 100rpx 100rpx 100rpx;
             }
           }
         }
@@ -406,7 +400,7 @@ page {
     left: 64rpx;
     bottom: calc(env(safe-area-inset-bottom) + 120rpx);
     width: 622rpx;
-    background-color: rgba(39, 58, 101, 0.8);
+    background-color: rgba(33, 29, 46, 0.62);
     box-shadow: 0 8rpx 24rpx rgba(92, 144, 220, 0.25);
     height: 84rpx;
     line-height: 84rpx;

src/patient/pages/index/index.ts

@@ -80,6 +80,7 @@ Page({
           zdUserInfo,
           publicCard: zdUserInfo.isShowFollowGuide == 1,
         })
+        this.getPopup()
         this.getConfig(zdUserInfo)
         this.getSystemConfig()
         if (zdUserInfo.ExclusiveDoctorId > 0) {
@@ -92,6 +93,22 @@ Page({
       })
     })
   },
+  async getPopup() {
+    const data3 = await wx.ajax({
+      method: 'GET',
+      url: '?r=zd/popup/info',
+      data: {
+        Type: 6,
+      },
+    })
+    if (data3.showAlert) {
+      this.setData({
+        toastShow: data3.showAlert,
+        toastType: 'dedicatedDoctor',
+        toastParams: {},
+      })
+    }
+  },
   getUnreadCount() {
     wx.ajax({
       method: 'GET',

src/patient/pages/index/index.wxml

@@ -6,14 +6,13 @@
   style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop}}px;"
 >
   <view class="page-container">
-    <!-- style="background: url({{imageUrl}}za-images/2/doctor-home{{theme === 'DRUG' ? '-drug':''}}-bg.png?t={{Timestamp}}) no-repeat 16rpx 9rpx/606rpx 173rpx,{{theme === 'DRUG'? 'linear-gradient( 360deg, #25D9C8 0%, #25D9C8 73%, #B5EFEA 100%)':'linear-gradient( 360deg, #CF5375 0%, #CF5375 74%, #EE9FB9 100%) no-repeat top center/100% 100%'}}" -->
     <view
       class="doctor"
       wx:if="{{zdUserInfo.ExclusiveDoctorId}}"
       bind:tap="routerTo"
+      style="background:#fff url({{imageUrl}}bg11.png?t={{Timestamp}}) no-repeat top center/100% 256rpx"
       data-url="/patient/pages/interactivePatient/index"
     >
-      <view class="title">我的专属医生</view>
       <view class="container">
         <view class="avatar">
           <image class="a-img" mode="aspectFill" src="{{zdUserInfo.ExclusiveDoctorImg}}" alt=""></image>
@@ -36,8 +35,8 @@
             </view>
           </view>
         </view>
-        <view class="btn">{{unreadCount ? '去看看':'去咨询'}}</view>
       </view>
+      <view class="btn">{{unreadCount ? '去看看':'去咨询'}}</view>
     </view>
     <block wx:for="{{configList}}" wx:key="index" wx:for-item="card" wx:for-index="cIndex">
       <view
@@ -114,7 +113,7 @@
                 <view class="date">{{item.BeginTime}}</view>
                 <view class="btn">
                   <image class="icon" src="{{imageUrl}}icon30.png?t={{Timestamp}}"></image>
-                  {{item.Status==2?'参会':'查看'}}
+                  {{item.Status==2?'点此参加':'查看'}}
                 </view>
               </view>
             </view>
@@ -124,10 +123,6 @@
       <view class="book" wx:if="{{card.code == 'article' && card.showStatus == 1 && infoList.length}}">
         <view class="header" wx:if="{{card.name}}">
           <view class="title">{{card.name}}</view>
-          <view bind:tap="routerTo" class="more" data-url="/patient/pages/repository/index" data-code="{{card.code}}">
-            查看全部
-            <van-icon name="arrow" />
-          </view>
         </view>
         <swiper
           class="swiper"
@@ -153,6 +148,15 @@
                   <view class="title">{{item.Title}}</view>
                 </view>
               </view>
+              <view
+                class="more"
+                bind:tap="routerTo"
+                class="more"
+                data-url="/patient/pages/repository/index"
+                data-code="{{card.code}}"
+              >
+                查看全部
+              </view>
             </view>
           </swiper-item>
         </swiper>

src/patient/pages/interactivePatient/index.scss

@@ -36,19 +36,16 @@ page {
         color: rgba(173, 172, 178, 1);
         display: flex;
         gap: 8rpx;
-        align-items: start;
+        align-items: center;
         .tag {
-          margin-top: 7rpx;
+          margin-left: 10rpx;
-          padding: 0 10rpx;
+          display: inline-block;
-          flex-shrink: 0;
+          font-size: 24rpx;
-          height: 28rpx;
-          font-size: 22rpx;
-          color: #fff;
-          line-height: 1;
-          text-align: center;
           line-height: 28rpx;
+          color: rgba(255, 255, 255, 1);
+          padding: 2rpx 8rpx;
           background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
-          border-radius: 4rpx;
+          border-radius: 8rpx 8rpx 8rpx 8rpx;
         }
       }
     }
@@ -449,7 +446,7 @@ page {
   .page-footer {
     position: relative;
     flex-shrink: 0;
-    padding: 18rpx 30rpx calc(env(safe-area-inset-bottom) + 30rpx);
+    padding: 18rpx 30rpx 30rpx;
     border-radius: 24rpx 24rpx 0 0;
     background-color: #fff;
     transition: all 0.3s;
@@ -467,7 +464,7 @@ page {
       background-color: #fff;
     }
     &.expend {
-      height: 50vh;
+      height: 45vh;
     }
     .line {
       margin: 0 auto;

src/patient/pages/live/index.scss

@@ -131,7 +131,7 @@ page {
           text-overflow: ellipsis;
           overflow: hidden;
           .line {
-            margin: 0 4rpx;
+            margin: 0 8rpx;
             vertical-align: baseline;
             display: inline-block;
             width: 1px;

src/patient/pages/liveDetail/index.scss

@@ -7,10 +7,10 @@
     height: 334rpx;
     border-radius: 24rpx;
     border: 2rpx solid #ffffff;
-    box-shadow: 0 10rpx 10rpx #ccc;
+    box-shadow: 0 10rpx 16rpx #dcdcdc;
   }
   .page-container {
-    padding: 18rpx 30rpx 160rpx;
+    padding: 30rpx 40rpx 160rpx;
     .title {
       font-size: 40rpx;
       color: #333333;
@@ -64,10 +64,10 @@
     .screen {
       position: relative;
       margin-top: 30rpx;
-      padding: 32rpx 32rpx 0;
+      padding: 16rpx 32rpx 16rpx;
       background: rgba(246, 248, 249, 1);
-      border-radius: 24rpx;
       box-sizing: border-box;
+      border-radius: 24rpx;
       .screen-list {
         max-height: 268rpx;
         .s-item {
@@ -93,14 +93,27 @@
           }
         }
       }
+      &::before {
+        position: absolute;
+        top: 0;
+        left: 0;
+        content: '';
+        width: 100%;
+        height: 84rpx;
+        border-radius: 24rpx;
+        background: linear-gradient(to top, rgba(246, 248, 249, 0) 0%, rgba(246, 248, 249, 0.68) 36%, #f6f8f9 100%);
+        z-index: 1;
+      }
       &::after {
         position: absolute;
         bottom: 0;
         left: 0;
         content: '';
         width: 100%;
-        height: 32rpx;
+        height: 84rpx;
-        background: linear-gradient(180deg, rgba(251, 252, 252, 0.49) 0%, #fcfdfd 100%);
+        border-radius: 24rpx;
+        background: linear-gradient(to bottom, rgba(246, 248, 249, 0) 0%, rgba(246, 248, 249, 0.68) 36%, #f6f8f9 100%);
+        z-index: 1;
       }
     }
     .content {
@@ -137,6 +150,10 @@
         color: #484848;
         background: #e7e7e7;
       }
+      &.active1{
+        color: #B982FF;
+        background: #F2E8FF;
+      }
     }
   }
   .video {
@@ -156,6 +173,7 @@
 
 .fixed-share {
   position: fixed;
+  z-index: 2;
   right: 14rpx;
   bottom: 264rpx;
   width: 84rpx;
@@ -168,11 +186,11 @@
   background-color: transparent !important;
 }
 .p-share {
-  width: 622rpx;
+  width: 705rpx;
   .photo {
     display: block;
     width: 100%;
-    height: 964rpx;
+    height: 1111rpx;
     border-radius: 24rpx;
   }
   .tip {
@@ -182,4 +200,3 @@
     text-align: center;
   }
 }
-

src/patient/pages/liveDetail/index.wxml

@@ -1,5 +1,5 @@
 <navbar fixed title="" custom-style="background:{{background}}">
-  <van-icon name="arrow-left" slot="left" color="#000" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 
 <view
@@ -12,13 +12,13 @@
     <view class="info">
       <view class="date">{{detail.BeginTime}}</view>
       <view class="stat">
-        <view class="s-item" wx:if="{{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}}">
-          <image class="icon" src="{{imageUrl}}icon40.png?t={{Timestamp}}"></image>
-          {{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}}次
-        </view>
         <view class="s-item" bind:tap="handleShare" wx:if="{{detail.ShareNum}}">
           <image class="icon" src="{{imageUrl}}icon39.png?t={{Timestamp}}"></image>
-          {{detail.ShareNum}}次
+          {{detail.ShareNum}}
+        </view>
+        <view class="s-item" wx:if="{{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}}">
+          <image class="icon" src="{{imageUrl}}icon40.png?t={{Timestamp}}"></image>
+          {{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}}
         </view>
       </view>
     </view>
@@ -69,8 +69,9 @@
       <block wx:if="{{zdUserInfo.AuditStatus == 1 || zdUserInfo.AuditStatus == 3 || zdUserInfo.AuditStatus == 4}}">
         <view class="btn active" wx:if="{{detail.SignUpStatus==1}}" bind:tap="handleResult">审核中</view>
         <block wx:elif="{{detail.SignUpStatus==2}}">
-          <view class="btn" wx:if="{{detail.BeginTimeValue * 1 < dateValue * 1}}" bind:tap="handleLive">参会</view>
+          <view class="btn" wx:if="{{detail.BeginTimeValue * 1 < dateValue * 1}}" bind:tap="handleLive">点此参加</view>
-          <view class="btn active" wx:else bind:tap="handleResult">已报名,查看活动码</view>
+          <!-- <view class="btn" wx:else bind:tap="handleResult">已报名,查看活动码</view> -->
+          <view class="btn active1" wx:else bind:tap="handleShare">已报名,查看活动码</view>
         </block>
         <block wx:elif="{{detail.SignUpStatus==3}}">
           <view
@@ -127,7 +128,7 @@
 <van-popup show="{{shareShow}}" custom-class="custom-popup" bind:click-overlay="handleShareClose">
   <view class="p-share">
     <image class="photo" mode="aspectFill" src="{{posterUrl}}" show-menu-by-longpress></image>
-    <view class="tip" bind:tap="handleDownload">点击下载到手机</view>
+    <view class="tip" bind:tap="handleDownload">长按图片保存或分享</view>
   </view>
 </van-popup>
 <customPoster wx:if="{{detail.PosterUrl}}" params="{{params}}" bind:finish="handlePosterFinish"></customPoster>

src/patient/pages/liveResult/index.wxml

@@ -1,5 +1,5 @@
 <navbar fixed title="" custom-style="background:{{background}}">
-  <van-icon name="arrow-left" slot="left" color="background=='#FFFFFF'?'#000':'#fff'" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left"  size="18px" color="background=='#FFFFFF'?'#000':'#fff'" bind:tap="handleBack" />
 </navbar>
 <!-- padding-top:{{pageTop+22}}px; -->
 <view class="page" style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx">

src/patient/pages/login/index.scss

@@ -41,7 +41,7 @@ pgae {
       text-align: center;
       font-size: 32rpx;
       color: rgba(255, 255, 255, 1);
-      background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 30%, #b982ff 100%);
+      background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%);
       border-radius: 100rpx;
       &::after {
         border: none;

src/patient/pages/myLive/index.wxml

@@ -1,5 +1,5 @@
 <navbar fixed title="我报名的活动" custom-style="background:{{background}}">
-  <van-icon name="arrow-left" slot="left" color="#000" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left"  size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 
 <view

src/patient/pages/mySave/index.scss

@@ -55,27 +55,27 @@ page {
           font-size: 28rpx;
         }
         .footer {
-          margin-top: 20rpx;
           display: flex;
-          gap: 48rpx;
+          justify-content: flex-end;
           .f-item {
+            padding: 26rpx 0 0 32rpx;
             display: flex;
             align-items: center;
-            gap: 8rpx;
+            gap: 4rpx;
             font-size: 28rpx;
             color: rgba(105, 104, 110, 1);
             line-height: 1;
             .icon {
               margin-right: 8rpx;
-              width: 36rpx;
+              flex-shrink: 0;
-              height: 36rpx;
+              width: 28rpx;
+              height: 28rpx;
             }
             &.active {
-              color: #e04775;
+              color: #b982ff;
             }
           }
           .share {
-            padding: 0;
             background-color: transparent;
             margin: 0;
             &::after {
@@ -83,14 +83,12 @@ page {
               outline: none;
             }
           }
-          .line {
-            margin: 18rpx;
-            width: 2rpx;
-            height: 20rpx;
-            background-color: #f3f3f4;
         }
       }
     }
   }
+
+  .external-none {
+    margin-top: 200rpx;
   }
 }

src/patient/pages/mySave/index.ts

@@ -16,7 +16,7 @@ Page({
     videoStatus: 0,
     config: {} as any,
   },
-  onLoad() {
+  onShow() {
     app.waitLogin({ type: [0, 1] }).then(() => {
       wx.ajax({
         method: 'GET',
@@ -301,6 +301,45 @@ Page({
     })
     this.getList()
   },
+  handleToggleSave(e) {
+    const { index } = e.currentTarget.dataset
+    const { Id, IsCollect } = this.data.list[index]
+    if (IsCollect == 1) {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/pic-text/cancel-collection',
+        data: {
+          ContentId: Id,
+        },
+        loading: true,
+      }).then(() => {
+        wx.showToast({
+          title: '取消收藏',
+          icon: 'none',
+        })
+        this.setData({
+          [`list[${index}].IsCollect`]: 0,
+        })
+      })
+    } else {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/pic-text/collection',
+        data: {
+          ContentId: Id,
+        },
+        loading: true,
+      }).then(() => {
+        wx.showToast({
+          title: '收藏成功',
+          icon: 'none',
+        })
+        this.setData({
+          [`list[${index}].IsCollect`]: 1,
+        })
+      })
+    }
+  },
   handleBack() {
     wx.navigateBack({
       fail() {

src/patient/pages/mySave/index.wxml

@@ -1,5 +1,5 @@
 <navbar fixed title="我的收藏" custom-style="background:{{background}}">
-  <van-icon name="arrow-left" slot="left" color="#000" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 
 <view
@@ -13,6 +13,12 @@
         <view class="title">{{item.Title}}</view>
         <view class="date">{{item.UpdatedAt}}</view>
         <view class="footer">
+          <view class="f-item {{item.IsCollect == 1 && 'active'}}" catch:tap="handleToggleSave" data-index="{{index}}">
+            <image wx:if="{{item.IsCollect == 1}}" class="icon" src="{{imageUrl}}icon59.png?t={{Timestamp}}"></image>
+            <image wx:else class="icon" src="{{imageUrl}}icon60.png?t={{Timestamp}}"></image>
+            <block wx:if="{{~~item.CollectionPeopleNum}}">{{~~item.CollectionPeopleNum}}</block>
+          </view>
+          <!-- <view class="line"></view> -->
           <button
             class="f-item share"
             open-type="share"
@@ -24,7 +30,7 @@
             <image class="icon" src="{{imageUrl}}icon39.png?t={{Timestamp}}"></image>
             <block wx:if="{{~~item.ShareNum}}">{{item.ShareNum}}</block>
           </button>
-          <view class="line"></view>
+          <!-- <view class="line"></view> -->
           <view class="f-item">
             <image class="icon" src="{{imageUrl}}icon40.png?t={{Timestamp}}"></image>
             <block wx:if="{{~~item.OpenNum + ~~item.BasicNum}}">{{~~item.OpenNum + ~~item.BasicNum}}</block>
@@ -33,5 +39,5 @@
       </view>
     </view>
   </view>
-  <pagination pagination="{{pagination}}"></pagination>
+  <pagination external-class="external-none" pagination="{{pagination}}"></pagination>
 </view>

src/patient/pages/personalInformation/index.scss

@@ -60,7 +60,7 @@
               &.active {
                 color: rgba(185, 130, 255, 1);
                 border-color: rgba(185, 130, 255, 1);
-                background-color: transparent;
+                background-color: #FAF6FF;
               }
             }
           }

src/patient/pages/repository/index.scss

@@ -19,6 +19,7 @@ page {
     z-index: 20;
     padding-bottom: 10rpx;
     .tags {
+      position: relative;
       overflow-y: hidden;
       overflow-x: auto;
       padding-bottom: 8rpx;
@@ -30,17 +31,18 @@ page {
         display: flex;
         flex-wrap: nowrap;
         .tag {
-          padding: 8rpx 24rpx;
           margin-right: 16rpx;
           flex-shrink: 0;
-          font-size: 24rpx;
+          font-size: 28rpx;
           color: rgba(33, 29, 46, 1);
-          line-height: 34rpx;
-          border-radius: 8rpx;
           background-color: rgba(255, 255, 255, 1);
+          border-radius: 8rpx;
+          padding: 8rpx 24rpx;
+          line-height: 1.2;
           &.active {
+            position: relative;
             color: #fff;
-            background-color: var(--name);
+            background-color: rgba(185, 130, 255, 1);
           }
         }
       }

src/patient/pages/repositoryDetail/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "资料详情页",
+  "navigationBarTitleText": "详情页",
   "navigationStyle": "default",
   "usingComponents": {
     "mp-html": "mp-html",

src/patient/pages/repositoryDetail/index.scss

@@ -202,8 +202,8 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      font-size: 30rpx;
+      font-size: 32rpx;
-      color: rgba(33, 29, 46, 1);
+      color: #211D2E;
       margin: 0;
       background: transparent;
       &::after {
@@ -212,15 +212,15 @@
       }
       .icon {
         margin-right: 6rpx;
-        width: 44rpx;
+        width: 56rpx;
-        height: 44rpx;
+        height: 56rpx;
       }
       .icon-active {
         @extend .icon;
         display: none;
       }
       &.active {
-        color: rgba(33, 29, 46, 1);
+        color: #B982FF;
         .icon {
           display: none;
         }

src/patient/pages/repositoryDetail/index.wxml

@@ -4,52 +4,11 @@
       <view class="title">{{detail.Title}}</view>
       <view class="banner-footer">
         <view class="date">{{detail.UpdatedAt}}</view>
-        <!-- <view class="time">{{detail.ReadCost}}分钟</view> -->
-        <!-- <view class="views"> -->
-        <!--   <image class="icon" src="{{imageUrl}}za-images/1/view.png?t={{Timestamp}}"></image> -->
-        <!--   {{~~detail.OpenNum + ~~detail.BasicNum}} -->
-        <!-- </view> -->
       </view>
-      <!-- <view class="tags"> -->
-      <!--   <view class="tag" wx:for="{{detail.Labels}}">{{item}}</view> -->
-      <!-- </view> -->
     </view>
     <view class="container">
-      <!-- <view class="audio" wx:if="{{detail.AudioLink.url}}"> -->
-      <!--   <free-audio audio="{{detail.AudioLink}}"></free-audio> -->
-      <!-- </view> -->
       <mp-html id="mp-html" class="mp-html" container-style="overflow: visible" content="{{detail.Content}}"></mp-html>
     </view>
-    <!-- <view class="other" wx:if="{{detail.Recommends.length}}"> -->
-    <!--   <view class="o-title">其它推荐文章</view> -->
-    <!--   <view class="other-list"> -->
-    <!--     <view class="list-item" wx:for="{{detail.Recommends}}" bind:tap="handleDetail" data-id="{{item.Id}}"> -->
-    <!--       <image src="{{item.TitlePicLink}}" class="photo"></image> -->
-    <!--       <view class="inner"> -->
-    <!--         <view class="title">{{item.Title}}</view> -->
-    <!--         <view class="date">{{item.PublishAt}}</view> -->
-    <!--         <view class="labels"> -->
-    <!--           <view class="label" wx:for="{{item.Labels}}" wx:for-item="label">{{label}}</view> -->
-    <!--         </view> -->
-    <!--         <view class="o-footer"> -->
-    <!--           <view class="f-item"> -->
-    <!--             <image class="icon" src="{{imageUrl}}za-images/1/view.png?t={{Timestamp}}"></image> -->
-    <!--             <block wx:if="{{~~item.OpenNum + ~~item.BasicNum}}">{{~~item.OpenNum + ~~item.BasicNum}}</block> -->
-    <!--           </view> -->
-    <!--           <view class="f-item {{item.IsCompliment==1 && 'active'}}"> -->
-    <!--             <image -->
-    <!--               class="icon" -->
-    <!--               wx:if="{{item.IsCompliment==1}}" -->
-    <!--               src="{{imageUrl}}za-images/1/star-active.png?t={{Timestamp}}" -->
-    <!--             ></image> -->
-    <!--             <image class="icon" wx:else src="{{imageUrl}}za-images/1/star.png?t={{Timestamp}}"></image> -->
-    <!--             <block wx:if="{{~~item.ComplimentNum}}">{{item.ComplimentNum}}</block> -->
-    <!--           </view> -->
-    <!--         </view> -->
-    <!--       </view> -->
-    <!--     </view> -->
-    <!--   </view> -->
-    <!-- </view> -->
   </view>
   <view class="footer">
     <view class="tip" wx:if="{{showTip}}">
@@ -62,7 +21,7 @@
       <block wx:if="{{~~detail.CollectionPeopleNum}}">{{detail.CollectionPeopleNum}}</block>
     </view>
     <view class="vertical"></view>
-    <button class="f-item" open-type="share" bind:tap="handleTapShare">
+    <button class="f-item active" open-type="share" bind:tap="handleTapShare">
       <image class="icon" src="{{imageUrl}}icon37.png?t={{Timestamp}}"></image>
       <image class="icon-active" src="{{imageUrl}}icon37.png?t={{Timestamp}}"></image>
       <block wx:if="{{detail.ShareNum}}">{{detail.ShareNum}}</block>