diff --git a/pmcalendar.php b/pmcalendar.php
index 8c71dfd..5610679 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -534,9 +534,9 @@ if ($act == 'newevent') {
     }
 
     .fujian-box {
-        display: flex;
+        /* display: flex;
         justify-content: space-between;
-        align-items: center;
+        align-items: center; */
         padding: 10px 0;
     }
 
@@ -547,13 +547,21 @@ if ($act == 'newevent') {
     .fujian a {
         color: #61adfe;
     }
+    input[type="file"] { padding: 0 14px; }
+    .tijaioanniu { 
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        /* padding: 10px 0;  */
+    }
+    .tijiao { width: 60px; height: 25px; background-color:#5fadff; font-size: 14px; text-align: center; line-height: 25px; color:#fff; border-radius: 4px; float: right; cursor:pointer;}
 </style>
 <div class='popup-bg' id='popup-bg'>
     <div class="yiny" id='yiny'></div>
     <div class='popup-box'>
         <div class="pop-top">
-            <div class='bianji'><img src='assets/images/bianji.png'/></div>
-            <div class="pop-title" onclick='Info()'>标题标题标题</div>
+            <div class='bianji'  onclick='bianji()'><img src='assets/images/bianji.png'/></div>
+            <div class="pop-title" id='pop-title' onclick='Info()'></div>
         </div>
         <div class="list-box">
             <div class='list-title'>
@@ -564,19 +572,22 @@ if ($act == 'newevent') {
                 <div class='cptime'>2020-10-19 17：00</div>
             </div>
             <div class='cptext-box'>
-                <textarea disabled='disabled'>顺丰科技安徽省会计法哈数据的开发哈市答复哈代发货挥洒的会计法哈萨付款哈是的金凤凰看见爱上安居客的回复可见暗红色的空间</textarea>
+                <textarea disabled='disabled' id='cptext'></textarea>
             </div>
             <div class='fujian-box'>
 
                 <!-- 附件 -->
-                <div class='fujian' id='fujian'></div>
+                <div class='fujian' id='fujianname'></div>
+                <div class="tijaioanniu">
+                    <div style=" position: relative;display: inline-block;">
+                        <iframe id="_hideiframe" name="_hideiframe" style="display: none;"></iframe>
+                        <form method="post" id="uploader" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="" enctype="multipart/form-data">
+                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" />
+                            <input type="file" id="fujian" name="fujian[]" multiple onchange="document.getElementById('uploader').submit()">
+                        </form>
+                        <div class='tijiao' id="cptijiao">提交</div>
 
-                <div style=" position: relative;display: inline-block;">
-                    <img class='tianjia' src='/assets/images/jiahao.png'/>
-                    <form method="post" id="uploader" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="./?app=uploader&id=7314&bumen=yanfa&act=add" enctype="multipart/form-data"><input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" /><input type="file" id="fujian" name="fujian[]" multiple onchange="document.getElementById('uploader').submit()"></form>
-
-<!--                    <input name="customer_file" type="file" id="excelFile"-->
-<!--                           style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;z-index: 1001;opacity: 0;filter:alpha(opacity=0);">-->
+                    </div>
                 </div>
             </div>
         </div>
@@ -590,18 +601,30 @@ if ($act == 'newevent') {
                 <div class='cptime'>2020-10-19 17：00</div>
             </div>
             <div class='cptext-box'>
-                <textarea disabled='disabled'>顺丰科技安徽省会计法哈数据的开发哈市答复哈代发货挥洒的会计法哈萨付款哈是的金凤凰看见爱上安居客的回复可见暗红色的空间</textarea>
+                <textarea disabled='disabled' id='yytext'></textarea>
             </div>
             <div class='fujian-box'>
 
                 <!-- 附件 -->
-                <div class='fujian' id='yyfujian'></div>
+                <div class='fujian' disabled='disabled' id='yyfujian'></div>
 
-                <div style=" position: relative;display: inline-block;">
+                <!-- <div style=" position: relative;display: inline-block;">
                     <img class='tianjia' src='/assets/images/jiahao.png'/>
                     <input name="customer_file" type="file" id="excelFile2"
                            style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;z-index: 1001;opacity: 0;filter:alpha(opacity=0);">
+                </div> -->
+                
+                <div style=" position: relative;display: inline-block;">
+                    <iframe id="_hideiframe2" name="_hideiframe" style="display: none;"></iframe>
+                    <form method="post" id="uploader_yy" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="" enctype="multipart/form-data">
+                        <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" />
+                        <input type="file" id="fujian_yy" name="fujian[]" multiple onchange="document.getElementById('uploader_yy').submit()">
+                    </form>
+                    <div class='tijiao' id="yytijiao">提交</div>
+
                 </div>
+
+
             </div>
         </div>
 
@@ -614,18 +637,28 @@ if ($act == 'newevent') {
                 <div class='cptime'>2020-10-19 17：00</div>
             </div>
             <div class='cptext-box'>
-                <textarea disabled='disabled'>顺丰科技安徽省会计法哈数据的开发哈市答复哈代发货挥洒的会计法哈萨付款哈是的金凤凰看见爱上安居客的回复可见暗红色的空间</textarea>
+                <textarea disabled='disabled' id='yftext'></textarea>
             </div>
             <div class='fujian-box'>
-
+            
                 <!-- 附件 -->
                 <div class='fujian' id='yffujian'></div>
 
                 <div style=" position: relative;display: inline-block;">
+                    <iframe id="_hideiframe3" name="_hideiframe" style="display: none;"></iframe>
+                    <form method="post" id="uploader_yf" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="" enctype="multipart/form-data">
+                        <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" />
+                        <input type="file" id="fujian_yf" name="fujian[]" multiple onchange="document.getElementById('uploader_yf').submit()">
+                    </form>
+                    <div class='tijiao' id="yftijiao">提交</div>
+
+                </div>
+
+                <!-- <div style=" position: relative;display: inline-block;">
                     <img class='tianjia' src='/assets/images/jiahao.png'/>
                     <input name="customer_file" type="file" id="excelFile3"
                            style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;z-index: 1001;opacity: 0;filter:alpha(opacity=0);">
-                </div>
+                </div> -->
             </div>
         </div>
 
@@ -683,6 +716,122 @@ if ($act == 'newevent') {
     var starttime, endtime;
     var dstr = ''
     var dict = {};
+    var notid;
+
+    $('#fujian').change(function(){
+        var wenjianname = $('#fujian').val();
+        var obj = document.getElementById("fujian");
+        var len = obj.files.length;
+        var temp ;
+        for (var i = 0; i < len; i++) {
+            temp = obj.files[i].name;
+        }
+        var arr = [];
+        arr.push(temp)
+        tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
+        document.getElementById("fujianname").innerHTML = tmpltxt(arr);//数据渲染
+        // console.log('arr');
+   })
+
+   $("#fujian_yy").change(function(){
+        var wenjianname = $('#fujian_yy').val();
+        var obj = document.getElementById("fujian_yy");
+        var len = obj.files.length;
+        var temp ;
+        for (var i = 0; i < len; i++) {
+            temp = obj.files[i].name;
+        }
+        var arr = [];
+        arr.push(temp)
+        tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
+        document.getElementById("yyfujian").innerHTML = tmpltxt(arr);//数据渲染
+   })
+
+   $("#fujian_yf").change(function(){
+        var wenjianname = $('#fujian_yf').val();
+        var obj = document.getElementById("fujian_yf");
+        var len = obj.files.length;
+        var temp ;
+        for (var i = 0; i < len; i++) {
+            temp = obj.files[i].name;
+        }
+        var arr = [];
+        arr.push(temp)
+        tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
+        document.getElementById("yffujian").innerHTML = tmpltxt(arr);//数据渲染
+   })
+
+   //产品提交
+   $('#cptijiao').click(function(){
+        var cptext = $("#cptext").val();
+        $.ajax({
+            url: './?app=pmcalendar&act=editchanpin',
+            dataType: 'json',
+            data: {
+                id: notid,
+                content: cptext
+            },
+            success: function (res) {
+                console.log(res);
+            },
+            error: function () {
+                alert('数据异常,请稍后重试!!!')
+            }
+        });
+   })
+   //运营
+   $('#yytijiao').click(function(){
+        var yytext = $("#yytext").val();
+        $.ajax({
+            url: './?app=pmcalendar&act=edityanfa',
+            dataType: 'json',
+            data: {
+                id: notid,
+                content: yytext
+            },
+            success: function (res) {
+                console.log(res);
+            },
+            error: function () {
+                alert('数据异常,请稍后重试!!!')
+            }
+        });
+   })
+
+   //研发
+   $('#yftijiao').click(function(){
+        var yftext = $("#yftext").val();
+        $.ajax({
+            url: './?app=pmcalendar&act=edityanfa',
+            dataType: 'json',
+            data: {
+                id: notid,
+                content: yftext
+            },
+            success: function (res) {
+                console.log(res);
+            },
+            error: function () {
+                alert('数据异常,请稍后重试!!!')
+            }
+        });
+   })
+
+    var i = 0;
+	function bianji(){
+		if(i == 0){
+			$('#cptext').attr('disabled',false)
+			$('#yytext').attr('disabled',false)
+			$('#yftext').attr('disabled',false)
+			i = 1;
+		}else {
+			$('#cptext').attr('disabled',true)
+			$('#yytext').attr('disabled',true)
+			$('#yftext').attr('disabled',true)
+			i = 0;
+		}
+		
+	}
 
     function onlyShowGame(o) {
         if (o.value != '') {
@@ -828,6 +977,13 @@ if ($act == 'newevent') {
             eventClick: function (calEvent, jsEvent, view) {
                 // if("<?=$canEdit?>"!="1")return;
                 console.log('calEvent', calEvent, jsEvent, view);
+                notid = calEvent.id;
+
+                $('#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) {
@@ -843,7 +999,7 @@ if ($act == 'newevent') {
                     hourChange($('#hour'));
                 });
                 dstr = $.fullCalendar.formatDate(calEvent.start, 'yyyy-MM-dd');
-                showEventData();
+                showEventData(calEvent.id);
 
 
             }
@@ -978,8 +1134,28 @@ if ($act == 'newevent') {
     }
 
 
-    function showEventData() {
+    function showEventData(id) {
+        // $("#cptext").val('15346546')
         $('#popup-bg').show();
+        $.ajax({
+            url: './?app=pmcalendar&act=getEventByid',
+            dataType: 'json',
+            async:"true",
+            data: {
+                id: id,
+            },
+            success: function (res) {
+                $('#pop-title').html('【'+ res.game +'】'+ res.event + ':' + res.title );
+                // $("#cptext").val(res.yanfa_remark)
+                console.log(res.chanpin_remark)
+                document.getElementById("cptext").innerHTML = res.chanpin_remark;
+                document.getElementById("yytext").innerHTML = res.yunying_remark;
+                document.getElementById("yftext").innerHTML = res.yanfa_remark;
+            },
+            error: function () {
+                alert('数据异常,请稍后重试!!!')
+            }
+        });
     }
 
     $("#yiny").click(function () {