diff --git a/application/plugins/view/petscms/pets/detail.html b/application/plugins/view/petscms/pets/detail.html index f9021a673..b8b781b60 100644 --- a/application/plugins/view/petscms/pets/detail.html +++ b/application/plugins/view/petscms/pets/detail.html @@ -146,8 +146,7 @@
-
- +
@@ -254,7 +253,7 @@ {{include file="public/footer" /}} -{{if isset($data['user_id']) and $data['user_id'] gt 0}} +{{if !empty($data['lose_lng']) and !empty($data['lose_lat']) and $data['lose_lng'] gt 0 and $data['lose_lat'] gt 0 and isset($data['status']) and $data['status'] eq 1}} @@ -262,7 +261,7 @@ $(function() { // 丢失地址-地图展示 - {{if !empty($data['lose_lng']) and !empty($data['lose_lat'])}} + {{if $data['lose_lng'] gt 0 and $data['lose_lat'] gt 0}} var map = new BMap.Map("map-view", {enableMapClick:false}); var level = $('#map-view').data('level') || 16; var point = new BMap.Point({{$data['lose_lng']}},{{$data['lose_lat']}}); diff --git a/application/plugins/view/share/index/content.html b/application/plugins/view/share/index/content.html index 5e928d839..f94e2bf7e 100755 --- a/application/plugins/view/share/index/content.html +++ b/application/plugins/view/share/index/content.html @@ -1,24 +1,27 @@ -
- + +
+
+
    + + + + + +
+
- +
@@ -32,13 +35,13 @@
- -
- + +
+
- -
+ +
× diff --git a/application/plugins/view/share/index/share.html b/application/plugins/view/share/index/share.html new file mode 100644 index 000000000..8f686ef49 --- /dev/null +++ b/application/plugins/view/share/index/share.html @@ -0,0 +1,20 @@ + +
+
    + + + + + +
+
\ No newline at end of file diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 628352db2..a73d2f049 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -1150,17 +1150,28 @@ function UrlFieldReplace(field, value, url) */ function MobileBrowserEnvironment() { + // 浏览器标识 var ua = navigator.userAgent.toLowerCase(); + + // 微信 if(ua.match(/MicroMessenger/i) == 'micromessenger') { return 'weixin'; } + // 新浪微博 if(ua.match(/WeiBo/i) == 'weibo') { return 'weibo'; } + // QQ空间 + if(ua.match(/qzone/i) == 'qzone') + { + return 'qzone'; + } + + // QQ if(ua.match(/QQ/i) == 'qq') { return 'qq'; diff --git a/public/static/plugins/css/petscms/pets.detail.css b/public/static/plugins/css/petscms/pets.detail.css index 9509ed1c2..fbde3d3bf 100644 --- a/public/static/plugins/css/petscms/pets.detail.css +++ b/public/static/plugins/css/petscms/pets.detail.css @@ -270,10 +270,18 @@ form.form-validation #map { .base-share-mobile { background: #9bddff; } - .base-share-mobile a { - padding-left: 0 !important; - width: 24px !important; - margin: 6px calc(12.5% - 32px) !important; + .base-share-mobile .plugins-share ul { + padding: 5px; + } + .base-share-mobile .plugins-share ul li { + width: 25px; + height: 25px; + line-height: 25px; + margin-right: calc(10% - 12.5px); + margin-left: calc(10% - 12.5px); + } + .base-share-mobile .plugins-share ul li .iconfont { + font-size: 16px; } .am-footer { padding-bottom: 35px; diff --git a/public/static/plugins/css/share/style.css b/public/static/plugins/css/share/style.css index a0090f427..818534260 100644 --- a/public/static/plugins/css/share/style.css +++ b/public/static/plugins/css/share/style.css @@ -1,12 +1,10 @@ /** * 分享 */ -.plugins-share { - +.plugins-share-container, #plugins-share-layer { + display: none; } .plugins-share ul { - padding: 10px; - background: #333; overflow: hidden; } .plugins-share ul li { @@ -44,12 +42,16 @@ /** - * 微信 + * 微信二维码 */ #plugins-share-weixin-modal .weixin-qrcode { margin-top: 10px; } -#plugins-share-weixin-layer { + +/** + * 弹层 + */ +#plugins-share-layer { position: fixed; top: 0; left: 0; @@ -58,15 +60,14 @@ background: rgba(0, 0, 0, 0.6); z-index: 10000; text-align: center; - display: none; } -#plugins-share-weixin-layer img { +#plugins-share-layer img { max-width: 90%; } /** - * url + * 复制 */ -#plugins-share-url-modal .am-input-group { +#plugins-share-copy-modal .am-input-group { margin-top: 10px; } \ No newline at end of file diff --git a/public/static/plugins/images/share/weixin-layer.png b/public/static/plugins/images/share/share-layer.png similarity index 100% rename from public/static/plugins/images/share/weixin-layer.png rename to public/static/plugins/images/share/share-layer.png diff --git a/public/static/plugins/js/share/style.js b/public/static/plugins/js/share/style.js index 10c00e23e..eea241ad0 100644 --- a/public/static/plugins/js/share/style.js +++ b/public/static/plugins/js/share/style.js @@ -27,31 +27,47 @@ $(function() // 平台地址 var platform_url = null; + + // 当前环境 + var env = MobileBrowserEnvironment(); + + // 关闭弹层 + $('#plugins-share-layer').hide(); + + // 根据分享类型处理 switch(type) { // QQ case 'qq' : - platform_url = 'https://connect.qq.com/widget/shareqq/index.html?url='+url+'&utm_medium=qqim&title='+title+'&desc='+desc+'&pics='+pic+'&site='+site + if(env == 'qq' || env == 'weixin' || env == 'qzone' || env == 'weibo') + { + $('#plugins-share-layer').show(); + } else { + platform_url = 'https://connect.qq.com/widget/shareqq/index.html?url='+url+'&utm_medium=qqim&title='+title+'&desc='+desc+'&pics='+pic+'&site='+site + } break; // QQ空间 case 'qq-space' : - platform_url = 'http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url='+url+'&utm_medium=qzone&title='+title+'&desc='+desc+'&pics='+pic+'&summary='+desc+'&site='+site; + if(env == 'qq' || env == 'weibo') + { + $('#plugins-share-layer').show(); + } else { + platform_url = 'http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url='+url+'&utm_medium=qzone&title='+title+'&desc='+desc+'&pics='+pic+'&summary='+desc+'&site='+site; + } break; - // 新浪 + // 新浪微博 case 'sian' : platform_url = 'http://service.weibo.com/share/share.php?url='+url+'&utm_medium=sian&title='+title+'&desc='+desc+'&pics='+pic+'&site='+site; break; // 微信 case 'weixin' : - // 是否微信环境中 - if(MobileBrowserEnvironment() == 'weixin') + if(env == 'qq' || env == 'weixin' || env == 'qzone' || env == 'weibo') { - $('#plugins-share-weixin-layer').show(); + $('#plugins-share-layer').show(); } else { - $('#plugins-share-weixin-layer').hide(); var $modal = $('#plugins-share-weixin-modal'); $modal.find('.weixin-qrcode').empty().qrcode({ text: decodeURIComponent(url), @@ -65,7 +81,7 @@ $(function() // url case 'url' : - var $modal = $('#plugins-share-url-modal'); + var $modal = $('#plugins-share-copy-modal'); $modal.find('.am-input-group input').val(decodeURIComponent(url)); $modal.modal({width: 300}); $modal.modal('open'); @@ -80,11 +96,11 @@ $(function() }); // url复制 - var clipboard = new ClipboardJS('#plugins-share-url-modal .am-input-group button.am-btn', + var clipboard = new ClipboardJS('#plugins-share-copy-modal .am-input-group button.am-btn', { text: function() { - return $('#plugins-share-url-modal .am-input-group input').val(); + return $('#plugins-share-copy-modal .am-input-group input').val(); } }); clipboard.on('success', function(e) @@ -96,9 +112,21 @@ $(function() Prompt('复制失败，请手动复制！'); }); - // 微信分享提示弹层关闭 - $('#plugins-share-weixin-layer').on('click', function() + // 分享提示弹层关闭 + $('#plugins-share-layer').on('click', function() { - $('#plugins-share-weixin-layer').hide(); + $('#plugins-share-layer').hide(); }); + + + // 初始化 + if($('.plugins-share-container').length > 0) + { + // 标签初始化 + if($('.plugins-share-view').length > 0) + { + $('.plugins-share-view').html($('.plugins-share-container').html()); + } + } + }); \ No newline at end of file