提交 eb6cc9a5 authored 作者: huaxinzhu's avatar huaxinzhu

Merge branch 'mobile_and_pc_master_1021' into test

...@@ -415,9 +415,6 @@ ...@@ -415,9 +415,6 @@
// htmlNode.style.fontSize = 32 + 'px' // htmlNode.style.fontSize = 32 + 'px'
// } // }
htmlNode.style.fontSize = w / 750 * 50 * 2 + 'px' htmlNode.style.fontSize = w / 750 * 50 * 2 + 'px'
console.log("根html字体大小:", w, htmlNode.style.fontSize);
} else {
console.log("说明当前屏幕宽度大于960", w);
} }
})(); })();
...@@ -438,6 +435,7 @@ ...@@ -438,6 +435,7 @@
] ]
} }
}, },
watch: {},
data() { data() {
let _this = this; let _this = this;
return { return {
...@@ -634,13 +632,11 @@ ...@@ -634,13 +632,11 @@
let isPc = this.IsPc() let isPc = this.IsPc()
/** 动态获取 sso配置域名 */ /** 动态获取 sso配置域名 */
this.getssourl(); this.getssourl();
// console.log(111,isPc);
// console.log(222,navigator.userAgent); // console.log(222,navigator.userAgent);
}, },
mounted() { mounted() {
this.getIndexInfo() this.getIndexInfo()
window.addEventListener('scroll', this.handleScroll, true); window.addEventListener('scroll', this.handleScroll, true);
// console.log(333,window.devicePixelRatio);
}, },
destroyed() { destroyed() {
window.removeEventListener('scroll', this.handleScroll); window.removeEventListener('scroll', this.handleScroll);
...@@ -663,7 +659,6 @@ ...@@ -663,7 +659,6 @@
IsPc() { IsPc() {
let userAgent = navigator.userAgent let userAgent = navigator.userAgent
let Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"]; let Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
console.log('userAgent:', userAgent)
return Agents.some((i) => { return Agents.some((i) => {
return userAgent.includes(i) return userAgent.includes(i)
}) })
...@@ -1611,10 +1606,11 @@ ...@@ -1611,10 +1606,11 @@
.step-pic { .step-pic {
width: 0.9rem; width: 0.9rem;
height: 0.64rem; height: 0.64rem;
margin: 0.3rem auto; margin: 0.3rem auto 0.3rem;
} }
.step-pic > img { .step-pic > img {
display : block;
width: 100%; width: 100%;
height: 100%; height: 100%;
border: none; border: none;
...@@ -1623,7 +1619,7 @@ ...@@ -1623,7 +1619,7 @@
.step-title { .step-title {
text-align: center; text-align: center;
height: 0.3rem; height: 0.3rem;
line-height: 0.2rem; line-height: 0.3rem;
font-size: 0.3rem; font-size: 0.3rem;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
...@@ -1633,9 +1629,9 @@ ...@@ -1633,9 +1629,9 @@
.step-cont-text { .step-cont-text {
width: 80%; width: 80%;
font-size: 0.26rem; font-size: 0.26rem;
margin: 0.1rem auto 0; margin: 0.3rem auto 0;
text-align: center; text-align: center;
line-height: 0.36rem; line-height: 0.4rem;
} }
.doc-bg-con { .doc-bg-con {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论