ct

韩昌
.hbuilderx/launch.json
TUIKit/TUIPages/TUIChat/components/message-elements/message-text.vue
TUIKit/TUIPages/TUIChat/index.vue
pages/mine/mine.vue
pages2/auth/audit.vue
pages2/message/mineComment.vue
pages2/order/com/Prescription.vue
pages2/order/symptomDetail.vue
--- a/.hbuilderx/launch.json
查看文件 @241e031
+++ b/.hbuilderx/launch.json
查看文件 @241e031
@@ -19,7 +19,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]
--- a/TUIKit/TUIPages/TUIChat/components/message-elements/message-text.vue
查看文件 @241e031
+++ b/TUIKit/TUIPages/TUIChat/components/message-elements/message-text.vue
查看文件 @241e031
 <template>
-  <view :class="['content content-' + message.flow]">
-    <view v-for="(item, index) in data.text" :key="index">
-      <view v-if="item.name === 'text'">{{ item.text }}</view>
+  <view :class="['content content-' + message.flow]" >
+    <view v-for="(item, index) in data.text" :key="index" >
+      <view v-if="item.name === 'text' && !['[自定义消息]'].includes(item.text)">{{ item.text }}</view>
       <img class="text-img" v-else-if="item.name === 'img'" :src="item.src" />
     </view>
   </view>
--- a/TUIKit/TUIPages/TUIChat/index.vue
查看文件 @241e031
+++ b/TUIKit/TUIPages/TUIChat/index.vue
查看文件 @241e031
@@ -71,7 +71,7 @@
                 <MessageVideo :id="item.flow + '-' + item.ID" v-if="item.type === types.MSG_VIDEO" :data="handleVideoMessageShowContext(item)" :messageData="item" @longpress="handleItem($event, item)" />
                 <MessageAudio :id="item.flow + '-' + item.ID" v-if="item.type === types.MSG_AUDIO" :data="handleAudioMessageShowContext(item)" :messageData="item" @longpress="handleItem($event, item)" />
                 <MessageFace :id="item.flow + '-' + item.ID" v-if="item.type === types.MSG_FACE" :data="handleFaceMessageShowContext(item)" :messageData="item" @longpress="handleItem($event, item)" />
-                <MessageCustom :id="item.flow + '-' + item.ID" v-if="item.type === types.MSG_CUSTOM" :data="handleCustomMessageShowContext(item)" :messageData="item" @longpress="handleItem($event, item)" />
+                <!-- <MessageCustom :id="item.flow + '-' + item.ID" v-if="item.type === types.MSG_CUSTOM" :data="handleCustomMessageShowContext(item)" :messageData="item" @longpress="handleItem($event, item)" /> -->
               </MessageBubble>
               <MessageRevoked v-if="item.isRevoked" :data="item" @edit="handleEdit(item)" />
             </view>
@@ -383,7 +383,7 @@ export default defineComponent({
     const scrollbottomHandler = () => {
       setTimeout(() => {
-        data.scrollTop = 10000
+        data.scrollTop = 100000
       }, 500)
     }
@@ -396,9 +396,9 @@ export default defineComponent({
     const stateInterval = setInterval(async () => {
       if (data.history === 'err') {
-        const { result }: { result: Consultation_information_detailType } = await getConsultation_information_detail({ id: data.Event.orderId })
+        // const { result }: { result: Consultation_information_detailType } = await getConsultation_information_detail({ id: data.Event.orderId })
-        if (result?.orderState !== 30) proxy.$h.timeCallBack('对方已结束问诊即将返回', 2000)
+        // if (result?.orderState !== 30) proxy.$h.timeCallBack('对方已结束问诊即将返回', 2000)
       }
     }, 3000)
--- a/pages/mine/mine.vue
查看文件 @241e031
+++ b/pages/mine/mine.vue
查看文件 @241e031
@@ -11,7 +11,7 @@
         <image src="/static/images/mAvatar.png" class="mine-avatar" mode="aspectFill" @click.stop="proxy.$h.previewImage('/static/images/mAvatar.png')" />
       </view>
       <view>
-        <view class="flexA" style="margin-bottom: 10rpx">
+        <view class="flexA" style="margin-bottom: 10rpx;flex-wrap: wrap;">
           <view class="mine-username">{{ UserInfo?.nickname ?? '去登录' }}</view>
           <view class="mine-toptag flexC" v-if="![null, undefined, ''].includes(UserInfo?.hospitalName)">{{ UserInfo?.hospitalName ?? '去登录' }}</view>
         </view>
--- a/pages2/auth/audit.vue
查看文件 @241e031
+++ b/pages2/auth/audit.vue
查看文件 @241e031
@@ -12,7 +12,10 @@
         </view>
         <!-- <view class="subtitle flexC" style="margin-bottom: 244rpx">提现申请已提交。请耐心等待审核通过！</view> -->
         <view class="subtitle flexC" style="margin-bottom: 244rpx">认证申请已提交。请耐心等待审核通过！</view>
-        <up-button color="#05B8D2" shape="circle" text="完成" throttleTime="1500" @click="proxy.$h.relaunchUrl(`/pages/index/index`)"></up-button>
+        <view class="fixBox">
+        <up-button color="#05B8D2" shape="circle" text="修改信息" :customStyle="{ marginBottom: '24rpx' }" throttleTime="1500" @click="reapplyAuthHandler"></up-button>
+        <up-button type="info" shape="circle" text="返回" throttleTime="1500" @click="proxy.$h.relaunchUrl(`/pages/index/index`)"></up-button>
+      </view>
       </view>
     </template>
     <!-- 失败 -->
@@ -25,9 +28,11 @@
           </view>
         </view>
         <view class="subtitle flexC" style="color: #ff3b2f; margin-bottom: 55%">驳回原因：{{ Event?.examineStateFailReason || '请联系管理员' }}</view>
+        <view class="fixBox">
         <up-button color="#05B8D2" shape="circle" text="重新申请" :customStyle="{ marginBottom: '24rpx' }" throttleTime="1500" @click="reapplyAuthHandler"></up-button>
         <up-button type="info" shape="circle" text="返回" throttleTime="1500" @click="proxy.$h.relaunchUrl(`/pages/index/index`)"></up-button>
       </view>
+      </view>
     </template>
     <!-- 成功 -->
     <template v-if="Event?.authState === '20'">
@@ -202,4 +207,10 @@ const reapplyAuthHandler = () => {
   color: #666666;
   font-size: 28rpx;
 }
+.fixBox{
+  position: fixed;
+  bottom: 20%;
+  left: 84rpx;
+  right: 84rpx;
+}
 </style>
--- a/pages2/message/mineComment.vue
查看文件 @241e031
+++ b/pages2/message/mineComment.vue
查看文件 @241e031
@@ -34,7 +34,7 @@
           <u-line margin="30rpx 0"></u-line>
           <view class="flexD" style="width: 100%">
             <view style="width: 170rpx">
-              <up-button color="#05B8D2" shape="circle" text="回复" throttleTime="1500" @click="proxy.$h.jumpUrl(`/pages2/message/reply?id=${_?.id}&detailData=${JSON.stringify(_)}`)"></up-button>
+              <up-button color="#05B8D2" shape="circle" text="回复" throttleTime="1500" @click="proxy.$h.jumpUrl(`/pages2/message/reply?id=${_?.id}&detailData=${JSON.stringify(_)}`)" :customStyle="{ height: '64rpx' }"></up-button>
             </view>
           </view>
         </template>
--- a/pages2/order/com/Prescription.vue
查看文件 @241e031
+++ b/pages2/order/com/Prescription.vue
查看文件 @241e031
@@ -19,9 +19,9 @@
       <view class="text mb24">{{ PrescriptionDetail?.renewRemark }}</view>
     </template>
     <view class="text mb24">处方药:</view>
-    <view class="list">
+    <view class="list br24">
       <view
-        class="flexJ"
+        class="flexJ "
         v-for="(_, index) in props.isRenew === 'err' ? PrescriptionDetail?.drugList : PrescriptionDetail?.renewDrugList"
         :key="index"
         :style="index === (props.isRenew === 'err' ? PrescriptionDetail?.drugList : PrescriptionDetail?.renewDrugList)?.length ? 'margin-bottom: 42rpx' : 'margin-bottom: 0'"
--- a/pages2/order/symptomDetail.vue
查看文件 @241e031
+++ b/pages2/order/symptomDetail.vue
查看文件 @241e031
@@ -61,10 +61,11 @@
       </view> -->
     </view>
     <view style="height: 200rpx"></view>
-    <view class="fixed-bottom" v-if="[30, '30', 20, '20', 40, '40'].includes(detailData?.orderState)">
-      <!-- <view> -->
+    <!-- <view class="fixed-bottom" v-if="[30, '30', 20, '20', 40, '40'].includes(detailData?.orderState)"> -->
+      <view>
       <view class="form-btns">
         <!-- <up-button type="info" v-if="[20, '20'].includes(detailData?.orderState)" shape="circle" text="返回" throttleTime="1500" @click="proxy.$h.backUrl()" :customStyle="{ width: '196rpx', marginRight: '16rpx' }"></up-button> -->
+        <up-button color="#05B8D2" shape="circle" :text="[20, '20'].includes(detailData?.orderState) ? '接诊' : '回复'" throttleTime="1500" @click="AcceptHandler('err')"></up-button>
         <up-button color="#05B8D2" v-if="[20, '20', 30, '30'].includes(detailData?.orderState)" shape="circle" :text="[20, '20'].includes(detailData?.orderState) ? '接诊' : '回复'" throttleTime="1500" @click="AcceptHandler('err')"></up-button>
         <up-button color="#05B8D2" v-if="[40, '40'].includes(detailData?.orderState)" shape="circle" text="问诊记录" throttleTime="1500" @click="AcceptHandler('success')"></up-button>
       </view>