Skip to content

C
company_app
提交 c315da16 作者: 毛细亚
操作

更新代码

上级 bd0a988a
正在显示 包含 59 行增加 和 53 行删除
company_app/index.html
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.68d406e7.js"></script><script defer="defer" src="static/js/app.063d8d3e.js"></script><link href="static/css/chunk-vendors.34a02360.css" rel="stylesheet"><link href="static/css/app.af2d5970.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.00c87327.js"></script><script defer="defer" src="static/js/app.89bab3f8.js"></script><link href="static/css/chunk-vendors.34a02360.css" rel="stylesheet"><link href="static/css/app.c6113497.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
src/App.vue
......@@ -3,14 +3,8 @@
<div class="mobile-menu-bar" v-if="token && external_userid && showMemberId">
<!-- 临时调试信息 -->
<el-menu
:default-active="selectedPath"
mode="horizontal"
class="mobile-el-menu"
background-color="#fff"
router
@select="handleSelect"
>
<el-menu :default-active="selectedPath" mode="horizontal" class="mobile-el-menu" background-color="#fff" router
@select="handleSelect">
<el-menu-item v-for="item in menuList" :key="item.path" :index="item.path" class="mobile-menu-item">
{{ item.label }}
</el-menu-item>
......@@ -26,8 +20,9 @@
<script>
import bindUserList from '@/views/components/bindGameAccount/bindUserList.vue'
import { getToken } from '@/utils/auth'
import { mapState } from 'vuex'
import { mapState, mapMutations } from 'vuex'
import Cookies from 'js-cookie'
import { getParams } from '@/utils/index'
export default {
name: 'App',
components: {
......@@ -65,8 +60,8 @@ export default {
showMemberId: false,
}
},
computed:{
...mapState('user',['external_userid','token']),
computed: {
...mapState('user', ['external_userid', 'token']),
},
watch: {
'$route.path'(val) {
......@@ -84,7 +79,7 @@ export default {
if (newVal) {
this.$nextTick(() => {
this.showMemberId = true
console.log('external_userid 已设置:', newVal, window.location.href, this.token,Cookies.get('token'))
console.log('external_userid 已设置:', newVal, window.location.href, this.token, Cookies.get('token'))
// 强制更新组件
this.$forceUpdate()
})
......@@ -93,7 +88,15 @@ export default {
immediate: true
}
},
created() {
const urlParams = getParams();
// 每次进入页面都缓存corp_id
if (urlParams.corp_id) {
this.cacheCorp_id(urlParams.corp_id) // 缓存 corp_id
}
},
mounted() {
this.initVuexValue()
// 初始化时处理路径
const currentPath = this.$route.path
if (currentPath === '/' || currentPath === '' || currentPath === '/index.html') {
......@@ -103,20 +106,43 @@ export default {
}
console.log('创建时路径:', currentPath, '选中路径:', this.selectedPath)
},
methods:{
methods: {
...mapMutations('user', ['set_userid', 'set_corp_id', 'set_token', 'set_cser_info', 'set_cser_id', 'set_cser_name', 'set_userInfo']),
// 设置缓存
cacheCorp_id(corp_id) {
Cookies.set('corp_id', corp_id, { expires: 7 })
this.set_corp_id(corp_id)
},
initVuexValue() {
this.set_userid(Cookies.get('userid'))
this.set_corp_id(Cookies.get('corp_id'))
this.set_token(Cookies.get('token'))
this.set_cser_id(Cookies.get('cser_id'))
this.set_cser_name(Cookies.get('cser_name'))
const userinfo = {
cser_id: Cookies.get('cser_id'),
cser_name: Cookies.get('cser_name'),
username: Cookies.get('cser_name'),
id: Cookies.get('cser_id'),
}
this.set_userInfo(userinfo)
const cser_info = Cookies.get('cser_info')
cser_info ? this.set_cser_info(JSON.parse(cser_info)) : this.set_cser_info({})
},
handleSelect(key, keyPath) {
console.log('菜单选择:', key, keyPath, window.location.href)
}
}
},
}
</script>
<style scoped>
#app{
#app {
width: 100%;
height: 100%;
background: #fff;
}
.mobile-app-wrapper {
width: 100%;
margin: 0 auto;
......@@ -124,14 +150,16 @@ export default {
min-height: 100vh;
display: flex;
flex-direction: column;
box-shadow: 0 0 12px rgba(0,0,0,0.04);
box-shadow: 0 0 12px rgba(0, 0, 0, 0.04);
}
.mobile-menu-bar {
background: #fff;
border-bottom: 1px solid #f0f0f0;
box-shadow: 0 2px 8px #f0f1f2;
z-index: 10;
}
.mobile-el-menu {
border: none;
background: #fff;
......@@ -139,8 +167,9 @@ export default {
justify-content: flex-start;
padding-left: 16px;
}
.mobile-menu-item {
font-size: 14px ;
font-size: 14px;
padding: 0 16px !important;
min-width: 0;
flex: none;
......@@ -150,23 +179,28 @@ export default {
margin-right: 8px;
transition: all 0.3s ease;
}
.mobile-el-menu .el-menu-item.is-active {
font-weight: bold;
}
.mobile-content {
flex: 1;
overflow-y: auto;
}
.mobile-content > div {
.mobile-content>div {
background: #fff;
border-radius: 8px;
min-height: 60vh;
padding: 10px;
}
.el-menu--horizontal>.el-menu-item{
.el-menu--horizontal>.el-menu-item {
height: 50px;
line-height: 50px;
}
body {
background: #f0f2f5;
}
......
src/main.js
......@@ -11,7 +11,7 @@ import 'lib-flexible/flexible.js'
// import '@/styles/element-theme-colors.css';
import '@/styles/index.scss';
import moment from 'moment'
// import VConsole from 'vconsole'; // 注释掉，使用 devMode.js 统一管理
import VConsole from 'vconsole'; // 注释掉，使用 devMode.js 统一管理
// import 'bi-element-ui/lib/bi-element-ui.css'
import Element from 'bi-eleme'
// import 'bi-eleme/lib/theme-chalk/index.css'
......@@ -21,7 +21,7 @@ import uploading from '@/utils/cos-upload'
import 'element-ui/lib/theme-chalk/index.css';
// 导入 VConsole 清理工具
import '@/utils/vconsoleCleanup'
new VConsole();
// 测试一下
Vue.use(uploading)
Vue.use(BiElementUi, {
......
src/utils/request.js
......@@ -37,7 +37,7 @@ service.interceptors.request.use(
if (authToken) {
config.headers['Authtoken'] = authToken
}
const corp_id = store.state.user.corp_id || Cookies.get('corp_id')
const corp_id = Cookies.get('corp_id') || store.state.user.corp_id
const userid = Cookies.get('userid')
if (corp_id) {
config.headers['Corp-Id'] = corp_id
......
src/views/login.vue
......@@ -70,7 +70,6 @@ export default {
}
},
async mounted() {
console.log(1231321321, '1231321321')
this.$nextTick(() => {
this.initLogin()
})
......@@ -81,16 +80,9 @@ export default {
methods: {
...mapMutations('user', ['set_corp_id', 'set_userid', 'set_userInfo', 'set_token', 'set_cser_info', 'set_signData', 'set_cser_id', 'set_cser_name', 'set_external_userid']),
async initLogin() {
await this.initOrganization();
const urlParams = getParams();
await this.initOrganization();
const userid = Cookies.get('userid');
// 每次进入页面都缓存corp_id
if (urlParams.corp_id) {
this.cacheCorp_id(urlParams.corp_id) // 缓存 corp_id
}else{
this.$message.error('主体id 不存在,请检查主体的入口文件')
return
}
// 如果是钉钉扫码回调页面
if (urlParams.type && urlParams.type === 'ding') {// 钉钉回调
console.log(1)
......
src/views/userInfo/userInfo.vue
......@@ -53,30 +53,10 @@ export default {
},
created(){
// 初始化 vuex 中的值
this.initVuexValue()
},
methods:{
...mapMutations('game',['set_chatUserInfo']),
...mapMutations('user',['set_userid','set_corp_id','set_token','set_cser_info','set_cser_id','set_cser_name','set_userInfo']),
initVuexValue(){
this.set_userid(Cookies.get('userid'))
this.set_corp_id(Cookies.get('corp_id'))
this.set_token(Cookies.get('token'))
this.set_cser_id(Cookies.get('cser_id'))
this.set_cser_name(Cookies.get('cser_name'))
const userinfo = {
cser_id:Cookies.get('cser_id'),
cser_name:Cookies.get('cser_name'),
username:Cookies.get('cser_name'),
id:Cookies.get('cser_id'),
}
this.set_userInfo(userinfo)
const cser_info = Cookies.get('cser_info')
console.log(Cookies.get('cser_id'),'cser_info',Cookies.get('cser_name'))
cser_info?this.set_cser_info(JSON.parse(cser_info)):this.set_cser_info({})
}
}
}
</script>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论