Commit df7a59db by zhangheng

2

parent 279091fe
......@@ -269,7 +269,7 @@
<script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=17"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=18"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
......@@ -367,19 +367,19 @@ function mergeImage_two(url) {
var cover_four = new Image();
var ceshi=new Image();;
var url_three = '/Public/static/images/s-c.jpg?t=1';
var url_three = '/Public/static/images/ceshi.jpg?t=1';
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
if(isAndroid){
ceshi.src='/Public/static/images/s-c.jpg?t=1';
ceshi.src='/Public/static/images/ceshi.jpg?t=1';
alert('安卓')
}else {
ceshi.src= url;
alert('IOS')
}
ceshi.onload = function () {
cover_four.onload = function () {
// cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
......
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 sign in to comment