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

Compare commits

base: huxuejian:edec00cb37ded5d97b3d5ce389e309c29e6197de
Branches Tags
huxuejian:main
huxuejian:dev-2.3
huxuejian:dev-订阅消息
huxuejian:dev-260402
huxuejian:dev-wdb
huxuejian:dev-hjf
..
compare: huxuejian:f99c412cf284a6ee140c68b09e4bb2845b4fad63
Branches Tags
huxuejian:dev-2.3
huxuejian:dev-订阅消息
huxuejian:main
huxuejian:dev-260402
huxuejian:dev-wdb
huxuejian:dev-hjf

No commits in common. "edec00cb37ded5d97b3d5ce389e309c29e6197de" and "f99c412cf284a6ee140c68b09e4bb2845b4fad63" have entirely different histories.
edec00cb37 ... f99c412cf2

6 changed files with 5 additions and 12 deletions
Show Stats Expand all files Collapse all files

1
.env.development
View File

@ -2,4 +2,3 @@ MP_API_BASE_URL=https://patient.youcan365.com
MP_CACHE_PREFIX=development MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx6ee11733526b4f04 MP_WX_APP_ID=wx6ee11733526b4f04
MP_TIM_SDK_APP_ID=1600123876 MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

1
.env.localhost
View File

@ -2,4 +2,3 @@ MP_API_BASE_URL=http://localhost:8080
MP_CACHE_PREFIX=development MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx6ee11733526b4f04 MP_WX_APP_ID=wx6ee11733526b4f04
MP_TIM_SDK_APP_ID=1600123876 MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

5
.env.production
View File

@ -1,5 +1,4 @@
MP_API_BASE_URL=https://ykt.youcan365.com MP_API_BASE_URL=https://patient.youcan365.com
MP_CACHE_PREFIX=production MP_CACHE_PREFIX=development
MP_WX_APP_ID=production MP_WX_APP_ID=production
MP_TIM_SDK_APP_ID=1600123876 MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

2
pages/login/login.vue
View File

@ -108,7 +108,7 @@ async function bindTeam() {
if (!res || !res.success) { if (!res || !res.success) {
return toast("关联团队失败"); return toast("关联团队失败");
} }
const res1 = await api('getWxAppCustomerCount', { miniAppId: account.value.openid, corpId: team.value.corpId, teamId: team.value.teamId }); const res1 = await api('getWxAppCustomerCount', { miniAppId: account.value.openid, corpId: account.value.corpId, teamId: team.value.teamId });
if (res1 && res1.data > 0) { if (res1 && res1.data > 0) {
set('home-invite-teamId', team.value.teamId); set('home-invite-teamId', team.value.teamId);
toHome(); toHome();

2
pages/login/redirect-page.vue
View File

@ -54,7 +54,7 @@ async function bindTeam() {
if (!res || !res.success) { if (!res || !res.success) {
return toast("关联团队失败"); return toast("关联团队失败");
} }
const res1 = await api('getWxAppCustomerCount', { miniAppId: account.value.openid, corpId: team.value.corpId, teamId: team.value.teamId }); const res1 = await api('getWxAppCustomerCount', { miniAppId: account.value.openid, corpId: account.value.corpId, teamId: team.value.teamId });
if (res1 && res1.data > 0) { if (res1 && res1.data > 0) {
set('home-invite-teamId', team.value.teamId); set('home-invite-teamId', team.value.teamId);
uni.switchTab({ uni.switchTab({

6
store/account.js
View File

@ -7,7 +7,6 @@ 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);
@ -27,8 +26,7 @@ export default defineStore("accountStore", () => {
const res = await api('wxAppLogin', { const res = await api('wxAppLogin', {
appId: appid, 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) {
@ -111,8 +109,6 @@ export default defineStore("accountStore", () => {
const corpId = account.value?.corpId; const corpId = account.value?.corpId;
const unionid = account.value?.unionid; const unionid = account.value?.unionid;
const openid = account.value?.openid; const openid = account.value?.openid;
console.clear()
console.log('corpId', corpId, ',unionid', unionid, ',openid', openid)
if (!(corpId && unionid && openid) || externalUserId.value) return; if (!(corpId && unionid && openid) || externalUserId.value) return;
const res = await api('getUnionidToExternalUserid', { unionid, openid, corpId }, false); const res = await api('getUnionidToExternalUserid', { unionid, openid, corpId }, false);
if (res && res.success && typeof res.data === 'string' && res.data.trim()) { if (res && res.success && typeof res.data === 'string' && res.data.trim()) {