Merge branch 'feature/students' into release/4.9.1.0

@@ -16,10 +16,8 @@ var defaultOptions = {
 var tpl =
     '<div class="yoho-dialog {{className}} hide">' +
         '{{#if closeIcon}}' +
-            '<span class="close {{#if myCloseIcon}}{{myCloseIcon}}{{/if}}">' +
-                '{{#unless myCloseIcon}}' +
-                    '<i class="iconfont">&#xe602;</i>' +
-                '{{/unless}}' +
+            '<span class="close">' +
+                '<i class="iconfont">&#xe60d;</i>' +
             '</span>' +
         '{{/if}}' +
         '<div class="content">' +

@@ -120,7 +120,6 @@ function givePoint(op, parameter) {
 function createStuDialog(cont) {
     var opt = {
         className: 'stu-dialog',
-        myCloseIcon: 'close-icon',
         content: cont
 
     };
@@ -228,7 +227,6 @@ alertConfig = {
         content: '恭喜您，成功领取优惠券',
         subContents: ['特殊情况下到账有延时', '请耐心等待'],
         className: 'subcontent-dialog',
-        myCloseIcon: 'close-icon',
         refreshOnClose: true,
         btns: [
             {
@@ -253,7 +251,6 @@ alertConfig = {
         content: '您已领取过优惠券',
         subContent: '快去选购心仪的潮品吧',
         className: 'subcontent-dialog',
-        myCloseIcon: 'close-icon',
         btns: [
             {
                 id: 1,
@@ -269,7 +266,6 @@ alertConfig = {
         content: '优惠券已过期',
         subContent: '去领最新的优惠券吧',
         className: 'subcontent-dialog',
-        myCloseIcon: 'close-icon',
         btns: [
             {
                 id: 1,
@@ -282,7 +278,6 @@ alertConfig = {
         content: '领取失败',
         subContents: ['请刷新重试,', '多次无效请联系客服'],
         className: 'subcontent-dialog',
-        myCloseIcon: 'close-icon',
         btns: [
             {
                 id: 1,
@@ -337,7 +332,6 @@ function requestCoupon(id) {
         error: function() {
             var opt = {
                 className: 'stu-alert',
-                myCloseIcon: 'close-icon',
                 content: '<p>网络异常</p>'
             };
 

@@ -529,15 +529,17 @@
     margin-top: 50px;
 }
 
-.stu-alert .close-icon,
-.stu-dialog .close-icon,
-.subcontent-dialog .close-icon {
+.stu-dialog .close {
     display: inline-block;
     top: -20px;
     right: -20px;
     width: 35px;
     height: 35px;
     background-image: resolve("students/close.png");
+
+    .iconfont {
+        display: none;
+    }
 }
 
 .min-screen {