修改弹窗

src/main/resources/static/js/document/beautyArchiveDetailMixin.js

@@ -115,7 +115,8 @@ var beautyArchiveDetailMixin = {
                 CAIMEI.Popup({
                     content: suffix + '类型文件暂时无法预览',
                     confitmBtnText: '确定',
-                    cancelBtnText: '取消'
+                    cancelBtnText: '取消',
+                    closeIcon:true
                 }, function () {
                 }, function () {
                 });
@@ -146,7 +147,8 @@ var beautyArchiveDetailMixin = {
                 CAIMEI.Popup({
                     content: '确认使用采美豆',
                     confitmBtnText: '确定',
-                    cancelBtnText: '取消'
+                    cancelBtnText: '取消',
+                    closeIcon:true
                 }, function () {
                     _self.SearchArchiveByBeans()
                 }, function () {
@@ -162,7 +164,8 @@ var beautyArchiveDetailMixin = {
             CAIMEI.Popup({
                 content: _self.TipStatus.text,
                 confitmBtnText: _self.TipStatus.btn,
-                cancelBtnText: '取消'
+                cancelBtnText: '取消',
+                closeIcon:true
             }, function () {
                 // 确认 执行 下一步  链接跳转 支付支付采美豆
                 _self.handleClickToPage(_self.TipStatus.redirect);

src/main/resources/static/js/product/detail.js

@@ -278,7 +278,8 @@ var productDetail = new Vue({
                 CAIMEI.Popup({
                     content: `<div class="payAlert"><p>${content}</p></div>`,
                     confitmBtnText: confitmBtnText,
-                    cancelBtnText: '关闭'
+                    cancelBtnText: '关闭',
+                    closeIcon:false
                 },function(){
                     // 确定
                     window.location.href = href;

src/main/resources/static/js/supplier-center/article/article-list.js

@@ -153,7 +153,8 @@ var articleList = new Vue({
             var params = {
                 content: '确认删除改文章?',
                 cancelBtnText: '取消',
-                confitmBtnText: '删除'
+                confitmBtnText: '删除',
+                closeIcon:true
             };
             CAIMEI.Popup(params, function () {
                 that.articleDelete(article);

src/main/resources/static/js/supplier-center/encyclopedia/instrument-list.js

@@ -195,7 +195,8 @@ var productList = new Vue({
             var params = {
                 content: '确认删除该仪器信息?',
                 cancelBtnText: '取消',
-                confitmBtnText: '删除'
+                confitmBtnText: '删除',
+                closeIcon:true
             };
             CAIMEI.Popup(params, function () {
                 that.productDelete(product);

src/main/resources/static/js/supplier-center/encyclopedia/product-list.js

@@ -193,7 +193,8 @@ var productList = new Vue({
             var params = {
                 content: '确认删除该商品信息?',
                 cancelBtnText: '取消',
-                confitmBtnText: '删除'
+                confitmBtnText: '删除',
+                closeIcon:true
             };
             CAIMEI.Popup(params, function () {
                 that.productDelete(product);

src/main/resources/static/js/user-center/member/memberPage.js

@@ -159,6 +159,7 @@ var memberPage = new Vue({
                 content: '确认使用' + (currentPackage.price * currentPackage.proportion) + '采美豆开通' + (currentPackage.duration) + '个月会员？',
                 confitmBtnText: '确认开通',
                 cancelBtnText: '取消',
+                closeIcon:true
             };
             CAIMEI.Popup(popupParams, function () {
                 console.log('采美豆支付');

src/main/resources/static/js/user-center/order/detail.js

@@ -177,7 +177,8 @@ var orderPage = new Vue({
                                 CAIMEI.Popup({
                                     content: '<div class="payAlert">您有采美余额<em>￥'+toFloat(data.ableUserMoney)+'</em>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<em>￥'+toFloat(data.pendingPayments)+'</em></div>',
                                     confitmBtnText: '抵扣,继续付款',
-                                    cancelBtnText: '不抵扣,继续付款'
+                                    cancelBtnText: '不抵扣,继续付款',
+                                    closeIcon:true
                                 },function(){
                                     // 抵扣,继续付款
                                     _self.hanldPaymentConfirm(1)
@@ -191,7 +192,8 @@ var orderPage = new Vue({
                                 CAIMEI.Popup({
                                     content: '<div class="payAlert">您有采美余额<em>￥'+toFloat(data.ableUserMoney)+'</em>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</div>',
                                     confitmBtnText: '抵扣',
-                                    cancelBtnText: '不抵扣,继续付款'
+                                    cancelBtnText: '不抵扣,继续付款',
+                                    closeIcon:true
                                 },function(){
                                     // 抵扣全款
                                     _self.hanldPaymentConfirm(2);

src/main/resources/static/js/user-center/order/list.js

@@ -253,7 +253,8 @@ var orderPage = new Vue({
                                 CAIMEI.Popup({
                                     content: '<div class="payAlert">您有采美余额<em>￥'+toFloat(data.ableUserMoney)+'</em>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<em>￥'+toFloat(data.pendingPayments)+'</em></div>',
                                     confitmBtnText: '抵扣,继续付款',
-                                    cancelBtnText: '不抵扣,继续付款'
+                                    cancelBtnText: '不抵扣,继续付款',
+                                    closeIcon:true
                                 },function(){
                                     // 抵扣,继续付款
                                     _self.hanldPaymentConfirm(1)
@@ -267,7 +268,8 @@ var orderPage = new Vue({
                                 CAIMEI.Popup({
                                     content: '<div class="payAlert">您有采美余额<em>￥'+toFloat(data.ableUserMoney)+'</em>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</div>',
                                     confitmBtnText: '抵扣',
-                                    cancelBtnText: '不抵扣,继续付款'
+                                    cancelBtnText: '不抵扣,继续付款',
+                                    closeIcon:true
                                 },function(){
                                     // 抵扣全款
                                     _self.hanldPaymentConfirm(2);

src/main/resources/static/js/utils.js

@@ -146,7 +146,7 @@ CAIMEI.Popup = function(params,confirmCallback, cancelCallback){
         boxWidth: (isPC?'300px':'70%'),
         title:'提示',
         content: params.content,
-        closeIcon: true,
+        closeIcon: params.closeIcon,
         animation: 'opacity',
         closeAnimation: 'opacity',
         useBootstrap: false,