Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into...

jiangping

2023-10-16 d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9

 h5_standard/src/views/tabPage/my.vue

@@ -1,7 +1,8 @@
<template>
    <div class="box">
        <div class="box_info">
            <img :src="store.state.userInfo.avatar ? store.state.userInfo.avatar : avatar" alt="" />
            <!-- store.state.userInfo.avatar ? store.state.userInfo.avatar :  -->
            <img :src="avatar" alt="" />
            <div class="box_info_box">
                <span>{{store.state.userInfo.companyUser ? store.state.userInfo.companyUser.name : ''}}</span>
                <div class="box_info_box_x" @click="switchOrganization">
@@ -21,7 +22,7 @@
                </div>
            </div>
        </div>
<!--        <div class="box_out"><span>退出登录</span></div>-->
        <div class="box_out" v-if="store.state.env && (store.state.env == 'WX' || store.state.env == 'XCX')" @click="loginOut"><span>退出登录</span></div>
    </div>
    <van-popup v-model:show="show" position="bottom" round :style="{ height: '50%' }">
        <van-picker
@@ -40,6 +41,7 @@
    import { Dialog, Toast } from 'vant'
    const VanDialog = Dialog.Component;
    import { changeCom, getDepartmentListByConditon } from '@/apis/PersonalAPI'
    import { wxLoginOut } from '@/apis'

    const router = useRouter()

@@ -69,6 +71,21 @@
        })
    };

    // 退出登录
    const loginOut = () => {
        wxLoginOut({
            companyUserId: store.state.userInfo.companyUser.id
        }).then(res => {
            if (res.code === 200) {
                // window.parent.postMessage('阿康', '*')
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                window.open(href)
            }
        })
    }

    // 关闭组织弹框
    const onCancel = (): void => {
        show.value = false