diff --git a/pmcalendar.php b/pmcalendar.php
index e6a0a95..b74a288 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -318,6 +318,10 @@ if ($act == 'newevent') {
                 </div>
 
                 <style>
+                html,body {
+                    height: 100%;
+                    overflow: auto;
+                }
                     .xian2 {
                         width: calc(100% - 200px);
                         height: 1px;
@@ -549,6 +553,12 @@ if ($act == 'newevent') {
         position: fixed;
         right: 0;
         z-index: 1001;
+        overflow: scroll;
+    }
+
+    ::-webkit-scrollbar {
+        /*隐藏滚轮*/
+        display: none;
     }
 
     .pop-top {
@@ -615,7 +625,8 @@ if ($act == 'newevent') {
 
     .cptext-box textarea {
         width: 100%;
-        height: 100px;
+        min-height: 111px;
+        max-height: 160px;
         padding: 20px 14px;
         font-size: 12px;
         color: #848484;
@@ -626,11 +637,18 @@ if ($act == 'newevent') {
 
     .fujian {
         display: flex;
+        flex-flow:row wrap;
         align-items: center;
         font-size: 12px;
         color: #b8b8b8;
     }
 
+    .fujianinfo {
+        display: flex;
+        align-items: center;
+        margin-top: 5px;
+    }
+
     .fujian img {
         width: 14px;
         margin-right: 7px;
@@ -730,6 +748,7 @@ if ($act == 'newevent') {
 
                 <!-- 附件 -->
                 <div class='fujian' id='fujianname' ></div>
+                <!-- <div class='fujian xz' id='xzfujianname' ></div> -->
                 <div class="tijaioanniu">
                     <div style=" position: relative; display: none" class="upfujian" id="upfujian_cp">
                         <img class='tianjia' src='./assets/images/jiahao.png'/>
@@ -762,7 +781,7 @@ if ($act == 'newevent') {
 
                 <!-- 附件 -->
                 <div class='fujian' disabled='disabled' id='yyfujian'></div>
-
+                <!-- <div class='fujian xz' id='yyxzfujian'></div> -->
                 <!-- <div style=" position: relative;display: inline-block;">
                     <img class='tianjia' src='/assets/images/jiahao.png'/>
                     <input name="customer_file" type="file" id="excelFile2"
@@ -801,6 +820,7 @@ if ($act == 'newevent') {
 
                 <!-- 附件 -->
                 <div class='fujian' id='yffujian'></div>
+                <!-- <div class='fujian xz' id='yfxzfujian'></div> -->
                 <div class="tijaioanniu">
                     <div style=" position: relative;display: none;" class="upfujian" id="upfujian_yf">
                         <img class='tianjia' src='./assets/images/jia.png'/>
@@ -867,11 +887,13 @@ if ($act == 'newevent') {
 
 <script type="text/x-dot-template" id="fujian-dot">
     {{~it:item:index}}
-        <img src="./assets/images/xiazai.png"/ class='xiazaiimg'>
-        <div id='cpfuinfo'>
-            <a href='http://leguevent.local{{= item.file}}' target="_blank">{{= item.name}}</a>
+        <div class='fujianinfo'>
+            <img src="./assets/images/xiazai.png"/ class='xiazaiimg'>
+            <div id='cpfuinfo'>
+                <a href='http://10.0.0.5/leguevent_dev{{= item.file}}' target="_blank">{{= item.name}}</a>
+            </div>
+            <img src="./assets/images/x.png" class='ximg' onclick="deletefujian('{{= item.key}}')"/>
         </div>
-        <img src="./assets/images/x.png" class='ximg' onclick="deletefujian('{{= item.key}}')"/>
     {{~}}
 </script>
 
@@ -890,30 +912,34 @@ if ($act == 'newevent') {
     var dstr = ''
     var dict = {};
     var notid;
+    var arrcp = [];
+    var arryy = [];
+    var arryf = [];
 
     function deletefujian(id){
 
         if("<?=$isxfvrole?>" != "1" && "<?=$isxfyyerole?>" != "1" && "<?=$canEdit?>" != "1" && "<?=$isgxvrole?>" != "1" && "<?=$isgxyyerole?>" != "1" && "<?=$isgxcperole?>" != "1" && "<?=$isgxyferole?>" != "1" && "<?=$canEdit?>" != "1")return
-
-        $.ajax({
-            url: './?app=uploader&act=del',
-            dataType: 'json',
-            data: {
-                id: notid,
-                key: id
-            },
-            success: function (res) {
-                console.log(res);
-                alert('删除成功');
-                showEventData(notid);
-                textdisabled();
-            },
-            error: function () {
-                alert('数据异常,请稍后重试!!!');
-                showEventData(notid);
-                textdisabled();
-            }
-        });
+        if (confirm("确定删除该用户？？？")) {
+            $.ajax({
+                url: './?app=uploader&act=del',
+                dataType: 'json',
+                data: {
+                    id: notid,
+                    key: id
+                },
+                success: function (res) {
+                    console.log(res);
+                    alert('删除成功');
+                    showEventData(notid);
+                    textdisabled();
+                },
+                error: function () {
+                    alert('数据异常,请稍后重试!!!');
+                    showEventData(notid);
+                    textdisabled();
+                }
+            });
+        }
     }
 
     // function isFocusyf(){
@@ -940,15 +966,15 @@ if ($act == 'newevent') {
         var len = obj.files.length;
         var temp;
         for (var i = 0; i < len; i++) {
-            temp = obj.files[i].name;
+            // temp = obj.files[i].name;
+            var data = {};
+            data['name'] = obj.files[i].name
+            data['file'] = "#"
+            arrcp.push(data)
         }
-        var arr = [];
-        var data = {};
-        data['name'] = temp
-        data['file'] = "#"
-        arr.push(data)
+        $("#fujianname").empty();
         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
-        document.getElementById("fujianname").innerHTML = tmpltxt(arr);//数据渲染
+        document.getElementById("fujianname").innerHTML = tmpltxt(arrcp);//数据渲染
         // console.log('arr');
     })
 
@@ -958,15 +984,15 @@ if ($act == 'newevent') {
         var len = obj.files.length;
         var temp;
         for (var i = 0; i < len; i++) {
-            temp = obj.files[i].name;
+            // temp = obj.files[i].name;
+            var data = {};
+            data['name'] = obj.files[i].name
+            data['file'] = "#"
+            arryy.push(data)
         }
-        var arr = [];
-        var data = {};
-        data['name'] = temp
-        data['file'] = "#"
-        arr.push(data)
+        $("#yyfujian").empty();
         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
-        document.getElementById("yyfujian").innerHTML = tmpltxt(arr);//数据渲染
+        document.getElementById("yyfujian").innerHTML = tmpltxt(arryy);//数据渲染
     })
 
     $("#fujian_yf").change(function () {
@@ -974,16 +1000,18 @@ if ($act == 'newevent') {
         var obj = document.getElementById("fujian_yf");
         var len = obj.files.length;
         var temp;
+        // var arr = [];
         for (var i = 0; i < len; i++) {
-            temp = obj.files[i].name;
+            // temp = obj.files[i].name;
+            var data = {};
+            data['name'] = obj.files[i].name
+            data['file'] = "#"
+            arryf.push(data)
         }
-        var arr = [];
-        var data = {};
-        data['name'] = temp
-        data['file'] = "#"
-        arr.push(data)
+        $("#yffujian").empty();
+        console.log(arryf);
         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
-        document.getElementById("yffujian").innerHTML = tmpltxt(arr);//数据渲染
+        document.getElementById("yffujian").innerHTML = tmpltxt(arryf);//数据渲染
     })
 
     //产品提交
@@ -1102,6 +1130,10 @@ if ($act == 'newevent') {
 
     var i = 0;
 
+    $(document).ready(function() {
+        $('html,body').scrollTop(0)
+    })
+
     function bianji() {
 
         if ("<?=$isgxyyerole?>" == "1") {
@@ -1181,7 +1213,6 @@ if ($act == 'newevent') {
         var m = date.getMonth();
         var y = date.getFullYear();
 
-
         var calendar = window.calendar = $('#calendar').fullCalendar({
             buttonText: {
                 prev: '<i class="icon-chevron-left"></i>',
@@ -1365,30 +1396,6 @@ if ($act == 'newevent') {
                     } else {
                         return
                     }
-                // }else {
-                    // $('#uploader').attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=chanpin&act=add');
-                    // $('#uploader_yy').attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yunyig&act=add')
-                    // $("#uploader_yf").attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yanfa&act=add')
-
-                    // //console.log($('#uploader').attr('action'))
-
-                    // dict = {};
-                    // $.post('./?app=pmcalendar&act=getEventByid', {id: calEvent.id}, function (txt) {
-                    //     var j = JSON.parse(txt);
-                    //     dict.start = j.start;
-                    //     dict.end = j.end;
-                    //     dict.id = calEvent.id;
-                    //     $('#game').val(j.game);
-                    //     $('#hour').val(j.shour);
-                    //     $('#min').val(j.smin);
-                    //     $('#event').val(j.event);
-                    //     $('#title').val(j.title);
-                    //     hourChange($('#hour'));
-                    // });
-                    // dstr = $.fullCalendar.formatDate(calEvent.start, 'yyyy-MM-dd');
-                    // showEventData(calEvent.id);
-                // }
-
             }
 
         });
@@ -1562,10 +1569,7 @@ if ($act == 'newevent') {
         } else {
             $('#data_box').hide();
             $('#datarepairname').html('查看统计');
-
-            // <img src='assets/images/tongji.png' id="dataimg"/>
             $("#dataimg").attr("src",'assets/images/tongji.png');
-
             $('#calendardiv').show();
         }
 
@@ -1575,6 +1579,7 @@ if ($act == 'newevent') {
     function showEventData(id) {
         // $("#cptext").val('15346546')
         $('#popup-bg').show();
+        $('body,html').css('overflow', 'hidden')
         $.ajax({
             url: './?app=pmcalendar&act=getEventByid',
             dataType: 'json',
@@ -1584,27 +1589,44 @@ if ($act == 'newevent') {
             },
             success: function (res) {
                 $('#pop-title').html('【' + res.game + '】' + res.event + ':' + res.title);
-                // $("#cptext").val(res.yanfa_remark)
-                // res.chanpin_remark = res.chanpin_remark.replace('\\','')
+                arrcp = [];
+                arryy = [];
+                arryf = [];
+                $("#fujianname").empty();
+                $("#yyfujian").empty();
+                $("#yffujian").empty();
                 console.log(res.chanpin_remark)
                 if (res.chanpin_remark != "" && res.chanpin_remark != null) {
                     var chanpin_remark = JSON.parse(res.chanpin_remark)
                     document.getElementById("cptext").innerHTML = chanpin_remark.msg;
                     document.getElementById("cptime").innerHTML = chanpin_remark.date;
+                    if(chanpin_remark.msg.length >= 100){
+                        $("#cptext").css('height','150px');
+                    }else {
+                        $("#cptext").css('height','111px');
+                    }
                 }
                 if (res.yunying_remark != "" && res.yunying_remark != null) {
                     var yunying_remark = JSON.parse(res.yunying_remark);
                     document.getElementById("yytext").innerHTML = yunying_remark.msg;
                     document.getElementById("yytime").innerHTML = yunying_remark.date;
+                    if(yunying_remark.msg.length >= 100){
+                        $("#yytext").css('height','150px');
+                    }else {
+                        $("#yytext").css('height','111px');
+                    }
                 }
                 if (res.yanfa_remark != "" && res.yanfa_remark != null) {
                     var yanfa_remark = JSON.parse(res.yanfa_remark);
                     document.getElementById("yftext").innerHTML = yanfa_remark.msg;
                     document.getElementById("yftime").innerHTML = yanfa_remark.date;
+                    if(yanfa_remark.msg.length >= 100){
+                        $("#yftext").css('height','150px');
+                    }else {
+                        $("#yftext").css('height','111px');
+                    }
                 }
-                var arrcp = [];
-                var arryy = [];
-                var arryf = [];
+                
                 // if(res.fujian != null){
                     var fujian = JSON.parse(res.fujian);
                     for (let i in fujian) {
@@ -1616,9 +1638,7 @@ if ($act == 'newevent') {
                             arryf.push(fujian[i])
                         }
                     }
-                    console.log(arrcp.length)
-                    console.log(arryy.length)
-                    console.log(arryf)
+
                     if(arrcp.length != 0){
                         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
                         document.getElementById("fujianname").innerHTML = tmpltxt(arrcp);//数据渲染
@@ -1653,6 +1673,7 @@ if ($act == 'newevent') {
     $("#yiny").click(function () {
         location.reload();
         $("#popup-bg").hide();
+        $('body,html').css('overflow', 'auto')
     })
 
     function Info() {
@@ -1715,30 +1736,6 @@ if ($act == 'newevent') {
 
     })
 
-    $('#excelFile2').change(function (e) {
-        // e.target得到的是input标签，e.target.files得到是一串filelist，
-        // e.target.files[0]得到的是图片的一些参数，这些参数可以根据自己的需要提取
-        var fileName = e.target.files[0].name;
-        var arr = [];
-        arr.push(fileName)
-        tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
-        document.getElementById("yyfujian").innerHTML = tmpltxt(arr);//数据渲染
-        // $(this).prev().find('span').text(fileName);
-
-    })
-
-    $('#excelFile3').change(function (e) {
-        // e.target得到的是input标签，e.target.files得到是一串filelist，
-        // e.target.files[0]得到的是图片的一些参数，这些参数可以根据自己的需要提取
-        var fileName = e.target.files[0].name;
-        var arr = [];
-        arr.push(fileName)
-        tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
-        document.getElementById("yffujian").innerHTML = tmpltxt(arr);//数据渲染
-        // $(this).prev().find('span').text(fileName);
-
-    })
-
     function showEventInfo(start, btns, stype) {
         var form = $("<form class=''><label>选择游戏和事件类型 (" + start + ")</label><div class='space-1'></div></form>");
         form.append('<?=gameGameListSelect('game')?>&nbsp<select id="event"><option value="打包">打包</option><option value="版本更新">版本更新</option><option value="修复外网">修复外网</option><option value="上线">上线</option><option value="节点">节点</option></select>');