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

Merge commit 'cde557022f4df21df0eff3db0645626c7b869f76' into dev-wdb

Browse Source 
# Conflicts:
#	.env.development
#	.env.localhost
This commit is contained in:
wangdongbo 2026-01-30 17:20:33 +08:00
commit 665b1be100
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -1,4 +1,5 @@
MP_API_BASE_URL=http://localhost:8080 MP_API_BASE_URL=https://patient.youcan365.com
MP_CACHE_PREFIX=development MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx93af55767423938e MP_WX_APP_ID=wx93af55767423938e
MP_TIM_SDK_APP_ID=1600123876 MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

3
.env.localhost
View File

@ -1,4 +1,5 @@
MP_API_BASE_URL=http://192.168.60.2:8080 MP_API_BASE_URL=http://localhost:8080
MP_CACHE_PREFIX=development MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx93af55767423938e MP_WX_APP_ID=wx93af55767423938e
MP_TIM_SDK_APP_ID=1600123876 MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

2
components/button-footer.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view v-if="showCancel || showConfirm" class="relative px-15 py-12 bg-white text-center" <view v-if="showCancel || showConfirm" class="relative flex px-15 py-12 bg-white text-center"
:class="hidedenShadow ? '' : 'shadow-up'"> :class="hidedenShadow ? '' : 'shadow-up'">
<view v-if="showCancel" class="flex-grow py-10 text-base border-primary rounded text-primary rounded" <view v-if="showCancel" class="flex-grow py-10 text-base border-primary rounded text-primary rounded"
@click="cancel()"> @click="cancel()">

1
pages/login/login.vue
View File

@ -40,6 +40,7 @@ import { toast } from "@/utils/widget";
import groupAvatar from "@/components/group-avatar.vue"; import groupAvatar from "@/components/group-avatar.vue";
const team = ref(null); const team = ref(null);
const checked = ref(false); const checked = ref(false);
const redirectUrl = ref(""); const redirectUrl = ref("");

2
pages/team/homepage.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view v-if="member" class="flex p-15 bg-whtie shadow-lg"> <view v-if="member" class="flex p-15 bg-white shadow-lg">
<view class="flex-grow w-0 mr-10 leading-normal"> <view class="flex-grow w-0 mr-10 leading-normal">
<view class="flex items-center"> <view class="flex items-center">
<view class="mr-5 flex-shrink-0 text-xl text-dark font-semibold">{{ member.anotherName }}</view> <view class="mr-5 flex-shrink-0 text-xl text-dark font-semibold">{{ member.anotherName }}</view>

3
store/account.js
View File

@ -8,6 +8,7 @@ const env = __VITE_ENV__;
export default defineStore("accountStore", () => { export default defineStore("accountStore", () => {
const appid = env.MP_WX_APP_ID; const appid = env.MP_WX_APP_ID;
const corpId = env.MP_CORP_ID;
const account = ref(null); const account = ref(null);
const loading = ref(false) const loading = ref(false)
const isIMInitialized = ref(false); const isIMInitialized = ref(false);
@ -25,8 +26,10 @@ export default defineStore("accountStore", () => {
}); });
if (code) { if (code) {
const res = await api('wxAppLogin', { const res = await api('wxAppLogin', {
appId:appid,
phoneCode, phoneCode,
code, code,
corpId
}); });
loading.value = false loading.value = false
if (res.success && res.data && res.data.mobile) { if (res.success && res.data && res.data.mobile) {