3.0bug处理

README.md

@@ -7,6 +7,7 @@ svn://39.106.86.127:28386/projects/wutian_xueyoubing_b/proj_src/shop/frontend/we
 ### vscode
 (/images/)(\S*(?=["|']))
 {{imageUrl}}$2?t={{Timestamp}}
+
 ### neovim
 (/images/)([^\"|']*)
 {{imageUrl}}${2}?t={{Timestamp}}

src/components/popup/index.wxml

@@ -4,7 +4,7 @@
   round
   z-index="{{100000}}"
   show="{{ true }}"
-  custom-style="background:transparent;"
+  custom-style="background:transparent;top:40%"
   position="{{params.position || 'center'}}"
   safe-area-inset-bottom="{{false}}"
   root-portal

src/components/uploadFile/index.wxml

@@ -2,8 +2,8 @@
   <view class="item" wx:for="{{fileList}}" wx:key="index" data-index="{{index}}" catchtap="viewFile">
     <image wx:if="{{item.fileType==='image'}}" class="image" mode="aspectFill" src="{{item.url}}"></image>
     <image wx:elif="{{item.fileType==='video'}}" class="image" mode="aspectFill" src="{{item.url}}"></image>
-    <image wx:elif="{{item.fileType==='audio'}}" class="sub-image" mode="aspectFill" src="/images/file.png"></image>
-    <image wx:else class="sub-image" mode="aspectFill" src="/images/{{item.fileType}}.png"></image>
+    <image wx:elif="{{item.fileType==='audio'}}" class="sub-image" mode="aspectFill" src="{{imageUrl}}file.png?t={{Timestamp}}"></image>
+    <image wx:else class="sub-image" mode="aspectFill" src="{{imageUrl}}{{item.fileType}}.png?t={{Timestamp}}"></image>
     <view class="item_mask">
       <van-icon
         wx:if="{{item.fileType === 'video'}}"
@@ -14,7 +14,7 @@
       />
       <image
         class="clear"
-        src="/images/icon97.png"
+        src="{{imageUrl}}icon97.png?t={{Timestamp}}"
         wx:if="{{canDelete}}"
         catchtap="deleteFile"
         data-item="{{item}}"

src/pages/ask/index.scss

@@ -528,8 +528,8 @@ page {
         padding: 20rpx 0;
         display: flex;
         justify-content: space-between;
-        align-items: center;
         .order {
+          margin-top: 8rpx;
           width: 28rpx;
           height: 28rpx;
           font-size: 24rpx;

src/patient/pages/askPatient/index.scss

@@ -394,8 +394,8 @@ page {
           padding: 20rpx 0;
           display: flex;
           justify-content: space-between;
-          align-items: center;
           .order {
+            margin-top: 8rpx;
             width: 28rpx;
             height: 28rpx;
             font-size: 24rpx;

src/patient/pages/casesAdd/index.ts

@@ -1,3 +1,5 @@
+import dayjs from 'dayjs'
+
 const app = getApp<IAppOption>()
 
 Page({
@@ -6,7 +8,8 @@ Page({
     popupType: 'casesAddComplete',
     popupParams: {} as any,
 
-    currentFinish: true,
+    end: dayjs().format('YYYY-MM-DD'),
+
     current: 0,
 
     // form
@@ -250,31 +253,29 @@ Page({
         this.setData({
           popupShow: true,
           popupType: 'casesAddComplete',
-          popupParams: {},
+          popupParams: { close: true },
         })
       }
     })
   },
-  handleFinish() {
-    this.setData({
-      currentFinish: true,
-    })
-  },
   handleBack() {
     wx.navigateBack()
   },
-  handlePrev() {
-    if (!this.data.currentFinish) return
+  handleSwiperChange(e) {
+    this.setData({
+      current: e.detail.current,
+    })
+  },
+  handlePrev(e) {
+    const { value } = e.currentTarget.dataset
     this.setData({
-      currentFinish: false,
-      current: this.data.current - 1,
+      current: value,
     })
   },
-  handleNext() {
-    if (!this.data.currentFinish) return
+  handleNext(e) {
+    const { value } = e.currentTarget.dataset
     this.setData({
-      currentFinish: false,
-      current: this.data.current + 1,
+      current: value,
     })
   },
   handlePopupCancel() {

src/patient/pages/casesAdd/index.wxml

@@ -32,14 +32,14 @@
     <view class="blod">最后 1 步啦！感谢您的耐心填写～</view>
     <view>对健康负责，就是对自己和家人最好的关爱</view>
   </view>
-  <swiper current="{{current}}" class="swiper" bindanimationfinish="handleFinish">
+  <swiper current="{{current}}" class="swiper" bindchange="handleSwiperChange">
     <swiper-item class="swiper-item">
       <scroll-view class="scroll-view0" scroll-y>
         <view class="card">
           <view class="row">
             <view class="label">确诊时间</view>
             <view class="container">
-              <picker mode="date" model:value="{{diagnosisTime}}" class="date">
+              <picker mode="date" model:value="{{diagnosisTime}}" end="{{end}}" class="date">
                 <view class="date-content" data-place="请选择确诊时间">{{diagnosisTime}}</view>
               </picker>
             </view>
@@ -115,7 +115,7 @@
       </scroll-view>
       <view class="footer">
         <view class="cancel" bind:tap="handleBack">取消</view>
-        <view class="submit" bind:tap="handleNext">下一步</view>
+        <view class="submit" bind:tap="handleNext"  data-value="{{1}}">下一步</view>
       </view>
     </swiper-item>
     <swiper-item class="swiper-item">
@@ -244,8 +244,8 @@
         </view>
       </scroll-view>
       <view class="footer">
-        <view class="cancel" bind:tap="handlePrev">上一步</view>
-        <view class="submit" bind:tap="handleNext">下一步</view>
+        <view class="cancel" bind:tap="handlePrev" data-value="{{0}}">上一步</view>
+        <view class="submit" bind:tap="handleNext"  data-value="{{2}}">下一步</view>
       </view>
     </swiper-item>
     <swiper-item class="swiper-item">
@@ -272,7 +272,7 @@
           <view class="part-name">
             <view class="item" wx:for="{{bleedingParts}}" wx:key="id">{{item.name}}</view>
           </view>
-          <view class="name">已选择关节</view>
+          <view class="name" wx:if="{{bleedingParts.length}}">已选择关节</view>
         </view>
         <view class="card">
           <view class="title">
@@ -295,7 +295,7 @@
         </view>
       </scroll-view>
       <view class="footer">
-        <view class="cancel" bind:tap="handlePrev">上一步</view>
+        <view class="cancel" bind:tap="handlePrev"  data-value="{{1}}">上一步</view>
         <view class="submit" bind:tap="updateSave" data-back="{{true}}">完成</view>
       </view>
     </swiper-item>
@@ -305,6 +305,7 @@
 <popup
   show="{{popupShow}}"
   type="{{popupType}}"
+  style="top: 30%"
   params="{{popupParams}}"
   bind:ok="handlePopupOk"
   bind:cancel="handlePopupCancel"

src/patient/pages/course/index.ts

@@ -50,8 +50,9 @@ Page({
     this.getPeriodInfo(e.detail.current + 1, `periodInfo${this.data.current + 1}`)
   },
   handleSelectHostipal() {
+    const { periodInfo1 } = this.data
     wx.navigateTo({
-      url: '/patient/pages/selectHostipal/index',
+      url: `/patient/pages/selectHostipal/index?id=${periodInfo1.hospitalId}`,
     })
   },
   handleCasesAdd() {

src/patient/pages/course/index.wxml

@@ -40,7 +40,7 @@
               <view class="container">
                 <view class="c-body">
                   <view class="wrap">
-                    <view class="content">1.您的诊前检查医院</view>
+                    <view class="content">1.我的定点检查医院</view>
                     <view class="hostipl-name" wx:if="{{periodInfo1.hospitalName}}">{{periodInfo1.hospitalName}}</view>
                   </view>
                   <image class="icon" src="{{imageUrl}}icon30.png?t={{Timestamp}}"></image>

src/patient/pages/file/index.wxml

@@ -13,11 +13,11 @@
       <view class="w-header">
         <view class="name">刘能</view>
         <view class="age">
-          <image class="icon" src="/images/icon91.png"></image>
+          <image class="icon" src="{{imageUrl}}icon91.png?t={{Timestamp}}"></image>
           32岁
         </view>
         <view class="site">
-          <image class="icon" src="/images/icon92.png"></image>
+          <image class="icon" src="{{imageUrl}}icon92.png?t={{Timestamp}}"></image>
           北京
         </view>
       </view>
@@ -254,13 +254,13 @@
       <image class="icon" src="{{imageUrl}}icon67.png?t={{Timestamp}}"></image>
       <view class="content">注射日：2025 年5月28日 星期三</view>
     </view>
-    <view class="notic" style="background: url('/images/bg21.png') no-repeat top center/100%">
+    <view class="notic" style="background: url('{{imageUrl}}bg21.png?t={{Timestamp}}') no-repeat top center/100%">
       <view class="title">最近1个月没有您的复诊信息哦！</view>
       <view class="content">本周是注射后第12周</view>
       <view class="sub-content">建议每周复诊1次～</view>
-      <image class="badge" src="/images/icon93.png"></image>
-      <!-- <image class="badge" src="/images/icon94.png"></image> -->
-      <!-- <image class="badge" src="/images/icon95.png"></image> -->
+      <image class="badge" src="{{imageUrl}}icon93.png?t={{Timestamp}}"></image>
+      <!-- <image class="badge" src="{{imageUrl}}icon94.png?t={{Timestamp}}"></image> -->
+      <!-- <image class="badge" src="{{imageUrl}}icon95.png?t={{Timestamp}}"></image> -->
     </view>
     <view class="card">
       <view class="c-calendar">

src/patient/pages/index/index.scss

@@ -205,6 +205,7 @@ page {
         .c-header {
           display: flex;
           .num {
+            margin-top: 8rpx;
             flex-shrink: 0;
             width: 40rpx;
             height: 40rpx;

src/patient/pages/index/index.wxml

@@ -159,7 +159,7 @@
                 </block>
               </view>
               <view class="tip">
-                <image class="icon" src="/images/icon96.png"></image>
+                <image class="icon" src="{{imageUrl}}icon96.png?t={{Timestamp}}"></image>
                 建议每2周复查一次
               </view>
             </view>

src/patient/pages/preDiagnosisReport/index.ts

@@ -86,6 +86,20 @@ Page({
       'otherInfo',
     ],
 
+    checkNum: 0,
+    checkList: [
+      'isBloodRoutine',
+      'isBiochemical',
+      'isCFIxActivity',
+      'isCFIxInhibitor',
+      'isHepatitisB',
+      'isHepatitisC',
+      'isHivAntibody',
+      'isAfp',
+      'isAav',
+      'isOther',
+    ],
+
     dict: {
       result: {},
       number: {},
@@ -110,6 +124,7 @@ Page({
         this.setData({
           ...reset,
         })
+        this.getCheckNum()
       } else {
         this.getDetail()
       }
@@ -158,6 +173,7 @@ Page({
         attachmentList9: res.attachmentList[9] || [],
         attachmentList10: res.attachmentList[10] || [],
       })
+      this.getCheckNum()
     })
   },
   handleToggleFold(e: any) {
@@ -169,7 +185,7 @@ Page({
   handleToggleCheck(e: any) {
     const { check, fold } = e.currentTarget.dataset
     let foldValue = this.data[fold]
-    if (!this.data[check]) {
+    if (this.data[check] == 2) {
       foldValue = false
     }
     this.setData({
@@ -177,6 +193,19 @@ Page({
       [fold]: foldValue,
     })
     this.updateSave()
+    this.getCheckNum()
+  },
+  getCheckNum() {
+    const { checkList } = this.data
+    let num = 0
+    checkList.forEach((item) => {
+      if (this.data[item] == 1) {
+        num += 1
+      }
+    })
+    this.setData({
+      checkNum: num,
+    })
   },
   handleSelect(e: any) {
     const { key, value } = e.currentTarget.dataset

src/patient/pages/preDiagnosisReport/index.wxml

@@ -24,9 +24,9 @@
     <view class="form-header">
       <view class="form-title">您的诊前检查项目</view>
       <view class="order">
-        <view class="green">1</view>
+        <view class="green">{{checkNum}}</view>
         /
-        <view class="all">8</view>
+        <view class="all">10</view>
       </view>
     </view>
     <view class="form-card">

src/patient/pages/selectDoctorList/index.ts

@@ -10,6 +10,11 @@ Page({
     selectId: '',
 
     doctorList: [] as any,
+    pagination: {
+      page: 1,
+      pages: 1,
+      count: 1,
+    },
   },
   onLoad() {
     app.waitLogin({ type: 1 }).then(() => {
@@ -24,6 +29,7 @@ Page({
     }).then((res) => {
       this.setData({
         doctorList: res,
+        ['pagination.count']: res.length,
       })
     })
   },

src/patient/pages/selectDoctorList/index.wxml

@@ -19,6 +19,7 @@
     </view>
     <view class="content" wx:if="{{item.introduce}}">{{item.introduce}}</view>
   </view>
+  <pagination wx:if="{{pagination.count==0}}" pagination="{{pagination}}"></pagination>
 </view>
 
 <popup

src/patient/pages/selectHostipal/index.scss

@@ -68,8 +68,28 @@ page {
           border-color: rgba(207, 209, 213, 1) transparent transparent transparent;
         }
       }
+      .clear {
+        padding-left: 40rpx;
+        flex-shrink: 0;
+        font-size: 28rpx;
+        color: rgba(1, 1, 5, 1);
+        display: flex;
+        align-items: center;
+        gap: 12rpx;
+        border-left: 1px solid rgba(225, 225, 232, 1);
+        .icon {
+          width: 36rpx;
+          height: 36rpx;
+        }
+      }
     }
   }
+  .tip {
+    margin: 24rpx 0 0;
+    font-size: 28rpx;
+    color: rgba(161, 164, 172, 1);
+    text-align: center;
+  }
   .list {
     padding-top: 12rpx;
     .list-item {

src/patient/pages/selectHostipal/index.ts

@@ -31,6 +31,16 @@ Page({
   handleSearch() {
     this.getHospitalList(1)
   },
+  handleClear() {
+    this.setData({
+      search: '',
+      provinceId: '',
+      provinceName: '',
+      cityId: '',
+      cityName: '',
+    })
+    this.getHospitalList(1)
+  },
   handleAreaChange(e) {
     const value = e.detail
     this.setData({

src/patient/pages/selectHostipal/index.wxml

@@ -1,4 +1,4 @@
-<navbar fixed title="选择我的诊前检查医院" custom-style="background:{{background}}" back>
+<navbar fixed z-index="2" title="选择我的定点检查医院" custom-style="background:{{background}}" back>
   <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 <view class="page" style="padding-top:{{pageTop + 30}}px">
@@ -13,7 +13,7 @@
         type="text"
         model:value="{{search}}"
         placeholder-class="place-input"
-        placeholder="请输入搜索您的诊前检查医院"
+        placeholder="请输入搜索您的定点检查医院"
         class="input"
         bindconfirm="handleSearch"
       />
@@ -22,9 +22,14 @@
       <view class="picker">
         <view class="picker-item">{{provinceName || '省份'}}</view>
         <view class="picker-item">{{cityName || '城市'}}</view>
+        <view class="clear" catchtap="handleClear">
+          <image class="icon" src="{{imageUrl}}icon98.png?t={{Timestamp}}"></image>
+          重选
+        </view>
       </view>
     </pickerArea>
   </view>
+  <view class="tip">定点检查医院为接受过相关培训的定点合作医院</view>
   <view class="list">
     <view class="list-item" wx:for="{{list}}" wx:key="hospitalId" bind:tap="handleSelect" data-index="{{index}}">
       <view class="aside">
@@ -41,6 +46,7 @@
         </view>
       </view>
     </view>
+    <pagination pagination="{{pagination}}"></pagination>
   </view>
 </view>