统一调整大陆站和国际站跳转首页

TEAMModelOS/ClientApp/src/common/BaseUserPoptip.vue

@@ -108,8 +108,9 @@ export default {
         /* 切换校级平台或区级平台 */
         changePlatform() {
             let goPlatform = this.curPlatform === 'area' ? 'school' : 'area'
+            let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
             this.$router.push({
-                name: goPlatform === 'area' ? 'area' : 'home'
+                name: goPlatform === 'area' ? 'area' : homePath
             })
 			if(goPlatform === 'area'){
 				localStorage.removeItem('curPeriod')
@@ -154,7 +155,8 @@ export default {
         onRoleSelect(val) {
             if (localStorage.getItem('identity') != val) {
                 this.curRole = val
-                let path = val === 'student' ? '/studentWeb' : '/home'
+                let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                let path = val === 'student' ? 'studentWeb' : homePath
                 localStorage.setItem('identity', val)
                 this.$router.push({ path: path })
             }

TEAMModelOS/ClientApp/src/view/Home.vue

@@ -111,8 +111,9 @@ export default {
         },
         changePlatform() {
             let goPlatform = this.curPlatform === 'area' ? 'school' : 'area'
+            let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
             this.$router.push({
-                name: goPlatform === 'area' ? 'area' : 'home'
+                name: goPlatform === 'area' ? 'area' : homePath
             })
             localStorage.setItem('platform', this.curPlatform === 'area' ? 'school' : 'area')
             this.curPlatform = goPlatform
@@ -165,7 +166,8 @@ export default {
             })
         },
         toHome() {
-            this.$router.push({ name: 'home' })
+            let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+            this.$router.push({ name: homePath })
         },
         toSettings() {
             this.$router.push({ path: '/home/settings' })

TEAMModelOS/ClientApp/src/view/areaMgmt/AreaBase.vue

@@ -81,8 +81,9 @@ export default {
     methods: {
 		changePlatform(){
 			let goPlatform = this.curPlatform === 'area' ? 'school' : 'area'
+            let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
 			this.$router.push({
-			    name: goPlatform === 'area' ? 'area' : 'home'
+			    name: goPlatform === 'area' ? 'area' : homePath
 			})
 			localStorage.setItem('platform',this.curPlatform === 'area' ? 'school' : 'area')
 			this.curPlatform = goPlatform

TEAMModelOS/ClientApp/src/view/forgotPw/Index.vue

@@ -298,7 +298,8 @@ export default {
                                         //設定權限並登入
                                         User.login(result).then(res => {
                                             if (res) {
-                                                this.$router.push({ path: '/home' })
+                                                let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                                                this.$router.push({ name: homePath })
                                             }
                                         })
                                     }

TEAMModelOS/ClientApp/src/view/homepage/HomePage.less

@@ -1,467 +0,0 @@
-@main-bgColor: rgb(40,40,40); //��������ɫ
-@borderColor: var(--border-color); //�߿���ɫ
-@primary-textColor: var(--primary-text-color); //主文本颜色
-@second-textColor: var(--second-text-color); //副文本颜色
-@hover-textBgColor: var(--hover-text-color); //hover 的背景色
-@nothing-textColor: #5f5f5f;
-@primary-fontSize: 14px;
-@second-fontSize: 16px;
-@large-fontSize: 20px;
-
-.home-page-container {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: row;
-    // background: #242328;
-}
-.box-item {
-    // background: #27262b;
-    border: 1px solid @borderColor;
-    border-radius: 3px;
-    // &:hover{
-        box-shadow: 0px 0px 10px 2px var(--card-shadow);
-    // }
-}
-.list-title {
-    /* width: 100%;
-    height: 50px;
-    line-height: 50px; */
-    // border-bottom: 2px solid @borderColor;
-    // background: #2b2a2f;
-    color: @second-textColor;
-    // padding-left: 15px;
-
-    border-left: 2px solid var(--tabs-bottom-color);
-    margin: 15px 0;
-    margin-left: 15px;
-    padding-left: 10px;
-}
-.chart-title {
-    /* width: 100%;
-    height: 50px;
-    line-height: 50px; */
-    color: @second-textColor;
-    // padding-left: 15px;
-
-    border-left: 2px solid var(--tabs-bottom-color);
-    margin: 15px 0;
-    margin-left: 15px;
-    padding-left: 10px;
-}
-.prepare-area {
-    width: ~"calc(29% - 30px)";
-    margin-right: 20px;
-    margin-left: 20px;
-    margin-top: 15px;
-    height: ~"calc(100% - 40px)";
-}
-.cus-table-area{
-    width: ~"calc(25% - 30px)";
-    margin-right: 30px;
-    margin-left: 20px;
-    margin-top: 15px;
-    height: ~"calc(100% - 40px)";
-}
-.class-data-area {
-    width: ~"calc(22% - 20px)";
-    margin-right: 30px;
-    height: ~"calc(100% - 40px)";
-    margin-top: 15px;
-
-    .upload-record-box {
-        margin-top: 15px;
-        height:~"calc(100% - 587px)";
-    }
-}
-.activity-area {
-    width: ~"calc(27% - 20px)";
-    margin-right: 30px;
-    height: ~"calc(100% - 40px)";
-    margin-top: 15px;
-    .ac-count-box {
-        width: 100%;
-    }
-
-    .ac-list-box {
-        margin-top: 15px;
-        height: ~"calc(100% - 427px)"
-    }
-}
-.notice-area {
-    width: ~"calc(22% - 20px)";
-    margin-right: 20px;
-    height: ~"calc(100% - 40px)";
-    margin-top: 15px;
-
-    .school-notice-box {
-        // height: 33%;
-        height: 395px;
-    }
-
-    .common-notice-box {
-        margin-top: 15px;
-        height: ~"calc(34% - 15px)";
-    }
-
-    .system-notice-box {
-        margin-top: 15px;
-        // height: ~"calc(33% - 15px)";
-        height: ~"calc(100% - 410px)";
-    }
-}
-
-
-.card-content-box {
-    height: ~"calc(100% - 50px)";
-    // padding-left:10px;
-}
-
-
-.in-pro-detail {
-    width: 100%;
-    height: ~"calc(100% - 50px)";
-
-    .in-pro-ac-item {
-        width: 100%;
-        color: @second-textColor;
-        padding: 10px 0px;
-        font-size: 16px;
-        // border-bottom: 1px solid @borderColor;
-        display: flex;
-        cursor: pointer;
-
-        &:hover{
-            background: @hover-textBgColor;
-        }
-        .ac-type-icon {
-            width: 60px;
-            text-align: center;
-            color: #40A8F0;
-            line-height: 55px;
-            font-size: 25px;
-            margin-right: 10px;
-        }
-
-        .ac-info-box {
-            width: ~"calc(100% - 150px)";
-
-            p {
-                text-overflow: ellipsis;
-                overflow: hidden;
-                white-space: nowrap;
-            }
-
-            .classname-label {
-                background: #666666;
-                border-radius: 15px;
-                padding: 1px 8px;
-                color: #EEEEEE;
-                font-weight: 600;
-                margin-right: 10px;
-                font-size: 14px;
-            }
-
-            .ac-name-label {
-                color: @primary-textColor;
-                text-overflow: ellipsis;
-                overflow: hidden;
-                white-space: nowrap;
-            }
-
-            .ac-time-wrap {
-                color: @second-textColor;
-                font-size: 14px;
-                margin-top: 8px;
-            }
-        }
-
-        .ac-pro-box {
-            width: 80px;
-            text-align: center;
-            .type-label{
-                font-size:14px;
-                padding: 1px 5px;
-                color: #5cadff;
-                border-radius: 2px;
-                border: 1px solid #5cadff;
-                line-height: 55px;
-            }
-            .special-color{
-                color: #19be6b;
-                border-color: #19be6b;
-            }
-        }
-    }
-}
-.notice-list-box {
-    list-style: none;
-    // color: white;
-
-    li {
-        width: 100%;
-        border-bottom: 1px solid #f0f0f0;
-        padding: 10px 5px 10px 10px;
-        cursor: pointer;
-
-        &:hover {
-            background: @hover-textBgColor;
-            // padding: 5px 2px;
-        }
-    }
-
-    .notice-title {
-        color: #1cc0f3;
-        font-size: 12px;
-        font-weight: 400;
-    }
-
-    .notice-text {
-        color: @second-textColor;
-        margin: 2px 0px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        width: 100%;
-
-        p {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            width: 100%;
-        }
-    }
-
-    .long-text {
-        white-space: unset;
-    }
-
-    .notice-time {
-        color: @second-textColor;
-        font-size: 12px;
-    }
-
-    .notice-dot {
-        width: 6px;
-        height: 6px;
-        display: inline-block;
-        background: red;
-        border-radius: 50%;
-        margin-left: 6px;
-        vertical-align: middle;
-    }
-}
-
-.upload-record-box {
-    //  box-shadow: 0px -6px 10px -2px #141414;
-}
-.upload-record-item {
-    width: 100%;
-    padding:10px 0px;
-    border-bottom:1px solid @borderColor;
-    cursor:pointer;
-    display:flex;
-    align-items:center;
-}
-.record-type-icon{
-    width:16px;
-    margin-right:4px;
-    color:#1cc0f3;
-    font-size:16px;
-}
-.record-info-wrap {
-    display: inline-block;
-    width: ~"calc(100% - 40px)";
-    margin-left:10px;
-}
-.recorde-name {
-    width:100%;
-    color: white;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    vertical-align: bottom;
-}
-.record-time {
-    display: block;
-    color: #a5a5a5;
-    padding-right:6px;
-}
-.circle-tag {
-    display: block;
-    position: absolute;
-    width: 12px;
-    height: 12px;
-    border: 2px solid white;
-    border-radius: 50%;
-    left: 115px;
-    top: -58px;
-}
-.notice-count-tag {
-    width: 18px;
-    height: 18px;
-    display: inline-block;
-    border-radius: 50%;
-    background: red;
-    color: white;
-    font-size: 12px;
-    line-height: 18px;
-    text-align: center;
-    margin-left: 10px;
-}
-.phone-tips{
-    color: #CCC;
-    text-align: center;
-    margin-top: 40px;
-    font-size: 14px;
-}
-.tips-icon{
-    display: block;
-    margin: auto;
-    margin-top: 6%;
-    font-size: 100px;
-    margin-right: 5px;
-    color: #eeeeee;
-}
-.to-verify{
-    display: block;
-    color: white;
-    background: #1cc0f3;
-    width: 150px;
-    padding: 4px 0px;
-    border-radius: 4px;
-    position: absolute;
-    text-align: center;
-    bottom: 50px;
-    left: 50%;
-    font-size: 16px;
-    margin-left: -75px;
-    &:hover{
-        background: white;
-        color: #1cc0f3;
-    }
-}
-.has-verify{
-    display: block;
-    color: white;
-    background: #19be6b;
-    width: 150px;
-    padding: 4px 0px;
-    border-radius: 4px;
-    position: absolute;
-    text-align: center;
-    bottom: 50px;
-    left: 50%;
-    font-size: 16px;
-    margin-left: -75px;
-}
-.uncomplete-wrap{
-    padding-top: 8%;
-    width: 100%;
-    height: 100%;
-}
-.verify-status-box{
-    width: 360px;
-    height: 360px;
-    // max-height: 550px;
-    // min-height: 450px;
-    background: #27262b;
-    margin: 30px 20px 0px 20px;
-    padding: 20px;
-    border-radius: 8px;
-    position: relative;
-    box-shadow: 0 0px 10px 0px rgba(0, 0, 0, .5 );
-
-    &:hover{
-        background: #3c3c41;
-    }
-}
-.verify-title{
-    color: #ed4014;
-    margin: auto;
-    margin-top: 40px;
-    display: block;
-    width: 100%;
-    font-size: 16px;
-    text-align: center;
-}
-.verify-status{
-    display: flex;
-    justify-content: center;
-}
-.verify-info-text{
-    margin: auto;
-    width: 750px;
-    color: white;
-    text-align: center;
-    font-size: 16px;
-}
-.today-text-label{
-    // color: #FFFFFF;
-    // margin-top: 30px;
-    // border-bottom: 1px solid @borderColor;
-    // padding-bottom: 8px;
-
-    border-left: 2px solid var(--tabs-bottom-color);
-    margin: 20px 0;
-    // margin-left: 15px;
-    margin-bottom: 8px;
-    padding-left: 10px;
-}
-.today-cus-item{
-    padding: 10px 10px;
-    border-bottom: 1px solid @borderColor;
-    display: flex;
-    align-items: center;
-    &:hover{
-        background: @hover-textBgColor;
-    }
-    
-    .label-icon{
-        color:#1cc0f3;
-        margin-right: 5px;
-        font-size: 22px;
-        display: block;
-        width: 40px;
-        margin-right: 10px;
-        text-align: center;
-    }
-    .cus-time{
-        font-size: 22px;
-        font-weight: 400;
-        color: @primary-textColor;
-        display: inline-block;
-    }
-    .cus-time-label{
-        font-size: 18px;
-        font-weight: 400;
-        margin-left: 5px;
-        // color: #1cc0f3;
-    }
-    .cus-name{
-        color: #a5a5a5;
-        font-size: 14px;
-        text-overflow:ellipsis; 
-        overflow:hidden; 
-        white-space:nowrap; 
-        margin-right: 20px;
-    }
-    .cus-class{
-        color: #a5a5a5;
-        font-size: 14px;
-        text-overflow:ellipsis; 
-        overflow:hidden; 
-        white-space:nowrap; 
-    }
-}
-.notice-title{
-    color: #2d8cf0;
-    text-align: center;
-    margin-top: 20px;
-}
-.notice-content{
-    margin-top: 10px;
-    margin-bottom: 20px;
-    text-indent: 2em;
-    color: #515a6e;
-}

TEAMModelOS/ClientApp/src/view/homepage/HomePage.vue

@@ -1,409 +0,0 @@
-<template>
-    <!-- 验证提示调整为提示框 -->
-    <!-- <div v-if="!isComplete" class="uncomplete-wrap">
-        <p class="verify-info-text" v-if="!$store.state.userInfo.hasSchool">
-            <span style="text-align:left;display: inline-block;">
-                {{$t('home.verifyText3')}}
-            </span>
-            <br />
-            <a href="https://www.habook.com/zh-tw/cloud.php?act=view&id=13" target="_blank">{{$t('home.websiteLink')}}</a>
-        </p>
-        <div class="verify-status">
-             如果是大陆站需要验证是否完成手机号认证 
-            <div v-show="srvAdr == 'China'" class="verify-status-box" v-if="!hasVerify">
-                <Icon custom="iconfont icon-phone-unverify" class="tips-icon" />
-                <b class="verify-title">{{$t('home.verifyPh')}}</b>
-                <router-link to="/home/userCenter" class="to-verify">{{$t('home.toPhone')}}</router-link>
-            </div>
-            <div v-show="srvAdr == 'China'" class="verify-status-box" v-else>
-                <Icon type="md-checkmark-circle-outline" class="tips-icon" color="#19be6b" />
-                <p class="phone-tips">
-                    <span style="font-size:16px;color:white">{{$t('home.phoneSuccess')}}</span>
-                    <br />
-                </p>
-                <span class="has-verify">{{$t('home.hasBanding')}}</span>
-            </div>
-
-            大陆和国际站都需要验证是否加入学校 
-            <div class="verify-status-box" v-if="!$store.state.userInfo.hasSchool">
-                <Icon custom="iconfont icon-school" class="tips-icon" />
-                <b class="verify-title">{{$t('home.verifySchool')}}</b>
-                <router-link to="/home/settings" class="to-verify">{{$t('home.toSchool')}}</router-link>
-            </div>
-            <div class="verify-status-box" v-else>
-                <Icon type="md-checkmark-circle-outline" class="tips-icon" color="#19be6b" />
-                <p class="phone-tips">
-                    <span style="font-size:16px">{{$t('home.schoolSuccess')}}</span>
-                </p>
-                <span class="has-verify">{{$t('home.hasJoin')}}</span>
-            </div>
-        </div>
-    </div> -->
-    <div class="home-page-container">
-        <!-- 课表区域 -->
-        <div class="cus-table-area box-item">
-            <p class="list-title">
-                {{$t('home.myCourse')}}
-            </p>
-            <div class="card-content-box" style="padding:10px">
-                <vuescroll>
-                    <MinTable @tmwCus="getTmwCus"></MinTable>
-                    <p class="today-text-label">
-                        {{$t('home.tmwCus')}}
-                    </p>
-                    <div class="today-cus-item" v-for="(item,index) in tmwCus" :key="index">
-                        <Icon type="md-time" class="label-icon" />
-                        <div>
-                            <p class="cus-time">
-                                <span>{{item.time}}</span>
-                                <span class="cus-time-label">
-                                    {{item.timeLabel}}
-                                </span>
-                            </p>
-                            <p>
-                                <span class="cus-name">
-                                    {{$t('home.course')}}
-                                    <span style="color: var(--primary-text-color)">
-                                        {{item.course}}
-                                    </span>
-                                </span>
-                                <span class="cus-class">
-                                    {{$t('home.className')}}
-                                    <span style="color: var(--primary-text-color)">
-                                        {{item.class}}
-                                    </span>
-                                </span>
-                            </p>
-                        </div>
-                    </div>
-                    <EmptyData v-show="!tmwCus.length" :textContent="$t('home.tmwNoCus')"></EmptyData>
-                </vuescroll>
-            </div>
-        </div>
-        <!-- 课堂数据区域 -->
-        <div class="class-data-area" style="display:flex;flex-direction:column;">
-            <div class="calss-chart-box box-item">
-                <p class="chart-title">
-                    {{$t('home.classData')}}
-                    <span style="color: var(--normal-icon-color);margin-left: 6px;font-size: 12px;">
-                        ({{$t('system.preview')}})
-                    </span>
-                </p>
-                <TechScore></TechScore>
-                <TeachScore></TeachScore>
-            </div>
-            <div class="upload-record-box box-item" style="flex:1;">
-                <p class="list-title">
-                    {{$t('home.recentRecord')}}
-                    <span style="color: var(--normal-icon-color);margin-left: 6px;font-size: 12px;">
-                        ({{$t('system.preview')}})
-                    </span>
-                </p>
-                <div class="card-content-box">
-                    <vuescroll>
-                        <!-- <div class="upload-record-item" v-for="(item,index) in itemCount" :key="index" @click="toRecordPage">
-                            <Icon class="record-type-icon" style="display:inline-block;" custom="iconfont icon-hi"></Icon>
-                            <div class="record-info-wrap" style="display:inline-block;">
-                                <p class="recorde-name">HiTeach-default-202009091212</p>
-                                <p class="record-time">
-                                    <Time :time="((new Date()).getTime() - 60 * 3 * 1000)" />
-                                </p>
-                            </div>
-                        </div> -->
-                        <EmptyData :textContent="$t('home.noRecord')"></EmptyData>
-                    </vuescroll>
-                </div>
-            </div>
-
-        </div>
-        <!-- 活动数据区域 -->
-        <div class="activity-area" style="display:flex;flex-direction:column;">
-            <div class="ac-count-box box-item">
-                <p class="chart-title">
-                    {{$t('home.acCount')}}
-                </p>
-                <AcCountPie style="margin-top:-20px;" :count="acCount"></AcCountPie>
-            </div>
-            <div class="ac-list-box box-item" style="flex:1;">
-                <p class="list-title">
-                    {{$t('home.goingList')}}
-                </p>
-                <div class="in-pro-detail">
-                    <vuescroll>
-                        <div v-for="(item,index) in goingList" :key="index" class="in-pro-ac-item" @click="toAc(item.pk, item.scope)">
-                            <Icon :custom="getAcIcon(item.pk)" class="ac-type-icon"></Icon>
-                            <div class="ac-info-box">
-                                <p>
-                                    <span class="ac-name-label">{{item.name}}</span>
-                                </p>
-                                <p class="ac-time-wrap">
-                                    <Icon type="md-alarm" />
-                                    {{$jsFn.dateFormat(item.startTime)}} - {{$jsFn.dateFormat(item.endTime)}}
-                                </p>
-                            </div>
-                            <div class="ac-pro-box">
-                                <span :class="['type-label', item.owner == 'school' ? '' : 'special-color']">
-                                    {{item.owner == 'school' ? $t('home.schoolLabel') : $t('home.privateLabel')}}
-                                </span>
-                            </div>
-                        </div>
-                        <EmptyData v-show="!goingList.length" :textContent="$t('home.noGoing')"></EmptyData>
-                    </vuescroll>
-                </div>
-
-            </div>
-        </div>
-        <!-- 消息通知区域 -->
-        <div class="notice-area">
-            <!-- 学校公告 -->
-            <div class="school-notice-box box-item">
-                <p class="list-title">
-                    <span>{{$t('home.scNotice')}}</span>
-                    <!-- <span style="color: aqua;margin-left: 6px;font-size: 12px;">
-                        ({{$t('system.preview')}})
-                    </span> -->
-                    <!-- 消息数量 -->
-                    <!-- <span class="notice-count-tag">2</span> -->
-                </p>
-                <div class="card-content-box">
-                    <vuescroll>
-                        <ul class="notice-list-box">
-                            <li v-for="(item,index) in noticeList" :key="index" @click="viewNotice(index)">
-                                <div style="display:flex;justify-content:space-between;">
-                                    <p>
-                                        <span class="notice-title">{{item.title}}</span>
-                                        <span class="notice-dot" v-if="index < 2"></span>
-                                    </p>
-                                    <span class="notice-time">{{$jsFn.dateFormat(item.startTime)}}</span>
-                                </div>
-                                <!-- <p class="notice-text" v-html="item.content"></p> -->
-                            </li>
-                            <EmptyData v-show="noticeList.length == 0" :textContent="$t('home.noNotice')"></EmptyData>
-                        </ul>
-                    </vuescroll>
-                </div>
-            </div>
-            <div class="system-notice-box box-item">
-                <p class="list-title">
-                    <span>{{$t('home.sysMsg')}}</span>
-                    <!-- <span style="color: aqua;margin-left: 6px;font-size: 12px;">
-                        ({{$t('system.preview')}})
-                    </span> -->
-                    <!-- 消息数量 -->
-                    <!-- <span class="notice-count-tag">{{$store.state.userInfo.hasSchool ? 1 : 2}}</span> -->
-                </p>
-                <div class="card-content-box">
-                    <vuescroll>
-                        <ul class="notice-list-box">
-                            <EmptyData :textContent="$t('home.noInfo')"></EmptyData>
-                        </ul>
-                    </vuescroll>
-                </div>
-            </div>
-        </div>
-        <Modal v-model="viewNoticeStatus" :title="noticeList[noticeIndex] ? noticeList[noticeIndex].title : ''" width="600">
-            <template v-if="noticeList[noticeIndex]">
-                <p class="notice-content" v-html="noticeList[noticeIndex].content"></p>
-            </template>
-        </Modal>
-    </div>
-</template>
-<script>
-import AcCountPie from "./AcCountPie.vue"
-import TechScore from "./TechScore.vue"
-import TeachScore from "./TeachScore.vue"
-import MinTable from "./MinTable.vue"
-export default {
-    components: {
-        AcCountPie, TechScore, TeachScore, MinTable
-    },
-    inject: ['reload'],
-    data() {
-        return {
-            split1: 0.5,
-            split2: 0.5,
-            split3: 0.5,
-            itemCount: 10,
-            tmwCus: [],
-            srvAdr: 'China',
-            hasVerify: false, //是否完成手机号验证
-            acCount: [],
-            goingList: [],
-            noticeList: [],
-            viewNoticeStatus: false,
-            noticeIndex: 0
-        }
-    },
-    methods: {
-        viewNotice(index) {
-            this.noticeIndex = index
-            this.viewNoticeStatus = true
-        },
-        //查询学校公告
-        findNotice() {
-            let params = {
-                code: this.$store.state.userInfo.schoolCode,
-                type: "school",
-                publish: 1
-            }
-            this.$api.notice.FindNotice(params).then(
-                res => {
-                    this.noticeList = res.notices
-                },
-                err => {
-                    this.$Message.error('API error!')
-                }
-            )
-        },
-        getAcIcon(type) {
-            let icon = ''
-            switch (type) {
-                case 'Exam':
-                    icon = 'iconfont icon-test'
-                    break
-                case 'Self':
-                    icon = 'iconfont icon-activityT'
-                    break
-                case 'Homework':
-                    icon = 'iconfont icon-hw'
-                    break
-                case 'Vote':
-                    icon = 'iconfont icon-vote'
-                    break
-                case 'Survey':
-                    icon = 'iconfont icon-questionnaire'
-                    break
-                default:
-                    break
-            }
-            return icon
-        },
-        getTmwCus(data) {
-            this.tmwCus = []
-            this.tmwCus = this._.cloneDeep(data)
-        },
-        toAc(type, scope) {
-            // if(scope == 'school'){
-            //     this.$Message.warning('暂未处理校本活动详情页')
-            //     return
-            // }
-            // switch (type) {
-            //     case 'Vote':
-            //         this.$router.push({
-            //             path: '/home/personalVote'
-            //         })
-            //         break
-            //     case 'Survey':
-            //         this.$router.push({
-            //             path: '/home/personalSurvey'
-            //         })
-            //         break
-            //     case 'Exam':
-            //         this.$router.push({
-            //             path: '/home/privateEvaluation'
-            //         })
-            //         break
-            //     default:
-            //         break
-            // }
-        },
-        toRecordPage() {
-            this.$router.push({
-                path: '/home/classRecord'
-            })
-        },
-        toSelfLearn() {
-            //this.$router.push({
-            //    path: '/home/SelfLearn'
-            //})
-        },
-        toJoinSchool() {
-            this.$router.push({
-                path: '/home/settings'
-            })
-        },
-
-        //获取活动统计数据已经进行中的活动
-        getAcCount() {
-            this.$api.learnActivity.ActivityCount({}).then(
-                res => {
-                    if (res.totalCount && res.totalCount.length) {
-                        res.totalCount.forEach(item => {
-                            switch (item.key) {
-                                case 'Exam':
-                                    item.name = this.$t('home.ac1')
-                                    break
-                                case 'Self':
-                                    item.name = this.$t('home.ac2')
-                                    break
-                                case 'Homework':
-                                    item.name = this.$t('home.ac3')
-                                    break
-                                case 'Vote':
-                                    item.name = this.$t('home.ac4')
-                                    break
-                                case 'Survey':
-                                    item.name = this.$t('home.ac5')
-                                    break
-                                default:
-                                    break
-                            }
-                        })
-                        this.acCount = res.totalCount
-                    }
-                    if (res.goingDatas) {
-                        this.goingList = res.goingDatas
-                    }
-
-                },
-                err => {
-                    this.$Message.error('API error!')
-                }
-            )
-        }
-    },
-    created() {
-        this.getAcCount()
-        if (this.$store.state.userInfo.hasSchool) {
-            this.findNotice()
-        }
-    },
-    mounted() {
-        this.$EventBus.$off('onGlobalLoading')
-        this.$EventBus.$on('onGlobalLoading', (data) => {
-			console.error('Home',data);
-            if (!data) this.getAcCount()
-        })
-    },
-    computed: {
-        //暂时只验证加入学校， 手机号需要对接API
-        isComplete() {
-            return this.$store.state.userInfo.hasSchool && this.hasVerify
-        }
-    },
-    watch: {
-        '$store.state.userInfo.schoolCode': {
-            handler(n, o) {
-                this.getAcCount()
-            }
-        }
-    }
-}
-</script>
-<style scoped lang="less">
-@import "./HomePage.less";
-</style>
-<style lang="less">
-.home-page-container .ivu-card-body {
-    height: calc(100% - 52px);
-    padding: 0px;
-}
-.notice-text {
-    p {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        width: 100%;
-    }
-}
-</style>

TEAMModelOS/ClientApp/src/view/homepage/NewHomePage.vue

@@ -18,7 +18,7 @@
                 </div>
                 <div class="chart-box-column2">
                     <!-- 课堂数据 -->
-                    <div class="class-chart-box" v-show="this.$store.state.config.srvAdrType != 'product'">
+                    <div class="class-chart-box" v-show="$store.state.config.srvAdrType != 'product'">
                         <!-- <p class="chart-title">
                             {{$t('home.classData')}}
                             <span style="color: var(--normal-icon-color);margin-left: 6px;font-size: 12px;">

TEAMModelOS/ClientApp/src/view/login/Index.vue

@@ -520,7 +520,8 @@ export default {
                             name: result.name,
                             schoolCode: result.defaultschool
                         })
-                        this.$router.push({ path: '/home' })
+                        let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                        this.$router.push({ name: homePath })
                     } else {
                         this.identityFlag = true;
                     }
@@ -540,8 +541,9 @@ export default {
         },
         goWhere: function (identity) {
             localStorage.setItem('identity', identity)
-            let path = identity == 'student' ? '/studentWeb' : '/home'
-            this.$router.push({ path: path })
+            let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+            let path = identity == 'student' ? 'studentWeb' : homePath
+            this.$router.push({ name: path })
         },
         loginTo: function (identity) {
             let pathname = identity == 'student' ? 'loginStudent' : 'loginTeacher'

TEAMModelOS/ClientApp/src/view/login/page/Teacher.vue

@@ -450,8 +450,9 @@ export default {
                         localStorage.setItem('platform', 'area')
                         this.$router.push({ path: '/area' })
                     } else {
+                        let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
                         localStorage.setItem('platform', 'school')
-                        this.$router.push({ path: '/home' })
+                        this.$router.push({ name: homePath })
                     }
                 }
             })

TEAMModelOS/ClientApp/src/view/regist/Index.vue

@@ -352,7 +352,8 @@ export default {
                                 //設定權限並登入
                                 User.login(result).then(res => {
                                     if (res) {
-                                        this.$router.push({ path: '/home' })
+                                        let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                                        this.$router.push({ name: homePath })
                                     }
                                 })
                             }
@@ -361,35 +362,6 @@ export default {
                 }
             })
         },
-        // （这部分统一调整手机绑定可以删掉）
-        // bandingID(idToken, result) {
-        //     this.$api.train.thirdSSO(this.routerData.bindurl, {
-        //         type: this.routerData.type,
-        //         param: this.routerData.param,
-        //         id_token: idToken
-        //     }).then(
-        //         async res => {
-        //             //绑定成功
-        //             if (res && res.status == 200) {
-        //                 this.$Message.success("绑定成功")
-        //                 await this.$api.login.teacherLogin(result).then(res => {
-        //                     result = res
-        //                 })
-        //                 //設定權限並登入
-        //                 User.login(result).then(res => {
-        //                     if (res) {
-        //                         this.$router.push({ path: '/home' })
-        //                     }
-        //                 })
-        //             } else {
-        //                 this.$Message.error("绑定失败")
-        //             }
-        //         },
-        //         err => {
-
-        //         }
-        //     )
-        // },
         sendPinCode() {
             let data = {
                 applyType: this.applyType,

TEAMModelOS/ClientApp/src/view/sso/Index.vue

@@ -130,7 +130,8 @@ export default {
                             this.$router.push({ path: '/area' })
                         } else {
                             localStorage.setItem('platform', 'school')
-                            this.$router.push({ path: '/home' })
+                            let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                            this.$router.push({ name: homePath })
                         }
                     }
                 })

TEAMModelOS/ClientApp/src/view/user/BandPhone.vue

@@ -128,7 +128,8 @@ export default {
                             //設定權限並登入
                             User.login(result).then(res => {
                                 if (res) {
-                                    this.$router.push({ path: '/home' })
+                                    let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                                    this.$router.push({ name: homePath })
                                 }
                             })
                         } catch (e) {
@@ -242,7 +243,8 @@ export default {
                                     } else if (!res.error) {
                                         User.login(res).then(res => {
                                             if (res) {
-                                                this.$router.push({ path: '/home' })
+                                                let homePath = this.$store.state.config.srvAdr == 'China' ? 'home' : 'myCourse'
+                                                this.$router.push({ name: homePath })
                                             }
                                         })
                                     } else {