Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type

5 years ago · 5ac23b6a5b
parent de8386c0cb 0934cd472a
commit 5ac23b6a5b
2 changed files with 11 additions and 9 deletions
--- a/Application/Admin/View/Statement/createCpStatement.html
+++ b/Application/Admin/View/Statement/createCpStatement.html
@ -83,9 +83,9 @@
    
 </style>
 <body>
-    <div style="width: 100%;line-height: 100px;font-size: 25px;font-weight: 600;text-align: center;">
+    <!-- <div style="width: 100%;line-height: 100px;font-size: 25px;font-weight: 600;text-align: center;">
        海南万盟天下科技有限公司
-    </div>
+    </div> -->
    <div style="display: flex;margin: auto;">
        <div class="tab-content tabcon1711" id="firstPartBaseInfo">
            <table  border="0" cellspacing="0" cellpadding="0">
@ -525,7 +525,6 @@
        },
        createStatement(){
            $("#createStatement").on("click",function(){
-                alert(1);
                //验证信息
                for (const key in DATAOBJ) {
                    if(DATAOBJ[key] === false){
@ -570,10 +569,10 @@
              
                PUBLIC.postData("{:U('doAddCpStatement')}",DATAOBJ,function(data){
                    if(data.success){
+                        layer.closeAll('loading');
+                        layer.msg('添加成功');
                        setTimeout(function(){
-                         layer.closeAll('loading');
-                         layer.msg('添加成功');
-                         //
+                          window.parent.reload();
                        },350);
                    }else{
                        alert("添加失败，请联系管理员")
--- a/Application/Admin/View/StatementMangement/lists.html
+++ b/Application/Admin/View/StatementMangement/lists.html
@ -177,7 +177,10 @@
    </script>
    <script type="text/javascript">
        //导航高亮
-        highlight_subnav('{:U('Query/marketList')}');
+        highlight_subnav("{:U('Query/marketList')}");
+        function reload() {
+            window.location.reload(); 
+        }
        $(function(){
            //搜索功能
            var start = $("#time_start").val();
@ -192,11 +195,11 @@
            $("#upstream").click(function () {
                layer.open({
                    type: 2,
-                    title: "【游戏角色】列表",
+                    title: "海南万盟天下科技有限公司",
                    shadeClose: true,
                    shade: 0.8,
                    area: ['70%', '80%'],
-                    content: ['/admin.php?s=/Member/role_list/' , 'no']
+                    content:'/admin.php?s=/Statement/createCpStatement/'
                });
            });