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

@@ -27,7 +27,7 @@ const index = (req, res, next) => {
         contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
         name = 'LIFT STYLE首页';
         link = 'http://www.yohoblk.com/lifestyle';
-        channel = 303
+        channel = 303;
     } else {
         contentCode = '81886aaa5e82e3741bc1ba1e04ec7706';
         name = 'MEN首页';

@@ -31,7 +31,7 @@ const _processListData = (list) => {
     _.forEach(list.data.allList, function(value, index) {
 
         _.forEach(value, function(data) {
-            data.brandDomain = `${config.siteUrl}/product/shop/${data.brandDomain}`;
+            data.brandDomain = `${config.siteUrl}/product/shop/${data.brandDomain}/list`;
         });
 
         if (index !== '0~9') {

@@ -514,6 +514,8 @@ const getOrderDetail = (uid, code) => {
             title: '订单详情'
         };
 
+        let btns = [];
+
         detail.orderGoods.forEach(good => {
             let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
 
@@ -534,7 +536,12 @@ const getOrderDetail = (uid, code) => {
 
         if (detail.isCancel !== 'Y') {
             detail.steps = _getStepByOrderStatus(st);
-            detail.btns = statusMap[st].btns;
+
+            statusMap[st].btns.forEach(function(btn) {
+                btns.push(btn);
+            });
+
+            detail.btns = btns;
 
             _.forEach(detail.btns, btn => {
                 if (btn.isPayBtn) {

@@ -574,7 +574,7 @@ const getChangeType = (uid, areaCode) => {
 const getChangeGoodsList = (orderCode, uid) => {
     return returnsAPI.getChangeGoodsListAsync(orderCode, uid).then(result => {
         const basicData = {
-            title: '申请换货'
+            title: '换货申请'
         };
         let data;
 

@@ -18,9 +18,15 @@
 <div class="info-box">
     <h4 class="status-title">发票信息</h4>
     {{# invoice}}
+        {{#if typeText}}
         <p class="text">发票类型：{{typeText}}</p>
+        {{/if}}
+        {{#if title}}
         <p class="text">发票抬头：{{title}}</p>
+        {{/if}}
+        {{#if contentValue}}
         <p class="text">发票内容：{{contentValue}}</p>
+        {{/if}}
     {{^}}
         <p class="text">暂不需要发票</p>
     {{/ invoice}}

@@ -66,7 +66,7 @@ let index = (req, res) => {
             location: '+86',
             countryName: {text: '中国'},
             captchaUrl: helpers.urlFormat('/passport/images', {t: Date.now()}),
-            itemUrl: helpers.urlFormat('/help'),
+            itemUrl: helpers.urlFormat('/help', {id: 5}),
             referUrl: refer,
             loginUrl: helpers.urlFormat('/passport/login', {refer: refer}),
             regBtnText: '立即注册'

@@ -55,7 +55,7 @@ const findUserAsync = (type, phone, area) => {
 
         const findBy = {
             email: LoginService.findByEmailAsync,
-            mobile: (phone1, area1) => LoginService.findByMobileAsync(area1, phone1) // 交换参数
+            mobile: _.rearg(LoginService.findByMobileAsync, [1, 0]) // 交换参数
         };
 
         const OK = {code: 200, message: MESSAGE.ok};

@@ -71,7 +71,7 @@ module.exports = {
             appSecret: 'c0af9c29e0900813028c2ccb42021792'
         },
         alipay: { // OK
-            partnerID: '2088701661478015',
+            partnerID: '2088421464239504',
             appSecret: 'e3i54meghrac3qhryzhw1h5yzeijik7e'
         },
         sina: { // 还未申请

@@ -118,6 +118,8 @@ function bindColorEvent() {
         var colorText = $this.attr('alt');
         var $c = $this.closest('.group.color').find('.color-text');
 
+        $('.size-list .active').removeClass('active');
+
         $c.text(colorText);
         $c.attr('data-color', colorId);
 

@@ -7,7 +7,7 @@ var addr;
 var validate = require('./validation');
 
 var addressReg = /^[\s\S]{2,100}$/;
-var phoneReg = /^(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])(\*{4}[0-9]{4}|[0-9]{8})$/;
+var phoneReg = /^(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
 
 var validateMap = {
     name: {
@@ -151,15 +151,6 @@ function editOrder(onEdit) {
         phone: phone
     };
 
-    if (/\*/.test(mobile)) {
-        d = {
-            orderCode: code,
-            areaCode: areaCode,
-            userName: userName,
-            address: address,
-            phone: phone
-        };
-    }
 
     $.ajax({
         url: '/me/editOrder',

@@ -21,9 +21,8 @@
         left: 12px;
         width: 0;
         height: 0;
-        border-width: 5px;
         top: -10px;
-        border-style: solid dashed dashed;
-        border-color: transparent transparent #379ed6;
+        border: 5px solid transparent;
+        border-bottom: 5px solid #379ed6;
     }
 }

@@ -23,6 +23,8 @@
         }
 
         .thumb-show {
+            width: 482px;
+            height: 643px;
             position: relative;
         }