fe / YOHOBUYWAP · Commits

Go to a project

Authored by 周少峰
Commit 9268ef226ac9b8084efd9aaf89be10116f3204d7 1 parent 1bfa4f1d

students price shop cart

Inline Side-by-side
Showing 6 changed files with 9 additions and 7 deletions
@@ -700,7 +700,8 @@ class Helpers @@ -700,7 +700,8 @@ class Helpers
700 $oneGoods['size'] = $value['size_name']; 700 $oneGoods['size'] = $value['size_name'];
701 $oneGoods['checked'] = $value['selected'] === 'Y'; 701 $oneGoods['checked'] = $value['selected'] === 'Y';
702 $oneGoods['price'] = self::transPrice($value['last_vip_price']); 702 $oneGoods['price'] = self::transPrice($value['last_vip_price']);
703 - $oneGoods['isVipPrice'] = $value['sales_price'] !== $value['last_vip_price']; 703 + $oneGoods['isVipPrice'] = $value['sales_price'] !== $value['last_vip_price'] && $value['discount_tag'] === 'V';
  704 + $oneGoods['isStudents'] = $value['sales_price'] !== $value['last_vip_price'] && $value['discount_tag'] === 'S';
704 $oneGoods['count'] = $value['buy_number']; 705 $oneGoods['count'] = $value['buy_number'];
705 $oneGoods['promotion_id'] = $value['promotion_id']; 706 $oneGoods['promotion_id'] = $value['promotion_id'];
706 707
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="iconfont more-icon tap-hightlight">&#xe604;</div> 15 <div class="iconfont more-icon tap-hightlight">&#xe604;</div>
16 </a> 16 </a>
17 {{^students}} 17 {{^students}}
18 - <a class="students-entry" href="###">学生认证</a> 18 + <a class="students-entry" href="{{verifyUrl}}">学生认证</a>
19 {{/students}} 19 {{/students}}
20 20
21 {{/isLogin}} 21 {{/isLogin}}
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <a class="login-btn" href="{{signinUrl}}"> 24 <a class="login-btn" href="{{signinUrl}}">
25 登录/注册 25 登录/注册
26 </a> 26 </a>
27 - <a class="students-entry" href="###">学生认证</a> 27 + <a class="students-entry" href="{{verifyUrl}}">学生认证</a>
28 </div> 28 </div>
29 {{/isLogin}} 29 {{/isLogin}}
30 </div> 30 </div>
@@ -49,15 +49,15 @@ @@ -49,15 +49,15 @@
49 {{#if isGift}} 49 {{#if isGift}}
50 <span class="sale-price">¥{{salesPrice}}</span> 50 <span class="sale-price">¥{{salesPrice}}</span>
51 {{/if}} 51 {{/if}}
52 - {{#if isStudents}}  
53 - <span class="students">学</span>  
54 - {{}}  
55 </p> 52 </p>
56 {{#if isVipPrice}} 53 {{#if isVipPrice}}
57 <span class="vip"> 54 <span class="vip">
58 VIP 55 VIP
59 </span> 56 </span>
60 {{/if}} 57 {{/if}}
  58 + {{#if isStudents}}
  59 + <span class="vip">学</span>
  60 + {{/if}}
61 {{#unless isAdvanceBuy}} 61 {{#unless isAdvanceBuy}}
62 {{#unless isGift}} 62 {{#unless isGift}}
63 <span class="iconfont icon-edit" data-count="{{count}}">&#xe61e;</span> 63 <span class="iconfont icon-edit" data-count="{{count}}">&#xe61e;</span>
@@ -1001,7 +1001,7 @@ class CartModel @@ -1001,7 +1001,7 @@ class CartModel
1001 $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']); 1001 $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']);
1002 } 1002 }
1003 while (0); 1003 while (0);
1004 - 1004 +
1005 return $result; 1005 return $result;
1006 } 1006 }
1007 1007
@@ -56,6 +56,7 @@ class IndexController extends AbstractAction @@ -56,6 +56,7 @@ class IndexController extends AbstractAction
56 56
57 $shoppingKey = Helpers::getShoppingKeyByCookie(); 57 $shoppingKey = Helpers::getShoppingKeyByCookie();
58 $uid = $this->getUid(true); 58 $uid = $this->getUid(true);
  59 + $uid = 13311991;
59 $cartType = $this->get('cartType', 'all'); 60 $cartType = $this->get('cartType', 'all');
60 61
61 $data = array( 62 $data = array(