Commit 360cf225 by 周志凯

styles: read-space version 1.0

1 parent 2c6a8bc5
...@@ -12,7 +12,7 @@ var lang = ['zh_CN','en_US','zh_TW','mall_CN'] ...@@ -12,7 +12,7 @@ var lang = ['zh_CN','en_US','zh_TW','mall_CN']
function loadI18nMessages(lang) { function loadI18nMessages(lang) {
return import(/* webpackChunkName: "[request]" */`./langs/${lang}`).then(msg => { return import(/* webpackChunkName: "[request]" */`./langs/${lang}`).then(msg => {
i18n.setLocaleMessage(lang, msg.default) i18n.setLocaleMessage(lang, msg.default)
i18n.locale = localStorage.getItem('lang') || 'mall_CN' i18n.locale = 'zh_CN'
return Promise.resolve() return Promise.resolve()
}) })
} }
......
...@@ -4,7 +4,7 @@ const zh_CN = { ...@@ -4,7 +4,7 @@ const zh_CN = {
btn: '登 录', btn: '登 录',
rememberPw: '记住密码', rememberPw: '记住密码',
loginLoading: '正在登录中...', loginLoading: '正在登录中...',
platformName: '智慧连锁客流分析平台' platformName: '阅读空间'
}, },
home: { home: {
home: '首页', home: '首页',
......
...@@ -55,10 +55,9 @@ Object.keys(custom).forEach(key => { ...@@ -55,10 +55,9 @@ Object.keys(custom).forEach(key => {
}); });
// 读取配置文件 多项目 默认6.0 平台 // 读取配置文件 多项目 默认6.0 平台
const platformName = window._vionConfig.platform || 'mall'
document.title = '阅读空间' document.title = '阅读空间'
Vue.prototype.$Project = platformName Vue.prototype.$Project = 'store'
// 读取配置文件 菜单权限 默认有菜单权限 // 读取配置文件 菜单权限 默认有菜单权限
Vue.prototype.$Menu = window._vionConfig.allMenu || false; Vue.prototype.$Menu = window._vionConfig.allMenu || false;
......
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
</el-table-column>--> </el-table-column>-->
<el-table-column prop="serialnum" :label="$t('table.deviceNum')" align="center"></el-table-column> <el-table-column prop="serialnum" :label="$t('table.deviceNum')" align="center"></el-table-column>
<el-table-column prop="localIp" :label="$t('table.localIP')" align="center"></el-table-column> <el-table-column prop="localIp" :label="$t('table.localIP')" align="center"></el-table-column>
<el-table-column :label="$t('table.bloc')" align="center"> <!-- <el-table-column :label="$t('table.bloc')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.account ? scope.row.account.name : '--' }}</span> <span>{{ scope.row.account ? scope.row.account.name : '--' }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('table.square')" align="center"> <el-table-column :label="$t('table.square')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.mall ? scope.row.mall.name : '--' }}</span> <span>{{ scope.row.mall ? scope.row.mall.name : '--' }}</span>
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<el-row> <el-row>
<el-col :span="4" :offset="1" class="col-logo"> <el-col :span="4" :offset="1" class="col-logo">
<div class="logo-img"> <div class="logo-img">
<!-- <router-link to="/"> --> <router-link to="/">
<img src="~@/assets/img/logo.png" alt="" /> <img src="~@/assets/img/logo.png" alt="" />
<!-- </router-link> --> </router-link>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="col-menu"> <el-col :span="12" class="col-menu">
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<span @click="logout" class="exit-span">{{$t('home.dropOut')}}</span> <span @click="logout" class="exit-span">{{$t('home.dropOut')}}</span>
<!-- <locale-component></locale-component> --> <!-- <locale-component></locale-component> -->
</div> </div>
<lange-Select v-if="$Project !== 'mall'"></lange-Select> <!-- <lange-Select v-if="$Project !== 'mall'"></lange-Select> -->
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
<div id="userLayout" class="user-layout-wrapper"> <div id="userLayout" class="user-layout-wrapper">
<div class="container"> <div class="container">
<div class="login-container"> <div class="login-container">
<div class="login-header" v-if="$Project !== 'mall'">
<lange-select class="login-lang"></lange-select>
</div>
<el-form <el-form
ref="loginForm" ref="loginForm"
:model="loginForm" :model="loginForm"
...@@ -53,10 +50,10 @@ ...@@ -53,10 +50,10 @@
>{{ falg ? $t('login.loginLoading') : $t('login.btn') }}</el-button> >{{ falg ? $t('login.loginLoading') : $t('login.btn') }}</el-button>
<el-checkbox v-model="rememberPass" class="remember-checkbox-wrapper">{{ $t('login.rememberPw') }}</el-checkbox> <el-checkbox v-model="rememberPass" class="remember-checkbox-wrapper">{{ $t('login.rememberPw') }}</el-checkbox>
</el-form-item> </el-form-item>
<div class="login-footer"> <!-- <div class="login-footer">
<p>{{ footerText }}</p> <p>{{ footerText }}</p>
<p>京ICP备12023019号-3</p> <p>京ICP备12023019号-3</p>
</div> </div> -->
</el-form> </el-form>
</div> </div>
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!