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

application/models/Business/Goods/GoodsCommonService.php

@@ -496,12 +496,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             $lng = $param['lng'];
             $lat = $param['lat'];
         }
-        $in_store_service_flag=0;
-        if($lng && $lat){
-            $location = array('lat'=>$lat,'lng'=>$lng);
-            $in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$commonInfo['store_id']);
-            $in_store_service && $in_store_service_flag = 1;
-        }
+        $storeInfo = \DAO\StoreModel::getInstance()->get($commonInfo['store_id'],false);
+        $in_store_service_flag = \DAO\StoreModel::getInstance()->checkAddressInServiceArea(array('lng'=>$lng,'lat'=>$lat),$storeInfo);
         //所在地
         $area = '';
         if($commonInfo['areaid_1'] && $commonInfo['areaid_2']){

application/models/Business/Goods/GroupSaleService.php

@@ -38,12 +38,14 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             $lng = $param['lng'];
             $lat = $param['lat'];
         }
-        $in_store_service_flag=0;
-        if($lng && $lat){
-            $location = array('lat'=>$lat,'lng'=>$lng);
-            $in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$data['store_id']);
-            $in_store_service && $in_store_service_flag = 1;
-        }
+//        $in_store_service_flag=0;
+//        if($lng && $lat){
+//            $location = array('lat'=>$lat,'lng'=>$lng);
+//            $in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$data['store_id']);
+//            $in_store_service && $in_store_service_flag = 1;
+//        }
+        $storeInfo = \DAO\StoreModel::getInstance()->get($data['store_id'],false);
+        $in_store_service_flag = \DAO\StoreModel::getInstance()->checkAddressInServiceArea(array('lng'=>$lng,'lat'=>$lat),$storeInfo);
         $data['inStoreService'] = $in_store_service_flag;
 
         $data['state'] = \Our\ApiConst::cartGoodsOnline;

application/models/Business/Order/OrderService.php

@@ -776,11 +776,22 @@ class OrderServiceModel extends \Business\AbstractModel
         file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
     }
 
-    public function updateOrderGoodsStoregeByOrderIds($orderIds){
+    public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         //更新商品库存
-        $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+        $orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+        $orderGoods=array();
+        if(!empty($orderGoodsId)){
+            foreach($orderGoodses as $orderGood){
+                    if($orderGood['recId']==$orderGoodsId){
+                        array_push($orderGoods,$orderGood);
+                    }
+            }
+        }
+        if(empty($orderGoods)){
+            $orderGoods=$orderGoodses;
+        }
         $storeCartsList=array();
         $storeCarts=array();
         $storeCarts['storeCarts']=array();

application/models/Business/User/ShareService.php

@@ -41,6 +41,7 @@ class ShareServiceModel extends \Business\AbstractModel
                 $data['goodsId']=$goods['goods_id'];
                 $data['goodsCommonid']=$goods['goods_commonid'];
                 $data['storeId']=$goods['store_id'];
+
             }
         }
         if($data['type']==ApiConst::shareGroup){
@@ -60,6 +61,12 @@ class ShareServiceModel extends \Business\AbstractModel
                 $data['imgUrl']=$storeDao->getStoreLabelSrc($store['store_label']);
                 $data['storeName']=$store['store_name'];
                 $data['desc']=$store['store_notice'];
+
+                $data['storeWorkingtime']=$store['store_workingtime'];
+                $data['buyerDistribution']=$store['buyer_distribution'];
+                $data['sellerDistribution']=$store['seller_distribution'];
+                $data['startShippingPrice']=$store['start_shipping_price'];
+                $data['freeShippingPrice']=$store['free_shipping_price'];
             }
 
         }

application/views/index/store.phtml

 <!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>我的身边店</title>
+    <meta name="description" content="">
+    <meta name="keywords" content="">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link type="image/x-icon" rel="icon" href="//static.shenbd.com/lib/img/favicon-hd.ico" />
+    <link type="image/x-icon" rel="shortcut icon" href="//static.shenbd.com/lib/img/favicon.ico" />
+    <style>
+        body,blockquote,h1,h2,h3,h4,h5,h6,p,pre,dd,form,figure{margin:0}
+        legend{padding:0}
+        menu,ol,ul,dl,fieldset,input,textarea{margin:0;padding:0}
+        audio,video,canvas{*display:inline;*zoom:1}
+        :link,:visited{text-decoration:none}
+        [hidden],template{display:none}
+        a{text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}
+        address,cite,em{font-style:normal}
+        code,kbd,samp,tt{font-family:inherit;font-size:100%}
+        img{border-style:none;vertical-align:middle}
+        svg:not(:root){overflow:hidden}
+        summary{display:list-item}
+        h1,h2,h3,h4,h5,h6{font-size:100%}
+        small{font-size:83.3%}
+        sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}
+        table{border-collapse:collapse;border-spacing:0}
+        menu,ol,ul{list-style:none outside none}
+        fieldset{border:0}
+        textarea{-webkit-appearance:none;overflow-y:auto}
+        button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}
+        button,input{overflow:visible}
+        button,select{text-transform:none}
+        button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}
+        button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:none}
+        [type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}
+        [type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}
+        [type="search"]{-webkit-appearance:textfield;outline-offset:-2px}
+        ::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
+        article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}
+        mark{background:#ff0;color:#000}
+        progress{display:inline-block;vertical-align:baseline}
+        .fl{float:left}
+        .fr{float:right}
+        *html .clearfix{zoom:1}
+        *+html .clearfix{zoom:1}
+        .clearfix:after{content:'\0020';display:table;clear:both}
+        .fs12{font-size:12px}
+        .fs14{font-size:14px}
+        .fb{font-weight:bolder}
+        .tc{text-align:center}
+        .tl{text-align:left}
+        .tr{text-align:right}
+        .global-footer{line-height:2;text-align:center}
+        .global-footer a:link{text-decoration:none}
+        .global-footer a:visited{text-decoration:none}
+        .global-footer a:hover{text-decoration:underline}
+        .global-footer a:active{text-decoration:underline}
 
-<html lang="en">
-<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
-    <title></title>
-    <style type="text/css">
-        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;}
-        .header{background:url(/data/img/headerBg.png);padding-top:100px; height:415px;  }
-        .bgBD{width:162px; height:162px;background-color:white;border-radius:50%;-moz-border-radius:50%;-webkit-border-radius:50%;margin:0 auto;}
-        #headerBg{width:160px; height:160px;border-radius:50%;-moz-border-radius:50%;-webkit-border-radius:50%;margin:1px;}
-        #title{font-size:34px; margin-top:24px;}
-        .address{ font-size:28px; line-height:36px; padding:50px 110px 0 110px; height:108px;display:block; display:-webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
-        .noticePart{ width:560px;margin:16px auto 0 auto;  background:url(/data/img/noticeBg.png);}
-        .noticePart p{height:44px; font-size:20px; line-height:22px; padding:68px 28px 32px 28px; }
-        #notice{ max-width:504px;display:block; display:-webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
-        .qrcode{background:url(/data/img/flower.png); height:488px; margin:6px auto 0 auto;}
-        #qrImg {margin-top:80px;}
-        #qrcodeImg img { margin: 0 auto;}
-        .footer{ font-size:30px; height:66px; line-height:66px; padding:0 0 55px 0;}
-        .footer img{vertical-align:bottom; display:inline-block;}
+        .header .address:before, .header .follow:before, .notice:before, .footer:before { background-image: url("//static.shenbd.com/www/index/2018/img/app-share/sprite-app-share.png"); background-repeat: no-repeat; display: inline-block; vertical-align: middle; overflow: hidden; }
+
+        body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Helvetica Neue", Tahoma, "Microsoft Yahei", "PingFang SC", "ST Heiti", SimHei, sans-serif, "Helvetica Neue", Tahoma, SimSun, "PingFang SC", "ST Heiti", sans-serif; }
+
+        .wrap { max-width: 750px; margin: 0 auto; }
+
+        .header .address:before, .header .follow:before, .notice:before, .footer:before { background-image: url("//static.shenbd.com/www/index/2018/img/app-share/sprite-app-share.png"); background-repeat: no-repeat; display: inline-block; vertical-align: middle; overflow: hidden; }
+
+        body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Helvetica Neue", Tahoma, "Microsoft Yahei", "PingFang SC", "ST Heiti", SimHei, sans-serif, "Helvetica Neue", Tahoma, SimSun, "PingFang SC", "ST Heiti", sans-serif; }
+
+        .wrap { max-width: 750px; margin: 0 auto; }
+
+        .header { background-position: top center; background-repeat: no-repeat; font-size: 22px; }
+        .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: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; }
+        .header .follow:before { content: ''; width: 30px; height: 20px; background-position: -30px 0; position: absolute; left: 8px; top: 50%; margin-top: -10px; }
+        .header .shop-name { overflow: hidden; font-size: 40px; }
+        .header .time { margin-top: 12px; }
+        .header .tag { font-size: 0; margin: 10px -10px 0; }
+        .header .tag p { display: inline-block; font-size: 22px; padding: 0 .72em; border-radius: .8em; border: 1px solid #212121; border: 1px solid rgba(50, 43, 34, 0.5); margin: 20px 10px 0; white-space: nowrap; line-height: 1.6; }
+
+        .notice { position: relative; padding-left: 65px; color: #ff8b25; font-size: 22px; }
+        .notice:before { content: ''; width: 48px; height: 40px; background-position: 0 -40px; position: absolute; left: 0; top: 15px; }
+        .notice-in { border: 1px solid #ff8b25; padding: 12px 3.2258064516% 6px; border-radius: 12px; position: relative; }
+        .notice-in:before, .notice-in:after { content: ''; position: absolute; }
+        .notice-in:before { color: #ff8b25; left: -16px; border-left: 8px dashed transparent; border-top: 8px dashed transparent; border-bottom-style: solid; border-bottom-width: 8px; border-right-style: solid; border-right-width: 8px; top: 9px; }
+        .notice-in:after { color: #fff; left: -14px; top: 8px; z-index: 2; border-left: 8px dashed transparent; border-top: 8px dashed transparent; border-right-style: solid; border-right-width: 8px; border-bottom-style: solid; border-bottom-width: 8px; }
+        .notice-hd { text-align: center; position: relative; z-index: 2; line-height: 1; }
+        .notice-hd:before { content: ''; position: absolute; width: 100%; left: 0; height: 10px; top: 50%; margin-top: -5px; z-index: -1; background: #ffeddd; }
+        .notice-hd .title { line-height: 1.5; font-size: 24px; display: inline-block; padding: 0 .5rem; background: #fff; vertical-align: middle; }
+        .notice-bd { padding-top: 12px; }
+
+        .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-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; }
+
+        .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; }
     </style>
+    <!--<style>-->
+        <!--.header{ background-color: #ffa62e;}-->
+    <!--</style>-->
 </head>
+<script type="text/javascript" src="/data/js/qrcode.min.js"></script>
 <body>
-<div class="shareC">
-    <div class="header">
-        <div class="bgBD">
-            <img src="" id="headerBg" />
+<div class="wrap">
+    <div class="header" style="background-color: #ffa62e;">
+        <div class="header-c1">
+            <div class="address"><?php echo $params['address'];?></div>
+            <img src="<?php echo $params['imgUrl'];?>" alt="" class="header-bg">
+        </div>
+        <div class="header-c2">
+            <div class="info">
+                <p class="follow">关注</p>
+                <div class="shop-name"><?php echo $params['storeName'];?></div>
+            </div>
+            <p class="time">营业时间：<?php echo $params['storeWorkingtime'];?></p>
+            <div class="tag">
+                <?php echo $params['buyerDistribution']?'<p>支持自提</p>':'';?>
+                <?php echo $params['sellerDistribution']?'<p>商家配送</p>':'';?>
+                <?php echo $params['startShippingPrice']?'<p>'.$params['startShippingPrice'].'起送</p>':'';?>
+                <?php echo $params['freeShippingPrice']?'<p>满'.$params['freeShippingPrice'].'免费配送</p>':'';?>
             </div>
-        <p id="title"></p>
-        <p class="address">地址：<span id="address"></span></p>
         </div>
-    <div class="noticePart">
-        <p>
-            <span id="notice"></span>
-        </p>
     </div>
-    <div class="qrcode" id="qrcode">
-        <img id="qrImg" src="" />
-        <div id="qrcodeImg"></div>
-        <p id="tip"></p>
+    <div class="pn-share">
+        <div class="notice">
+            <div class="notice-in">
+                <div class="notice-hd">
+                    <div class="title">店铺公告</div>
                 </div>
-    <div class="footer">
-        <img src="/data/img/logo.png" /> 我的身边店
+                <div class="notice-bd">
+                    <p><?php echo $params['desc'];?></p>
                 </div>
+            </div>
+        </div>
+<!--        <div class="code-box">-->
+<!--            <img src="//static.shenbd.com/www/index/2018/img/app-share/bg-code1.jpg" alt="">-->
+<!--            <div class="code-in">-->
+<!--                <img src="//static.shenbd.com/www/index/2018/img/app-share/code1.png" alt="" class="code1">-->
+<!--            </div>-->
+<!--            <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 id="qrcodeImg" src="//static.shenbd.com/www/index/2018/img/app-share/code2.jpg" alt="">-->
+            </div>
+            <p class="code-txt">长按图片识别二维码</p>
+        </div>
+    </div>
+    <div class="footer">我的身边店提供技术服务</div>
 </div>
-<script type="text/javascript" src="/data/js/qrcode.min.js"></script>
-<script type="text/javascript">
-    var pageObj = {
-        type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码
-        id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码,
-        headerBg : "<?php echo $params['imgUrl'];?>",
-        url : "<?php echo $params['qrCode'];?>",
-        qrImg :  "<?php echo $params['qrCode'];?>",
-        title : "<?php echo $params['storeName'];?>",
-        address : "<?php echo $params['address'];?>",
-        notice : "<?php echo $params['desc'];?>"
-    };
-    if(pageObj.notice==null || pageObj.notice=="")
-        pageObj.notice="暂无公告";
-    var excute = ["title","address","notice"];
-    excute.forEach(function(v,i){
-        document.getElementById(v).innerHTML = pageObj[v];
-    });
-    document.getElementById("headerBg").src = pageObj.headerBg;
-    new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
-//    if(pageObj.type<=2){
-//        document.getElementById("qrImg").src = pageObj.qrImg;}
-//    else{
-//        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
-//    }
-
-
-
-</script>
 </body>
+<script>
+    new QRCode(document.getElementById('qrcodeImg'), '<?php echo $params['qrCode'];?>');
+</script>
 </html>
\ No newline at end of file

application/views/index/store_bak.phtml

+<!DOCTYPE html>
+
+<html lang="en">
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
+    <title></title>
+    <style type="text/css">
+        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;}
+        .header{background:url(/data/img/headerBg.png);padding-top:100px; height:415px;  }
+        .bgBD{width:162px; height:162px;background-color:white;border-radius:50%;-moz-border-radius:50%;-webkit-border-radius:50%;margin:0 auto;}
+        #headerBg{width:160px; height:160px;border-radius:50%;-moz-border-radius:50%;-webkit-border-radius:50%;margin:1px;}
+        #title{font-size:34px; margin-top:24px;}
+        .address{ font-size:28px; line-height:36px; padding:50px 110px 0 110px; height:108px;display:block; display:-webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
+        .noticePart{ width:560px;margin:16px auto 0 auto;  background:url(/data/img/noticeBg.png);}
+        .noticePart p{height:44px; font-size:20px; line-height:22px; padding:68px 28px 32px 28px; }
+        #notice{ max-width:504px;display:block; display:-webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
+        .qrcode{background:url(/data/img/flower.png); height:488px; margin:6px auto 0 auto;}
+        #qrImg {margin-top:80px;}
+        #qrcodeImg img { margin: 0 auto;}
+        .footer{ font-size:30px; height:66px; line-height:66px; padding:0 0 55px 0;}
+        .footer img{vertical-align:bottom; display:inline-block;}
+    </style>
+</head>
+<body>
+<div class="shareC">
+    <div class="header">
+        <div class="bgBD">
+            <img src="" id="headerBg" />
+        </div>
+        <p id="title"></p>
+        <p class="address">地址：<span id="address"></span></p>
+    </div>
+    <div class="noticePart">
+        <p>
+            <span id="notice"></span>
+        </p>
+    </div>
+    <div class="qrcode" id="qrcode">
+        <img id="qrImg" src="" />
+        <div id="qrcodeImg"></div>
+        <p id="tip"></p>
+    </div>
+    <div class="footer">
+        <img src="/data/img/logo.png" /> 我的身边店
+    </div>
+</div>
+<script type="text/javascript" src="/data/js/qrcode.min.js"></script>
+<script type="text/javascript">
+    var pageObj = {
+        type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码
+        id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码,
+        headerBg : "<?php echo $params['imgUrl'];?>",
+        url : "<?php echo $params['qrCode'];?>",
+        qrImg :  "<?php echo $params['qrCode'];?>",
+        title : "<?php echo $params['storeName'];?>",
+        address : "<?php echo $params['address'];?>",
+        notice : "<?php echo $params['desc'];?>"
+    };
+    if(pageObj.notice==null || pageObj.notice=="")
+        pageObj.notice="暂无公告";
+    var excute = ["title","address","notice"];
+    excute.forEach(function(v,i){
+        document.getElementById(v).innerHTML = pageObj[v];
+    });
+    document.getElementById("headerBg").src = pageObj.headerBg;
+    new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+//    if(pageObj.type<=2){
+//        document.getElementById("qrImg").src = pageObj.qrImg;}
+//    else{
+//        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+//    }
+
+
+
+</script>
+</body>
+</html>
\ No newline at end of file