Skip to content

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

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

parents 8c6ef539 55446b7b
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 7 deletions
application/library/Our/ApiConst.php
View file @ aa270d82
...@@ -20,6 +20,8 @@ class ApiConst ...@@ -20,6 +20,8 @@ class ApiConst
//一个小时 //一个小时
const oneHour = 3600; const oneHour = 3600;
const twoMinSecond = 120;
const fiveMinutes=180; const fiveMinutes=180;
//10分钟秒数 //10分钟秒数
const tenMinSecond = 600; const tenMinSecond = 600;
......
application/models/Business/Store/ShopkeeperService.php
View file @ aa270d82
...@@ -683,6 +683,9 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -683,6 +683,9 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$storeMemberStatisticData = $refundReturnDao->getMemberStoreStaticsByGmtUpdate($gmtUpdate, $this->taskIndex, $this->taskSize); $storeMemberStatisticData = $refundReturnDao->getMemberStoreStaticsByGmtUpdate($gmtUpdate, $this->taskIndex, $this->taskSize);
$storeMemberStatisticData = isset($storeMemberStatisticData['list']) ? $storeMemberStatisticData['list'] : false; $storeMemberStatisticData = isset($storeMemberStatisticData['list']) ? $storeMemberStatisticData['list'] : false;
if(!empty($storeMemberStatisticData)){ if(!empty($storeMemberStatisticData)){
foreach($storeMemberStatisticData as $item){
$orderDao->deleteOrderCache($item['buyerId'],$item['orderId'],$item['storeId'],true,true);
}
$orderIds=array_column($storeMemberStatisticData,'orderId'); $orderIds=array_column($storeMemberStatisticData,'orderId');
foreach($orderIds as $orderId){ foreach($orderIds as $orderId){
$res=$orderGoodsDao->find(array('order_id'=>$orderId,'refund_id'=>ApiConst::zero)); $res=$orderGoodsDao->find(array('order_id'=>$orderId,'refund_id'=>ApiConst::zero));
......
application/models/Business/User/FootprintService.php 100755 → 100644
View file @ aa270d82
...@@ -26,7 +26,7 @@ class FootprintServiceModel extends \Business\AbstractModel ...@@ -26,7 +26,7 @@ class FootprintServiceModel extends \Business\AbstractModel
$startTime = mktime(0,0,0,$month-2,1,$year); $startTime = mktime(0,0,0,$month-2,1,$year);
$endTime = mktime(0,0,-1,$month+1,1,$year); $endTime = mktime(0,0,-1,$month+1,1,$year);
$browseDAO = \DAO\GoodsBrowseModel::getInstance(); $browseDAO = \DAO\GoodsBrowseModel::getInstance();
$list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getDistinctDate'),array($memberId,$startTime,$endTime,$order),\Our\ApiConst::tenMinSecond,array($memberId)); $list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getDistinctDate'),array($memberId,$startTime,$endTime,$order),\Our\ApiConst::twoMinSecond,array($memberId));
$date = []; $date = [];
if($list){ if($list){
$date = array_column($list,'browsedate'); $date = array_column($list,'browsedate');
......
application/views/index/goodsdetail.phtml
View file @ aa270d82
...@@ -9,12 +9,13 @@ ...@@ -9,12 +9,13 @@
<body> <body>
<div> <div>
<?php <?php
$str = $commonInfo['goods_youku_url']; $str = \Our\Common::is_https() ? str_replace('http://','https://',$commonInfo['goods_youku_url']) : $commonInfo['goods_youku_url'];
if($str) { if($str) {
preg_match('/<iframe((?!src).)*src[\s]*=[\s]*[\'"](?<src>[^\'"]*)[\'"]/i',$str,$match); // preg_match('/iframe((?!src).)*src[\s]*=[\s]*[\'"](?<src>[^\'"]*)[\'"]/i',$str,$match);
if($match) { // if($match) {
echo "<iframe height=auto width=100% src='{$match['src']}' frameborder=0 'allowfullscreen'></iframe>"; // echo "<iframe height=auto width=100% src='{$match['src']}' frameborder=0 'allowfullscreen'></iframe>";
} // }
echo htmlspecialchars_decode($str);
} }
?> ?>
<?php echo $commonInfo['goods_body']; ?> <?php echo $commonInfo['goods_body']; ?>
...@@ -31,4 +32,9 @@ ...@@ -31,4 +32,9 @@
height:auto; height:auto;
} }
</style> </style>
<script>
window.onload=function (){
document.getElementsByTagName("iframe")[0].style.width=document.body.clientWidth+'px';
document.getElementsByTagName("iframe")[0].style.height=(document.body.clientWidth*480/510)+'px';
}
</script>
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