Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

 {{# refund}}
     <div class="refund-wrap">
+        <a href="/help?id=43" class="refund-notice">退货须知</a>
         {{> returns/returns-status}}
 
         <h4 class="third-title">选择退货商品</h4>

@@ -314,7 +314,7 @@ const relateMobile = (req, res, next) => {
     let areaCode = req.body.areaCode || '86';
     let sourceType = req.body.sourceType;
 
-    return BindService.relateMobileAsync(openId, sourceType, mobile, areaCode).then(result => {
+    BindService.relateMobileAsync(openId, sourceType, mobile, areaCode).then(result => {
         if (result && result.code) {
             if (result.code === 200 && result.data && result.data.uid) {
                 let refer = helpers.urlFormat('/passport/thirdlogin/relatesuccess', {

@@ -193,7 +193,7 @@ let msgCaptcha = (req, res, next) => {
 };
 
 /**
- * 注册接口
+ *  手机注册
  */
 let mobileRegister = (req, res, next) => {
     Promise.coroutine(function*() {

 /**
  * 订单 controller
- * @author: TODO
+ * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2016/07/04
  */
 

@@ -3,9 +3,9 @@
         <ul class="about-us clearfix">
             <li><a href="{{siteUrl}}">BLK首页</a></li>
             <li><a href="{{siteUrl}}/help">客户服务</a></li>
-            <li><a href="{{siteUrl}}/#">支付方式</a></li>
-            <li><a href="{{siteUrl}}/#">配送方式</a></li>
-            <li><a href="{{siteUrl}}/#">售后服务</a></li>
+            <li><a href="{{siteUrl}}/help?id=2">支付方式</a></li>
+            <li><a href="{{siteUrl}}/help?id=31">配送方式</a></li>
+            <li><a href="{{siteUrl}}/help?id=41">售后服务</a></li>
         </ul>
         <div class="record-info">
             <p>

@@ -223,6 +223,11 @@ $refundTable.on('change', '.refund-reason', function() {
     upload.up({
         callback: function(result) {
             if (result && result.code === 200) {
+                // 避免异步上传导致数量不统一
+                num = $this.data('num') || 0;
+                if (num > 3) {
+                    return;
+                }
                 $this.siblings('.img-up-tip').text(++num + '/4');
                 $this.data('num', num);
                 $this.before(imgFn(result));

@@ -318,9 +318,9 @@ exports.init = function() {
         var name = $clickItem.data('value');
         var $selectedItem = $clickItem.siblings('.selected');
 
-        $selectedItem.find('.iconfont').html('').removeClass('selected');
+        $selectedItem.find('.iconfont').html('').end().removeClass('selected');
 
-        $clickItem.find('.iconfont').html(selectedIcon).addClass('selected');
+        $clickItem.find('.iconfont').html(selectedIcon).end().addClass('selected');
 
         $regionSelectHeader.find('.name').html(name);
         $regionCodeText.text(areaCode);

@@ -287,9 +287,9 @@ $regionSelectList.on('click', '.option', function() {
     var name = $clickItem.data('value');
     var $selectedItem = $clickItem.siblings('.selected');
 
-    $selectedItem.find('.iconfont').html('').removeClass('selected');
+    $selectedItem.find('.iconfont').html('').end().removeClass('selected');
 
-    $clickItem.find('.iconfont').html(selectedIcon).addClass('selected');
+    $clickItem.find('.iconfont').html(selectedIcon).end().addClass('selected');
 
     $regionSelectHeader.find('.name').html(name);
     $regionCodeText.text(areaCode);

@@ -534,9 +534,8 @@ exports.init = function() {
         var name = $clickItem.data('value');
         var $selectedItem = $clickItem.siblings('.selected');
 
-        $selectedItem.find('.iconfont').html('').removeClass('selected');
-
-        $clickItem.find('.iconfont').html(selectedIcon).addClass('selected');
+        $selectedItem.find('.iconfont').html('').end().removeClass('selected');
+        $clickItem.find('.iconfont').html(selectedIcon).end().addClass('selected');
 
         $regionSelectHeader.find('.name').html(name);
         $regionCodeText.text(areaCode);

@@ -39,6 +39,8 @@ var pkgCache = {};
 
 var $pkgList;
 
+require('yoho-jquery-placeholder');
+
 require('yoho-jquery-dotdotdot');
 
 require('../plugins/check'); // before 地址和发票
@@ -48,6 +50,9 @@ require('./order/invoice'); // 发票
 
 lazyLoad($('img.lazy'));
 
+// IE8 placeholder
+$('[placeholder]').placeholder();
+
 // dot
 $('.brand-and-name .name').dotdotdot({
     wrap: 'letter'

 .refund-wrap {
+    position: relative;
+
+    .refund-notice {
+        width: 70px;
+        height: 24px;
+        line-height: 26px;
+        text-align: center;
+        font-size: 12px;
+        border: 1px solid #eee;
+        display: block;
+        cursor: pointer;
+        position: absolute;
+        top: -64px;
+        right: 0;
+    }
+
     .returns-status {
         margin-bottom: 40px;
     }