huxuejian/ykt-wxapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 问题修复

Browse Source
This commit is contained in:
huxuejian 2026-02-10 13:52:54 +08:00
parent 14149ef143
commit 9d549afaa4
9 changed files with 95 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/button-footer.vue
View File

@ -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'">
<view v-if="showCancel" class="flex-grow py-10 text-base border-primary rounded text-primary rounded"
:class="showShadow ? 'shadow-up' : ''">
<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"
:class="showCancel && showConfirm ? 'ml-15' : ''" @click="confirm()">
<view v-if="showConfirm && customConfirm" :class="showCancel && showConfirm ? 'ml-15' : ''" :style="widthStyle">
<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>

6
components/form-template/form-cell/form-input.vue
View File

@ -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);

2
pages/home/components/cert-popup.vue
View File

@ -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>

2
pages/login/login.vue
View File

@ -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) {

2
pages/work/department-select.vue
View File

@ -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>

2
pages/work/hospital-select.vue
View File

@ -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>

42
pages/work/profile.vue
View File

@ -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: '' }];
@ -185,7 +198,7 @@ function toCert() {
}
function selectDept() {
if(rule.value.dept.disabled) return;
if (rule.value.dept.disabled) return;
const eventName = `selectDept_${Date.now()}`
const deptIds = (formData.value.hlwDepts || []).map(i => i.deptId).filter(Boolean).join(',')
uni.navigateTo({
@ -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>

2
pages/work/team/invite/rename-popup.vue
View File

@ -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>

36
store/account.js
View File

@ -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) {
const target = '/pages/login/login';
uni.redirectTo({ url: target });
return;
}
// if (!res.data.mobile) {
// const target = '/pages/login/login';
// uni.redirectTo({ url: target });
// return;
// }
account.value = res.data;
openid.value = res.data.openid;
// 持久化账户信息
cache.set(CACHE_KEYS.ACCOUNT, res.data);
cache.set(CACHE_KEYS.OPENID, res.data.openid);
// cache.set(CACHE_KEYS.ACCOUNT, res.data);
// 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);
// 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 }
})