editorial样式

@@ -16,7 +16,7 @@
                                 </li>
                             {{/each}}
                         </ul>
-                        <p class="package-shipping">运费：¥{{shoppingCost}}元（原价{{shoppingOrigCost}}元，优惠{{shoppingCutCost}}元）</p>
+                        <p class="package-shipping">运费：¥{{shoppingCost}}元（原价{{round shoppingOrigCost 2}}元，优惠{{round shoppingCutCost 2}}元）</p>
                     </div>
                 {{/each}}
             </div>

@@ -19,7 +19,7 @@
             <div class="form-group">
                 <lable class="label-name">手机验证码：</lable>
                 <input id="msg-code" type="text" class="input small-input">
-                <span id="send-code" class="btn white disable">发送验证码</span>
+                <span id="send-code" class="btn white">发送验证码</span>
             </div>
             <div class="form-group">
                 <span id="mobile-step1" class="btn submit">提交</span>

@@ -6,7 +6,7 @@
 'use strict';
 
 const api = global.yoho.API;
-const favApi = global.yoho.FavAPI;
+const SingleAPI = global.yoho.SingleAPI;
 
 /**
  * 获取商品基础数据API
@@ -41,7 +41,7 @@ const getProductBaseAsync = (productId, uid, skn) => {
  * @return { Object } 收藏状态
  */
 const getUserIsFav = (uid, productId) => {
-    return favApi.get('', {
+    return SingleAPI.get('', {
         method: 'app.favorite.isFavorite',
         id: productId,
         uid: uid,

@@ -22,7 +22,7 @@ module.exports = {
     },
     cookieDomain: 'yohoblk.com',
     domains: {
-        favApi: 'http://192.168.102.31:8092/brower',
+        singleApi: 'http://192.168.102.31:8092/brower',
         api: 'http://api-test1.yohops.com:9999/',
         service: 'http://service-test1.yohops.com:9999/',
         search: 'http://192.168.102.216:8080/yohosearch/'
@@ -107,6 +107,7 @@ if (isProduction) {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com for test',
         domains: {
+            singleApi: 'http://192.168.102.31:8092/brower',
             api: 'http://testapi.yoho.cn:28078/',
             service: 'http://testservice.yoho.cn:28077/',
             search: 'http://192.168.102.216:8080/yohosearch/'

@@ -61,7 +61,7 @@
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.37"
+    "yoho-node-lib": "0.0.38"
   },
   "devDependencies": {
     "autoprefixer": "^6.3.6",
@@ -95,7 +95,7 @@
     "precss": "^1.4.0",
     "rewire": "^2.5.1",
     "shelljs": "^0.7.0",
-    "stylelint": "^6.6.0",
+    "stylelint": "^7.1.0",
     "stylelint-config-yoho": "^1.2.4",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",

@@ -5,7 +5,7 @@
  */
 var $ = require('yoho-jquery'),
     lazyload = require('yoho-jquery-lazyload'),
-    Confirm = require('../plugins/dialog').Confirm;
+    dialog = require('../plugins/dialog');
 
 var $mainWrap = $('.refund-datail-wrap'),
     $submitExpress = $mainWrap.find('.submit-express'),
@@ -18,6 +18,9 @@ var $expressCompany = $('.express-company'),
 var id = $mainWrap.data('id'),
     expressList = $editExpress.data();
 
+var Confirm = dialog.Confirm,
+    Alert = dialog.Alert;
+
 $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件
 
 require('yoho-jquery-dotdotdot');
@@ -43,6 +46,8 @@ function cancelRefundApply() {
         success: function(data) {
             if (data.code === 200) {
                 location.reload();
+            } else {
+                new Alert(data.message || '取消申请失败').show();
             }
         }
     });
@@ -60,9 +65,10 @@ function setRefundEepress(eid, num) {
             number: num
         },
         success: function(data) {
-            console.log(data);
             if (data.code === 200) {
                 location.reload();
+            } else {
+                new Alert(data.message || '保存失败').show();
             }
         }
     });

 var _alert = require('../plugins/dialog').Alert;
 var lazyLoad = require('yoho-jquery-lazyload');
+var Confirm = require('../plugins/dialog').Confirm;
 
 lazyLoad($('img.banner-img'));
 
@@ -7,24 +8,27 @@ lazyLoad($('img.banner-img'));
 require('./me');
 
 $('.cancel-apply').on('click', function() {
-    var id = $(this).data('applyId');
-    var type = $(this).data('type');
+    var $this = $(this);
 
-    $.ajax({
-        url: '/me/return/cancel',
-        method: 'POST',
-        data: {
-            type: type,
-            id: id
+    new Confirm({
+        content: '<h1 class="title">取消申请</h1><p>您确定要取消申请么？</p>',
+        cb: function() {
+            $.ajax({
+                url: '/me/return/cancel',
+                method: 'POST',
+                data: {
+                    type: $this.data('applyId'),
+                    id: $this.data('type')
+                }
+            }).done(function(result) {
+                if (result.code === 200) {
+                    location.reload();
+                } else {
+                    new _alert(result.message).show();
+                }
+            }).fail(function() {
+                new _alert('出错了').show();
+            });
         }
-    }).done(function(result) {
-        if (result.code === 200) {
-            location.reload();
-        } else {
-            new _alert(result.message).show();
-        }
-    }).fail(function(err) {
-        console.log(err);
-        new _alert('出错了').show();
-    });
+    }).show();
 });

@@ -21,7 +21,7 @@
             font-size: 16px;
             text-align: center;
             background-color: #fff;
-            color: $fontColor;
+            color: #666;
             cursor: pointer;
             position: relative;
 
@@ -31,7 +31,7 @@
                 line-height: calc($liHeight - 2px);
                 top: 1px;
                 border-bottom: none;
-                color: #515151;
+                color: #1b1b1b;
                 font-weight: bold;
                 z-index: 3;
             }

@@ -32,6 +32,7 @@
         overflow: hidden;
         -webkit-line-clamp: 2;
         -webkit-box-orient: vertical;
+        color: #1b1b1b;
     }
 
     .good-name-text:hover {
@@ -82,6 +83,7 @@
             height: 100%;
             float: left;
             text-align: center;
+            color: #1b1b1b;
 
             &.big-width {
                 width: $bigWidth;
@@ -139,7 +141,7 @@
 
             .detail {
                 width: calc($bigWidth - $goodImgWidth - $space);
-                padding: $bigSpace 5px 0 0;
+                padding: $bigSpace 25px 0 0;
                 float: right;
                 box-sizing: border-box;
                 line-height: 1.4;
@@ -148,10 +150,12 @@
 
                 .with-bottom-space {
                     margin-bottom: $smallSpace;
+                    line-height: 20px;
                 }
 
                 span {
                     font-size: 12px;
+                    color: #1b1b1b;
                 }
 
                 .with-space {
@@ -177,6 +181,7 @@
 
                 &.last {
                     border-bottom: none;
+                    line-height: 20px;
                 }
             }
         }
@@ -216,6 +221,7 @@
 
         p {
             margin-bottom: $space;
+            line-height: 20px;
         }
 
         .pay-operation {
@@ -233,6 +239,7 @@
         .subtext {
             font-size: 12px;
             cursor: pointer;
+            color: #666;
         }
 
         .no-space {
@@ -245,7 +252,7 @@
 
         .bg {
             height: 250px;
-            background-image: resolve('me/no-order.png');
+            background-image: resolve("me/no-order.png");
             background-repeat: no-repeat;
             background-position: center bottom;
             background-size: 100px 125px;