Skip to content

M
my-yaf-project
Commit 1e855756 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

parents 2f0aef0b 5004f5d3
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 24 deletions
application/controllers/Index.php
View file @ 1e855756
...@@ -38,27 +38,30 @@ class IndexController extends \Our\Controller_Abstract { ...@@ -38,27 +38,30 @@ class IndexController extends \Our\Controller_Abstract {
$this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance(); $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
$paramsStr= $this->memberDb0Redis->tablelpop($this->key); $paramsStr= $this->memberDb0Redis->tablelpop($this->key);
// $paramsStr='{ if($_GET['debug']==1){
// "desc": "最优质的产品，最实惠的价格，最好的服务质量，欢迎选购", $paramsStr='{
//"deviceWidth": "828", "desc": "最优质的产品，最实惠的价格，最好的服务质量，欢迎选购",
//"id": "1050000", "deviceWidth": "828",
//"imgUrl": "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/store/05960231407828374.jpg?x-oss-process=image/resize,m_fill,h_186,w_186", "id": "1050000",
//"key": "bda203557fcc08150fc997360d432bfa", "imgUrl": "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/store/05960231407828374.jpg?x-oss-process=image/resize,m_fill,h_186,w_186",
//"shareType": "1", "key": "bda203557fcc08150fc997360d432bfa",
//"storeName": "LQ日化用品", "shareType": "1",
//"timestamp": "1543913056", "storeName": "LQ日化用品",
//"type": "2", "timestamp": "1543913056",
//"driverType": 2, "type": "4",
//"qrCode": "http://share.shenbd.com/share.html?type=store&id=1050000", "driverType": 2,
//"address": "鑫雄盛快捷酒店仓山紫番林幼儿园", "qrCode": "https://img.shenbd.com/mall/salesman_qr/170.png",
//"storeWorkingtime": "", "address": "鑫雄盛快捷酒店仓山紫番林幼儿园",
//"buyerDistribution": 1, "storeWorkingtime": "",
//"sellerDistribution": 1, "buyerDistribution": 1,
//"startShippingPrice": 2000, "sellerDistribution": 1,
//"freeShippingPrice": 0, "startShippingPrice": 2000,
//"storeStartTime": "09:00", "freeShippingPrice": 0,
//"storeCloseTime": "23:00" "storeStartTime": "09:00",
//}'; "storeCloseTime": "23:00"
}';
}
$paramsStr=json_decode($paramsStr,true); $paramsStr=json_decode($paramsStr,true);
if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){ if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){
$begin=strtotime($paramsStr['storeStartTime']); $begin=strtotime($paramsStr['storeStartTime']);
......
application/views/index/saleShare.phtml
View file @ 1e855756
...@@ -96,7 +96,8 @@ ...@@ -96,7 +96,8 @@
.pn-share { padding: 20px 4% 0; } .pn-share { padding: 20px 4% 0; }
.pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; } .pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; }
.pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-130px; margin-top:-130px; } .pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-125px; margin-top:-125px; width:250px; height:250px;
display: block;}
.pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; } .pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; }
.pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; } .pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; }
.pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; } .pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; }
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
<div class="code-box"> <div class="code-box">
<img src="/data/images/bg-code2.jpg" alt=""> <img src="/data/images/bg-code2.jpg" alt="">
<div id="qrcodeImg" class="code-in" > <div id="qrcodeImg" class="code-in" >
<img id="qrcodeImg" src="<?php echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_250,w_250";?>" alt=""> <img id="qrcodeImg" src="<?php echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_250,w_250";?>" alt="" width="250" height="250">
</div> </div>
<p class="code-txt">长按图片识别二维码</p> <p class="code-txt">长按图片识别二维码</p>
</div> </div>
......
application/views/index/store.phtml
View file @ 1e855756
...@@ -96,7 +96,9 @@ ...@@ -96,7 +96,9 @@
.pn-share { padding: 20px 4% 0; } .pn-share { padding: 20px 4% 0; }
.pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; } .pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; }
.pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-130px; margin-top:-130px; }
.pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-125px; margin-top:-125px; width:250px; height:250px;
display: block;}
.pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; } .pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; }
.pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; } .pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; }
.pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; } .pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; }
......
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