弹框

OF1706
Commit 9c6bd739ef8fbc1ddb6d79fc7758e9ffc2151065 1 parent 06ad97aa
Showing 6 changed files with 41 additions and 23 deletions
public/font/iconfont.eot
public/font/iconfont.svg
public/font/iconfont.ttf
public/font/iconfont.woff
public/js/cart/cart-action.js
public/scss/cart/_cart.css
--- a/public/font/iconfont.eot
View file @9c6bd73
+++ b/public/font/iconfont.eot
View file @9c6bd73
--- a/public/font/iconfont.svg
View file @9c6bd73
+++ b/public/font/iconfont.svg
View file @9c6bd73
@@ -2,11 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-<<<<<<< HEAD
-Created by FontForge 20120731 at Tue Jan 17 16:09:10 2017
-=======
-Created by FontForge 20120731 at Thu Dec 29 16:36:04 2016
->>>>>>> remotes/origin/master
+Created by FontForge 20120731 at Tue Jan 24 14:14:23 2017
  By admin
 </metadata>
 <defs>
@@ -189,6 +185,8 @@ d="M958 758q0 30 -21 51.5t-51 21.5h-749q-30 0 -51 -21.5t-21 -51.5v-748q0 -30 21 
 z" />
     <glyph glyph-name="wujiaoxing" unicode="&#xe623;" 
 d="M512 63l-316 -166l60 352l-256 250l354 51l158 321l158 -321l354 -51l-256 -250l60 -352z" />
+    <glyph glyph-name="shanchu1" unicode="&#xe646;" 
+d="M1004 851l-17 17l-475 -476l-475 476l-17 -17l475 -475l-458 -459l17 -17l458 459l458 -459l17 17l-458 459z" />
     <glyph glyph-name="7xiaoche" unicode="&#xe636;" horiz-adv-x="1163" 
 d="M295 196q67 0 114 -47t47 -113.5t-47 -114t-114 -47.5t-114 47.5t-47 114t47 113.5t114 47zM917.5 196q66.5 0 113.5 -47t47 -113.5t-47 -114t-113.5 -47.5t-114 47.5t-47.5 114t47.5 113.5t114 47zM400 894v-99h-210v0v0l-187 -294v-372h95q27 56 80 90.5t117 34.5
 t117 -34.5t80 -90.5h228q27 56 80 90.5t117.5 34.5t117.5 -34.5t79 -90.5h46v765h-760v0zM400 452h-283l159 250l124 1v-251v0v0zM893 701l-131 -276l-63 31l101 206h-105v68h198v-29v0v0z" />
@@ -270,7 +268,6 @@ d="M947 179q31 0 54 -23t23 -53.5t-23 -53.5t-54 -23h-51q31 0 54 -23t23 -54t-23 -5
 q0 -136 -26 -205h256q31 0 54 -23t23 -53.5t-23 -53.5t-54 -23h51q31 0 54 -23t23 -54t-23 -54t-54 -23zM102.5 -128q-42.5 0 -72.5 30t-30 72v410q0 42 30 72t72.5 30t72.5 -30t30 -72v-410q0 -42 -30 -72t-72.5 -30z" />
     <glyph glyph-name="juxingkaobei" unicode="&#xe6bc;" 
 d="M186 2l391 382l-391 382l131 130l521 -512l-521 -512z" />
-<<<<<<< HEAD
     <glyph glyph-name="shang" unicode="&#xe6c0;" 
 d="M958 179q0 -15 -10.5 -25.5t-25.5 -10.5t-26 10l-384 384l-384 -384q-11 -10 -26 -10t-25.5 10.5t-10.5 25.5t11 26l409 410q11 10 26 10t26 -10l409 -410q11 -11 11 -26z" />
     <glyph glyph-name="xia" unicode="&#xe6c1;" 
@@ -329,7 +326,8 @@ l-102 96v13l13 14q25 21 60.5 19.5t55.5 -26.5zM123 -5l61 143l82 -82z" />
     <glyph glyph-name="jinzhi" unicode="&#xe6e0;" 
 d="M998 384q0 99 -38.5 189t-103.5 155t-155 103.5t-189 38.5t-189 -38.5t-155 -103.5t-103.5 -155t-38.5 -189t38.5 -189t103.5 -155t155 -103.5t189 -38.5t189 38.5t155 103.5t103.5 155t38.5 189zM512 806q152 0 275 -102l-595 -595q-102 123 -102 275q0 85 33.5 163
 t90.5 135t135 90.5t163 33.5zM237 64l595 595q102 -123 102 -275q0 -114 -55.5 -211t-153 -154t-213.5 -57q-152 0 -275 102z" />
-=======
->>>>>>> remotes/origin/master
+    <glyph glyph-name="shiliangzhinengduixiang1" unicode="&#xe6e2;" 
+d="M515 -128q60 0 105.5 40t52.5 98h-322q11 -58 57 -98t107 -40zM852 225q-15 31 -15 123v113q0 111 -56 200t-149 127q-7 47 -42 77.5t-81 30.5q-51 0 -87 -36q-26 -27 -35 -72q-93 -42 -149 -131t-56 -196v-113q0 -97 -16 -128q-30 -10 -46 -20q-20 -31 -20 -57
+q0 -31 24 -53.5t58 -22.5h660q34 0 58 22.5t24 53.5q-4 31 -24.5 54.5t-47.5 27.5z" />
   </font>
 </defs></svg>
--- a/public/font/iconfont.ttf
View file @9c6bd73
+++ b/public/font/iconfont.ttf
View file @9c6bd73
--- a/public/font/iconfont.woff
View file @9c6bd73
+++ b/public/font/iconfont.woff
View file @9c6bd73
--- a/public/js/cart/cart-action.js
View file @9c6bd73
+++ b/public/js/cart/cart-action.js
View file @9c6bd73
@@ -4,10 +4,11 @@
 var $ = require('yoho-jquery');
 var dialog = require('../common/dialog');
-var Alert = dialog.Alert;
 var Confirm = dialog.Confirm;
 var rDialog = require('./rdialog');
 var RConfirm = rDialog.RConfirm;
+var RAlert = rDialog.RAlert;
+
 var Cart;
 var $cartnewTips = $('.cartnew-tips'),
@@ -187,13 +188,13 @@ Cart = {
                 capi.cartItemDel(selectArray, true, PromotionArray);
             });
         } else {
-            new Alert('请至少选择一件商品').show();
+            var content = '<div class="alert-main"><i class="iconfont">&#xe6cc;</i>请至少选中一件商品!</div>';
+            new RAlert(content).show();
         }
     },
     cleanAllDisable: function() {
         var selectArray = [];
         var PromotionArray = [];
-        var content = '<div><i class="iconfont">&#xe684;</i>删除商品</div><p>确定从购物车中删除所有失效商品？</p>';
         $payWapper.find('.tr-disabled[data-role=pitem]').each(function() {
@@ -220,14 +221,13 @@ Cart = {
         });
         if (!$.isEmptyObject(selectArray)) {
-            new Confirm({
-                content: content,
-                cb: function() {
-                    capi.cartItemDel(selectArray, true, PromotionArray);
-                }
+            var content = '<div><i class="iconfont">&#xe684;</i>清除失效商品</div><p>确定要清除失效商品吗？</p>';
+            new RConfirm(content, function() {
+                capi.cartItemDel(selectArray, true, PromotionArray);
             }).show();
         } else {
-            new Alert('请至少选择一件商品').show();
+            var content = '<div class="alert-main"><i class="iconfont">&#xe6cc;</i>购物车中没有失效商品!</div>';
+            new RAlert(content).show();
         }
     },
     toFav: function() {
@@ -253,6 +253,7 @@ Cart = {
     toFavAll: function() {
         var selectArray = [];
+        var content = '<div><i class="iconfont">&#xe68e;</i>移入收藏</div><p>确定要将已选中的商品从购物车中移入收藏夹吗?<br/>移入收藏后已选中的商品将不在购物车中显示</p>';
         $payWapper.find('[data-role=cart-item-check]').each(function() {
@@ -272,9 +273,14 @@ Cart = {
         });
         if (!$.isEmptyObject(selectArray)) {
-            capi.cartItemDel(selectArray);
+
+            new RConfirm(content, function() {
+                capi.cartItemDel(selectArray);
+            });
+
         } else {
-            new Alert('请至少选择一件商品').show();
+            var content = '<div class="alert-main"><i class="iconfont">&#xe6cc;</i>请至少选中一件商品!</div>';
+            new RAlert(content).show();
         }
     },
     modNum: function() {
--- a/public/scss/cart/_cart.css
View file @9c6bd73
+++ b/public/scss/cart/_cart.css
View file @9c6bd73
@@ -1512,21 +1512,26 @@
 }
 .r-dialog.yoho-dialog{
     min-width: 370px;
+    min-height: 104px;
     box-sizing: content-box;
 }
 .r-dialog{
-    padding: 40px 20px;
+    padding: 74px 20px 40px 20px;
     .close {
-        top: 20px;
-        right: 20px;
+        top: 16px;
+        right: 16px;
+        i {
+            font-size: 24px;
+        }
     }
     .dialog-content{
         font-size: 24px;
         color: #444;
-        font-weight: 300;
+        font-weight: 500;
+
         i {
             display: inline-block;
             color: #d0021b;
@@ -1544,6 +1549,7 @@
             margin-bottom: 30px;
             font-size: 14px;
             color: #444;
+            font-weight: normal;
         }
     }
     .btn {
@@ -1555,6 +1561,14 @@
             margin-left: 20px;
         }
     }
+
+    .alert-main {
+        margin-bottom: 64px;
+        i {
+            -webkit-text-stroke-width: 1.5px;
+            text-stroke-width: 1.5px;
+        }
+    }
 }