Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/login/page/Student.less

@@ -182,7 +182,7 @@
 }
 .left-box {
     padding: 0px 70px;
-    height: 400px;
+    height: 431px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -193,7 +193,7 @@
     padding: 40px 120px;
     // box-shadow: -2px 0px 15px 0px rgba(75, 113, 136, 0.9);
     display: flex;
-    height: 400px;
+    height: 431px;
     min-width: 600px;
 }
 .student-login-img {

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

@@ -96,6 +96,19 @@
                         <div class="errlable">{{ schoolErrText }}</div>
                         <Checkbox v-model="isRememberForm" style="color:#fff;float:right">{{ $t('login.title.rememberPsw') }}</Checkbox>
                     </Form>
+                    <!-- 三方登录 -->
+                    <template v-if="srvAdr == 'Global'">
+                        <Divider class="login-divider">{{$t('login.communy.title')}}</Divider>
+                        <div class="other-login-box" style="margin-top:0px">
+                            <!-- 教育雲 -->
+                            <div class="other-login-item" @click="oauthLogin('educloudtwl')">
+                                <v-icon iconClass="educloudtw" class="icon-educlowudtw"></v-icon>
+                                <p class="other-login-text">
+                                {{$t('login.communy.educloudtw')}}
+                                </p>
+                            </div>
+                        </div>
+                    </template>
                 </TabPane>
                 <!-- 醍摩豆表单登录 -->
                 <TabPane :label="$t('login.title.IDLogin')" name="name2">
@@ -136,22 +149,32 @@
                                   <Icon custom="iconfont icon-dingding" class="other-login-icon" />
                                   <p class="other-login-text">DingDing</p>
                               </div> -->
+                        <!-- FB -->
                         <div class="other-login-item" @click="oauthLogin('facebook')" v-if="srvAdr == 'Global'">
                             <Icon type="logo-facebook" class="other-login-icon" />
                             <p class="other-login-text">
                               {{$t('login.communy.fb')}}
                             </p>
                         </div>
+                        <!-- Google -->
                         <div class="other-login-item" @click="oauthLogin('google')" v-if="srvAdr == 'Global'">
                             <Icon custom="iconfont icon-google" class="other-login-icon" />
                             <p class="other-login-text">
                               {{$t('login.communy.google')}}
                             </p>
                         </div>
+                        <!-- wechat -->
                         <div style="margin:auto" class="other-login-item" v-if="srvAdr == 'China'" @click="oauthLogin('wechat')">
                             <Icon custom="iconfont icon-wechat" class="other-login-icon" />
                             <p class="other-login-text">{{$t('login.communy.wechat')}}</p>
                         </div>
+                        <!-- 教育雲 -->
+                        <div class="other-login-item" @click="oauthLogin('educloudtw')" v-if="srvAdr == 'Global'">
+                            <v-icon iconClass="educloudtw" class="icon-educlowudtw"></v-icon>
+                            <p class="other-login-text">
+                            {{$t('login.communy.educloudtw')}}
+                            </p>
+                        </div>
                     </div>
                 </TabPane>
             </Tabs>
@@ -163,6 +186,7 @@ import { EventSourcePolyfill } from 'event-source-polyfill';
 import QRCode from 'qrcodejs2'
 import { User } from '@/service/User'
 import { mapState, mapGetters } from 'vuex'
+import "@/icons/svg/educloudtw.svg";
 
 export default {
     data() {