提交 877607e1 authored 作者: 何忠建's avatar 何忠建

修复bug

上级 0d59a7de
...@@ -2,6 +2,9 @@ import { getAction, deleteAction, putAction, postAction, httpAction } from '@/ap ...@@ -2,6 +2,9 @@ import { getAction, deleteAction, putAction, postAction, httpAction } from '@/ap
import Vue from 'vue' import Vue from 'vue'
import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types" import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
// 获取当前账号个人信息
export const loginUrlCheck = (params)=>postAction("/sys/loginUrlCheck",params);
// 统计数据 // 统计数据
const getDataStatisticsApi = (params)=>getAction("/property-central/partners/partnersInfo/statistics",params); const getDataStatisticsApi = (params)=>getAction("/property-central/partners/partnersInfo/statistics",params);
const shareBoardApi = (params)=>getAction("/property-community/order/paymentOrder/shareBoard",params); const shareBoardApi = (params)=>getAction("/property-community/order/paymentOrder/shareBoard",params);
......
<template> <template>
<div id="userLayout" :class="['user-layout-wrapper', device]"> <div id="userLayout" :class="['user-layout-wrapper', device]">
<div class="container"> <div class="container" v-if="isPageUrlTrue">
<div class="top"> <div class="top">
<div class="header"> <div class="header">
<a href="/"> <a href="/">
...@@ -27,20 +27,25 @@ ...@@ -27,20 +27,25 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div v-else>
<err-page />
</div>
</div> </div>
</template> </template>
<script> <script>
import RouteView from "@/components/layouts/RouteView" import RouteView from "@/components/layouts/RouteView"
import { mixinDevice } from '@/utils/mixin.js' import { mixinDevice } from '@/utils/mixin.js'
import { mapGetters } from 'vuex'
import errPage from './urlErr.vue'
export default { export default {
name: "UserLayout", name: "UserLayout",
components: { RouteView }, components: { RouteView, errPage },
mixins: [mixinDevice], mixins: [mixinDevice],
data () { data () {
return {} return {}
}, },
computed: mapGetters(["isPageUrlTrue"]),
mounted () { mounted () {
document.body.classList.add('userLayout') document.body.classList.add('userLayout')
}, },
......
<template>
<div class="exception">
<div class="img">
<img src="https://gw.alipayobjects.com/zos/rmsportal/KpnpchXsobRgLElEozzI.svg"/>
</div>
<div class="content">
<h1>404</h1>
<div class="desc">抱歉,你访问的页面地址错误</div>
<!-- <div class="action">
<a-button type="primary" @click="handleToHome">返回首页</a-button>
</div> -->
</div>
</div>
</template>
<script>
export default {
name: "ErrPage",
data() {
return {}
},
methods: {
}
}
</script>
<style lang="less" scoped>
.exception {
min-height: 500px;
height: 80%;
align-items: center;
text-align: center;
margin-top: 150px;
.img {
display: inline-block;
padding-right: 52px;
zoom: 1;
img {
height: 360px;
max-width: 430px;
}
}
.content {
display: inline-block;
flex: auto;
h1 {
color: #434e59;
font-size: 72px;
font-weight: 600;
line-height: 72px;
margin-bottom: 24px;
}
.desc {
color: rgba(0, 0, 0, .45);
font-size: 20px;
line-height: 28px;
margin-bottom: 16px;
}
}
}
.mobile {
.exception {
margin-top: 30px;
.img {
padding-right: unset;
img {
height: 40%;
max-width: 80%;
}
}
}
}
</style>
\ No newline at end of file
<!--
* @Author: luofu
* @Date: 2023-07-17 11:41:17
* @Descripttion:
-->
<template> <template>
<div class="logo"> <div class="logo">
<router-link :to="routerLinkTo"> <router-link :to="routerLinkTo">
...@@ -21,7 +26,7 @@ ...@@ -21,7 +26,7 @@
props: { props: {
title: { title: {
type: String, type: String,
default: '汉星科技', default: '合作伙伴管理后台',
required: false required: false
}, },
showTitle: { showTitle: {
...@@ -61,4 +66,7 @@ ...@@ -61,4 +66,7 @@
background-color: @primary-color; background-color: @primary-color;
} }
} }
.light .sider .logo img{
display: none;
}
</style> </style>
\ No newline at end of file
/*
* @Author: luofu
* @Date: 2023-07-17 11:41:17
* @Descripttion:
*/
import Vue from 'vue' import Vue from 'vue'
import { USER_INFO, ENHANCE_PRE } from "@/store/mutation-types" import { USER_INFO, ENHANCE_PRE } from "@/store/mutation-types"
const getters = { const getters = {
...@@ -18,7 +23,7 @@ const getters = { ...@@ -18,7 +23,7 @@ const getters = {
return state.enhance.enhanceJs[code] return state.enhance.enhanceJs[code]
}, },
sysSafeMode: state => state.user.sysSafeMode, sysSafeMode: state => state.user.sysSafeMode,
isPageUrlTrue: state => state.loginurl.isPageUrlTrue
} }
export default getters export default getters
/*
* @Author: luofu
* @Date: 2023-07-17 11:41:17
* @Descripttion:
*/
import Vue from 'vue' import Vue from 'vue'
import Vuex from 'vuex' import Vuex from 'vuex'
...@@ -5,6 +10,7 @@ import app from './modules/app' ...@@ -5,6 +10,7 @@ import app from './modules/app'
import user from './modules/user' import user from './modules/user'
import permission from './modules/permission' import permission from './modules/permission'
import enhance from './modules/enhance' import enhance from './modules/enhance'
import loginurl from './modules/loginurl'
import online from './modules/online' import online from './modules/online'
import getters from './getters' import getters from './getters'
...@@ -17,6 +23,7 @@ export default new Vuex.Store({ ...@@ -17,6 +23,7 @@ export default new Vuex.Store({
permission, permission,
enhance, enhance,
online, online,
loginurl,
}, },
state: { state: {
......
/*
* @Author: luofu
* @Date: 2023-08-30 10:44:15
* @Descripttion:
*/
import {loginUrlCheck} from '@/api/api'
import { getFileAccessHttpUrl } from '@/api/manage'
const enhance = {
state: {
isPageUrlTrue: true,
pageTitle: '湖北汉江之星科技有限公司',
pageImage: ''
},
mutations: {
SET_PAGE_URL_FLAG: (state, flag) => {
state.isPageUrlTrue = flag
},
},
actions: {
onLoginUrlCheck({ commit }, record) {
loginUrlCheck({platformType: 'partner'}).then(res=> {
if(res.result && res.result.name) {
commit('SET_PAGE_URL_FLAG', true)
} else {
commit('SET_PAGE_URL_FLAG', false)
}
})
}
}
}
export default enhance
\ No newline at end of file
...@@ -110,8 +110,9 @@ ...@@ -110,8 +110,9 @@
<script> <script>
const mapZoom = [5, 8, 10, 12] const mapZoom = [5, 8, 10, 12]
let timer = null let timer = null
import { partnersShopByDepId, partnersShopAudit,getQrCode } from '@/api/api' import { partnersShopByDepId, partnersShopAudit, getQrCode } from '@/api/api'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
import { axios } from '@/utils/request'
import SelectCommunityModal from './modules/SelectCommunityModal' import SelectCommunityModal from './modules/SelectCommunityModal'
import SelectShopsModal from './modules/SelectShopsModal' import SelectShopsModal from './modules/SelectShopsModal'
...@@ -125,7 +126,7 @@ export default { ...@@ -125,7 +126,7 @@ export default {
data() { data() {
return { return {
title: '', title: '',
loading:false, loading: false,
pageType: '', pageType: '',
model: { model: {
communityName: '', communityName: '',
...@@ -134,7 +135,7 @@ export default { ...@@ -134,7 +135,7 @@ export default {
shopCode: '', shopCode: '',
}, },
shopsInfo: {}, shopsInfo: {},
codeImg:'', codeImg: '',
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 6 }, sm: { span: 6 },
...@@ -218,7 +219,7 @@ export default { ...@@ -218,7 +219,7 @@ export default {
this.recordList = result.recordList this.recordList = result.recordList
this.model = Object.assign({}, result.partnersShop) this.model = Object.assign({}, result.partnersShop)
this.shopsInfo = Object.assign({}, result.shopInfo) this.shopsInfo = Object.assign({}, result.shopInfo)
if(this.shopsInfo && this.shopsInfo.shopCode){ if (this.shopsInfo && this.shopsInfo.shopCode) {
this.getQrCode(this.shopsInfo.shopCode) this.getQrCode(this.shopsInfo.shopCode)
} }
this.shopsInfo.registAdress = result.shopInfo.provinceName + result.shopInfo.cityName + result.shopInfo.countyName this.shopsInfo.registAdress = result.shopInfo.provinceName + result.shopInfo.cityName + result.shopInfo.countyName
...@@ -233,16 +234,12 @@ export default { ...@@ -233,16 +234,12 @@ export default {
) )
} }
}, },
async getQrCode(shopCode) { getQrCode(shopCode) {
let params = { axios('/property-central/shop/shopInfo/getQrCode?shopCode=' + shopCode + '&platformType=partner', {
shopCode:shopCode, responseType: 'blob',
platformType:'partner' }).then((res) => {
} this.codeImg = window.URL.createObjectURL(new Blob([res]))
let { res } = await getQrCode(params) })
console.log(res)
if(res && res!=undefined){
this.codeImg = window.URL.createObjectURL(new Blob([res]));
}
}, },
toReturn() { toReturn() {
this.closeCurrent() this.closeCurrent()
......
...@@ -38,6 +38,7 @@ import { ACCESS_TOKEN, ENCRYPTED_STRING } from '@/store/mutation-types' ...@@ -38,6 +38,7 @@ import { ACCESS_TOKEN, ENCRYPTED_STRING } from '@/store/mutation-types'
import LoginSelectTenant from './LoginSelectTenant' import LoginSelectTenant from './LoginSelectTenant'
import { getEncryptedString } from '@/utils/encryption/aesEncrypt' import { getEncryptedString } from '@/utils/encryption/aesEncrypt'
import { timeFix } from '@/utils/util' import { timeFix } from '@/utils/util'
import { mapActions } from 'vuex'
import LoginAccount from './LoginAccount' import LoginAccount from './LoginAccount'
import LoginPhone from './LoginPhone' import LoginPhone from './LoginPhone'
...@@ -63,9 +64,11 @@ export default { ...@@ -63,9 +64,11 @@ export default {
created() { created() {
Vue.ls.remove(ACCESS_TOKEN) Vue.ls.remove(ACCESS_TOKEN)
this.getRouterData(); this.getRouterData();
this.rememberMe = true this.rememberMe = true;
this.onLoginUrlCheck()
}, },
methods:{ methods:{
...mapActions(["onLoginUrlCheck"]),
handleTabClick(key){ handleTabClick(key){
this.customActiveKey = key this.customActiveKey = key
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论