合并后的bug处理

src/gift/pages/recordList/index.wxml

@@ -89,9 +89,7 @@
         </view>
       </view>
     </view>
-    <pagination pagination="{{pagination}}" customEmpty emptyTitle="暂无就诊记录">
+    <pagination pagination="{{pagination}}"></pagination>
-      <view class="empty-text" slot>暂无就诊记录</view>
-    </pagination>
   </view>
   <view class="page-footer" bind:tap="handleAdd">
     <view class="btn">新增就诊记录</view>

src/pages/qaFormDetail/index.ts

@@ -33,6 +33,7 @@ Page({
   data: {
     questions: [] as IQuestion[],
     hasData: false,
+    showPage: false,
     caseReportList: [
       {
         icon: 'icon126.png',
@@ -63,15 +64,12 @@ Page({
     ],
   },
 
-  onLoad() {
+  onLoad() {},
-    app.waitLogin({}).then(() => {
-      this.loadData()
-    })
-  },
   onShow() {
-    if (this.data.questions.length) {
+    this.setData({ questions: [], hasData: false, showPage: false })
+    app.waitLogin().then(() => {
       this.loadData()
-    }
+    })
   },
 
   loadData() {
@@ -134,8 +132,11 @@ Page({
       questions.forEach((q, i) => {
         const found = answers.find((a: any) => a.QuestionNo === q.QuestionNo)
         if (!found) return
-        const answer = found.Answer
+        let answer = found.Answer
         if (answer === null || answer === undefined) return
+        if (Array.isArray(answer)) {
+          answer = answer.filter((item) => item != 99)
+        }
         if (q.QuestionType === 1) {
           updates[`questions[${i}].Answer`] = Number(answer)
           updates[`questions[${i}].answerText`] = this.getAnswerText(q, Number(answer))
@@ -206,6 +207,7 @@ Page({
       }
     })
     if (Object.keys(updates).length) {
+      updates.showPage = true
       this.setData(updates)
     }
   },
@@ -226,4 +228,10 @@ Page({
       url: '/pages/qaForm/index',
     })
   },
+  handleDetail(e) {
+    const { name, imagefield } = e.currentTarget.dataset
+    wx.navigateTo({
+      url: `/pages/caseReport/index?name=${name}&imageField=${imagefield}`,
+    })
+  },
 })

src/pages/qaFormDetail/index.wxml

@@ -3,7 +3,10 @@
   <view class="page-container" wx:if="{{showPage}}">
     <block wx:for="{{questions}}" wx:for-index="qIndex" wx:key="QuestionNo">
       <view class="card" wx:if="{{item.visible}}">
-        <view class="c-title"><block wx:if="{{item.displayNo}}">{{item.displayNo}}.</block> {{item.QuestionContent}}</view>
+        <view class="c-title">
+          <block wx:if="{{item.displayNo}}">{{item.displayNo}}.</block>
+          {{item.QuestionContent}}
+        </view>
 
         <view wx:if="{{item.QuestionType === 1 && item.answerText}}" class="answer-text">
           <view class="answer-tag">{{item.answerText}}</view>
@@ -60,8 +63,19 @@
       <view class="right"></view>
     </view>
     <view class="list">
-      <view class="row" wx:for="{{caseReportList}}" wx:key="icon" bind:tap="handleDetail" data-name="{{item.name}}" data-imagefield="{{item.imageField}}">
+      <view
-        <image wx:if="{{item.drugIcon && theme === 'DRUG'}}" class="icon" src="{{imageUrl}}{{item.drugIcon}}?t={{Timestamp}}"></image>
+        class="row"
+        wx:for="{{caseReportList}}"
+        wx:key="icon"
+        bind:tap="handleDetail"
+        data-name="{{item.name}}"
+        data-imagefield="{{item.imageField}}"
+      >
+        <image
+          wx:if="{{item.drugIcon && theme === 'DRUG'}}"
+          class="icon"
+          src="{{imageUrl}}{{item.drugIcon}}?t={{Timestamp}}"
+        ></image>
         <image wx:else class="icon" src="{{imageUrl}}{{item.icon}}?t={{Timestamp}}"></image>
         <view class="col">
           <view class="name">{{item.name}}</view>