|
@@ -9,7 +9,9 @@
|
|
|
@click="backVersion"
|
|
@click="backVersion"
|
|
|
class="Version"
|
|
class="Version"
|
|
|
>
|
|
>
|
|
|
- {{ cocoNoteType ? lang.interlearning : lang.Returnoldversion }}
|
|
|
|
|
|
|
+ <span v-if="!cocoNoteType">{{ lang.Returnoldversion }}</span>
|
|
|
|
|
+ <span v-if="cocoNoteType === 'coconote'">{{ lang.interlearning }}</span>
|
|
|
|
|
+ <span v-if="cocoNoteType === 'person'">拔尖人才</span>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="lp_r_box" v-loading="nextStepsLoading">
|
|
<div class="lp_r_box" v-loading="nextStepsLoading">
|
|
|
<div class="lp_r_b_logo">
|
|
<div class="lp_r_b_logo">
|
|
@@ -52,7 +54,10 @@
|
|
|
v-if="['default', 'weChat', 'orgL', 'code','code2'].includes(loginType)"
|
|
v-if="['default', 'weChat', 'orgL', 'code','code2'].includes(loginType)"
|
|
|
style="display: flex;justify-content: space-between;align-items: first baseline;"
|
|
style="display: flex;justify-content: space-between;align-items: first baseline;"
|
|
|
>
|
|
>
|
|
|
- {{ cocoNoteType ? lang.interlearning : lang.login }}
|
|
|
|
|
|
|
+ <span v-if="!cocoNoteType">{{ lang.login }}</span>
|
|
|
|
|
+ <span v-if="cocoNoteType === 'coconote'">{{ lang.interlearning }}</span>
|
|
|
|
|
+ <span v-if="cocoNoteType === 'person'">拔尖人才</span>
|
|
|
|
|
+ <!-- {{ cocoNoteType === 'coconote' ? lang.interlearning : lang.login }} -->
|
|
|
<!-- 返回到选择身份 -->
|
|
<!-- 返回到选择身份 -->
|
|
|
<div v-if="logIdentity != 0" @click="backIDyData" class="backIDy">{{ lang.Reidentity }}</div>
|
|
<div v-if="logIdentity != 0" @click="backIDyData" class="backIDy">{{ lang.Reidentity }}</div>
|
|
|
</span>
|
|
</span>
|
|
@@ -530,6 +535,11 @@ export default {
|
|
|
logo: '',
|
|
logo: '',
|
|
|
name: '跨学科学习'
|
|
name: '跨学科学习'
|
|
|
},
|
|
},
|
|
|
|
|
+ personCon: {
|
|
|
|
|
+ banner: 'https://liyuan.cocorobo.cn/img/login2.3d600ff5.jpg',
|
|
|
|
|
+ logo: '',
|
|
|
|
|
+ name: '拔尖人才'
|
|
|
|
|
+ },
|
|
|
cocoNoteName:'',
|
|
cocoNoteName:'',
|
|
|
uppercaseAlphabet:['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
|
|
uppercaseAlphabet:['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
|
|
|
allowOrgList: [
|
|
allowOrgList: [
|
|
@@ -582,6 +592,10 @@ export default {
|
|
|
_result.banner = this.cocoNoteCon.banner;
|
|
_result.banner = this.cocoNoteCon.banner;
|
|
|
_result.name = this.cocoNoteCon.name;
|
|
_result.name = this.cocoNoteCon.name;
|
|
|
_result.logo = this.cocoNoteCon.logo;
|
|
_result.logo = this.cocoNoteCon.logo;
|
|
|
|
|
+ } else if (this.cocoNoteType == 'person') {
|
|
|
|
|
+ _result.banner = this.personCon.banner;
|
|
|
|
|
+ _result.name = this.personCon.name;
|
|
|
|
|
+ _result.logo = this.personCon.logo;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return _result;
|
|
return _result;
|
|
@@ -663,7 +677,7 @@ export default {
|
|
|
// 返回旧版本
|
|
// 返回旧版本
|
|
|
backVersion() {
|
|
backVersion() {
|
|
|
console.log(this.$region);
|
|
console.log(this.$region);
|
|
|
- if (this.cocoNoteType == 'coconote') return console.log('不能返回');
|
|
|
|
|
|
|
+ if (this.cocoNoteType) return console.log('不能返回');
|
|
|
|
|
|
|
|
this.$confirm(this.lang.backoldversion, this.lang.tip, {
|
|
this.$confirm(this.lang.backoldversion, this.lang.tip, {
|
|
|
confirmButtonText: this.lang.confirm,
|
|
confirmButtonText: this.lang.confirm,
|