diff --git a/application/plugins/view/share/index/content.html b/application/plugins/view/share/index/content.html index d7430a25fdd9e802eb6af4a2f90c3c71d387500e..5e928d839be18c2b1587749c5a5bf2954030d993 100755 --- a/application/plugins/view/share/index/content.html +++ b/application/plugins/view/share/index/content.html @@ -32,6 +32,11 @@ + +
+ +
+
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index e6d4ec82726b0fa0ea41b290b9cb03b186374eb5..628352db2a627978064978e28100d25507e8e0cb 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -1141,14 +1141,14 @@ function UrlFieldReplace(field, value, url) } /** - * 当前环境 + * 当前手机浏览器环境 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 * @datetime 2019-04-20T19:48:59+0800 * @return {string} [weixin,weibo,qq] */ -function IsEnvironment() +function MobileBrowserEnvironment() { var ua = navigator.userAgent.toLowerCase(); if(ua.match(/MicroMessenger/i) == 'micromessenger') @@ -1168,13 +1168,6 @@ function IsEnvironment() return null; } -function IsWeixinss() -{ - var ua = navigator.userAgent.toLowerCase(); - return (ua.match(/MicroMessenger/i) == "micromessenger"); -} - - // 公共数据操作 $(function() { diff --git a/public/static/plugins/css/share/style.css b/public/static/plugins/css/share/style.css index a0a7fa42cf55e28060db4614e891cd8f1a5930d1..a0090f427c963867f060006e468dc67d0f504056 100644 --- a/public/static/plugins/css/share/style.css +++ b/public/static/plugins/css/share/style.css @@ -49,6 +49,20 @@ #plugins-share-weixin-modal .weixin-qrcode { margin-top: 10px; } +#plugins-share-weixin-layer { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.6); + z-index: 10000; + text-align: center; + display: none; +} +#plugins-share-weixin-layer img { + max-width: 90%; +} /** * url diff --git a/public/static/plugins/images/share/weixin-layer.png b/public/static/plugins/images/share/weixin-layer.png new file mode 100644 index 0000000000000000000000000000000000000000..38c22789c369358b6eaf7fbed04134fa56e2ccdb Binary files /dev/null and b/public/static/plugins/images/share/weixin-layer.png differ diff --git a/public/static/plugins/js/share/style.js b/public/static/plugins/js/share/style.js index 9922a9a2ffd74c59a44a632dbf033a08e2423971..9157638ec2f8a81d73de06673ab69c1100d5a0bc 100644 --- a/public/static/plugins/js/share/style.js +++ b/public/static/plugins/js/share/style.js @@ -47,11 +47,11 @@ $(function() // 微信 case 'weixin' : // 是否微信环境中 - alert(IsEnvironment()) - if(IsEnvironment() == 'weixin') + if(MobileBrowserEnvironment() == 'weixin') { - + $('#plugins-share-weixin-layer').show(); } else { + $('#plugins-share-weixin-layer').hide(); var $modal = $('#plugins-share-weixin-modal'); $modal.find('.weixin-qrcode').empty().qrcode({ text: decodeURIComponent(url),