Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -101,7 +101,7 @@ Cart = {
         var $this = $(this);
         var $this = $(this);
         var $item = $this.closest('li[data-role="pitem"]');
         var $item = $this.closest('li[data-role="pitem"]');
         var selectArray = [];
         var selectArray = [];
-        var content = '<div><span></span>删除商品</div><p>确定从购物车中删除此商品？</p>';
+        var content = '<div><i class="iconfont">&#xe684;</i>删除商品</div><p>确定要从购物车中删除该商品？</p>';
         var countJSON;
         var countJSON;
 
 
         selectArray.push({
         selectArray.push({

@@ -227,7 +227,7 @@ var areaSelect = {
         return this.area ? this.area.id : '';
         return this.area ? this.area.id : '';
     },
     },
     text: function() {
     text: function() {
-        let arr = [];
+        var arr = [];
 
 
         if (this.province.text) {
         if (this.province.text) {
             arr.push(this.province.text);
             arr.push(this.province.text);

@@ -4,7 +4,9 @@
  * @date: 2016/01/06
  * @date: 2016/01/06
  */
  */
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
-    Dialog = require('../plugins/dialog').Dialog;
+    Dialog = require('../common/dialog').Dialog;
+
+
 
 
 function RDialog(opts) {
 function RDialog(opts) {
     var option = $.extend(true, {}, {
     var option = $.extend(true, {}, {
@@ -16,6 +18,7 @@ function RDialog(opts) {
     option.btns.name = '';
     option.btns.name = '';
 
 
     Dialog.call(this, option);
     Dialog.call(this, option);
+
 }
 }
 
 
 RDialog.prototype = new Dialog({
 RDialog.prototype = new Dialog({

@@ -1394,8 +1394,11 @@
         }
         }
     }
     }
 }
 }
+.r-dialog.yoho-dialog{
+    min-width: 370px;
+    box-sizing: content-box;
+}
 .r-dialog{
 .r-dialog{
-    min-width: 420px;
     padding: 40px 20px;
     padding: 40px 20px;
 
 
     .close {
     .close {
@@ -1411,9 +1414,9 @@
         i {
         i {
             display: inline-block;
             display: inline-block;
             color: #d0021b;
             color: #d0021b;
-            font-size: 24px;
+            font-size: 26px;
             margin-right: 20px;
             margin-right: 20px;
-            vertical-align: middle;
+            vertical-align: baseline;
         }
         }
         h3 {
         h3 {
             margin-top: 35px;
             margin-top: 35px;