Skip to content

T
techbook
Commit c511b82e authored by anxixi's avatar anxixi
Browse files
Options

Merge remote-tracking branch 'origin/dev13.0.1' into dev13.0.1

parents 66cb1e14 58b2cc60
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/App.vue
View file @ c511b82e
......@@ -42,7 +42,7 @@
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);`
document.getElementsByTagName('head')[0].appendChild(script)
if (document.body.clientWidth <= 1000) {
if (document.body.clientWidth <= 1000||(this.publicFun.judgeBrandIsWechatOrHtml() == 1&&(/miniProgram/i.test(userAgent)))) {
document.getElementsByTagName("html")[0].style.height = "100%";
document.getElementsByTagName("body")[0].style.height = "100%";
document.getElementsByTagName("html")[0].style.overflow = "hidden";
......
src/main.js
View file @ c511b82e
......@@ -22,7 +22,7 @@ Vue.use(vuePreview, {
tapToClose: true,
tapToToggleControls: false
})
var u = navigator.userAgent, ucFlag = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
var u = navigator.userAgent, ucFlag = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 || /miniProgram/i.test(navigator.userAgent);
let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i);
// 手机
// if(window.innerWidth>=1000){
......@@ -36,7 +36,7 @@ let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Androi
// document.getElementsByTagName("html")[0].style.minWidth = "1400px";
// document.getElementsByTagName("body")[0].style.minWidth = "1400px";
// }
if (publicFun.judgeBrandIsWechatOrHtml() == 1) {
if (publicFun.judgeBrandIsWechatOrHtml() == 1&&(!/miniProgram/i.test(navigator.userAgent))) {
require('../public/css/pc.scss');
document.getElementsByTagName("html")[0].style.minWidth = "1200px";
document.getElementsByTagName("body")[0].style.minWidth = "1200px";
......
src/views/error/notFind.vue
View file @ c511b82e
......@@ -17,7 +17,8 @@
name: "notFind",
data(){
return {
isMobile: (navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1 || navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i || /miniProgram/i.test(navigator.userAgent)) && document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) ? 1 : 0,
isMobile: (navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1 || navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i) && document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) || /miniProgram/i.test(navigator.userAgent) ? 1 : 0,
}
},
mounted(){
......
src/views/error/notServer.vue
View file @ c511b82e
......@@ -16,7 +16,7 @@
name: "notServer",
data(){
return {
isMobile: (navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1 || navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i || /miniProgram/i.test(navigator.userAgent)) && document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) ? 1 : 0,
isMobile:(navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i)&&document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000))|| /miniProgram/i.test(navigator.userAgent) ? 1 : 0,
}
},
mounted(){
......
src/views/error/notServerPhone.vue
View file @ c511b82e
......@@ -16,7 +16,7 @@
name: "notServer",
data(){
return {
isMobile: (navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1 || navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i || /miniProgram/i.test(navigator.userAgent)) && document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) ? 1 : 0,
isMobile:(navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i)&&document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) || /miniProgram/i.test(navigator.userAgent) ? 1 : 0,
}
},
mounted(){
......
src/views/mobile/article/articlelist.vue
View file @ c511b82e
......@@ -14,8 +14,7 @@
name: "articlelist",
data() {
return {
// isMobile:(navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType|AppleWebKit)/i)||document.body.clientWidth<1000)?1:0
isMobile:(navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i || /miniProgram/i.test(navigator.userAgent))&&document.body.clientWidth<1000||(navigator.userAgent.match(/AppleWebKit/i)&&document.body.clientWidth<1000))?1:0,
isMobile:(navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i)&&document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) || /miniProgram/i.test(navigator.userAgent) ? 1 : 0,
}
......
src/views/mobile/logined.vue
View file @ c511b82e
......@@ -60,7 +60,7 @@
return {
visible: true,
isMargin: false,
isMobile: (navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1 || navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i || /miniProgram/i.test(navigator.userAgent)) && document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) ? 1 : 0,
isMobile:(navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i)&&document.body.clientWidth < 1000 || (navigator.userAgent.match(/AppleWebKit/i) && document.body.clientWidth < 1000)) || /miniProgram/i.test(navigator.userAgent) ? 1 : 0,
islogindata: true,
isInit: true,
isShow: false,
......
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