浏览代码

Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml
wangxiaoming 7 年之前
父节点
当前提交
558a8edea1
共有 1 个文件被更改,包括 18 次插入2 次删除
  1. 18 2
      tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

+ 18 - 2
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -95,7 +95,7 @@
 	</div>
 
 <!-- 审核备注 -->
-	<div class="layui-layer layui-anim layui-layer-iframe" id="layui-audit" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 400px; height: 260px; position: absolute; top: 100px; left: 379px;">
+	<div class="layui-layer layui-anim layui-layer-iframe" id="layui-audit" times="4" showtime="0" contype="string" style="display:none;width: 400px; height: 260px; position: absolute; top: 100px; left: 379px;">
 		<form action="" method="post" class="form form-horizontal" id="form-admin-audit">
 			<div class="layui-layer-title" id="audit" style="cursor: move;" move="ok">审核备注</div>
 			<br>
@@ -530,7 +530,23 @@
                 function audit_order() {
                     var salesAuditRemark = $('#salesAuditRemark').val();
                     if (salesAuditRemark == null || salesAuditRemark == '') {
-                        layer.msg("请完善审核备注!",{icon: 5,time:2000});
+                        layer.msg("请完善审核备注!",{
+                            icon: 5,
+                            zIndex: 999,
+							time:2000
+                        });
+                        //通过这种方式弹出的层,每当它被选择,就会置顶。
+                        /*layer.open({
+                            type: 2,
+                            shade: false,
+                            area: '500px',
+                            maxmin: true,
+                            content: '请完善审核备注',
+                            zIndex: 999, //重点1
+                            success: function(layero){
+                                layer.setTop(layero); //重点2
+                            }
+                        });*/
                         return false;
                     }
                     return true;