Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

This commit is contained in:
dongruihua
2023-02-02 14:20:43 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -41,11 +41,11 @@
<el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item> <el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item>
<el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item> <el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item>
<el-dropdown-item command="five" divided>社招新员工</el-dropdown-item> <el-dropdown-item command="five" divided>社招新员工</el-dropdown-item>
<el-dropdown-item command="six" divided>贡献者专区</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
<div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''"> <div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
<router-link to="/follow">我的关注 <router-link to="/follow">我的关注
<div :class="current == 'follow' ? 'nav-bottbor' : ''"></div> <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
@@ -221,7 +221,8 @@ export default {
two: urlPre+'/grow180/login', two: urlPre+'/grow180/login',
three: this.webBaseUrl + '/study/index?study=1', three: this.webBaseUrl + '/study/index?study=1',
four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130', four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
five: urlPre+'/boe/new-employee/index.html' five: urlPre+'/boe/new-employee/index.html',
six: urlPre+'/web/contributor/index'
}; };
window.open(obj[val]); window.open(obj[val]);
}, },

View File

@@ -283,7 +283,6 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="saveForm()" type="primary">提交</el-button> <el-button @click="saveForm()" type="primary">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="考试信息" :visible.sync="examInfoShow" width="1000px" custom-class="g-dialog"> <el-dialog title="考试信息" :visible.sync="examInfoShow" width="1000px" custom-class="g-dialog">
<div> <div>