Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf

.env.development

@@ -3,7 +3,7 @@ MP_IMAGE_URL=https://patient.youcan365.com
 MP_CACHE_PREFIX=development
 MP_WX_APP_ID=wx1d8337a40c11d66c
 MP_CORP_ID=wwe3fb2faa52cf9dfb
-MP_TIM_SDK_APP_ID=1600123876
+MP_TIM_SDK_APP_ID=1600126296
 MP_INVITE_TEAMMATE_QRCODE=https://patient.youcan365.com/invite-teammate
 MP_INVITE_PATIENT_QRCODE=https://patient.youcan365.com/invite-patient
 MP_PATIENT_PAGE_BASE_URL= 'https://www.youcan365.com/patientDeploy/#/'

.env.localhost

@@ -3,7 +3,7 @@ MP_IMAGE_URL=https://patient.youcan365.com
 MP_CACHE_PREFIX=development
 MP_WX_APP_ID=wx1d8337a40c11d66c
 MP_CORP_ID=wwe3fb2faa52cf9dfb
-MP_TIM_SDK_APP_ID=1600123876
+MP_TIM_SDK_APP_ID=1600126296
 MP_INVITE_TEAMMATE_QRCODE=https://patient.youcan365.com/invite-teammate
 MP_INVITE_PATIENT_QRCODE=https://patient.youcan365.com/invite-patient
 MP_PATIENT_PAGE_BASE_URL= 'https://www.youcan365.com/patientDeploy/#/'

App.vue

@@ -1,14 +1,18 @@
 <script>
 	import useAccountStore from "@/store/account.js";
-import { globalTimChatManager } from "@/utils/tim-chat.js";
+	import {
+		globalTimChatManager
+	} from "@/utils/tim-chat.js";
 
 	export default {
 		onLaunch: function() {
-    // 需在 pinia 安装后再获取 store，避免 getActivePinia 报错
+			const {
-    const { account, login, initIMAfterLogin, getDoctorInfo } =
+				account,
-      useAccountStore();
+				login,
+				initIMAfterLogin,
+				getDoctorInfo
+			} = useAccountStore();
 
-    // 如果已有缓存的账户信息，尝试初始化 IM，否则重新登录
 			if (account && account.openid) {
 				console.log("App Launch: 已有登录信息，初始化 IM");
 				initIMAfterLogin().catch((err) => {
@@ -84,6 +88,7 @@ uni-button[type="primary"]:not([disabled]):active {
 	.relative {
 		position: relative;
 	}
+
 	.absolute {
 		position: absolute;
 	}
@@ -212,6 +217,7 @@ uni-button[type="primary"]:not([disabled]):active {
 	.pt-5 {
 		padding-top: 10rpx;
 	}
+
 	.pt-15 {
 		padding-top: 30rpx;
 	}

components/button-footer.vue

@@ -1,24 +1,32 @@
 <template>
   <view v-if="showCancel || showConfirm" class="relative flex px-15 py-12 bg-white text-center"
-    :class="hidedenShadow ? '' : 'shadow-up'">
+    :class="showShadow ? 'shadow-up' : ''">
-    <view v-if="showCancel" class="flex-grow py-10 text-base border-primary rounded text-primary rounded"
+    <view v-if="showCancel && customCancel" class="relative" :style="widthStyle">
+      <slot name="cancel"></slot>
+    </view>
+    <view v-else-if="showCancel" class="py-10 text-base border-primary rounded text-primary rounded" :style="widthStyle"
       @click="cancel()">
       {{ cancelText }}
     </view>
-    <view v-if="showConfirm" class="flex-grow py-10 text-base border-primary bg-primary text-white rounded"
+    <view v-if="showConfirm && customConfirm" :class="showCancel && showConfirm ? 'ml-15' : ''" :style="widthStyle">
-      :class="showCancel && showConfirm ? 'ml-15' : ''" @click="confirm()">
+      <slot name="confirm"></slot>
+    </view>
+    <view v-else-if="showConfirm" class="py-10 text-base border-primary bg-primary text-white rounded"
+      :class="showCancel && showConfirm ? 'ml-15' : ''" :style="widthStyle" @click="confirm()">
       {{ confirmText }}
     </view>
   </view>
 </template>
 <script setup>
+import { computed, useSlots, ref } from "vue";
+
 import useDebounce from '@/utils/useDebounce';
 
 const emits = defineEmits(['cancel', 'confirm']);
 const props = defineProps({
-  hidedenShadow: {
+  showShadow: {
     type: Boolean,
-    default: false
+    default: true
   },
   cancelText: {
     type: String,
@@ -40,5 +48,11 @@ const props = defineProps({
 
 const cancel = useDebounce(() => emits('cancel'));
 const confirm = useDebounce(() => emits('confirm'));
-
+const slots = useSlots();
+const customCancel = computed(() => !!slots.cancel);
+const customConfirm = computed(() => !!slots.confirm);
+const widthStyle = computed(() => {
+  const val = [props.showCancel, props.showConfirm].filter(Boolean);
+  return `width: ${100 / (val.length || 1)}%`
+})
 </script>

components/form-template/form-cell/form-input.vue

@@ -42,9 +42,13 @@ const props = defineProps({
 		type: [Number, String],
 		default: 20
 	},
+	placeholder: {
+		type: String,
+		default: ''
+	}
 })
 
-const placeholder = computed(() => `请输入${props.name || ''}`)
+const placeholder = computed(() => props.placeholder || `请输入${props.name || ''}`)
 const value = computed(() => {
 	const v = props.form?.[props.title];
 	return v === undefined || v === null ? '' : String(v);

pages/home/components/cert-popup.vue

@@ -37,7 +37,7 @@
         </view>
       </template>
       <view v-if="btns" class="footer-buttons">
-        <button-footer hideden-shadow :cancelText="btns.cancelText" :confirmText="btns.confirmText"
+        <button-footer :showShadow="false" :cancelText="btns.cancelText" :confirmText="btns.confirmText"
           :showCancel="btns.showCancel" :showConfirm="btns.showConfirm" @confirm="confirm()" @cancel="close()" />
       </view>
     </view>

pages/home/message-home.vue

@@ -368,22 +368,6 @@ const loadConversationList = async () => {
     }
   } catch (error) {
     console.error("加载会话列表失败:", error);
-
-    // 如果是超时或连接错误，提示用户重试
-    if (
-      error.message &&
-      (error.message.includes("超时") || error.message.includes("连接"))
-    ) {
-      uni.showToast({
-        title: "网络连接不稳定，请重试",
-        icon: "none",
-      });
-    } else {
-      uni.showToast({
-        title: error.message || "加载失败，请重试",
-        icon: "none",
-      });
-    }
   } finally {
     loading.value = false;
   }

pages/login/login.vue

@@ -84,7 +84,7 @@ function toAggreement(type) {
 
 async function getPhoneNumber(e) {
   const phoneCode = e && e.detail && e.detail.code;
-  // if (e && !phoneCode) return;
+  if (e && !phoneCode) return;
   const res = await login(phoneCode);
 
   if (res && redirectUrl.value) {

pages/message/index.vue

@@ -245,11 +245,16 @@ async function tryConsumePendingFollowUpSend() {
   const currentGroupId = normalizeGroupId(groupId.value || "");
 
   // 必须匹配当前会话，才允许发送
-  if (!payloadConversationID || payloadConversationID !== currentConversationID) return;
+  if (!payloadConversationID || payloadConversationID !== currentConversationID)
-  if (payloadGroupId && currentGroupId && payloadGroupId !== currentGroupId) return;
+    return;
+  if (payloadGroupId && currentGroupId && payloadGroupId !== currentGroupId)
+    return;
 
   const messages = Array.isArray(payload.messages) ? payload.messages : [];
-  const context = payload.context && typeof payload.context === "object" ? payload.context : {};
+  const context =
+    payload.context && typeof payload.context === "object"
+      ? payload.context
+      : {};
   if (!messages.length) {
     uni.removeStorageSync(PENDING_FOLLOWUP_SEND_STORAGE_KEY);
     return;
@@ -438,7 +443,9 @@ onLoad((options) => {
   };
 
   const rawGroupId = decodeQueryValue(options.groupID || "");
-  groupId.value = rawGroupId.startsWith("GROUP") ? rawGroupId.replace(/^GROUP/, "") : rawGroupId;
+  groupId.value = rawGroupId.startsWith("GROUP")
+    ? rawGroupId.replace(/^GROUP/, "")
+    : rawGroupId;
   messageList.value = [];
   isLoading.value = false;
   if (options.conversationID) {
@@ -872,13 +879,17 @@ onShow(() => {
     checkLoginAndInitTIM();
   } else if (timChatManager.tim && !timChatManager.isLoggedIn) {
     timChatManager.ensureIMConnection();
-  } else if (timChatManager.tim && timChatManager.isLoggedIn && chatInfo.value.conversationID) {
+  } else if (
+    timChatManager.tim &&
+    timChatManager.isLoggedIn &&
+    chatInfo.value.conversationID
+  ) {
     // 页面从后台返回时，重新加载消息列表
     console.log("页面从后台返回，重新加载消息列表");
     messageList.value = [];
     isCompleted.value = false;
     lastFirstMessageId.value = "";
-    loadMessageList();
+    // loadMessageList();
   }
 
   startIMMonitoring(30000);

pages/work/department-select.vue

@@ -48,7 +48,7 @@
           <text class="mr-5 text-base text-gray">如没有符合的内容，请</text>
           <text class="text-base text-primary">联系客服</text>
         </view>
-        <button-footer :showCancel="false" @confirm="save()" />
+        <button-footer :showShadow="false" :showCancel="false" @confirm="save()" />
       </view>
     </template>
   </full-page>

pages/work/hospital-select.vue

@@ -26,7 +26,7 @@
           <text class="mr-5 text-base text-gray">如没有符合的内容，请</text>
           <text class="text-base text-primary">联系客服</text>
         </view>
-        <button-footer :showCancel="false" @confirm="save()" />
+        <button-footer :showShadow="false" :showCancel="false" @confirm="save()" />
       </view>
     </template>
   </full-page>

pages/work/profile.vue

@@ -12,7 +12,10 @@
           </view>
         </common-cell>
         <form-select :form="formData" name="性别" title="gender" :range="genderOptions" @change="onChange($event)" />
-        <form-input :form="formData" disableChange wordLimit="11" title="mobile" name="手机号 (不可修改)" />
+        <form-input v-if="account && account.mobile" :form="formData" disableChange wordLimit="11" title="mobile"
+          name="手机号 (不可修改)" />
+        <form-input v-else :form="formData" disableChange wordLimit="11" title="mobile" name="手机号 (不可修改)"
+          placeholder=" " />
       </view>
 
       <view class="bg-white px-10 mb-10 rounded">
@@ -48,7 +51,17 @@
       </view>
     </view>
     <template #footer>
-      <button-footer :cancelText="cancelText" :confirmText="confirmText" @confirm="save()" @cancel="back()" />
+      <button-footer v-if="account && account.mobile" :cancelText="cancelText" :confirmText="confirmText"
+        @confirm="save()" @cancel="back()" />
+      <button-footer v-else :cancelText="cancelText" :confirmText="confirmText" @confirm="save()" @cancel="back()">
+        <template #confirm>
+          <view class="relative py-10 text-base border-primary bg-primary text-white rounded">
+            {{ confirmText }}
+            <button class="phone-btn absolute w-full h-full" open-type="getPhoneNumber"
+              @getphonenumber="getPhoneNumber"></button>
+          </view>
+        </template>
+      </button-footer>
     </template>
   </full-page>
 </template>
@@ -72,7 +85,7 @@ import fullPage from "@/components/full-page.vue";
 
 const { account, doctorInfo } = storeToRefs(useAccountStore());
 const { useLoad, useShow } = useGuard();
-const { getDoctorInfo } = useAccountStore();
+const { getDoctorInfo, login } = useAccountStore();
 
 const job = { assistant: "医生助理", doctor: "医生" };
 const jobOptions = [{ name: '医生', value: 'doctor' }, { name: '医生助理', value: 'assistant' }, { name: '无', value: '' }];
@@ -196,6 +209,21 @@ function selectDept() {
   })
 }
 
+async function getPhoneNumber(e) {
+  const phoneCode = e && e.detail && e.detail.code;
+  if (e && !phoneCode) return;
+  try {
+    const res = await login(phoneCode);
+    if (!res || !res.mobile) {
+      return toast('绑定手机号失败')
+    }
+    save()
+  } catch (e) {
+    toast('绑定手机号失败')
+  }
+
+}
+
 async function save() {
   if (
     typeof formData.value.anotherName !== "string" ||
@@ -253,4 +281,10 @@ useShow(() => {
   width: 64rpx;
   height: 64rpx;
 }
+
+.phone-btn {
+  left: 0;
+  top: 0;
+  opacity: 0;
+}
 </style>

pages/work/team/invite/rename-popup.vue

@@ -9,7 +9,7 @@
           <input v-model="name" class="w-full" placeholder="请输入名称" />
         </view>
       </view>
-      <button-footer hideden-shadow confirmText="保存" @confirm="confirm()" @cancel="close()" />
+      <button-footer :showShadow="false" confirmText="保存" @confirm="confirm()" @cancel="close()" />
     </view>
   </uni-popup>
 </template>

store/account.js

@@ -1,4 +1,4 @@
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { defineStore } from "pinia";
 import api from '@/utils/api';
 import { toast } from '@/utils/widget';
@@ -55,16 +55,16 @@ export default defineStore("accountStore", () => {
           corpId,
         });
         if (res.success && res.data) {
-          if (!res.data.mobile) {
+          // if (!res.data.mobile) {
-            const target = '/pages/login/login';
+          //   const target = '/pages/login/login';
-            uni.redirectTo({ url: target });
+          //   uni.redirectTo({ url: target });
-            return;
+          //   return;
-          }
+          // }
           account.value = res.data;
           openid.value = res.data.openid;
           // 持久化账户信息
-          cache.set(CACHE_KEYS.ACCOUNT, res.data);
+          // cache.set(CACHE_KEYS.ACCOUNT, res.data);
-          cache.set(CACHE_KEYS.OPENID, res.data.openid);
+          // cache.set(CACHE_KEYS.OPENID, res.data.openid);
 
           // 登录成功后初始化腾讯IM
           await getDoctorInfo({ openid: openid.value });
@@ -155,9 +155,25 @@ export default defineStore("accountStore", () => {
     doctorInfo.value = null;
 
     // 清空缓存
+    // cache.remove(CACHE_KEYS.ACCOUNT);
+    // cache.remove(CACHE_KEYS.OPENID);
+  }
+
+  watch(account, n => {
+    if (n) {
+      cache.set(CACHE_KEYS.ACCOUNT, n);
+    } else {
       cache.remove(CACHE_KEYS.ACCOUNT);
+    }
+  })
+
+  watch(openid, n => {
+    if (n) {
+      cache.set(CACHE_KEYS.OPENID, n);
+    } else {
       cache.remove(CACHE_KEYS.OPENID);
     }
+  })
 
   return { account, openid, isIMInitialized, doctorInfo, login, getDoctorInfo, initIMAfterLogin, logout }
 })