Merge branch 'release/1.0'

@@ -54,13 +54,15 @@ module.exports = {
         infoFile: {
             name: 'info',
             level: 'info',
-            filename: 'logs/info.log'
+            filename: 'logs/info.log',
+            maxFiles: 7
         },
         errorFile: {
             name: 'error',
             level: 'error',
             filename: 'logs/error.log',
-            handleExceptions: true
+            handleExceptions: true,
+            maxFiles: 7
         },
         udp: { // send by udp
             level: 'debug', // logger level

@@ -197,12 +197,6 @@ const matchHeader = (path, qs, titleMap) => {
         return header;
     }
 
-    if (/\/me\/service$/.test(path)) {
-        header = titleMap[1];
-        header.title.des = 'Yoho!Blk在线客服';
-        return header;
-    }
-
     if (/\/me\/feedback$/.test(path)) {
         header = titleMap[3];
         header.title.des = '意见反馈';
@@ -219,13 +213,6 @@ const matchHeader = (path, qs, titleMap) => {
         return header;
     }
 
-    // 处理 feature.yoho.cn 等域名下的站外链接
-    if (/^(https?:)?\/\//i.test(path) && !/yohoblk\.com/.test(path)) {
-        header = titleMap[1];
-        header.title.des = qs.title || '';
-        return header;
-    }
-
     return header;
 };
 
@@ -280,10 +267,25 @@ const intercept = (url) => {
             });
         }
 
-        yoho.goNewPage({
+        const args = {
             header: matchHeader(path, qs, titleMap),
             url: /^(https?:)?\/\//i.test(url) ? url : origin + url
-        });
+        };
+
+        if (/\/me\/service$/.test(path)) {
+            args.header = titleMap[1];
+            args.header.title.des = 'Yoho!Blk在线客服';
+            args.showLoading = 'no';
+        }
+
+        // 处理 feature.yoho.cn 等域名下的站外链接
+        if (/^(https?:)?\/\//i.test(path) && !/m\.yohoblk\.com/.test(path)) {
+            args.header = titleMap[1];
+            args.header.title.des = qs.title || '';
+            args.showLoading = 'no';
+        }
+
+        yoho.goNewPage(args);
     } else {
         location.href = url;
     }

@@ -44,7 +44,7 @@ module.exports = (Vue) => {
         let url = `/product/shop/${value}`;
 
         if (kind === 'shop') {
-            url = `/product/shop/favorite?id=${value}`;
+            url = `/product/shop/favorite?id=${value || ''}`;
         }
         return url;
     });

@@ -3,11 +3,9 @@
     padding-top: 20px;
 
     .coin-total {
-        padding: 40px 0;
+        padding: 38px 0;
         background: white;
         text-align: center;
-        border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
 
         p:first-child {
             font-size: 34px;
@@ -39,10 +37,10 @@
         .coin-detail-list {
             padding: 0 30px;
             background: white;
-            border-top: 1px solid #eee;
             border-bottom: 1px solid #eee;
 
             li {
+                height: 128px;
                 display: flex;
                 padding: 20px 0;
                 border-bottom: 1px solid #eee;

@@ -164,7 +164,7 @@ body {
             }
 
             .goods-status {
-                background-color: #4A90E2;
+                background-color: #4a90e2;
                 color: #fffefe;
                 font-size: 22px;
                 border-radius: 15px;
@@ -181,17 +181,17 @@ body {
 
         li {
             font-size: 28px;
+            margin-left: 50%;
 
             label {
                 display: inline-block;
-                width: 180px;
                 text-align: left;
+                float: left;
                 color: #b0b0b0;
             }
 
             span {
                 display: inline-block;
-                width: 120px;
                 text-align: right;
             }
 

@@ -3,7 +3,7 @@
         <swipe class="swipe swipe-{{floor.length}}">
             <swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}">
                 <a href="{{item.url}}" title="{{item.title}}">
-                    <img v-lazy="item.src | resize 750 365">
+                    <img v-bind:src="item.src | resize 750 365">
                 </a>
             </swipe-item>
         </swipe>

@@ -17,7 +17,7 @@
             <div class="list-item exchange-mode">
                     <span>换货方式</span>
                     <i class="icon icon-right right"></i>
-                    <select class="right" v-model="deliveryTpye">
+                    <select class="right select-mode" v-model="deliveryTpye">
                         <option v-for="mode in delivery" :value="mode.id">{{mode.name}}</option>
                     </select>
             </div>
@@ -302,7 +302,7 @@
     }
 
     .exchange-info {
-        margin: 30px 0;
+        margin: 20px 0;
         background-color: #fff;
     }
 
@@ -327,6 +327,10 @@
         .icon:before {
             vertical-align: -5px;
         }
+
+        .select-mode {
+            margin-right: 25px;
+        }
     }
 
 </style>

@@ -4,7 +4,7 @@
         <div class="field" @click="openFeatureSelector(product.productId)">
             换货的颜色尺码
             <div class="right">
-                <span v-if="product.change">颜色:{{product.change.color}} 尺码:{{product.change.size}}</span>
+                <span class="change" v-if="product.change">颜色:{{product.change.color}} 尺码:{{product.change.size}}</span>
                 <i class="icon icon-right"></i>
             </div>
         </div>
@@ -64,6 +64,7 @@
             padding: 0 30px;
             background-color: #fff;
             font-size: 32px;
+
             &:after {
                 position: absolute;
                 z-index: 1;
@@ -78,6 +79,11 @@
         .field .right {
             color: #b0b0b0;
         }
+
+        .change {
+            display: inline-block;
+            margin-right: 14px;
+        }
     }
 
 </style>

@@ -394,7 +394,7 @@
                     }
 
                     .new-price {
-                        color: #000;
+                        color: #d1021c;
                         font-size: 24px;
                     }
 

@@ -191,8 +191,6 @@
             font-size: 32px;
             line-height: 90px;
             background: #fff;
-            border-top: 1px solid #eee;
-            border-bottom: 1px solid #eee;
         }
 
         .return-amount-info {
@@ -205,7 +203,7 @@
         .return-amount-item {
             position: relative;
             width: 100%;
-            height: 90px;
+            height: 88px;
 
             &:after {
                 content: "";
@@ -238,6 +236,7 @@
 
             select {
                 direction: rtl;
+                margin-right: 24px;
             }
         }
     }

@@ -54,8 +54,6 @@
     
     .product-list {
         margin-top: -4px;
-        border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
     }
 
 </style>

@@ -8,13 +8,13 @@
             <slot name="type">退货原因</slot>
 
             <span class="icon icon-right"></span>
-            <select v-model="product.reason.id" name="reason">
+            <select class="reason" v-model="product.reason.id" name="reason">
                 <option v-for="reason in reasons" v-bind:value="reason.id" selected="{{reason.id === product.reason.id}}">{{reason.name}}</option>
             </select>
         </div>
         <template v-if="specialReasons.indexOf(product.reason.id) !== -1">
             <div class="remark">
-                <textarea v-model="product.remark" rows="3" max-length="100" placeholder="原因说明"></textarea>
+                <textarea v-model="product.remark" rows="4" max-length="100" placeholder="原因说明"></textarea>
             </div>
             <div class="image-list clearfix">
                 <div class="image-item" v-for="image in imageListForShow">
@@ -83,14 +83,14 @@
         font-size: 32px;
         line-height: 90px;
         background: #f6f6f6;
+
         &:after {
             content: "";
             display: block;
             width: 100%;
             height: 30px;
-            border-top: 1px solid #eee;
-            border-bottom: 1px solid #eee;
         }
+
         .tip {
             position: relative;
             padding: 0 30px;
@@ -115,15 +115,7 @@
             width: 100%;
             height: 90px;
             background: #fff;
-            &:after {
-                content: "";
-                position: absolute;
-                left: 0;
-                bottom: -1px;
-                width: 690px;
-                height: 0;
-                border-bottom: 1px solid #eee;
-            }
+
             .icon,
             select {
                 direction: rtl;
@@ -132,14 +124,19 @@
                 line-height: 90px;
                 color: #b0b0b0;
             }
+
+            .reason {
+                margin-right: 25px;
+            }
         }
         .remark {
             margin-top: 20px;
             padding: 0 30px;
             background: #fff;
-            border-top: 1px solid #eee;
+            height: 190px;
+
             textarea {
-                margin-top: 30px;
+                margin-top: 25px;
                 width: 100%;
                 font-size: 24px;
                 line-height: 40px;
@@ -149,16 +146,20 @@
         }
         .image-list {
             padding: 30px;
+            padding-top: 5px;
             background: #fff;
+
             .image-item {
                 position: relative;
                 float: left;
-                margin-right: 20px;
-                width: 150px;
-                height: 150px;
+                margin-right: 25px;
+                width: 154px;
+                height: 154px;
+                
                 &:last-child {
                     margin-right: 0;
                 }
+
                 .icon-close {
                     position: absolute;
                     right: -20px;

@@ -18,10 +18,11 @@
         <img :src="entity.brand.brandIco | resize 110 68"/>
 
         <h2>{{entity.brand.brandName}}</h2>
-        <a :href="entity.brand.brandDomain | brandUrl">
-            进入店铺
+        <div class="brand-go">
+            <span>进入店铺</span>
             <span class="icon icon-right"></span>
-        </a>
+        </div>
+        <a :href="entity.brand.brandDomain | brandUrl"></a>
     </show-box>
 
     <show-box v-if="intro.productDescBo">
@@ -217,7 +218,7 @@
             line-height: $lh;
         }
 
-        a {
+        .brand-go {
             float: right;
             font-size: 28px;
             line-height: $lh;
@@ -227,6 +228,14 @@
         .icon-right {
             margin-left: 30px;
         }
+
+        a {
+            position: absolute;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+        }
     }
 
     .product-detail-desc {

@@ -5,6 +5,7 @@
 </template>
 <style>
     .show-box {
+        position: relative;
         margin-top: 20px;
         background: #fff;
         border-top: 1px solid #eee;