Merge remote-tracking branch 'origin/dev-2.46' into fixbug-2.45

This commit is contained in:
huxuejian 2026-06-04 16:06:30 +08:00
commit 289e697330
14 changed files with 433 additions and 102 deletions

View File

@ -2,15 +2,18 @@
import dbStore from "@/store/db";
import accountStore from "@/store/account";
import { globalUnreadListenerManager } from "@/utils/global-unread-listener.js";
import { initApiContextFromAppOptions } from "@/utils/api-base-config";
export default {
async onLaunch() {
async onLaunch(options) {
initApiContextFromAppOptions(options);
console.log("App Launch: ");
// openId IM
// await this.initIMOnLaunch();
},
onShow: function () {
onShow: function (options) {
initApiContextFromAppOptions(options);
const db = dbStore();
if (db && typeof db.getJobs === "function") {
db.getJobs();

View File

@ -1,13 +1,14 @@
<template>
<template v-for="item in formItems" :key="item.title">
<form-cell v-if="item.cellType === 'formCellItem'" v-bind="item" :form="form"
:disableChange="disabledMap[item.title]" @change="change" @addRule="addRule" />
:disableChange="isDisableChange(item)" @change="change" @addRule="addRule" />
</template>
<form-cell />
</template>
<script setup>
import { computed, provide, ref } from 'vue';
import { computed, provide, ref, watch } from 'vue';
import verifyForm from './verify.js';
import { collectAutoFillChanges } from './auto-fill.mjs';
import FormCell from './form-cell/index.vue';
// import CustomCell from './custom-cell/index.vue';
@ -69,6 +70,21 @@ function change(data) {
emits('change', data)
}
function isDisableChange(item) {
return Boolean(disabledMap.value[item.title] || item.readonly === true || item.readonly === 'true');
}
function syncAutoFill() {
const changes = collectAutoFillChanges(formItems.value, props.form);
changes.forEach(change);
}
watch(
() => [props.items, props.form],
syncAutoFill,
{ deep: true, immediate: true }
);
function verify() {
return verifyForm(props.items, rules.value, props.form)
}

View File

@ -94,7 +94,7 @@ function toFriend(userid) {
}
async function getQrcode(userid) {
const res = await api('addContactWay', { corpUserId: userid, corpId: corpId.value, unionid: account.value?.openid });
const res = await api('addContactWay', { corpUserId: userid, corpId: corpId.value, unionid: account.value?.openid, fetchType: 'realtime' });
if (res && res.data) {
qrcode.value = res.data;
}

View File

@ -8,7 +8,7 @@
<view class="flex items-center py-12 px-15">
<view class="min-w-90 flex items-center bg-white rounded-sm px-10 mr-5" @click="selectType()">
<view class="leading-normal text-base py-5 px-10 text-dark mr-5">
{{ tempType[type] || '全部' }}
{{ selectedTypeLabel }}
</view>
<uni-icons type="down" size="16" color="#666" />
</view>
@ -36,12 +36,11 @@
<view class="text-lg font-semibold text-dark mr-5">
{{ i.date }}
</view>
<view v-if="i.medicalType === 'outpatient'"
class="mr-5 px-10 leading-normal text-white text-base bg-warning rounded-full">门诊信息</view>
<view v-else-if="i.medicalType === 'inhospital'"
class="mr-5 px-10 leading-normal text-white text-base bg-success rounded-full">住院信息</view>
<view v-if="i.medicalType === 'physicalExaminationTemplate'"
class="mr-5 px-10 leading-normal text-white text-base bg-danger rounded-full">体检报告</view>
<view v-if="getTemplateLabel(i.medicalType)"
class="mr-5 px-10 leading-normal text-white text-base rounded-full"
:class="getTemplateTagClass(i.medicalType)">
{{ getTemplateLabel(i.medicalType) }}
</view>
<view v-if="i.corp === '其他'" class="px-10 leading-normal text-white text-base bg-danger rounded-full">
外院
</view>
@ -81,9 +80,25 @@
</view>
</view>
<template #footer>
<button-footer v-if="healthTempList.length" confirmText="+新增健康档案" :showCancel="false" @confirm="addArchive()" />
<button-footer v-if="enabledTemplateCount" confirmText="+新增健康档案" :showCancel="false" @confirm="addArchive()" />
</template>
</full-page>
<uni-popup ref="templatePopup" type="bottom" :safe-area="false">
<view class="template-popup">
<view class="template-popup-header">
<view class="template-popup-title">{{ templateSelectorTitle }}</view>
<view class="template-popup-close" @click="closeTemplateSelector()">取消</view>
</view>
<scroll-view scroll-y="true" class="template-popup-list">
<view v-for="item in templateSelectorItems" :key="item.value" class="template-popup-item"
@click="selectTemplateItem(item)">
<view class="template-popup-item-label">{{ item.label }}</view>
<uni-icons v-if="templateSelectorMode === 'filter' && type === item.value" type="checkmarkempty" size="18"
color="#0074ff" />
</view>
</scroll-view>
</view>
</uni-popup>
</template>
<script setup>
import { computed, ref, watch } from 'vue';
@ -96,11 +111,7 @@ import EmptyData from '@/components/empty-data.vue';
import FullPage from '@/components/full-page.vue';
import { toast } from '../../utils/widget';
const tempType = {
outpatient: '门诊信息',
inhospital: '住院信息',
physicalExaminationTemplate: '体检报告'
}
const templateTagClasses = ['bg-warning', 'bg-success', 'bg-danger', 'bg-primary'];
const empty = ref(false)
const { useLoad, useShow } = useGuard();
const corpId = ref('');
@ -108,43 +119,94 @@ const customerId = ref('');
const dates = ref([])
const list = ref([]);
const name = ref('');
const team = ref(null);
const type = ref('all');
const teamId = ref('');
const page = ref(1);
const more = ref(false)
const loading = ref(false);
const qrcode = computed(() => team.value && Array.isArray(team.value.qrcodes) ? team.value.qrcodes[0] : null)
const healthTempList = computed(() => qrcode.value && Array.isArray(qrcode.value.healthTempList) ? qrcode.value.healthTempList.map(i => ({ enable: i.enable, label: tempType[i.templateType], value: i.templateType })).filter(i => i.label && i.enable) : [])
const teamHealthTemplates = ref([]);
const templatePopup = ref(null);
const templateSelectorItems = ref([]);
const templateSelectorMode = ref('add');
const healthTempList = computed(() => {
return teamHealthTemplates.value
.map(i => {
const value = typeof i.templateType === 'string' ? i.templateType.trim() : '';
return {
...i,
value,
label: getTemplateLabel(value, i),
}
})
.filter(i => i.value && i.enable && i.label);
})
const enabledTemplateCount = computed(() => teamHealthTemplates.value.filter(i => i && i.enable && i.templateType).length);
const selectedTypeLabel = computed(() => type.value === 'all' ? '全部' : getTemplateLabel(type.value) || '全部');
const templateSelectorTitle = computed(() => templateSelectorMode.value === 'filter' ? '选择档案类型' : '选择新增档案类型');
const tempShowField = ref(null);
const tempMeta = ref({});
const config = {
outpatient: ["corp", "deptName", "doctor", "diagnosisName", "files"],
inhospital: ["corp", "diagnosisName", "operation", "operationDate", "outhosDate", "files"],
physicalExaminationTemplate: ['inspectPakageName']
};
function getTemplateLabel(templateType, config = {}) {
if (!templateType) return '';
const meta = tempMeta.value && tempMeta.value[templateType] ? tempMeta.value[templateType] : {};
return config.name || config.templateName || config.templateTypeName || config.label || meta.name || '';
}
function addArchive() {
if (healthTempList.value.length > 1) {
uni.showActionSheet({
title: '选择新增档案类型',
itemList: healthTempList.value.map(i => i.label),
success: function (res) {
toRecord(healthTempList.value[res.tapIndex].value)
function getTemplateTagClass(templateType) {
const index = healthTempList.value.findIndex(i => i.value === templateType);
return templateTagClasses[index >= 0 ? index % templateTagClasses.length : templateTagClasses.length - 1];
}
function getTemplateTitleList(templateType, data) {
const template = healthTempList.value.find(i => i.value === templateType);
const titleList = template && Array.isArray(template.titleList) ? template.titleList.filter(Boolean) : [];
if (data.corp === '其他') {
return ['corpName', ...titleList.filter(i => i !== 'corp' && i !== 'corpName')];
}
});
} else {
toRecord(healthTempList.value[0].value)
return titleList;
}
async function addArchive() {
if (!teamHealthTemplates.value.length) {
await getTeamHealthTemps();
}
const templates = healthTempList.value;
if (!templates.length) {
toast('未查询到启用的健康档案模板名称');
return;
}
if (templates.length === 1) {
toRecord(templates[0].value)
return;
}
openTemplateSelector('add', templates);
}
function openTemplateSelector(mode, items) {
templateSelectorMode.value = mode;
templateSelectorItems.value = items;
templatePopup.value && templatePopup.value.open();
}
function closeTemplateSelector() {
templatePopup.value && templatePopup.value.close();
}
function selectTemplateItem(item) {
closeTemplateSelector();
if (templateSelectorMode.value === 'add') {
toRecord(item.value);
return;
}
type.value = item.value;
page.value = 1;
getList();
}
function getTempRows(type, data) {
if (config[type] && tempShowField.value && tempShowField.value[type]) {
if (tempShowField.value && tempShowField.value[type]) {
const list = [];
let titles = config[type];
if (data.corp === '其他') {
titles = ['corpName', 'diagnosisName', 'files']
}
const titles = getTemplateTitleList(type, data);
titles.forEach(i => {
if (tempShowField.value[type][i]) {
list.push({ title: i, label: tempShowField.value[type][i], value: data[i], key: `${i}_${data._id}` })
@ -169,26 +231,12 @@ function preview(file) {
}
}
function selectType() {
async function selectType() {
if (!teamHealthTemplates.value.length) {
await getTeamHealthTemps();
}
const itemList = [{ label: '全部', value: 'all' }, ...healthTempList.value]
uni.showActionSheet({
title: '选择新增档案类型',
itemList: itemList.map(i => i.label),
success: function (res) {
type.value = itemList[res.tapIndex].value;
page.value = 1;
getList()
}
});
}
async function getTeam() {
const res = await api('getTeamData', { teamId: teamId.value, corpId: corpId.value });
if (res && res.data) {
team.value = res.data;
} else {
toast(res?.message || '获取团队信息失败')
}
openTemplateSelector('filter', itemList);
}
async function getList() {
@ -196,12 +244,20 @@ async function getList() {
await getTeamHealthTemps()
}
if (loading.value) return;
const medicalTypes = teamHealthTemplates.value
.map(i => typeof i.templateType === 'string' ? i.templateType.trim() : '')
.filter(Boolean);
if (!medicalTypes.length) {
list.value = [];
more.value = false;
return;
}
const params = {
corpId: corpId.value,
memberId: customerId.value,
page: page.value,
pageSize: 20,
medicalType: Object.keys(tempType)
medicalType: medicalTypes
}
if (type.value !== 'all') {
params.medicalType = [type.value]
@ -228,6 +284,11 @@ async function getTeamHealthTemps() {
const res = await api('getTeamHealthTemps', { teamId: teamId.value, corpId: corpId.value });
if (res && res.success) {
const arr = res && Array.isArray(res.data) ? res.data : [];
teamHealthTemplates.value = arr;
tempMeta.value = arr.reduce((m, item) => {
m[item.templateType] = { name: item.name || '', service: item.service || {} };
return m
}, {});
tempShowField.value = arr.reduce((m, item) => {
const templateList = Array.isArray(item.templateList) ? item.templateList : [];
const data = {}
@ -246,7 +307,6 @@ useLoad(options => {
teamId.value = options.teamId;
corpId.value = options.corpId;
customerId.value = options.id || '';
getTeam()
// getTeamHealthTemps();
})
@ -283,4 +343,51 @@ watch(dates, n => {
width: 80rpx;
height: 80rpx;
}
.template-popup {
background: #fff;
border-radius: 24rpx 24rpx 0 0;
overflow: hidden;
}
.template-popup-header {
display: flex;
align-items: center;
padding: 28rpx 30rpx;
border-bottom: 1rpx solid #f0f0f0;
}
.template-popup-title {
flex: 1;
text-align: center;
font-size: 32rpx;
font-weight: 600;
color: #222;
}
.template-popup-close {
position: absolute;
right: 30rpx;
font-size: 28rpx;
color: #666;
}
.template-popup-list {
max-height: 640rpx;
padding-bottom: env(safe-area-inset-bottom);
}
.template-popup-item {
display: flex;
align-items: center;
min-height: 96rpx;
padding: 0 32rpx;
border-bottom: 1rpx solid #f5f5f5;
}
.template-popup-item-label {
flex: 1;
font-size: 30rpx;
color: #222;
}
</style>

View File

@ -46,6 +46,7 @@ const timeTitle = ref('');
const canEdit = ref(false)
const nextTypes = ref([]);
const source = ref('');
const templateName = ref('');
const formData = computed(() => ({ ...record.value, ...form.value }));
const displayFormItems = computed(() => {
@ -85,7 +86,8 @@ async function addHealthRecord() {
// teamId: teamId.value,
dataSource: 'customerReport',
miniAppId: account.value.openid,
medicalType: type.value
medicalType: type.value,
medicalTypeName: templateName.value
}
if (timeTitle.value) {
data.sortTime = data[timeTitle.value] && dayjs(data[timeTitle.value]).isValid() ? dayjs(data[timeTitle.value]).valueOf() : dayjs().valueOf();
@ -129,7 +131,8 @@ async function updateHealthRecord() {
corpId: corpId.value,
memberId: customerId.value,
miniAppId: account.value.openid,
medicalType: type.value
medicalType: type.value,
medicalTypeName: templateName.value
}
if (timeTitle.value) {
data.sortTime = formData.value[timeTitle.value] && dayjs(formData.value[timeTitle.value]).isValid() ? dayjs(formData.value[timeTitle.value]).valueOf() : dayjs().valueOf();
@ -157,12 +160,19 @@ async function getBaseForm() {
if (res && res.success) {
formItems.value = Array.isArray(res.data) ? res.data : [];
timeTitle.value = typeof res.timeTitle === 'string' ? res.timeTitle : '';
templateName.value = typeof res.templateName === 'string' ? res.templateName : '';
setPageTitle();
} else {
toast(res?.message || '查询失败');
return Promise.reject()
}
}
function setPageTitle() {
const action = id.value ? '编辑' : '新增';
uni.setNavigationBarTitle({ title: `${action}${templateName.value || '健康档案'}` })
}
async function getRecord() {
const res = await api('getMedicalRecordById', {
corpId: corpId.value,
@ -187,7 +197,7 @@ onLoad(options => {
source.value = options.source || '';
const nextTypeStr = typeof options.nextTypes === 'string' ? options.nextTypes : '';
nextTypes.value = nextTypeStr.split(',');
uni.setNavigationBarTitle({ title: id.value ? '编辑健康档案' : '新增健康档案' })
setPageTitle();
})
useLoad(options => {
init();

View File

@ -105,12 +105,33 @@ function toHome() {
});
}
async function syncExternalUserRelation() {
const currentTeam = team.value || {};
const currentAccount = account.value || {};
if (!(currentTeam.corpId && currentTeam.externalUserId && currentAccount.openid)) return;
try {
const res = await api('syncWxappExternalUserRelation', {
corpId: currentTeam.corpId,
externalUserId: currentTeam.externalUserId,
unionid: currentAccount.unionid || '',
openid: currentAccount.openid,
corpUserId: currentTeam.corpUserId || '',
}, false);
if (!res || !res.success) {
console.warn('关联 externalUserId 失败:', res && res.message);
}
} catch (error) {
console.warn('关联 externalUserId 异常:', error && error.message ? error.message : error);
}
}
async function bindTeam() {
const res = await api('bindWxappWithTeam', { appid, corpId: team.value.corpId, teamId: team.value.teamId, openid: account.value.openid });
if (!res || !res.success) {
return toast("关联团队失败");
}
await syncExternalUserRelation();
const res1 = await api('getWxAppCustomerCount', { miniAppId: account.value.openid, corpId: team.value.corpId, teamId: team.value.teamId });
if (res1 && res1.data > 0) {
toHome();
@ -126,7 +147,7 @@ async function getPhoneNumber(e) {
if (!res) return;
}
if (team.value) {
bindTeam(account.value)
bindTeam()
} else if (redirectUrl.value) {
await attempToPage(redirectUrl.value);
} else {

View File

@ -29,7 +29,51 @@ function copy() {
})
}
async function changeTeam({ teamId, corpId, corpUserId, qrid, referenceCustomerId }) {
function safeDecode(value) {
try {
return decodeURIComponent(value);
} catch (error) {
return value;
}
}
function parseInviteOptions(options = {}) {
const href =
typeof options.q === "string" ? safeDecode(options.q) : "";
const [, url = ""] = href.split("?");
const data = url.split("&").reduce((acc, cur) => {
if (!cur) return acc;
const [key, ...valueParts] = cur.split("=");
if (!key) return acc;
acc[key] = safeDecode(valueParts.join("=") || "");
return acc;
}, {});
return {
...options,
...data,
};
}
async function syncExternalUserRelation({ corpId, externalUserId, corpUserId }) {
const currentAccount = account.value || {};
if (!(corpId && externalUserId && currentAccount.openid)) return;
try {
const res = await api('syncWxappExternalUserRelation', {
corpId,
externalUserId,
unionid: currentAccount.unionid || '',
openid: currentAccount.openid,
corpUserId: corpUserId || '',
}, false);
if (!res || !res.success) {
console.warn('关联 externalUserId 失败:', res && res.message);
}
} catch (error) {
console.warn('关联 externalUserId 异常:', error && error.message ? error.message : error);
}
}
async function changeTeam({ teamId, corpId, corpUserId, externalUserId, qrid, referenceCustomerId }) {
loading.value = true;
const res = await api("getTeamData", { teamId, corpId, withCorpName: true });
loading.value = false;
@ -39,16 +83,17 @@ async function changeTeam({ teamId, corpId, corpUserId, qrid, referenceCustomerI
set('home-invite-team-info', {
teamId: team.value.teamId,
corpUserId: corpUserId || '',
corpUserId,
externalUserId: externalUserId || '',
qrid,
referenceCustomerId: referenceCustomerId || ''
});
await login()
if (account.value && account.value.mobile) {
bindTeam(corpUserId)
bindTeam({ corpUserId, externalUserId })
} else {
set("invite-team-info", {
corpUserId,
externalUserId,
qrid,
referenceCustomerId,
corpId: team.value.corpId,
@ -69,11 +114,16 @@ async function changeTeam({ teamId, corpId, corpUserId, qrid, referenceCustomerI
}
}
async function bindTeam(corpUserId) {
async function bindTeam({ corpUserId, externalUserId }) {
const res = await api('bindWxappWithTeam', { appid, corpId: team.value.corpId, teamId: team.value.teamId, openid: account.value.openid });
if (!res || !res.success) {
return toast("关联团队失败");
}
await syncExternalUserRelation({
corpId: team.value.corpId,
externalUserId,
corpUserId,
});
const res1 = await api('getWxAppCustomerCount', { miniAppId: account.value.openid, corpId: team.value.corpId, teamId: team.value.teamId });
if (res1 && res1.data > 0) {
uni.switchTab({
@ -89,16 +139,8 @@ async function bindTeam(corpUserId) {
onLoad((options) => {
if (options.q) {
opts.value = JSON.stringify(options)
const href =
typeof options.q === "string" ? decodeURIComponent(options.q) : "";
const [, url = ""] = href.split("?");
const data = url.split("&").reduce((acc, cur) => {
const [key, value] = cur.split("=");
acc[key] = value;
return acc;
}, {});
changeTeam(data);
} else if (options.type === 'archive') {
changeTeam(parseInviteOptions(options));
} else if (options.type === 'archive' || (options.teamId && options.corpId)) {
changeTeam(options);
}

View File

@ -56,7 +56,7 @@ async function getMember() {
}
async function getQrcode() {
const res = await api('addContactWay', { corpUserId: userid.value, corpId: corpId.value, unionid: account.value?.openid });
const res = await api('addContactWay', { corpUserId: userid.value, corpId: corpId.value, unionid: account.value?.openid, fetchType: 'realtime' });
if (res && res.data) {
qrcode.value = res.data;
}

View File

@ -137,7 +137,7 @@ async function getMember() {
}
async function getQrcode() {
const res = await api('addContactWay', { corpUserId: userid.value, corpId: corpId.value, unionid: account.value?.openid });
const res = await api('addContactWay', { corpUserId: userid.value, corpId: corpId.value, unionid: account.value?.openid, fetchType: 'realtime' });
if (res && res.data) {
qrcode.value = res.data;
}

View File

@ -96,6 +96,7 @@ const teammate = computed(() => {
const friendlyMember = computed(() => {
const friendlyMembers = team.value && Array.isArray(team.value.friendlyMembers) ? team.value.friendlyMembers : [];
debugger
return friendlyMembers.reduce((data, item) => {
data[item] = true;
return data

View File

@ -150,7 +150,10 @@ export default defineStore("accountStore", () => {
async function getExternalUserId(corpId) {
const unionid = account.value?.unionid;
const openid = account.value?.openid;
if (!(corpId && unionid && openid)) return;
if (!(corpId && unionid && openid)) {
externalUserId.value = '';
return
};
const res = await api('getUnionidToExternalUserid', { unionid, openid, corpId }, false);
const id = res && res.success && typeof res.data === 'string' && res.data.trim() ? res.data.trim() : '';
externalUserId.value = id;

128
utils/api-base-config.js Normal file
View File

@ -0,0 +1,128 @@
const env = __VITE_ENV__;
export const API_CONTEXT_CACHE_KEY = "ykt_team_api_context";
export const CORP_API_BASE_URL_MAP = {
wwa54dfba0b5441ef1: "https://crm.gykqyy.com/ykt/",
};
function normalizeBaseUrl(url) {
return String(url || "").replace(/\/+$/, "");
}
function getDefaultBaseUrl() {
return normalizeBaseUrl(env.MP_API_BASE_URL);
}
function readCachedContext() {
if (typeof uni === "undefined" || typeof uni.getStorageSync !== "function") {
return null;
}
try {
const cached = uni.getStorageSync(API_CONTEXT_CACHE_KEY);
if (!cached || typeof cached !== "object" || !cached.baseUrl) return null;
return {
corpId: cached.corpId || "",
baseUrl: normalizeBaseUrl(cached.baseUrl),
};
} catch (error) {
return null;
}
}
function writeCachedContext(context) {
if (typeof uni === "undefined" || typeof uni.setStorageSync !== "function") {
return;
}
try {
uni.setStorageSync(API_CONTEXT_CACHE_KEY, {
corpId: context.corpId || "",
baseUrl: normalizeBaseUrl(context.baseUrl),
});
} catch (error) {
// 缓存失败不能阻断接口请求。
}
}
function createContext(corpId, baseUrl) {
return {
corpId: corpId || "",
baseUrl: normalizeBaseUrl(baseUrl),
};
}
function safeDecode(value) {
try {
return decodeURIComponent(value);
} catch (error) {
return value;
}
}
function parseQueryString(queryString) {
return String(queryString || "")
.replace(/^[^?]*\?/, "")
.split("&")
.reduce((acc, item) => {
if (!item) return acc;
const [key, ...valueParts] = item.split("=");
if (!key) return acc;
acc[safeDecode(key)] = safeDecode(valueParts.join("=") || "");
return acc;
}, {});
}
export function getCorpIdFromAppOptions(options = {}) {
const query = options.query || options || {};
const corpId = query.corpId || query.corpid || query.corp_id;
if (corpId) return String(corpId).trim();
if (typeof query.q === "string") {
const qParams = parseQueryString(safeDecode(query.q));
const qCorpId = qParams.corpId || qParams.corpid || qParams.corp_id;
if (qCorpId) return String(qCorpId).trim();
}
return "";
}
export function initApiContextFromAppOptions(options = {}) {
const corpId = getCorpIdFromAppOptions(options);
if (!corpId) return null;
return resolveApiContext(corpId);
}
export function resolveApiContext(corpId) {
const normalizedCorpId = String(corpId || "").trim();
if (normalizedCorpId) {
const configuredBaseUrl = CORP_API_BASE_URL_MAP[normalizedCorpId];
const context = createContext(
normalizedCorpId,
configuredBaseUrl || getDefaultBaseUrl()
);
writeCachedContext(context);
return context;
}
const cachedContext = readCachedContext();
if (cachedContext) return cachedContext;
const context = createContext("", getDefaultBaseUrl());
writeCachedContext(context);
return context;
}
export function getApiBaseUrlByCorpId(corpId) {
return resolveApiContext(corpId).baseUrl;
}
export function getDefaultUploadUrl() {
return `${getDefaultBaseUrl()}/upload`;
}
export function buildApiUrl(path, corpId) {
const { baseUrl } = resolveApiContext(corpId);
const normalizedPath = String(path || "").replace(/^\/+/, "");
return normalizedPath ? `${baseUrl}/${normalizedPath}` : baseUrl;
}

View File

@ -59,6 +59,7 @@ const urlsConfig = {
unbindMiniAppArchive: 'unbindMiniAppArchive',
updateMedicalRecord: 'updateMedicalRecord',
getUnionidToExternalUserid: 'getUnionidToExternalUserid',
syncWxappExternalUserRelation: 'syncWxappExternalUserRelation',
getWxAppCustomerCount: "getWxAppCustomerCount",
updateCustomer: 'update',
getRefrencePeople: 'getRefrencePeople',
@ -116,4 +117,3 @@ export default async function api(urlId, data = {}, loading = true) {
}
}, loading)
}

View File

@ -1,6 +1,5 @@
import { loading, hideLoading } from "./widget";
const env = __VITE_ENV__;
const baseUrl = env.MP_API_BASE_URL;
import { buildApiUrl, getDefaultUploadUrl } from "./api-base-config";
const defaultOptions = {
header: {
@ -58,7 +57,7 @@ async function refreshAccessToken() {
try {
const res = await uni.request({
url: `${baseUrl}/auth/refresh`,
url: buildApiUrl("/auth/refresh"),
method: "POST",
header: {
"Content-Type": "application/json",
@ -101,7 +100,7 @@ const request = async (options = {}, showLoading = true) => {
const config = {
...defaultOptions,
...options,
url: baseUrl + options.url,
url: buildApiUrl(options.url, options.data.corpId),
};
// 添加 token 到请求头
@ -199,24 +198,25 @@ function removeTask(task) {
export default request;
export const uploadUrl = `${baseUrl}/upload`;
export const uploadUrl = getDefaultUploadUrl();
export function getFullPath(path) {
return `${baseUrl}/${path}`;
export function getFullPath(path, corpId) {
return buildApiUrl(path, corpId);
}
export function upload(path) {
export function upload(path, corpId) {
const currentUploadUrl = buildApiUrl("/upload", corpId);
return new Promise((resolve) => {
uni.uploadFile({
url: uploadUrl, // 替换为你的上传接口地址
url: currentUploadUrl,
filePath: path,
name: 'file',
fileType: 'image',
success: (res) => {
try {
const url = JSON.parse(res.data).filePath;
resolve(url ? getFullPath(url) : '')
resolve(url ? getFullPath(url, corpId) : '')
} catch (e) {
resolve()
}