Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Rock Zhang
Commit b7195dea8a67e63ae4bf134d41ee6c8404eb79c1 2 parents d21a81a9 e9c438dc
Showing 9 changed files with 120 additions and 35 deletions
library/LibModels/Wap/Product/DetailData.php
library/Plugin/Helpers.php
static/js/cart/chose-panel.js
static/sass/cart/_index.scss
template/m.yohobuy.com/partials/cart/cart-content.phtml
yohobuy/m.yohobuy.com/application/models/Product/Detail.php
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Detail.php
yohobuy/m.yohobuy.com/configs/routes.index.ini
yohobuy/m.yohobuy.com/configs/routes.product.ini
--- a/library/LibModels/Wap/Product/DetailData.php
View file @b7195de
+++ b/library/LibModels/Wap/Product/DetailData.php
View file @b7195de
@@ -29,11 +29,15 @@ class DetailData
      * @param int $uid 用户ID
      * @return array
      */
-    public static function baseInfo($productId, $uid)
+    public static function baseInfo($productId, $uid, $productSkn = null)
     {
         $param = Yohobuy::param();
         $param['method'] = 'h5.product.data';
+        if ($productId !== null) {
             $param['productId'] = $productId;
+        } elseif ($productSkn !== null) {
+            $param['product_skn'] = $productSkn;
+        }
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
--- a/library/Plugin/Helpers.php
View file @b7195de
+++ b/library/Plugin/Helpers.php
View file @b7195de
@@ -546,8 +546,8 @@ class Helpers
                 $arr[$key]['appearDate'] = $vo['expect_arrival_time'];
             }
             // 商品链接
-            if ($haveLink && isset($vo['product_id'])) {
-                $arr[$key]['link'] = self::url('/product/pro_' . $vo['product_id'] . '_' . $vo['goods_id'] . '/' . $vo['cn_alphabet'] . '.html');
+            if ($haveLink && isset($vo['product_skn'])) {
+                $arr[$key]['link'] = self::url('/product/show_' . $vo['product_skn'] . '.html');
             }
             // 累计购买数
             $count += intval($vo['buy_number']);
--- a/static/js/cart/chose-panel.js
View file @b7195de
+++ b/static/js/cart/chose-panel.js
View file @b7195de
@@ -18,9 +18,9 @@ var panelTmpl,
     $chosePanel = $('#chose-panel'),
     $num,
     $chosed,
-    re = /\d+/,
+
+    // re = /\d+/,
     leftNum,
-    $sizeList,
     confirming,
     hasChooseColor = false,
     hasChooseSize = false,
@@ -98,7 +98,7 @@ function hide() {
     $('body').css('overflow', 'auto');
 }
-$('.yoho-page').on('touchstart', '.infos', function(e) {
+$('.yoho-page').on('touchstart', '.chose-panel', function(e) {
     var $cur = $(e.target);
     if ($cur.closest('.main').length > 0) {
@@ -132,6 +132,7 @@ $('.color-list').on('touchstart', '.block', function(e) {
         //颜色原来已经是勾选时，要清空剩余件数的提示
         $that.find('.num .left-num').html('');
+        $('#left-num').val(0);
         hasChooseColor = false;
         // 当前颜色不是选中状态,选中时
@@ -161,9 +162,11 @@ $('.color-list').on('touchstart', '.block', function(e) {
             //如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式
             if (curGoodNum > 0) {
                 $that.find('.num .left-num').html('剩余' + curGoodNum + '件');
+                $('#left-num').val(curGoodNum);
             } else {
                 $(curSelectedSizeBlock).removeClass('zero-stock').addClass('zero-stock');
                 $that.find('.num .left-num').html('');
+                $('#left-num').val(0);
             }
         }
     }
@@ -250,7 +253,6 @@ $('.size-list').on('touchstart', '.block', function(e) {
         $that = $(e.target).closest('.chose-items'),
         index,
         $colorChosed,
-        selectedColorindex,
         curGoodNum;
     var $siblingBlock = $this.closest('.block-list').siblings(':first');
@@ -259,7 +261,6 @@ $('.size-list').on('touchstart', '.block', function(e) {
     index = $this.index();
     $colorChosed = $siblingBlock.find('.chosed');
-    selectedColorindex = $colorChosed.index();
     $curSizeRow = $sizeRowList.eq(index);
     // 当前尺码已经是选中状态,再点击时
@@ -267,6 +268,7 @@ $('.size-list').on('touchstart', '.block', function(e) {
         //尺码原来已经是勾选时，要清空剩余件数的提示
         $that.find('.num .left-num').html('');
+        $('#left-num').val(0);
         hasChooseSize = false;
         // 去掉已经选中颜色的 数量为0的样式
@@ -286,11 +288,13 @@ $('.size-list').on('touchstart', '.block', function(e) {
         }
         // 如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式, 否则显示剩余件数
-        if (curGoodNum > 0) {
+        if (curGoodNum > 0 && hasChooseColor) {
             $that.find('.num .left-num').html('剩余' + curGoodNum + '件');
+            $('#left-num').val(curGoodNum);
         } else {
             $colorChosed.removeClass('zero-stock').addClass('zero-stock');
             $that.find('.num .left-num').html('');
+            $('#left-num').val(0);
         }
     }
@@ -375,8 +379,9 @@ $('.size-list').on('touchstart', '.block', function(e) {
 });
 $('.btn-minus').on('touchstart', function() {
-    var num = $num.val(),
-        leftNum = re.exec($('.num .left-num').html());
+    var num = $num.val();
+
+    leftNum = $('#left-num').val();
     if (!checkColorSizeNum()) {
         return;
@@ -392,12 +397,14 @@ $('.btn-minus').on('touchstart', function() {
 $('.btn-plus').on('touchstart', function() {
     var num = $num.val();
+    leftNum = $('#left-num').val();
+
     if (!checkColorSizeNum()) {
         return;
     }
-    leftNum = re.exec($('.num .left-num').html());
-    if (num - 0 === leftNum - 0 || 0 === leftNum - 0) {
+
+    if (num - 0 === leftNum || 0 === leftNum) {
         return;
     }
@@ -405,7 +412,7 @@ $('.btn-plus').on('touchstart', function() {
     $num.val(num + 1);
 });
-$('#chose-btn-sure').on('touchend', function() {
+$('#chose-btn-sure').on('touchstart', function() {
     var productSku,
         buyNumber = $('#good-num').val() - 0,
@@ -419,7 +426,11 @@ $('#chose-btn-sure').on('touchend', function() {
         return;
     }
-    leftNum = re.exec($('.num .left-num').html());
+    if ($('#chose-btn-sure').html() === '已售罄') {
+        return;
+    }
+
+    leftNum = $('#left-num').val();
     if (num > leftNum) {
         tip.show('您选择的数量超过了最大库存量~');
@@ -429,7 +440,7 @@ $('#chose-btn-sure').on('touchend', function() {
     $chosed = $('.block-list>ul>li.chosed');
     if (2 === $chosed.length && 0 === $chosed.closest('.zero-stock').length) {
-        productSku = $sizeList.closest('.chosed').data('skuid');
+        productSku = $curSizeBlock.data('skuid');
         promotionId = $('[data-id="' + productSku + '"]').closest('.advance-block').data('promotion-id');
         if (confirming) {
             return false;
--- a/static/sass/cart/_index.scss
View file @b7195de
+++ b/static/sass/cart/_index.scss
View file @b7195de
@@ -116,11 +116,26 @@
             color: #8f8f8f;
         }
     }
-
-    .price-compute {
+    .activity{
         padding: 20rem / $pxConvertRem;
-        border-bottom: 1px solid #e0e0e0;
         font-size: 26rem / $pxConvertRem;
+        h1{
+            font-size: 32rem / $pxConvertRem;
+        }
+        li:before {
+            content: "";
+            display: inline-block;
+            width: 4px;
+            height: 4px;
+            background-color: #000;
+            border-radius: 50%;
+            margin-right: 8rem / $pxConvertRem;
+        }
+    }
+    .price-compute {
+        padding: 20rem / $pxConvertRem;
+        border-top: 1px solid #e0e0e0;
+        font-size: 28rem / $pxConvertRem;
         .title {
             display: inline-block;
--- a/template/m.yohobuy.com/partials/cart/cart-content.phtml
View file @b7195de
+++ b/template/m.yohobuy.com/partials/cart/cart-content.phtml
View file @b7195de
@@ -33,18 +33,21 @@
         {{/if}}
     </ul>
 {{/if}}
-
+<div class="activity">
+    <h1>以参与活动</h1>
+    <ul>
+        {{# promotionInfo}}
+            <li>{{name}}</li>
+        {{/ promotionInfo}}
+    </ul>
+</div>
 <div class="price-compute">
-    <p class="sum-price">
-        <span class="title">总价</span>
-        <span id="good-totalprice">¥{{price}}</span>
+    <p>
+        <span>总价（¥{{price}}）<i>-</i></span>
+        <span>活动价(¥{{activityPrice}})</span>
     </p>
-    <p class="activity-price">
-        <span class="title">
-            活动价
-            <i class="minus">-</i>
-        </span>
-        <span id="good-activityPrice">¥{{activityPrice}}</span>
+    <p>
+        <span><i>=</i>商品总计金额 （¥{{sumPrice}}）</span>
     </p>
 </div>
--- a/yohobuy/m.yohobuy.com/application/models/Product/Detail.php
View file @b7195de
+++ b/yohobuy/m.yohobuy.com/application/models/Product/Detail.php
View file @b7195de
@@ -20,24 +20,30 @@ class DetailModel
     /**
      * 商品基本信息
      * 
-     * @param int $productId 商品ID
+     * @param int $productId 商品ID SKN 和 ID 只需要传一个
      * @param int $goodsId 某个颜色的商品
      * @param int $uid 当前登录用户ID, 未登录为0
+     * @param int $productSkn SKN 和 ID 只需要传一个
      * @return array
      */
-    public static function getBaseInfo($productId, $goodsId, $uid, $vipLevel)
+    public static function getBaseInfo($productId, $goodsId, $uid, $vipLevel, $productSkn = null)
     {
         $result = array();
+        $baseInfo = array();
+        // 通过ID获取
         if (is_numeric($productId) && is_numeric($goodsId)) {
-            // 调用服务
             $baseInfo = DetailData::baseInfo($productId, $uid);
+        } 
+        // 通过SKN获取
+        elseif (is_numeric($productSkn)) {
+            $baseInfo = DetailData::baseInfo(null, $uid, $productSkn);
+        }
         // 商品名称
         if (empty($baseInfo['productName'])) {
             return $result;
         }
-
         $result['goodsName'] = $baseInfo['productName'];
         // 商品促销短语
@@ -190,7 +196,7 @@ class DetailModel
                         );
                         $colorStorageNum += intval($size['goodsSizeStorageNum']);
                         $sizeStorageStr .= $size['goodsSizeStorageNum'] . '/';
-                            $colorStorageGroup[$size['sizeName']][$value['colorName']] = $size['goodsSizeStorageNum'];
+                        $colorStorageGroup[$size['sizeName']][$value['colorId']] = $size['goodsSizeStorageNum'];
                     }
                     // 颜色分组
@@ -277,7 +283,6 @@ class DetailModel
         // 底部简介的URL链接
         $result['introUrl'] = Helpers::url('/product/intro_' . $baseInfo['erpProductId'] . '/' . $baseInfo['cnAlphabet'] . '.html', null, '');
         $result['id'] = $productId;
-        }
         return $result;
     }
--- a/yohobuy/m.yohobuy.com/application/modules/Product/controllers/Detail.php
View file @b7195de
+++ b/yohobuy/m.yohobuy.com/application/modules/Product/controllers/Detail.php
View file @b7195de
@@ -49,6 +49,39 @@ class DetailController extends AbstractAction
     }
     /**
+     * 商品详情 (SKN)
+     * 
+     * @param int productSkn
+     */
+    public function showAction()
+    {
+        $productSkn = $this->param('productSkn');
+        if (!is_numeric($productSkn)) {
+            $this->error();
+        }
+        $uid = $this->getUid();
+        
+        $vipLevel = 0;
+        if (isset($this->_vip)) {
+            $vipLevel = Helpers::getVipLevel($this->_vip);
+        }
+
+        $data = \Product\DetailModel::getBaseInfo(null, null, $uid, $vipLevel, $productSkn);
+        if (array() === $data) {
+            $this->error();
+        }
+        $data['goodsDetailPage'] = true;
+        $data['pageFooter'] = true;
+
+        if (isset($data['goodsName'])) {
+            $this->setTitle($data['goodsName']);
+        }
+        $this->setNavHeader('商品详情');
+        // 渲染模板
+        $this->_view->display('index', $data);
+    }
+
+    /**
      * 尺码描述信息
      */
     public function introAction()
--- a/yohobuy/m.yohobuy.com/configs/routes.index.ini
View file @b7195de
+++ b/yohobuy/m.yohobuy.com/configs/routes.index.ini
View file @b7195de
@@ -147,6 +147,13 @@ routes.productintro.route.controller = Detail
 routes.productintro.route.action = Intro
 routes.productintro.map.1 = productSkn
+routes.productskn.type = "regex"
+routes.productskn.match = "#/product/show_([0-9]+).html#"
+routes.productskn.route.module = Product
+routes.productskn.route.controller = Detail
+routes.productskn.route.action = Show
+routes.productskn.map.1 = productSkn
+
 ; 订单相关
 routes.cart.type = "rewrite"
 routes.cart.match = "/home/order/detail$"
--- a/yohobuy/m.yohobuy.com/configs/routes.product.ini
View file @b7195de
+++ b/yohobuy/m.yohobuy.com/configs/routes.product.ini
View file @b7195de
@@ -20,3 +20,10 @@ routes.productintro.route.module = Product
 routes.productintro.route.controller = Detail
 routes.productintro.route.action = Intro
 routes.productintro.map.1 = productSkn
+
+routes.productskn.type = "regex"
+routes.productskn.match = "#/product/show_([0-9]+).html#"
+routes.productskn.route.module = Product
+routes.productskn.route.controller = Detail
+routes.productskn.route.action = Show
+routes.productskn.map.1 = productSkn