Commit 2ae90fb9 by crushh

update: dist

parent 6b5526d9
......@@ -76,6 +76,12 @@ Vue.axios.interceptors.request.use(
Vue.axios.interceptors.response.use(
data => {
removePending(data.config); //在一个ajax响应后再执行一下取消操作,把已经完成的请求从pending中移除
if (data.data.hasOwnProperty('errorCode') && data.data.errorCode != 1) {
Message.error({ message: `${data.data.message}` });
}
if (data.data.hasOwnProperty('code') && data.data.code != 0) {
Message.error({ message: `${data.data.message}` });
}
if (data.status && data.status == 200 && data.data.errorCode != 1 && data.data.code != 0) {
if (data.data.errorCode == 4) {
if (window.location.href.indexOf('gic-error') != -1) {
......@@ -88,6 +94,7 @@ Vue.axios.interceptors.response.use(
}
return data;
}
return data;
},
err => {
......
......@@ -82,17 +82,17 @@ export default {
}
.content {
width: 228px;
height: 410px;
height: 437px;
box-sizing: border-box;
padding: 20px 16px;
position: absolute;
top: 97px;
top: 70px;
left: 26px;
background: #ffffff;
display: flex;
align-items: center;
flex-direction: column;
border-radius: 10px 10px 24px 24px;
border-radius: 0 0 24px 24px;
.bgImg {
position: absolute;
width: 228px;
......
......@@ -45,7 +45,7 @@
<el-descriptions-item label="商户名称">{{ page.merchantName }}</el-descriptions-item>
<el-descriptions-item label="商户电话">{{ page.merchantPhoneNumber }}</el-descriptions-item>
<el-descriptions-item label="商户LOGO">
<img :src="page.merchantLogo" class="merchantLogo" />
<img :src="page.merchantLogo" class="merchantLogo" v-if="page.merchantLogo" />
</el-descriptions-item>
<el-descriptions-item label="引导语">{{ page.guideComment }}</el-descriptions-item>
</el-descriptions>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment