From 630f486831096dba2e3eec6bbe82561587eb186f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=90=A6?= <liqiworkers@gmail.com>
Date: Thu, 18 Jun 2026 17:04:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=AF=8A=E6=89=80=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/upload.js                                 |  16 +-
 common/js/oss-upload.js                       |  11 +-
 .../account-switch/account-switch-panel.vue   |   7 +-
 components/doctor-login/doctor-login.vue      |   7 +-
 .../common/inputFormHelpers.js                |  14 +-
 .../components/ImageGalleryPicker.vue         | 200 ++++++++++++++++--
 utils/doctorWxAuth.js                         |  19 ++
 7 files changed, 234 insertions(+), 40 deletions(-)
 create mode 100644 utils/doctorWxAuth.js

diff --git a/api/upload.js b/api/upload.js
index c76e9e0..41bea39 100644
--- a/api/upload.js
+++ b/api/upload.js
@@ -28,26 +28,30 @@ function getOssSignatureByPrefix(prefix, headerKey) {
   });
 }
 
-function registerOssFileByPrefix(prefix, headerKey, url, fileSize = 0) {
+function registerOssFileByPrefix(prefix, headerKey, url, fileSize = 0, fileName = '') {
+  const data = { url, source: 2, file_size: fileSize }
+  if (fileName) {
+    data.file_name = fileName
+  }
   return req.request({
     url: `${prefix}register-oss-file`,
     method: 'POST',
-    data: { url, source: 2, file_size: fileSize },
+    data,
     header: {
       [headerKey]: '1',
     },
   });
 }
 
-function registerBusinessOssFile(url, fileSize = 0) {
+function registerBusinessOssFile(url, fileSize = 0, fileName = '') {
   const mode = uni.getStorageSync('loginMode');
   if (mode === 'platform_admin') {
-    return registerOssFileByPrefix(PLATFORM_PREFIX, '_platformAdmin', url, fileSize);
+    return registerOssFileByPrefix(PLATFORM_PREFIX, '_platformAdmin', url, fileSize, fileName);
   }
   if (mode === 'clinic_admin') {
-    return registerOssFileByPrefix(CLINIC_ADMIN_PREFIX, '_clinicAdmin', url, fileSize);
+    return registerOssFileByPrefix(CLINIC_ADMIN_PREFIX, '_clinicAdmin', url, fileSize, fileName);
   }
-  return registerOssFileByPrefix(SALESPERSON_PREFIX, '_salesperson', url, fileSize);
+  return registerOssFileByPrefix(SALESPERSON_PREFIX, '_salesperson', url, fileSize, fileName);
 }
 
 export { registerBusinessOssFile };
diff --git a/common/js/oss-upload.js b/common/js/oss-upload.js
index 0a6d9f9..fd00ef1 100644
--- a/common/js/oss-upload.js
+++ b/common/js/oss-upload.js
@@ -31,6 +31,12 @@ export function generateObjectName(filePath) {
   return `xk_upload_${dateStr}/${uuid}_${timestamp}.${extension}`;
 }
 
+function basenameFromPath(filePath) {
+  const pathStr = String(filePath || '');
+  const parts = pathStr.split(/[/\\]/);
+  return parts[parts.length - 1] || '';
+}
+
 /**
  * @returns {Promise<{ accessKeyId, policy, signature, host, bucket, key, expire }>}
  */
@@ -48,7 +54,7 @@ export async function getOssSignatureFromBackend() {
  * @returns {Promise<{ url: string, objectName: string }>}
  */
 export async function uploadToOss(options) {
-  const { filePath, onProgress, fileSize = 0 } = options || {};
+  const { filePath, onProgress, fileSize = 0, fileName = '' } = options || {};
   if (!filePath) {
     throw new Error('文件路径为空');
   }
@@ -76,7 +82,8 @@ export async function uploadToOss(options) {
         if (code >= 200 && code < 300 || code === 204) {
           const host = String(signature.host).replace(/\/$/, '');
           const url = `${host}/${objectName}`;
-          registerBusinessOssFile(url, fileSize).catch((err) => {
+          const displayName = fileName || basenameFromPath(filePath);
+          registerBusinessOssFile(url, fileSize, displayName).catch((err) => {
             console.warn('OSS 文件登记失败:', err);
           });
           resolve({
diff --git a/components/account-switch/account-switch-panel.vue b/components/account-switch/account-switch-panel.vue
index d0bb66c..d574cb0 100644
--- a/components/account-switch/account-switch-panel.vue
+++ b/components/account-switch/account-switch-panel.vue
@@ -49,6 +49,7 @@
 
 <script>
 import { switchDoctorWxAccount, getDoctorWxSiblingAccounts } from '@/api/doctorAuth.js';
+import { buildDoctorWxAuthExtra } from '@/utils/doctorWxAuth.js';
 
 export default {
 	name: 'AccountSwitchPanel',
@@ -172,11 +173,7 @@ export default {
 		},
 		submitSwitch() {
 			this.loading = true;
-			switchDoctorWxAccount({
-				account_type: this.selected.account_type,
-				account_id: this.selected.id,
-				login_persona: this.selected.login_persona || undefined,
-			}).then((wrap) => {
+			switchDoctorWxAccount(buildDoctorWxAuthExtra(this.selected)).then((wrap) => {
 				if (!wrap || !wrap.ok || !wrap.data || !wrap.data.token) {
 					return Promise.reject({
 						message: this.resolveSwitchError(wrap),
diff --git a/components/doctor-login/doctor-login.vue b/components/doctor-login/doctor-login.vue
index a1724d2..5af8065 100644
--- a/components/doctor-login/doctor-login.vue
+++ b/components/doctor-login/doctor-login.vue
@@ -86,6 +86,7 @@ import {
 	fetchProfileAfterLogin,
 	navigateAfterLogin,
 } from '@/utils/loginSession.js';
+import { buildDoctorWxAuthExtra } from '@/utils/doctorWxAuth.js';
 
 export default {
 	name: 'DoctorLogin',
@@ -190,11 +191,7 @@ export default {
 				});
 		},
 		onAccountPicked(account) {
-			this.doLogin({
-				account_type: account.account_type,
-				account_id: account.id,
-				login_persona: account.login_persona || undefined,
-			});
+			this.doLogin(buildDoctorWxAuthExtra(account));
 		},
 		async finishLogin(result) {
 			saveLoginSession(result);
diff --git a/subPackages/sub_salesperson/common/inputFormHelpers.js b/subPackages/sub_salesperson/common/inputFormHelpers.js
index 6b3e3ea..55ad369 100644
--- a/subPackages/sub_salesperson/common/inputFormHelpers.js
+++ b/subPackages/sub_salesperson/common/inputFormHelpers.js
@@ -2,6 +2,12 @@ import { prepareImagePath } from '@/common/js/image-compress.js'
 import { uploadToOss } from '@/common/js/oss-upload.js'
 import { requestGalleryPick } from '@/subPackages/sub_salesperson/common/imageGalleryBridge.js'
 
+function basenameFromPath(filePath) {
+  const pathStr = String(filePath || '')
+  const parts = pathStr.split(/[/\\]/)
+  return parts[parts.length - 1] || ''
+}
+
 function chooseImageFromDevice(count = 1) {
   return new Promise((resolve, reject) => {
     uni.showActionSheet({
@@ -40,13 +46,15 @@ async function uploadChosenImages(res, count = 1) {
     const paths = files.length ? files.map((f) => f.path) : (res.tempFilePaths || [])
     const urls = []
     for (const path of paths) {
+      const fileMeta = files.find((f) => f.path === path) || {};
       const prepared = await prepareImagePath({
         path,
-        size: files.find((f) => f.path === path)?.size,
+        size: fileMeta.size,
       })
       if (!prepared) continue
-      const fileSize = files.find((f) => f.path === path)?.size || 0
-      const result = await uploadToOss({ filePath: prepared.path, fileSize })
+      const fileSize = fileMeta.size || 0
+      const fileName = fileMeta.name || basenameFromPath(path)
+      const result = await uploadToOss({ filePath: prepared.path, fileSize, fileName })
       urls.push(result.url)
     }
     uni.hideLoading()
diff --git a/subPackages/sub_salesperson/components/ImageGalleryPicker.vue b/subPackages/sub_salesperson/components/ImageGalleryPicker.vue
index 2174697..68b3957 100644
--- a/subPackages/sub_salesperson/components/ImageGalleryPicker.vue
+++ b/subPackages/sub_salesperson/components/ImageGalleryPicker.vue
@@ -1,13 +1,39 @@
 <template>
-  <u-popup v-model="visible" mode="bottom" border-radius="24" height="70%">
+  <u-popup v-model="visible" mode="bottom" border-radius="24" height="75%">
     <view class="gallery-panel">
       <view class="gallery-header">
-        <text class="gallery-title">从图库选择</text>
+        <text class="gallery-title">从文件库选择</text>
         <text class="gallery-close" @click="close">关闭</text>
       </view>
+
+      <scroll-view scroll-x class="type-scroll" :show-scrollbar="false">
+        <view class="type-tabs">
+          <view
+            v-for="tab in tabs"
+            :key="tab.value"
+            class="type-tab"
+            :class="{ active: activeType === tab.value }"
+            @click="switchType(tab.value)"
+          >
+            <text>{{ tab.label }}</text>
+          </view>
+        </view>
+      </scroll-view>
+
+      <view class="search-bar">
+        <input
+          v-model="keyword"
+          class="search-input"
+          placeholder="按文件名搜索"
+          confirm-type="search"
+          @confirm="onSearch"
+          @input="onSearch"
+        />
+      </view>
+
       <scroll-view scroll-y class="gallery-scroll" @scrolltolower="loadMore">
         <view v-if="loading && !items.length" class="gallery-loading">加载中...</view>
-        <view v-else-if="!items.length" class="gallery-empty">图库暂无图片</view>
+        <view v-else-if="!items.length" class="gallery-empty">暂无文件</view>
         <view v-else class="gallery-grid">
           <view
             v-for="item in items"
@@ -15,12 +41,17 @@
             class="gallery-item"
             @click="selectItem(item)"
           >
-            <image :src="item.url" class="gallery-thumb" mode="aspectFill" />
+            <image v-if="item.type === 0" :src="item.url" class="gallery-thumb" mode="aspectFill" />
+            <view v-else class="gallery-file-icon">
+              <text class="file-type-tag">{{ item.type_text || '文件' }}</text>
+              <text class="file-name">{{ item.file_name || item.original_name || '未命名' }}</text>
+            </view>
+            <text class="gallery-name">{{ item.file_name || item.original_name || '-' }}</text>
             <text class="gallery-size">{{ item.file_size_text || '' }}</text>
-            <text v-if="item.created_at" class="gallery-time">{{ item.created_at }}</text>
           </view>
         </view>
         <view v-if="loadingMore" class="gallery-loading">加载更多...</view>
+        <view v-if="total > 0" class="gallery-total">共 {{ total }} 条</view>
       </scroll-view>
     </view>
   </u-popup>
@@ -33,13 +64,20 @@ import { cancelGalleryPick, resolveGalleryPick } from '@/subPackages/sub_salespe
 
 const SALESPERSON_PREFIX = '/newApi/salesperson-file-gallery/'
 const PLATFORM_PREFIX = '/newApi/platform-admin-file-gallery/'
+const ALL_TYPE_VALUE = -1
+const STORAGE_KEY = 'file-picker-active-type'
 
-function getGalleryListApi(params) {
+function getGalleryApiConfig() {
   const mode = uni.getStorageSync('loginMode')
   const prefix = mode === 'platform_admin' ? PLATFORM_PREFIX : SALESPERSON_PREFIX
   const headerKey = mode === 'platform_admin' ? '_platformAdmin' : '_salesperson'
+  return { prefix, headerKey }
+}
+
+function galleryRequest(path, params) {
+  const { prefix, headerKey } = getGalleryApiConfig()
   return req.request({
-    url: `${prefix}list`,
+    url: `${prefix}${path}`,
     method: 'GET',
     data: params,
     header: { [headerKey]: '1' },
@@ -54,9 +92,14 @@ export default {
       loading: false,
       loadingMore: false,
       items: [],
+      fileTypes: [],
+      tabs: [{ value: ALL_TYPE_VALUE, label: '全部' }],
+      activeType: ALL_TYPE_VALUE,
+      keyword: '',
       page: 1,
       pageSize: 24,
       total: 0,
+      searchTimer: null,
     }
   },
   created() {
@@ -64,18 +107,65 @@ export default {
   },
   beforeDestroy() {
     uni.$off('salesperson:open-gallery', this.open)
+    if (this.searchTimer) {
+      clearTimeout(this.searchTimer)
+    }
   },
   methods: {
-    open() {
+    async open() {
       this.visible = true
       this.page = 1
       this.items = []
-      this.fetchList(true)
+      this.keyword = ''
+      await this.loadFileTypes()
+      this.restoreActiveType()
+      await this.fetchList(true)
     },
     close() {
       this.visible = false
       cancelGalleryPick()
     },
+    restoreActiveType() {
+      const saved = uni.getStorageSync(STORAGE_KEY)
+      if (saved === '' || saved === null || saved === undefined) {
+        this.activeType = ALL_TYPE_VALUE
+        return
+      }
+      const parsed = parseInt(saved, 10)
+      if (parsed === ALL_TYPE_VALUE || this.tabs.some((t) => t.value === parsed)) {
+        this.activeType = parsed
+      } else {
+        this.activeType = ALL_TYPE_VALUE
+      }
+    },
+    async loadFileTypes() {
+      try {
+        const res = await galleryRequest('file-types')
+        const data = unwrapClinicRes(res) || []
+        this.fileTypes = Array.isArray(data) ? data : []
+        this.tabs = [
+          { value: ALL_TYPE_VALUE, label: '全部' },
+          ...this.fileTypes.map((item) => ({ value: item.value, label: item.name, icon: item.icon })),
+        ]
+      } catch (e) {
+        this.tabs = [{ value: ALL_TYPE_VALUE, label: '全部' }]
+      }
+    },
+    buildParams() {
+      const params = {
+        page: this.page,
+        page_size: this.pageSize,
+        pid: 0,
+      }
+      if (this.activeType !== ALL_TYPE_VALUE) {
+        params.type = this.activeType
+      }
+      const kw = (this.keyword || '').trim()
+      if (kw) {
+        params.keyword = kw
+      }
+      return params
+    },
     async fetchList(reset) {
       if (reset) {
         this.loading = true
@@ -83,12 +173,7 @@ export default {
         this.loadingMore = true
       }
       try {
-        const res = await getGalleryListApi({
-          page: this.page,
-          page_size: this.pageSize,
-          pid: 0,
-          type: 0,
-        })
+        const res = await galleryRequest('list', this.buildParams())
         const data = unwrapClinicRes(res) || {}
         const list = data.items || []
         this.total = data.total || 0
@@ -100,6 +185,21 @@ export default {
         this.loadingMore = false
       }
     },
+    switchType(value) {
+      this.activeType = value
+      uni.setStorageSync(STORAGE_KEY, String(value))
+      this.page = 1
+      this.fetchList(true)
+    },
+    onSearch() {
+      if (this.searchTimer) {
+        clearTimeout(this.searchTimer)
+      }
+      this.searchTimer = setTimeout(() => {
+        this.page = 1
+        this.fetchList(true)
+      }, 300)
+    },
     loadMore() {
       if (this.loadingMore || this.items.length >= this.total) return
       this.page += 1
@@ -137,6 +237,37 @@ export default {
   font-size: 28rpx;
   color: #86909c;
 }
+.type-scroll {
+  white-space: nowrap;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+.type-tabs {
+  display: inline-flex;
+  padding: 16rpx 24rpx;
+  gap: 16rpx;
+}
+.type-tab {
+  padding: 10rpx 24rpx;
+  border-radius: 999rpx;
+  background: #f5f5f5;
+  font-size: 24rpx;
+  color: #4e5969;
+  &.active {
+    background: #e8f3ff;
+    color: #165dff;
+  }
+}
+.search-bar {
+  padding: 16rpx 24rpx;
+}
+.search-input {
+  width: 100%;
+  height: 64rpx;
+  padding: 0 24rpx;
+  border-radius: 12rpx;
+  background: #f5f5f5;
+  font-size: 26rpx;
+}
 .gallery-scroll {
   flex: 1;
   height: 0;
@@ -157,14 +288,39 @@ export default {
   height: 200rpx;
   display: block;
 }
-.gallery-size {
+.gallery-file-icon {
+  height: 200rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 12rpx;
+  padding: 12rpx;
+}
+.file-type-tag {
+  font-size: 22rpx;
+  color: #165dff;
+  background: #e8f3ff;
+  padding: 4rpx 12rpx;
+  border-radius: 8rpx;
+}
+.file-name {
+  font-size: 22rpx;
+  color: #4e5969;
+  text-align: center;
+  word-break: break-all;
+}
+.gallery-name {
   display: block;
   font-size: 22rpx;
-  color: #86909c;
+  color: #1d2129;
   text-align: center;
-  padding: 8rpx 0 0;
+  padding: 8rpx 8rpx 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-.gallery-time {
+.gallery-size {
   display: block;
   font-size: 20rpx;
   color: #86909c;
@@ -178,4 +334,10 @@ export default {
   color: #86909c;
   font-size: 28rpx;
 }
+.gallery-total {
+  text-align: center;
+  padding: 16rpx 0 32rpx;
+  color: #86909c;
+  font-size: 24rpx;
+}
 </style>
diff --git a/utils/doctorWxAuth.js b/utils/doctorWxAuth.js
new file mode 100644
index 0000000..d86994d
--- /dev/null
+++ b/utils/doctorWxAuth.js
@@ -0,0 +1,19 @@
+const VALID_PERSONAS = ['admin', 'clinic_salesperson'];
+
+/**
+ * 构建医生小程序登录/切换账号的附加参数（仅 admin 多身份传 login_persona）
+ * @param {Record<string, any>} account
+ */
+export function buildDoctorWxAuthExtra(account) {
+  const extra = {
+    account_type: account.account_type,
+    account_id: account.id,
+  };
+  if (
+    account.account_type === 'admin'
+    && VALID_PERSONAS.includes(account.login_persona)
+  ) {
+    extra.login_persona = account.login_persona;
+  }
+  return extra;
+}