3.14提交

pages_app/groupManage/groupManage.vue

@@ -83,7 +83,9 @@ const loadAllGroups = async () => {
   try {
     const res = await api.groupList();
     if (res.code === 200) {
-      allGroups.value = res.data || [];
+      const hiddenGroupNames = new Set(['待分组患者', '肝系医生非患教组', '肝系医生患教组']);
+      const arr = (res.data || []).filter((item) => !hiddenGroupNames.has(String(item?.name || '').trim()));
+      allGroups.value = arr;
     }
   } catch (e) {
     console.error("加载分组列表失败:", e);

pages_app/idcardAuth/idcardAuth.vue

@@ -68,6 +68,7 @@
 							class="form-input" 
 							placeholder="请输入您的姓名" 
 							v-model="formData.name"
+							:adjust-position="false"
 							placeholder-style="color: #cccccc"
 						/>
 					</view>
@@ -76,6 +77,7 @@
 						<input 
 							class="form-input" 
 							placeholder="请输入您的身份证号" 
+							:adjust-position="false"
 							v-model="formData.idNumber"
 							placeholder-style="color: #cccccc"
 						/>
@@ -92,6 +94,7 @@
 								:class="{ 'is-filled': !!formData.cardNumber }"
 								placeholder="仅限借记卡" 
 								:value="cardNumberDisplay"
+								:adjust-position="false"
 								@input="onCardNumberInput"
 								placeholder-style="color: #cccccc"
 							/>
@@ -108,6 +111,7 @@
 								class="form-input card-number-input" 
 								placeholder="银行预留手机号" 
 								v-model="formData.mobile"
+								:adjust-position="false"
 								placeholder-style="color: #cccccc"
 							/>
 							

pages_app/myAccount/withdrawal.vue

@@ -399,7 +399,7 @@ const onGetSmsCode = async () => {
 	} catch (error) {
 		console.error('发送短信验证码失败:', error)
 		uni.showToast({
-			title: '网络错误，请重试',
+			title:error.message || error.msg,
 			icon: 'none'
 		})
 	} finally {

pages_app/patientDetail/patientDetail.vue

@@ -71,12 +71,15 @@
 		</view>
 
 		<!-- 患者病史 -->
-		<view class="history-section" v-if="patientDetail.medicalHistoryContent">
+		<view class="history-section">
 			<view class="section-title">患者病史</view>
-			<view class="card history-card">
+			<view class="card history-card"  v-if="patientDetail.medicalHistoryContent">
 				<text class="history-text" :class="{ fold: !showAllHistory }">{{ patientDetail.medicalHistoryContent }}</text>
 				<text class="toggle" @click="toggleHistory" v-if="patientDetail.medicalHistoryContent">{{ showAllHistory ? '收起' : '展开全部' }}</text>
 			</view>
+			<view class="card history-card"  v-else>
+				<text class="history-text">暂无</text>
+			</view>
 		</view>
 		<!-- 检查报告 -->
 		<view class="history-section" v-if="patientDetail.patientCase && patientDetail.patientCase.length>0">
@@ -325,9 +328,9 @@
 	.name-row { display:flex; align-items:center; margin-bottom: 10rpx; }
 	.name { font-size: 36rpx; color:#222; margin-right: 10rpx;}
 	.line { font-size: 28rpx; color:#666; margin-top: 6rpx; display:flex; align-items:center;  }
-	.label { color:#999;white-space: nowrap; }
+	.label { color:#666;white-space: nowrap; }
-	.value { color:#333; }
+	.value { color:#666; }
-	.sep { color:#ddd; margin: 0 10rpx; }
+	.sep { color:#666; margin: 0 10rpx; }
      .multi{
 		 display: inline;
 	 }
@@ -338,9 +341,9 @@
 	.hint { font-size: 28rpx; color:#999; margin-right: 12rpx; }
 	.phone { font-size: 32rpx; color:#b10000; }
 
-	.section-title { padding: 16rpx 30rpx; color:#8B2316; font-size: 28rpx; margin-top: 20rpx; background: #fff;}
+	.section-title { padding: 16rpx 30rpx; color:#333; font-size: 28rpx; margin-top: 20rpx; background: #fff;}
 	.history-card { position: relative; }
-	.history-text { font-size: 28rpx; color:#666; line-height: 1.7; display:block; }
+	.history-text { font-size: 28rpx; color:#999; line-height: 1.7; display:block; }
 	.history-text.fold { display:-webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; }
 	.toggle { position:absolute; right: 20rpx; bottom: 25rpx; color:#b10000; font-size: 28rpx;background: #fff; z-index: 10;}
 

pages_app/patientMsg/patientMsg.vue

@@ -137,11 +137,11 @@
 						:id="`anchor-${group.letter}`"
 					>
 						<view class="group-header">{{ group.letter }}</view>
-						<view class="patient-item" v-for="item in group.items" :key="item.uuid || item.id" @longpress="onPatientItemLongPress(item)">
+						<view class="patient-item" v-for="item in group.items" :key="item.uuid || item.id" @longpress="onPatientItemLongPress(item)" @click="goPatientDetail(item.uuid)">
 							<image class="patient-avatar" :src="getPatientAvatar(item)" mode="aspectFill" @error="handlePatientAvatarError(item)" @click.stop="goPatientDetail(item.uuid)"></image>
 
 							<view class="patient-info">
-								<text class="patient-name" @click.stop="goPatientDetail(item.uuid)">{{ item.nickname || item.realName }}</text>
+								<text class="patient-name" >{{ item.nickname || item.realName }}</text>
 								<view class="patient-badge" v-if="item.badge">
 									<text class="badge-text">{{ item.badge }}</text>
 								</view>

pages_app/patientSetting/patientSetting.vue

@@ -163,10 +163,23 @@
 			.cell-right{
 				display: flex;
 				align-items: center;
-				gap: 16rpx;
+				justify-content: flex-end;
+				flex: 1;
+				margin-left: 20rpx;
+				min-width: 0;
+				
 				.cell-desc{
+					flex: 1;
+					min-width: 0;
+					display: block;
 					font-size: 26rpx;
 					color: #999;
+					overflow: hidden;
+					margin-right: 16rpx;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					text-align: right;
+					
 				}
 			}
 		}

pages_chat/article/article.vue

@@ -481,7 +481,7 @@ $padding-small: 10px;
 		gap: 12px;
 
 		.article-image {
-			width: 80px;
+			width: 160px;
 			height: 80px;
 			border-radius: $border-radius-small;
 			flex-shrink: 0;

pages_chat/chat/message/message-input.vue

@@ -306,6 +306,20 @@
       </view>
     </view>
   </div>
+  <unidialog
+      :visible="outDialog"
+      :content="'您是否发送您的出/停诊公告？'"
+      @close="outDialog = false"
+      @confirm="confirmOutDialog"
+    >
+    </unidialog>
+    <unidialog
+      :visible="mallDialog"
+      :content="'您是否发送该商品详情？'"
+      @close="mallDialog = false"
+      @confirm="confirmMallDialog"
+    >
+    </unidialog>
 </template>
 
 <script lang="ts" setup>
@@ -350,7 +364,7 @@ import hjImg from '@/static/huanjiao.png'
 import picImg from '@/static/im_icon_images_on.png'
 import cameraImg from '@/static/im_icon_camera_on.png'
 import {onShow,onUnload} from '@dcloudio/uni-app'
-
+import unidialog from "@/components/dialog/dialog.vue";
 import {
   V2NIMTeam,
   V2NIMTeamChatBannedMode,
@@ -374,6 +388,9 @@ let patient_uuid='';
 const articleInfo=ref({});
 const videoInfo=ref({});
 const textMsg=ref('');
+const outDialog = ref(false);
+const mallDialog = ref(false);
+
 const patientListByGBK = async () => {
 		
 		const res = await api.patientListByGBK();
@@ -511,7 +528,8 @@ let rawStr="{\"gdxz_content\":\"我已入驻肝胆相照互联网医院，复诊
 const sendMallMsg = () => {
   showMallModal.value = false;
   //handleSendTextMsg('mall');
-  senCustomMsg('mall');
+  //senCustomMsg('mall');
+  mallDialog.value = true;
  
 }
 
@@ -1023,6 +1041,14 @@ const senCustomMsg = (type:string) => {
   }
 }
 
+const confirmOutDialog = () => {
+  outDialog.value = false;
+  senCustomMsg('outpatient');
+}
+const confirmMallDialog = () => {
+  mallDialog.value = false;
+  senCustomMsg('mall')
+}
 const handleCustom = (type: string, event: any) => {
   if (isTeamMute.value) return
   if(type == 'reply'){
@@ -1043,7 +1069,8 @@ const handleCustom = (type: string, event: any) => {
         url: '/pages_chat/outpatient/outpatient',
       })
     }else{
-      senCustomMsg('outpatient');
+      //senCustomMsg('outpatient');
+      outDialog.value = true;
     }
    
    
@@ -1422,7 +1449,8 @@ onUnmounted(() => {
      height:38px;
      border: 1px solid #CCC;
      border-radius: 10rpx;
-     margin-top:-2rpx;
+    //  margin-top:-2rpx;
+    margin-bottom:12rpx;
      font-size: 28rpx;
      color: #666;
      border-radius: 10rpx;

pages_chat/groupMessage/groupMessage.vue

@@ -168,10 +168,12 @@ onLoad((options) => {
 	}
 });
 onBackPress(() => {
-	if(!from.value){
+	// if(!from.value){
-		plus.runtime.quit();
+	// 	plus.runtime.quit();
-		return true;
+	// 	return true;
-	}
+	// }
+	plus.runtime.quit();
+	return true;
 });
 const goBack = () => {
 	if(!from.value){

pages_chat/groupSend/groupSend.vue

@@ -88,6 +88,7 @@
         />
       </view>
     </view>
+    
 </template>
 
 <script setup>
@@ -97,6 +98,7 @@ import api from "@/api/api.js";
 import { events } from "@/utils/im/constants";
 import { onShow,onLoad,onUnload } from "@dcloudio/uni-app";
 import navTo from "@/utils/navTo.js";
+import unidialog from "@/components/dialog/dialog.vue";
 import MessageInput from "@/pages_chat/chat/message/message-input.vue";
 const showModal = ref(false);
 const selectedPatients = ref([]);
@@ -106,6 +108,7 @@ const conversationType = ref("1");
 const msg_content = ref("");
 const msg_type = ref("1");
 const to = ref("");
+
 onLoad((options) => {
   if(options.from == 'chatMsg'){
     from.value = 'chatMsg';

pages_chat/video/video.vue

@@ -21,7 +21,7 @@
 					@click="showAllVideoPopup=!showAllVideoPopup"
 				>
 					<up-image  :src="isAllActive?allOnImg:allImg" width="30rpx" height="30rpx" ></up-image>
-					<text class="tab-text" :class="{active:isAllActive}">{{typeName}}</text>
+					<text class="tab-text" :class="{active:isAllActive}">{{formatName(typeName)}}</text>
 					<up-image  :src="isAllActive?selectOnImg:selectImg" width="30rpx" height="30rpx" ></up-image>
 				</view>
 				<view class="divider"></view>
@@ -136,7 +136,7 @@
 						:key="item.uuid"
 						@click="selectCategory(item.uuid)"
 					>
-						{{ item.name }}
+						{{ formatName(item.name) }}
 					</view>
 					<view v-if="videoTypeList.length === 0" class="empty-content">
 						<text>暂无数据</text>
@@ -221,6 +221,18 @@
 	 }
 
 	const videoTypeList=ref([]);
+const formatName = (name) => {
+   let nameStr=name.substring(0,4);
+   let lateStr=name.substring(4,name.length);
+  
+  let index = nameStr.lastIndexOf("-");
+ 
+  if (index > -1) {
+ 
+      return name.substring(index+1,4)+lateStr;
+  }
+  return name;
+};
 	const patientVideoNew=async ()=>{
 		const res=await api.patientVideoNew();
 		if(res.code==200){
@@ -635,29 +647,28 @@
 
 /* Video List */
 .video-list {
-	padding: 0 20rpx;
+	padding: 20rpx;
 	display: flex;
-	flex-wrap: wrap;/* 卡片间距 */
+	flex-direction: column;
-	
 }
 
 .video-item {
 	background-color: #fff;
-	border-radius: 16rpx;
+	border-radius: 12rpx;
-	margin-bottom: 0;
+	margin-bottom: 16rpx;
-	overflow: hidden;
+	padding: 20rpx;
-	box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.1);
+	display: flex;
-	width: calc((100% - 16rpx) / 2); /* 两列布局，中间间距16rpx */
+	gap: 18rpx;
-	min-width: 300rpx; /* 确保最小宽度 */
+	box-sizing: border-box;
-	flex-shrink: 0; /* 防止收缩 */
-}
-.video-list .video-item:nth-child(2n+2){
-	margin-left: 16rpx;
 }
 
 .video-thumbnail {
 	position: relative;
-	height: 200rpx;
+	width: 250rpx;
+	height: 150rpx;
+	border-radius: 10rpx;
+	flex-shrink: 0;
+	overflow: hidden;
 }
 
 .video-thumbnail image {
@@ -677,7 +688,11 @@
 }
 
 .video-info {
-	padding: 24rpx;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	min-width: 0;
 }
 
 .video-title {
@@ -685,7 +700,7 @@
 	font-weight: 400;
 	color: #333;
 	line-height: 1.4;
-	margin-bottom: 16rpx;
+	margin-bottom: 12rpx;
 	display: -webkit-box;
 	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 2;
@@ -702,11 +717,12 @@
 
 .author {
 	font-size: 24rpx;
-	color: #999;
+	color: #666;
 	white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   margin-right: 20rpx;
+  flex: 1;
 }
 
 .stats {