Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -119,7 +119,7 @@ if (isProduction) {
 
 
             api: 'http://api-test1.yohops.com:9999/',
             api: 'http://api-test1.yohops.com:9999/',
             service: 'http://service-test1.yohops.com:9999/',
             service: 'http://service-test1.yohops.com:9999/',
-            singleApi: 'http://192.168.102.27:8092/'
+            singleApi: 'http://api-test1.yohops.com:9999/'
         },
         },
         memcache: {
         memcache: {
             master: ['127.0.0.1:12111'],
             master: ['127.0.0.1:12111'],

@@ -82,12 +82,12 @@
     "stylelint-processor-html": "^1.0.0",
     "stylelint-processor-html": "^1.0.0",
     "vue": "1.0.26",
     "vue": "1.0.26",
     "vue-infinite-scroll": "0.2.3",
     "vue-infinite-scroll": "0.2.3",
-    "vue-lazyload": "^0.5.0",
-    "vue-loader": "^8.5.3",
+    "vue-lazyload": "^0.7.0",
+    "vue-loader": "^8.5.2",
     "vue-swipe": "0.2.6",
     "vue-swipe": "0.2.6",
     "vue-touch": "1.1.0",
     "vue-touch": "1.1.0",
     "webpack": "^1.13.2",
     "webpack": "^1.13.2",
-    "webpack-dashboard": "^0.1.1",
+    "webpack-dashboard": "^0.1.6",
     "webpack-dev-server": "^1.14.1",
     "webpack-dev-server": "^1.14.1",
     "webpack-stream": "^3.1.0",
     "webpack-stream": "^3.1.0",
     "yoho-cookie": "1.2.0",
     "yoho-cookie": "1.2.0",

@@ -170,7 +170,7 @@ gulp.task('img', () => {
 
 
 // copy font
 // copy font
 gulp.task('font', () => {
 gulp.task('font', () => {
-    return gulp.src('font/*')
+    return gulp.src('font/**/*')
         .pipe(gulp.dest(dist.font));
         .pipe(gulp.dest(dist.font));
 });
 });
 
 

@@ -103,8 +103,8 @@
         .card-label {
         .card-label {
             margin: 0 0 10px;
             margin: 0 0 10px;
             font-size: 24px;
             font-size: 24px;
-            line-height: 28px;
-            height: 65px;
+            line-height: 1.4;
+            height: 67.1999999999px;
             font-weight: normal;
             font-weight: normal;
         }
         }
     }
     }

@@ -429,6 +429,8 @@
                             this.cartCount = result.data.goods_count;
                             this.cartCount = result.data.goods_count;
 
 
                             selector.playAnimation();
                             selector.playAnimation();
+                        } else {
+                            result.message = '添加购物车失败 >_<';
                         }
                         }
 
 
                         this.showFeatureSelector = false;
                         this.showFeatureSelector = false;