Merge commit '932ec63261d20bca7b811367d7aa1ab2abcee391' into dev-wdb
This commit is contained in:
commit
f2bad7b3de
@ -134,6 +134,7 @@ async function addArchive() {
|
|||||||
mobile: account.value.mobile,
|
mobile: account.value.mobile,
|
||||||
miniAppId: account.value.openid,
|
miniAppId: account.value.openid,
|
||||||
externalUserId: externalUserId.value,
|
externalUserId: externalUserId.value,
|
||||||
|
realUnionid: account.value.unionid || '',
|
||||||
}
|
}
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
const res = await api('addCustomer', { params });
|
const res = await api('addCustomer', { params });
|
||||||
@ -154,7 +155,7 @@ async function bindArchive(customerId) {
|
|||||||
await toast('绑定成功');
|
await toast('绑定成功');
|
||||||
set('home-invite-teamId', teamId.value);
|
set('home-invite-teamId', teamId.value);
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url:'/pages/home/home'
|
url: '/pages/home/home'
|
||||||
})
|
})
|
||||||
// uni.reLaunch({ url: `/pages/home/home?corpId=${corpId.value}&teamId=${teamId.value}` })
|
// uni.reLaunch({ url: `/pages/home/home?corpId=${corpId.value}&teamId=${teamId.value}` })
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -254,7 +254,7 @@ const selectCate = async (cateId) => {
|
|||||||
|
|
||||||
function goToDetail(item) {
|
function goToDetail(item) {
|
||||||
if (!item?._id) return;
|
if (!item?._id) return;
|
||||||
uni.navigateTo({ url: `/pages/article/article-detail?id=${item._id}` });
|
uni.navigateTo({ url: `/pages/article/article-detail?id=${item._id}&corpId=${corpId.value}` });
|
||||||
}
|
}
|
||||||
|
|
||||||
onLoad(async (options) => {
|
onLoad(async (options) => {
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<yc-home v-else />
|
<yc-home v-else />
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, ref } from "vue";
|
import { computed, ref, watch } from "vue";
|
||||||
import { storeToRefs } from "pinia";
|
import { storeToRefs } from "pinia";
|
||||||
import { onLoad, onShow } from "@dcloudio/uni-app";
|
import { onLoad, onShow } from "@dcloudio/uni-app";
|
||||||
// import useGuard from "@/hooks/useGuard";
|
// import useGuard from "@/hooks/useGuard";
|
||||||
@ -103,6 +103,13 @@ onShow(async () => {
|
|||||||
teams.value = [];
|
teams.value = [];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
watch(account, (n, o) => {
|
||||||
|
if (n && !o) {
|
||||||
|
getTeams();
|
||||||
|
} else if (!n && o) {
|
||||||
|
teams.value = [];
|
||||||
|
}
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.home-container {
|
.home-container {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user