1.10.0bu版本bug处理

project.private.config.json

@@ -26,8 +26,8 @@
           "name": "患者-个人信息",
           "pathName": "patient/pages/personalInformation/index",
           "query": "bottom=1",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "patient/pages/liveResult/index",

src/app.ts

@@ -114,6 +114,8 @@ App<IAppOption>({
   onShow(options) {
     if (options.query.scene) {
       this.globalData.scene = parseScene(options.query.scene)
+    } else if (options.query.proMethodId) {
+      this.globalData.scene.proMethodId = options.query.proMethodId
     }
   },
   startLogin(callback) {

src/patient/pages/enterInfo/index.scss

@@ -67,7 +67,7 @@
         }
         .rt-content {
           margin-top: 8rpx;
-          font-size: 32rpx;
+          font-size: 28rpx;
           color: #adacb2;
           font-weight: normal;
           line-height: 52rpx;
@@ -232,6 +232,11 @@
           }
         }
       }
+      .row-sub {
+        margin-top: 8rpx;
+        font-size: 28rpx;
+        color: #adacb2;
+      }
       .tip {
         margin-top: -24rpx;
         margin-left: 46rpx;

src/patient/pages/enterInfo/index.ts

@@ -115,7 +115,17 @@ Page({
     app.mpBehavior({ PageName: 'BTN_PatientInfoComfirm' })
     if (this.data.submiting) return
 
-    const { name, gender, ageRange, relationType, IsGraves, HasTedSurgery } = this.data
+    const {
+      name,
+      gender,
+      ageRange,
+      relationType,
+      IsGraves,
+      HasTedSurgery,
+      isKnowTituyo,
+      isUseTituyo,
+      prescriptionImg,
+    } = this.data
     const { registrationSource, registChannel, regBusinessId, WorkerId, IsAliQiWei } = app.globalData
     const { doctorId, inviteChan, proMethodId } = app.globalData.scene
     let toast = ''
@@ -152,6 +162,9 @@ Page({
         regBusinessId,
         IsGraves,
         HasTedSurgery,
+        isKnowTituyo,
+        isUseTituyo,
+        prescriptionImg,
         WorkerId,
         inviteDoctorId: doctorId,
         inviteChannel: inviteChan,

src/patient/pages/enterInfo/index.wxml

@@ -129,6 +129,7 @@
             </block>
           </view>
         </uploadFile>
+        <view class="row-sub">您可以上传您的诊断处方、住院小结等</view>
       </block>
     </view>
   </view>

src/patient/pages/liveDetail/index.scss

@@ -193,7 +193,6 @@
       margin-top: 32rpx;
       display: block;
       height: 270rpx;
-      border-radius: 24rpx;
       .p-code{
         position: absolute;
         top: 38rpx;

src/patient/pages/liveDetail/index.ts

@@ -1,4 +1,6 @@
+/* eslint-disable eqeqeq */
 import dayjs from 'dayjs'
+import { parseScene } from '../../../utils/util'
 const app = getApp<IAppOption>()
 let live_time: null | number = null
 
@@ -18,6 +20,7 @@ Page({
     lightList: [],
 
     timeData: {},
+    optionsScene: {} as any,
 
     popupShow: false,
     popupType: 'popup6', // 登录失败弹窗
@@ -27,10 +30,21 @@ Page({
   },
   videoContext: {} as WechatMiniprogram.VideoContext,
   onLoad(options) {
-    const scene = app.globalData.scene
     this.setData({
-      id: options.id || scene.id,
+      id: options.id,
     })
+    if (options.scene) {
+      const optionsScene: any = parseScene(options.scene)
+      this.setData({
+        optionsScene: optionsScene || {},
+        id: options.id || optionsScene?.id,
+      })
+    } else if (options.proMethodId) {
+      this.setData({
+        'optionsScene.proMethodId': options.proMethodId,
+      })
+    }
+
     if (live_time) {
       clearInterval(live_time)
     }
@@ -45,7 +59,11 @@ Page({
   },
   onShow() {
     app.waitLogin({ type: [0, 1] }).then(() => {
-      app.mpBehavior({ PageName: 'PG_PatientLiveDetails' })
+      app.mpBehavior({
+        PageName: 'PG_PatientLiveDetails',
+        detailId: this.data.id,
+        promotionMethodId: this.data.optionsScene.proMethodId,
+      })
       this.getDetail()
       this.setView()
       this.getLightList()
@@ -161,9 +179,7 @@ Page({
   handleBanner() {
     const { detail, zdUserInfo, dateValue } = this.data
     if (detail.IsSignUp && zdUserInfo.AuditStatus) {
-      // eslint-disable-next-line eqeqeq
       if (zdUserInfo.AuditStatus == 1 || zdUserInfo.AuditStatus == 3 || zdUserInfo.AuditStatus == 4) {
-        // eslint-disable-next-line eqeqeq
         if (detail.SignUpStatus == 2) {
           if (detail.BeginTimeValue * 1 < dateValue * 1) {
             this.handleLive()
@@ -206,36 +222,47 @@ Page({
   handleSignUp() {
     const { SubscribeTemplateList } = this.data.detail
     app.mpBehavior({ PageName: 'BTN_PatientLiveSign' })
-    const { Type } = this.data.detail
-    const { UserType } = this.data.zdUserInfo
-
     wx.requestSubscribeMessage({
       tmplIds: SubscribeTemplateList,
-      complete: () => {
-        wx.ajax({
-          method: 'POST',
-          url: '?r=zd/activity/sign-up',
-          data: {
-            Id: this.data.id,
-            PreUserIdentity: UserType,
-          },
-        }).then((res) => {
-          app
-            .zdPermissionVerification(
-              3,
-              Type == 1 ? 1 : 10,
-              `/patient/pages/liveResult/index?id=${this.data.id}&rewardScore=${res.rewardScore}`,
-              this.data.id,
-            )
-            .then(() => {
-              wx.navigateTo({
-                url: `/patient/pages/liveResult/index?id=${this.data.id}&rewardScore=${res.rewardScore}`,
-              })
-            })
+      success: (res) => {
+        const subscribe = SubscribeTemplateList.map((item) => {
+          return res[item] === 'accept' ? 1 : 2
         })
+        this.handleSignUpCallback(subscribe)
+      },
+      fail: () => {
+        this.handleSignUpCallback([2, 2])
       },
     })
   },
+  handleSignUpCallback(res = [2, 2]) {
+    const { Type } = this.data.detail
+    const { UserType } = this.data.zdUserInfo
+    const optionsScene = this.data.optionsScene
+    wx.ajax({
+      method: 'POST',
+      url: '?r=zd/activity/sign-up',
+      data: {
+        Id: this.data.id,
+        PreUserIdentity: UserType,
+        promotionMethodId: optionsScene.proMethodId,
+        subscribe: [...res],
+      },
+    }).then((res) => {
+      app
+        .zdPermissionVerification(
+          3,
+          Type == 1 ? 1 : 10,
+          `/patient/pages/liveResult/index?id=${this.data.id}&rewardScore=${res.rewardScore}`,
+          this.data.id,
+        )
+        .then(() => {
+          wx.navigateTo({
+            url: `/patient/pages/liveResult/index?id=${this.data.id}&rewardScore=${res.rewardScore}`,
+          })
+        })
+    })
+  },
   handleShare() {
     this.setData({
       shareShow: true,

src/patient/pages/personalInformation/index.scss

@@ -36,6 +36,11 @@ page {
             color: #cf5375;
           }
         }
+        .row-sub {
+          margin-top: 8rpx;
+          font-size: 28rpx;
+          color: #ADACB2;
+        }
         .row-content {
           padding-top: 24rpx;
           .input {
@@ -180,18 +185,17 @@ page {
             }
             .check {
               position: absolute;
-              top: 50%;
-              left: 50%;
-              transform: translate(-50%, -50%);
+              top: 0;
+              left: 0;
               font-size: 32rpx;
               color: #ffffff;
               display: flex;
               align-items: center;
               justify-content: center;
               gap: 12rpx;
-              width: 234rpx;
-              height: 76rpx;
-              background: rgba(0, 0, 0, 0.8);
+              width: 100%;
+              height: 100%;
+              background: rgba(0, 0, 0, 0.3);
               border-radius: 8rpx 8rpx 8rpx 8rpx;
               .check-icon {
                 width: 36rpx;
@@ -213,7 +217,6 @@ page {
         }
       }
       .reject {
-        margin-top: 24rpx;
         font-size: 32rpx;
         color: #ef3939;
       }

src/patient/pages/personalInformation/index.ts

@@ -99,14 +99,6 @@ Page({
       this.setData({
         dict: res,
       })
-      if (this.data.scrollBottom) {
-        wx.pageScrollTo({
-          scrollTop: 100000,
-        })
-        this.setData({
-          scrollBottom: '',
-        })
-      }
     })
   },
 
@@ -117,6 +109,15 @@ Page({
     this.handleChangeDiagnoseType({ detail: { value: [diagnoseTypeValue] } })
     this.handleDiagnoseTypeSave(false)
     // this.handleTapRT();
+
+    if (this.data.scrollBottom) {
+      wx.pageScrollTo({
+        scrollTop: 100000,
+      })
+      this.setData({
+        scrollBottom: '',
+      })
+    }
   },
   formatBorn(Birth) {
     let bron = ''

src/patient/pages/personalInformation/index.wxml

@@ -163,29 +163,36 @@
           </view>
         </view>
         <block wx:if="{{zdUserInfo.IsUseTituyo == 1 }}">
-          <uploadFile class="upload" accept="image" bind:file="handleSetData">
-            <view
-              class="mask"
-              wx:if="{{zdUserInfo.DrugsAuditStatus==1 || zdUserInfo.DrugsAuditStatus==3}}"
-              catchtap="handleNoUpload"
-            ></view>
-            <view class="upload-container">
-              <view class="upload-img" wx:if="{{zdUserInfo.PrescriptionImg}}">
-                <view class="del" catchtap="handleDelData" wx:if="{{zdUserInfo.DrugsAuditStatus==2}}">
-                  <image class="d-icon" src="{{imageUrl}}icon77.png?t={{Timestamp}}"></image>
-                </view>
-                <image class="img" src="{{zdUserInfo.PrescriptionImg}}" mode="aspectFill"></image>
-                <view class="check" wx:if="{{zdUserInfo.DrugsAuditStatus==1}}">
-                  <image class="check-icon" src="{{imageUrl}}icon81.png?t={{Timestamp}}"></image>
-                  审核中...
+          <view class="row">
+            <view class="row-header">
+              <view class="label">请上传您的处方证明</view>
+            </view>
+            <view class="row-sub">处方证明审核通过后，即可享受平台全部服务</view>
+            <uploadFile class="upload" accept="image" bind:file="handleSetData">
+              <view
+                class="mask"
+                wx:if="{{zdUserInfo.DrugsAuditStatus==1 || zdUserInfo.DrugsAuditStatus==3}}"
+                catchtap="handleNoUpload"
+              ></view>
+              <view class="upload-container">
+                <view class="upload-img" wx:if="{{zdUserInfo.PrescriptionImg}}">
+                  <view class="del" catchtap="handleDelData" wx:if="{{zdUserInfo.DrugsAuditStatus==2}}">
+                    <image class="d-icon" src="{{imageUrl}}icon77.png?t={{Timestamp}}"></image>
+                  </view>
+                  <image class="img" src="{{zdUserInfo.PrescriptionImg}}" mode="aspectFill"></image>
+                  <view class="check" wx:if="{{zdUserInfo.DrugsAuditStatus==1}}">
+                    <image class="check-icon" src="{{imageUrl}}icon81.png?t={{Timestamp}}"></image>
+                    审核中...
+                  </view>
                 </view>
+                <block wx:else>
+                  <van-icon name="plus" style="font-size: 80rpx; color: rgba(173, 172, 178, 0.5)" />
+                </block>
               </view>
-              <block wx:else>
-                <van-icon name="plus" style="font-size: 80rpx; color: rgba(173, 172, 178, 0.5)" />
-              </block>
-            </view>
-          </uploadFile>
-          <view class="reject" wx:if="{{zdUserInfo.DrugsAuditStatus==2}}">*审核不通过</view>
+            </uploadFile>
+            <view class="reject" wx:if="{{zdUserInfo.DrugsAuditStatus==2}}">*审核不通过</view>
+            <view class="row-sub" wx:else>您可以上传您的诊断处方、住院小结等</view>
+          </view>
         </block>
       </block>
     </view>

typings/index.d.ts

@@ -39,7 +39,7 @@ interface IAppOption {
   checkLoginType: (type: pageType[] | 'any', backPath?: string) => boolean
   getMenuInfo: (arg0: WechatMiniprogram.Page.Instance<any, any>) => void
   getUserInfo: (type: 0 | 1 | 2) => Promise<never>
-  mpBehavior: (data: { doctor?: boolean; PageName: string }) => void
+  mpBehavior: (data: { doctor?: boolean; PageName: string; detailId?: string; promotionMethodId?: string }) => void
   oldMpBehavior: (data: { PositionId: string; OperateType: string; OperateId: string }) => void
   zdMpBehavior: (data: { PageName: string; doctor?: boolean }) => void
   zdGetTheme: () => Promise<'PATIENT'>