Skip to content

M
my-yaf-project
Commit 41c89d41 authored by lingqingmei's avatar lingqingmei
Browse files
Options

Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

parents fcc6baca 8d9efbc0
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
application/models/Business/User/ShareService.php
View file @ 41c89d41
...@@ -223,6 +223,7 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -223,6 +223,7 @@ class ShareServiceModel extends \Business\AbstractModel
$params=$key.PathConst::cutVertical.TIMESTAMP; $params=$key.PathConst::cutVertical.TIMESTAMP;
$params=base64_encode($params); $params=base64_encode($params);
$convertUrl=$converSource.PathConst::params.'key='.$params; $convertUrl=$converSource.PathConst::params.'key='.$params;
echo $convertUrl;exit;
$savePath=\Our\PathConst::shareSavePath; $savePath=\Our\PathConst::shareSavePath;
$saveImageName=ImageUtil::getFileName().\Our\NameConst::jpgSuffix; $saveImageName=ImageUtil::getFileName().\Our\NameConst::jpgSuffix;
$saveFile=$savePath.$saveImageName; $saveFile=$savePath.$saveImageName;
......
application/views/index/goods.phtml
View file @ 41c89d41
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
<title></title> <title></title>
<style type="text/css"> <style type="text/css">
html,body,p,span,div,img{margin:0;padding:0;}body{width:750px;} html,body,p,span,div,img{margin:0;padding:0;}body{width:750px;}
.shareC { width:750px;padding:0; text-align:center;font-family:"黑体";color:#212121;} .shareC {width:750px;padding:0;text-align:center;font-family: "Microsoft Yahei";color:#212121;}
.avatar{padding:55px 55px 20px 55px;} .avatar{padding: 35px 55px 20px 55px;}
#headerBg{width:600px; height:500px;} #headerBg{width:600px; height:500px;}
#title{font-size:34px; } #title{font-size:34px; }
#title{ font-size:28px; line-height:36px; padding:0 110px 0 110px; height:72px;display:block; display:-webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;} #title{font-size: 40px;line-height: 1.5;padding:0 110px 0 110px;/* height:72px; */display:block;display:-webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
.price{color:#ff8519;font-size:46px;} .price{color:#ff8519;font-size: 40px;margin-top: 20px;}
.price #price{font-size:34px; text-decoration:line-through;} .price #price{font-size: 30px;text-decoration:line-through;}
.qrcode{background:url(/data/img/flower.png); height:488px; margin:6px auto 0 auto;} .qrcode{background:url(/data/img/flower.png);height: 388px;margin: 40px auto 0 auto;padding-top: 100px;}
#qrImg {margin-top:80px;} #qrImg {margin-top:80px;}
#qrcodeImg img { margin: 0 auto;} #qrcodeImg img { margin: 0 auto;}
.footer{ font-size:30px; height:66px; line-height:66px; padding:0 0 55px 0;} .footer{font-size:30px;height:66px;line-height:66px;padding: 20px 0 55px 0;}
.footer img{vertical-align:bottom; display:inline-block;} .footer img{vertical-align:bottom; display:inline-block;}
</style> </style>
</head> </head>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<span id="price"></span> <span id="price"></span>
</div> </div>
<div class="qrcode" id="qrcode"> <div class="qrcode" id="qrcode">
<img id="qrImg" width="250" height="250" src="" /> <!-- <img id="qrImg" width="250" height="250" src="" />-->
<div id="qrcodeImg"></div> <div id="qrcodeImg"></div>
<p id="tip"></p> <p id="tip"></p>
</div> </div>
......
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