Commit 60cd3a48 authored by zhoujun's avatar zhoujun

Merge branch 'test'

parents c879429c 83faac0e
This diff is collapsed.
This diff is collapsed.
......@@ -568,30 +568,44 @@ textarea {
font-size: 0.32rem;
color: #5f1a11;
}
.dialog-img {
.dialog-img,
.share-img {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: scroll;
background: rgba(0, 0, 0, 0.7) url("../images/save_img_bg.png") no-repeat center;
background-size: 100% auto;
background: rgba(0, 0, 0, 0.7);
}
.dialog-img .dialog-img-content {
.dialog-img .dialog-img-content,
.share-img .dialog-img-content {
position: absolute;
width: 90%;
left: 5%;
top: 1rem;
left: 50%;
top: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
padding-top: 2.5rem;
}
.dialog-img .dialog-img-content .img-scroll {
height: 13.5rem;
background: url("../images/save_img_bg.png") no-repeat center;
background-size: 100% auto;
}
.dialog-img .dialog-img-content .img-scroll,
.share-img .dialog-img-content .img-scroll {
height: 12rem;
overflow: scroll;
width: 85%;
margin: 0 auto;
}
.dialog-img .dialog-img-content img,
.share-img .dialog-img-content img {
width: 100%;
}
.dialog-img .dialog-img-content img {
.share-img img {
width: 100%;
display: block;
margin: 0 auto;
}
.fixed {
position: fixed;
......
......@@ -526,31 +526,42 @@
}
}
}
.dialog-img{
.dialog-img,.share-img{
.pf();
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: scroll;
background: rgba(0,0,0,.7) url("../images/save_img_bg.png") no-repeat center;
background-size: 100% auto;
background: rgba(0,0,0,.7);
.dialog-img-content{
.pa();
width: 90%;
left: 5%;
top: 1rem;
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
padding-top: 2.5rem;
.img-scroll{
height: 13.5rem;
background:url("../images/save_img_bg.png") no-repeat center;
background-size: 100% auto;
.img-scroll{
height: 12rem;
overflow: scroll;
width: 100%;
width: 85%;
margin:0 auto;
}
img{
width: 100%;
}
}
}
.share-img{
img{
width: 100%;
display: block;
margin: 0 auto;
}
}
.fixed{
.pf();
left: 0;
......
This diff is collapsed.
......@@ -19,15 +19,15 @@
reSizeRem();
}
</script>
<link rel="stylesheet" href="/static/postcard/css/style.css">
<script src="/static/js/jquery.2.1.3.min.js"></script>
<script src="/static/postcard/js/main.js"></script>
<link rel="stylesheet" href="{{ asset('postcard/css/style.css') }}">
<script src="{{ asset('js/jquery.2.1.3.min.js') }}"></script>
<script src="{{ asset('postcard/js/main.js') }}"></script>
</head>
<body>
<div class="container home-container">
<div class="header-avatar">
<span></span>
<img src="/static/postcard/images/default_img.png" alt="">
<img src="{{ asset('postcard/images/default_img.png') }}" alt="">
</div>
<a href="javascript:" class="btn-start"></a>
......@@ -48,6 +48,7 @@
</div>
</div>
</div>
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
<script>
$(function(){
$('.close').click(function (){
......@@ -56,6 +57,52 @@
$('.btn-start').click(function (){
card.handleGetServer();
});
$.ajax({
url : "/wx/config",
data : {
url:location.href.split('#')[0]
},
type:'GET',
dataType : "json",
async: false,
timeout : 5000,
error : function(XMLHttpRequest, textStatus, errorThrown) {
if (textStatus == "timeout") { // 请求超时
} else {
}
},
success : function(res) {
var data = res.data;
wx.config({
debug : true,
appId : data.appId,
timestamp : data.timestamp,
nonceStr : data.nonceStr,
signature : data.signature,
url:location.href.split('#')[0],
jsApiList : [ 'onMenuShareAppMessage', 'onMenuShareTimeline' ]
});
wx.ready(function () {
wx.onMenuShareAppMessage({
title: '阿拉德之怒', // 分享标题
desc: '阿拉德之怒', // 分享描述
link: 'http://uc-signin2.srccwl.com', // 分享链接,该链接域名或路径必须与当前页面对应// 分享图标的公众号JS安全域名一致
imgUrl: 'https://static-platform.srccwl.com/ucSign/ald/sign/images/wx.png',
});
});
}
});
$('.btn-share').click(function(){
wx.ready(function () {
wx.onMenuShareAppMessage({
title: '阿拉德之怒', // 分享标题
desc: '阿拉德之怒', // 分享描述
link: 'http://uc-signin2.srccwl.com', // 分享链接,该链接域名或路径必须与当前页面对应// 分享图标的公众号JS安全域名一致
imgUrl: 'https://static-platform.srccwl.com/ucSign/ald/sign/images/wx.png',
});
});
})
})
</script>
</body>
......
......@@ -10,7 +10,7 @@
@else
<div class="container container-mb" style="padding-top: 1.2rem">
<div class="mb-header">
<a href="/wx/index" class="back"></a>
<a href="/" class="back"></a>
<span>橙橙网络</span>
</div>
<div class="dialog-orange">
......
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