wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit e252a68f66621d84b65b6d366e17f8fb6ffd1d3b 2 parents 07c3ff89 e94f94d0

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

Inline Side-by-side
Showing 10 changed files with 121 additions and 17 deletions
@@ -1085,6 +1085,9 @@ @@ -1085,6 +1085,9 @@
1085 }, 1085 },
1086 { 1086 {
1087 is_advance: true //再到着 1087 is_advance: true //再到着
  1088 + },
  1089 + {
  1090 + is_soon_sold_out: true //即将售罄
1088 } 1091 }
1089 ], 1092 ],
1090 1093
@@ -82,22 +82,22 @@ headerNavHammer.on('tap', function(e) { @@ -82,22 +82,22 @@ headerNavHammer.on('tap', function(e) {
82 } 82 }
83 }); 83 });
84 84
85 -formHammer = new Hammer(document.getElementById('img-form')); 85 +if (document.getElementById('img-form') !== null) {
  86 + formHammer = new Hammer(document.getElementById('img-form'));
86 87
87 -formHammer.on('tap', function(e) {  
88 - if ($(e.target).hasClass('upload-img-remove')) {  
89 - $uploadImgList.html('');  
90 - imgStr = '';  
91 - setTimeout(function() {  
92 - $imgAdd.show();  
93 - }, 50); 88 + formHammer.on('tap', function(e) {
  89 + if ($(e.target).hasClass('upload-img-remove')) {
  90 + $uploadImgList.html('');
  91 + imgStr = '';
  92 + setTimeout(function() {
  93 + $imgAdd.show();
  94 + }, 50);
94 95
95 - }  
96 -}); 96 + }
  97 + });
  98 +}
97 99
98 // 点赞与取消点赞 100 // 点赞与取消点赞
99 -// suggestContentHammer = new Hammer(document.getElementById('suggest-content'));  
100 -  
101 $likeBtn.bind('click', function() { 101 $likeBtn.bind('click', function() {
102 var id = $(this).closest('.suggest-item').attr('data-id'), 102 var id = $(this).closest('.suggest-item').attr('data-id'),
103 $that = $(this); 103 $that = $(this);
  1 +.iHelp{
  2 + width: 100%;
  3 + height: auto;
  4 + overflow: hidden;
  5 + .helpSearch{
  6 + width: 90%;
  7 + height: 84rem / $pxConvertRem;
  8 + overflow: hidden;
  9 + position: relative;
  10 + margin: 0 auto;
  11 + input{
  12 + width: 100%;
  13 + height: 100%;
  14 + overflow: hidden;
  15 + border:none;
  16 + font-size: 54em / $pxConvertRem;
  17 + }
  18 + i{
  19 + height: 100%;
  20 + line-height: 88rem / $pxConvertRem;
  21 + position: absolute;
  22 + right: 20rem / $pxConvertRem;
  23 + top: 0;
  24 + color: #e0e0e0;
  25 + }
  26 + }
  27 + ul{
  28 + width: 100%;
  29 + height: auto;
  30 + overflow: hidden;
  31 + display: block;
  32 + border-top: 1px solid #e0e0e0;
  33 + li{
  34 + width: 95%;
  35 + height: 80rem / $pxConvertRem;
  36 + line-height: 84rem / $pxConvertRem;
  37 + overflow: hidden;
  38 + font-size: 54em / $pxConvertRem;
  39 + border-bottom: 1px solid #e0e0e0;
  40 + float: right;
  41 + color: #444444;
  42 + &:last-of-type{
  43 + border-bottom:none;
  44 + }
  45 + span{
  46 + width: 88%;
  47 + height: 100%;
  48 + overflow: hidden;
  49 + float: left;
  50 + }
  51 + i{
  52 + color: #e0e0e0;
  53 + }
  54 + }
  55 + }
  56 +}
1 $vip: sprite-map("me/vip/*.png", $spacing: 10px); 1 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
2 $fav: sprite-map("me/fav/*.png", $spacing: 5px); 2 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
3 3
4 -@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang"; 4 +@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp";
5 5
@@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
110 110
111 //发表意见 111 //发表意见
112 .create-new-suggest { 112 .create-new-suggest {
113 - display: block; 113 + display: inline-block;
114 color: #444; 114 color: #444;
115 width: 100%; 115 width: 100%;
116 height: pxToRem(88px); 116 height: pxToRem(88px);
@@ -69,6 +69,10 @@ $basicBtnC:#eb0313; @@ -69,6 +69,10 @@ $basicBtnC:#eb0313;
69 border: 1px solid #000; 69 border: 1px solid #000;
70 color: #000; 70 color: #000;
71 } 71 }
  72 + .soonSoldOut-tag{
  73 + background-color:#ffac5b;
  74 + color:#fff;
  75 + }
72 } 76 }
73 .good-detail-page { 77 .good-detail-page {
74 overflow: hidden; 78 overflow: hidden;
  1 +{{> layout/header}}
  2 +<div class="iHelp">
  3 + <div class="helpSearch">
  4 + <input type="text">
  5 + <i class="iconfont">&#xe60f;</i>
  6 + </div>
  7 + <ul>
  8 + {{# iHelp}}
  9 + <li><a href="{{ url }}"><span>{{ name }}</span><i class="iconfont num">&#xe604;</i></a></li>
  10 + {{/ iHelp}}
  11 + </ul>
  12 +</div>
  13 +{{> layout/footer}}
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </a> 94 </a>
95 </div> 95 </div>
96 <div class="group-list"> 96 <div class="group-list">
97 - <a class="list-item" href="/help.html"> 97 + <a class="list-item" href="/home/IHelp">
98 <span class="iconfont icon">&#xe639;</span> 98 <span class="iconfont icon">&#xe639;</span>
99 帮助 99 帮助
100 <span class="iconfont num">&#xe604;</span> 100 <span class="iconfont num">&#xe604;</span>
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 <div class="good-detail-page yoho-page"> 2 <div class="good-detail-page yoho-page">
3 <div class="banner-container"> 3 <div class="banner-container">
4 <div class="tag-container"> 4 <div class="tag-container">
  5 + <p class="good-tag soonSoldOut-tag">即将售罄</p>
5 {{# tags}} 6 {{# tags}}
6 {{# is_new}} 7 {{# is_new}}
7 <p class="good-tag new-tag">NEW</p> 8 <p class="good-tag new-tag">NEW</p>
@@ -18,6 +19,9 @@ @@ -18,6 +19,9 @@
18 {{# is_limited}} 19 {{# is_limited}}
19 <p class="good-tag limit-tag">限量商品</p> 20 <p class="good-tag limit-tag">限量商品</p>
20 {{/ is_limited}} 21 {{/ is_limited}}
  22 + {{# is_soon_sold_out}}
  23 + <p class="good-tag soonSoldOut-tag">即将售罄</p>
  24 + {{/ is_soon_sold_out}}
21 {{/ tags}} 25 {{/ tags}}
22 </div> 26 </div>
23 {{# bannerTop}} 27 {{# bannerTop}}
@@ -102,7 +106,7 @@ @@ -102,7 +106,7 @@
102 106
103 <div id="productDesc"></div> 107 <div id="productDesc"></div>
104 {{> product/recommend-for-you}} 108 {{> product/recommend-for-you}}
105 - 109 +
106 {{#cartInfo}} 110 {{#cartInfo}}
107 <div class="cart-bar"> 111 <div class="cart-bar">
108 {{#if numInCart}} 112 {{#if numInCart}}
@@ -659,4 +659,28 @@ class HomeController extends AbstractAction @@ -659,4 +659,28 @@ class HomeController extends AbstractAction
659 $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true)); 659 $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
660 } 660 }
661 661
662 -} 662 + /**
  663 + * 帮助列表页
  664 + */
  665 + private function IHelpAction()
  666 + {
  667 + $this->setTitle('帮助中心');
  668 + $this->setNavHeader('帮助中心');
  669 + $data = array(
  670 + 'iHelp' => array(
  671 + array('name' => '新用户注册','url' => 'http://m.dev.yohobuy.com/' ),
  672 + array('name' => '交款须知' ,'url' => 'http://m.dev.yohobuy.com/'),
  673 + array('name' => '服务条款' ,'url' => 'http://m.dev.yohobuy.com/'),
  674 + array('name' => '网站订购流程' ,'url' => 'http://m.dev.yohobuy.com/'),
  675 + array('name' => '会员登录' ,'url' => 'http://m.dev.yohobuy.com/'),
  676 + array('name' => '网站订单修改' ,'url' => 'http://m.dev.yohobuy.com/'),
  677 + array('name' => 'YOHO币' ,'url' => 'http://m.dev.yohobuy.com/'),
  678 + array('name' => '常见问题' ,'url' => 'http://m.dev.yohobuy.com/'),
  679 + array('name' => '支付方式' ,'url' => 'http://m.dev.yohobuy.com/'),
  680 + array('name' => '发票制度说明' ,'url' => 'http://m.dev.yohobuy.com/'),
  681 + array('name' => '配送时间' ,'url' => 'http://m.dev.yohobuy.com/')
  682 + )
  683 + );
  684 + $this->_view->display('i-help', $data);
  685 + }
  686 +}