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

application/controllers/Index.php

@@ -38,8 +38,36 @@ class IndexController extends \Our\Controller_Abstract  {
         $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
 
         $paramsStr= $this->memberDb0Redis->tablelpop($this->key);
+//        $paramsStr='{
+//        "desc": "最优质的产品，最实惠的价格，最好的服务质量，欢迎选购",
+//"deviceWidth": "828",
+//"id": "1050000",
+//"imgUrl": "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/store/05960231407828374.jpg?x-oss-process=image/resize,m_fill,h_186,w_186",
+//"key": "bda203557fcc08150fc997360d432bfa",
+//"shareType": "1",
+//"storeName": "LQ日化用品",
+//"timestamp": "1543913056",
+//"type": "2",
+//"driverType": 2,
+//"qrCode": "http://share.shenbd.com/share.html?type=store&id=1050000",
+//"address": "鑫雄盛快捷酒店仓山紫番林幼儿园",
+//"storeWorkingtime": "",
+//"buyerDistribution": 1,
+//"sellerDistribution": 1,
+//"startShippingPrice": 2000,
+//"freeShippingPrice": 0,
+//"storeStartTime": "09:00",
+//"storeCloseTime": "23:00"
+//}';
         $paramsStr=json_decode($paramsStr,true);
+        if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){
+            $begin=strtotime($paramsStr['storeStartTime']);
+            $end=strtotime($paramsStr['storeCloseTime']);
+            if($begin>=$end){
+                $paramsStr['storeCloseTime']=\Our\DescribeConst::storeCloseTimePre.date('H:i',$end+\Our\ApiConst::oneDaySecond);
+            }
 
+        }
         $this->_view->assign("params", $paramsStr);
         if($paramsStr['type']==\Our\ApiConst::sharePlat){
             $this->_view->display('index/plat.phtml');
@@ -48,6 +76,7 @@ class IndexController extends \Our\Controller_Abstract  {
             $this->_view->display('index/store.phtml');
         }
         if($paramsStr['type']==\Our\ApiConst::shareGoods || $paramsStr['type']==\Our\ApiConst::shareGroup){
+
             $this->_view->display('index/goods.phtml');
         }
         if($paramsStr['type']==\Our\ApiConst::shareSaler){

application/library/Our/DescribeConst.php

@@ -66,6 +66,8 @@ class DescribeConst
     const receiveCouponSuccess = '领取优惠券成功';
 
     const addCartSuccess = '加入购物车成功';
+
+    const storeCloseTimePre='次日';
     const setMessageSuccess='消息设置成功';
 
     const editCartSuccess = '编辑购物车成功';

application/models/Business/User/ShareService.php

@@ -67,6 +67,9 @@ class ShareServiceModel extends \Business\AbstractModel
                 $data['sellerDistribution']=$store['seller_distribution'];
                 $data['startShippingPrice']=$store['start_shipping_price'];
                 $data['freeShippingPrice']=$store['free_shipping_price'];
+
+                $data['storeStartTime']=$store['store_start_time'];
+                $data['storeCloseTime']=$store['store_close_time'];
             }
 
         }

application/views/index/store.phtml

@@ -73,7 +73,7 @@
         .header-c1 { position: relative; }
         .header-c2 { padding: 16px 4% 30px; }
         .header .header-bg { width: 750px; height: 314px; display: block; }
-        .header .address { font-size: 30px; position: absolute; top: 30px; left: 4%; padding-left: 34px; }
+        .header .address { font-size: 30px; position: absolute; top: 30px; left: 4%; padding-left: 34px; text-shadow: 1px 1px 1px rgba(255,255,255,.8);}
         .header .address:before { position: absolute; content: ''; width: 24px; height: 28px; left: 0; top: 8px; }
         .header .info { overflow: hidden; line-height: 60px; }
         .header .follow { float: right; color: #ff3419; border: 1px solid #ff3b1a; border: 1px solid rgba(255, 59, 26, 0.5); line-height: 36px; padding: 0 8px 0 36px; border-radius: 18px; margin: 11px 0 0 1em; font-size: 20px; position: relative; }
@@ -96,10 +96,10 @@
 
         .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 .code-in img { position: absolute; top: 50%; left: 50%; }
+        .pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-130px; margin-top:-130px; }
         .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 .code2 { width: 260px; height: 260px; margin-left: -130px; margin-top: -130px; }
+        .pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; }
 
         .footer { color: #bbb; font-size: 20px; text-align: center; margin-top: 136px; padding: 30px 0; }
         .footer:before { content: ''; width: 23px; height: 28px; background-position: -60px 0; margin: 0 10px 6px 0; }
@@ -121,7 +121,7 @@
                 <p class="follow">关注</p>
                 <div class="shop-name"><?php echo $params['storeName'];?></div>
             </div>
-            <p class="time">营业时间：<?php echo $params['storeWorkingtime'];?></p>
+            <p class="time">营业时间：<?php echo $params['storeStartTime'].'-'.$params['storeCloseTime'];?></p>
             <div class="tag">
                 <?php echo $params['buyerDistribution']?'<p>支持自提</p>':'';?>
                 <?php echo $params['sellerDistribution']?'<p>商家配送</p>':'';?>
@@ -149,8 +149,8 @@
 <!--            <p class="code-txt">长按图片识别二维码</p>-->
 <!--        </div>-->
         <div class="code-box">
-            <img src="img/app-share/bg-code2.jpg" alt="">
-            <div id="qrcodeImg" class="code-in code2">
+            <img src="/data/images/bg-code2.jpg" alt="">
+            <div id="qrcodeImg" class="code-in">
 <!--                <img id="qrcodeImg" src="//static.shenbd.com/www/index/2018/img/app-share/code2.jpg" alt="">-->
             </div>
             <p class="code-txt">长按图片识别二维码</p>
@@ -160,6 +160,11 @@
 </div>
 </body>
 <script>
-    new QRCode(document.getElementById('qrcodeImg'), '<?php echo $params['qrCode'];?>');
+    new QRCode(document.getElementById('qrcodeImg'), {
+        text: '<?php echo $params['qrCode'];?>',
+        width: 250,
+        height: 250
+
+    });
 </script>
 </html>
\ No newline at end of file