Commit 9c38d07c authored by 郝聪敏's avatar 郝聪敏

fix: 升级组件库;修改部分bug;

parent 2eb69578
...@@ -166,13 +166,13 @@ body, ...@@ -166,13 +166,13 @@ body,
box-sizing: content-box; box-sizing: content-box;
} }
@media screen and (min-width: 768Px) { @media screen and (min-width: 769Px) {
html { html {
font-size: 37.5Px !important; font-size: 37.5Px !important;
} }
body { body {
max-width: 375Px; max-width: 375Px;
max-height: 667Px; /*max-height: 667Px;*/
margin: 0 auto !important; margin: 0 auto !important;
} }
} }
...@@ -60,11 +60,12 @@ export default class Activity extends Mixins(TransformStyleMixin) { ...@@ -60,11 +60,12 @@ export default class Activity extends Mixins(TransformStyleMixin) {
} }
modifyPoints() { modifyPoints() {
const clientWidth = document.documentElement.clientWidth > 768 ? 375 : document.documentElement.clientWidth;
const elements = this.pageData?.elements?.map(v => { const elements = this.pageData?.elements?.map(v => {
const point = { const point = {
...v.point, ...v.point,
h: v.point.h * this.rowHeight * document.documentElement.clientWidth / 375, h: v.point.h * this.rowHeight * clientWidth / 375,
w: document.documentElement.clientWidth w: clientWidth
}; };
return { ...v, point }; return { ...v, point };
}); });
......
...@@ -67,11 +67,10 @@ instance.interceptors.request.use( ...@@ -67,11 +67,10 @@ instance.interceptors.request.use(
config => { config => {
!config.hideLoading && beforeRequest(config?.url || ''); !config.hideLoading && beforeRequest(config?.url || '');
// 发起请求时,取消掉当前正在进行的相同请求 // 发起请求时,取消掉当前正在进行的相同请求
// 发起请求时,取消掉当前正在进行的相同请求 // if (pending[config.url]) {
if (pending[config.url]) { // pending[config.url]('取消重复请求');
pending[config.url]('取消重复请求'); // }
} // config.cancelToken = new CancelToken(c => (pending[config.url] = c));
config.cancelToken = new CancelToken(c => (pending[config.url] = c));
// 使用默认响应处理策略 // 使用默认响应处理策略
if (!config.strategy) { if (!config.strategy) {
config.strategy = 'service'; config.strategy = 'service';
......
...@@ -12,15 +12,20 @@ export default { ...@@ -12,15 +12,20 @@ export default {
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// 所有自定义路由字段在此处理 // 所有自定义路由字段在此处理
const { meta } = to; const { meta } = to;
// meta?.has?.header && store.commit('CHANGE_HEADER', meta.has.header); // 改变header // meta?.has?.header && store.commit('CHANGE_HEADER', meta.has.header); // 改变header
localStorageParams.forEach(item => { localStorageParams.forEach(item => {
if (to.query[item]) { if (to.query[item]) {
localStorage.set(item, to.query[item]); localStorage.set(item, to.query[item]);
} else {
localStorage.remove(item);
} }
}); });
cookiesParams.forEach(item => { cookiesParams.forEach(item => {
if (to.query[item]) { if (to.query[item]) {
Cookies.set(item, to.query[item]); Cookies.set(item, to.query[item]);
} else {
Cookies.remove(item);
} }
}); });
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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