Merge remote-tracking branch 'origin/feature/shopCoupon'

@@ -145,4 +145,25 @@ class ListData
 
     }
 
+    /**
+     * 获取单品店店铺券
+     http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/%E5%95%86%E5%93%81%E5%88%97%E8%A1%A8/brandShops.md#%E8%8E%B7%E5%8F%96%E5%8D%95%E5%93%81%E5%BA%97%E5%BA%97%E9%93%BA%E5%88%B8
+     * @param int $shopId 店铺id
+     * @param int $uid 用户uid
+     * @return array
+     */
+    public static function shopCouponsList($shopId, $uid = '')
+    {
+        $param = Yohobuy::param();
+        $param['method'] = 'shop.coupons.list';
+        $param['shop_id'] = intval($shopId);
+
+        if (!empty($uid)) {
+            $param['uid'] = intval($uid);
+        }
+
+        $param['client_secret'] = Sign::getSign($param);
+        return Yohobuy::get(API_URL, $param);
+    }
+
 }

@@ -642,3 +642,6 @@ $listNav.on('touchstart', 'li', function() {
 }).on('touchend touchcancel', 'li', function() {
     $listNav.find('li').removeClass('bytouch');
 });
+
+//店铺优惠券
+require('./shop_coupon');
\ No newline at end of file

@@ -954,3 +954,6 @@ $('#collect').on('touchstart', function(e) {
         collectShop();
     }
 });
+
+//店铺优惠券
+require('./shop_coupon');
\ No newline at end of file

+var $ = require('jquery'),
+    IScroll = require('iscroll/iscroll-probe'),
+    Swiper = require('yoho.iswiper'),
+    tip = require('../plugin/tip');
+
+var appVersion = $('input[name="app_version"]').val();
+
+$(".coupon-content .receive-btn").closest('.swiper-slide').on('click', function(e) {
+    var that = this,
+        code = $(this).data('id') || '';
+
+    if (that.isCouponClick === false) {
+        return false;
+    }
+
+    that.isCouponClick = false;
+
+    $.ajax({
+        method: 'POST',
+        url: location.protocol + '//m.yohobuy.com/product/index/userCoupon',
+        data: {
+            couponID: code,
+            app_version: appVersion
+        },
+        xhrFields: {
+            withCredentials: true
+        },
+        success: function(data) {
+
+            that.isCouponClick = true;
+
+            if (data.code === 200) {
+                tip.show('领取成功');
+                $(that).find('.receive-btn').html('已领取');
+                return true;
+            } else if (data.code === 4401) {
+                $('#shop-login').remove();
+                $('body').append('<a href=\'' + data.url + '\'><span id="shop-login"><span></a>');
+                $('#shop-login').click();
+            } else if (data.code === 401) {
+                tip.show('已领取过');
+            } else {
+                tip.show(data.message);
+            }
+        },
+        error: function() {
+            tip.show('网络断开连接了~');
+            that.isCouponClick = true;
+        }
+    });
+});
+
+$(function() {
+    new Swiper('.coupon-content', {
+        slideElement: '.coupon-small',
+        slidesPerView: 'auto',
+        watchSlidesVisibility: true
+    });
+})

@@ -142,18 +142,17 @@ iframe[height="0"] {
     position: fixed;
     display: none;
     text-align: center;
-    width: 70%;
-    padding: 34PX 0;
+    padding: 15PX;
     top: 50%;
-    left: 50%;
-    margin-left: -35%;
-    margin-top: -45PX;
     background-color: rgba(0,0,0,.7);
     color: #fff;
     font-size: 18PX;
     border: none;
     z-index:4;
     border-radius: 10PX;
+    margin: 0 auto;
+    left: 50%;
+    transform: translateX(-50%);
 }
 
 .tap-hightlight {

@@ -9,5 +9,6 @@
 @import "limit-help";
 
 @import "shop-index";
+@import "shop-index-coupon";
 @import "shop-prodfile";
 @import "product-category";

+.coupon-content {
+    color: #fff;
+    height: 180px;
+    overflow: hidden;
+
+    .coupon-big {
+        height: 120px;
+        width: 580px;
+        background: resolve('product/coupon-big.png') no-repeat;
+        background-size: 580px 120px;
+        margin: 30px;
+        position: relative;
+
+        .coupon-left {
+            position: absolute;
+            margin: 10px 0;
+        }
+
+        .coupon-left .coupon-left-price {
+            margin: 0 50px;
+            float: left;
+        }
+
+        .coupon-left .coupon-left-price .coupon-sign{
+            font-size: 50px;
+        }
+
+        .coupon-left .coupon-left-price .coupon-price{
+            font-size: 72px;
+        }
+
+        .coupon-left  .coupon-left-name {
+            font-size: 22px;
+            width: 250px;
+            height: 100px;
+            float: left;
+            align-items: center;
+            display: flex;
+        }
+
+        .coupon-right {
+            width: 20px;
+            font-size: 22px;
+            right: 5%;
+            position: absolute;
+            height: inherit;
+            line-height: 1.2em;
+            align-items: center;
+            display: flex;
+        }
+    }
+
+    .coupon-small {
+        height: 120px;
+        width: 245px;
+        background: resolve('product/coupon-small.png') no-repeat;
+        background-size: 245px 120px;
+        margin: 30px 0 30px 30px;
+        position: relative;
+        float: left;
+        display: table;
+
+        .coupon-left {
+            position: absolute;
+            width: 165px;
+            overflow: hidden;
+            margin: 0 30px;
+            height: inherit;
+        }
+
+        .coupon-left .coupon-left-price {
+            width: inherit;
+            display: inline-block;
+            height: 62px;
+        }
+
+        .coupon-left .coupon-left-price .coupon-sign{
+            font-size: 42px;
+        }
+
+        .coupon-left .coupon-left-price .coupon-price{
+            font-size: 52px;
+        }
+
+        .coupon-left  .coupon-left-name {
+            font-size: 18px;
+            width: 150px;
+            height: 45px;
+            line-height: 24px;
+            padding-top: 2px;
+            overflow: hidden;
+            word-break: break-all;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+        }
+
+        .coupon-right {
+            width: 20px;
+            font-size: 18px;
+            right: 7.5%;
+            position: absolute;
+            height: inherit;
+            line-height: 1.2em;
+            align-items: center;
+            display: flex;
+        }
+    }
+}
\ No newline at end of file

@@ -55,6 +55,11 @@
              
             <div id="home-page" class="main">   
                 <div id="nav-main" class="nav-main">
+                    <!-- 优惠卷 -->
+                    {{#if shopCoupons}}
+                        {{> product/shop-coupon}}
+                    {{/if}}
+
                     <!-- 大导航 -->
                     {{#if brandList}}
                     <div class="multi-brands first">

@@ -84,6 +84,11 @@
         </div>
     </div>
     <input type="hidden" name="app_version" value="{{appVersion}}">
+    <!-- 店铺优惠卷 -->
+    {{#if shopCoupons}}
+        {{> product/shop-coupon}}
+    {{/if}}
+
     {{/ baseShopHome}}
     <!-- /基础店铺页面 -->
     <ul id="list-nav" class="list-nav clearfix">

+<div class="coupon-content">
+<div class="swiper-wrapper">
+    {{#if shopCouponsOne}}
+        {{#each shopCoupons}}
+        <div class="swiper-slide coupon-big" data-id = "{{id}}">
+            <div class='coupon-left'>
+            <span class="coupon-left-price">
+                <span class="coupon-sign">¥</span>
+                <span class="coupon-price">{{money}}</span>
+            </span>
+            <span class="coupon-left-name">
+                {{name}}
+            </span>
+            </div>
+            {{#if status}} 
+                <div class='coupon-right receive-btn'>
+                    立即领取
+                </div>
+            {{^}}
+                <div class='coupon-right receive-btn'>
+                    已领取
+                </div>
+            {{/if}}
+        </div><!--/coupon-big-->
+        {{/each}}
+    {{^}}
+        {{#each shopCoupons}}
+            <div class="swiper-slide coupon-small" data-id = "{{id}}">
+                <div class='coupon-left'>
+                    <span class="coupon-left-price">
+                        <span class="coupon-sign">¥</span>
+                        <span class="coupon-price">{{money}}</span>
+                    </span>
+                    <span class="coupon-left-name">
+                       {{name}}
+                    </span>
+                </div>
+                {{#if status}} 
+                    <div class='coupon-right receive-btn'>
+                        立即领取
+                    </div>
+                {{^}}
+                    <div class='coupon-right receive-btn'>
+                        已领取
+                    </div>
+                {{/if}}
+            </div><!--/coupon-small-->
+        {{/each}}
+    {{/if}}
+</div>
+</div>
\ No newline at end of file

@@ -12,6 +12,7 @@ use Plugin\DataProcess\ShopProcess;
 use Plugin\Helpers;
 use Plugin\Cache;
 use Plugin\Images;
+use Plugin\Encryption;
 
 /**
  * 商品列表相关的模板数据模型
@@ -494,4 +495,31 @@ class ListModel
             }
         }
     }
+
+    public static function getShopCouponsList($shopId, $uid)
+    {
+        $shopCoupons = array();
+        $result = ListData::shopCouponsList($shopId, $uid);
+
+        if ($result['code'] !== 200) {
+            return $shopCoupons;
+        }
+
+        foreach ($result['data'] as $key => $value) {
+            $value['status'] = $value['status'] * 1;
+
+            if ($value['status'] === 1 || $value['status'] === 3) {
+                $shopCoupons[] = array(
+                        'validity' => $value['couponValidity'],
+                        'id' => Encryption::encrypt($value['coupon_id']),
+                        'name' => $value['coupon_name'],
+                        'pic' => $value['coupon_pic'],
+                        'money' => intval($value['money']),
+                        'status' => $value['status'] === 1
+                    );
+            }
+        }
+
+        return $shopCoupons;
+    }
 }

@@ -5,6 +5,8 @@ use LibModels\Wap\Product\SaleData;
 use LibModels\Wap\Product\ShopData;
 use Plugin\Helpers;
 use Product\ListModel;
+use LibModels\Wap\Coupon\CouponData;
+use Plugin\Encryption;
 
 /**
  * 商品列表相关的控制器
@@ -506,6 +508,9 @@ class IndexController extends AbstractAction
         ));
         $data['goods'] = isset($goods['new']) ? $goods['new'] : array();
 
+        $data['shopCoupons'] = ListModel::getShopCouponsList($shopId, $uid);
+        $data['shopCouponsOne'] = count($data['shopCoupons']) === 1;
+
         $this->_view->display('shop', array(
             'shopIndex' => $data,
             'shopPage' => array(
@@ -528,6 +533,18 @@ class IndexController extends AbstractAction
      */
     private function baseShop($shop)
     {
+        $appVersion = $this->get('app_version');
+        $uid = '';
+        if (empty($appVersion)) {
+            $uid = $this->getUid(true);
+        }
+        //app环境
+        else {
+            $uid = $this->get('uid');
+            $this->setSession('appUid', $uid);
+            $this->setCookie('appUid', $uid);
+        }
+
         /* 过滤请求参数 */
         $condition = filter_input_array(INPUT_GET, array(
             'sort' => FILTER_DEFAULT,
@@ -605,12 +622,15 @@ class IndexController extends AbstractAction
         $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
         $data['goodList'] += $condition;
         $data['pageFooter'] = true;
+        //基础模板，于水说APP没有，H5暂时不须要
+        // $data['shopCoupons'] = ListModel::getShopCouponsList($shop['shops_id'], $uid);
+        // $data['shopCouponsOne'] = count($data['shopCoupons']) === 1;
 
         $this->setTitle($title);
         $this->setNavHeader($title, true, SITE_MAIN);
 
         // 店铺使用基础模板
-        $baseShopInfo = ListModel::getShopInfoById($shop['shops_id'], $this->getUid());
+        $baseShopInfo = ListModel::getShopInfoById($shop['shops_id'], $uid);
 
         if ($baseShopInfo['code'] === 200) {
             $data['baseShopHome'] = array(
@@ -694,4 +714,48 @@ class IndexController extends AbstractAction
         return ListModel::getBrandShops($brandId);
     }
 
+    /**
+     * 用户领券
+     * @param int app_version
+     * @param int couponID
+     * @return json
+     */
+    public function userCouponAction()
+    {
+        header('Access-Control-Allow-Origin:' . $_SERVER['HTTP_ORIGIN']);
+        header('Access-Control-Allow-Credentials:true');
+
+        $data = array();
+        $appVersion = $this->post('app_version', 0);
+        $couponID = $this->post('couponID', 0);
+
+        if (empty($couponID)) {
+            exit(0);
+        }
+
+        if (empty($appVersion)){
+            $uid = $this->getUid();
+        } else {
+            $uid = $this->getCookie('appUid');
+        }
+
+        do {
+
+            if (empty($uid)) {
+                $data['code'] = 4401;//401错误已经被接口占用
+                $refer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+                $toUrl = Helpers::url('/signin.html')."?refer=".$refer;
+                if (!empty($appVersion)){
+                    $toUrl .= '&openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"'. $refer . '","param":{}},"requesturl":{"param":{"method":"app.promotion.getCoupon","couponId":"' . Encryption::decrypt($couponID) . '"},"url":"' . API_URL . '"},"priority":"Y"}}';
+                }
+                $data['url'] = $toUrl;
+                break;
+            }
+
+            $data = CouponData::receiveCoupon($uid, Encryption::decrypt($couponID));
+        } while(false);
+
+        $this->echoJson($data);
+    }
+
 }