diff --git a/assets/images/dabao.png b/assets/images/dabao.png
new file mode 100644
index 0000000..b43ccb7
Binary files /dev/null and b/assets/images/dabao.png differ
diff --git a/assets/images/gengxin.png b/assets/images/gengxin.png
new file mode 100644
index 0000000..ece8b52
Binary files /dev/null and b/assets/images/gengxin.png differ
diff --git a/assets/images/jeidian.png b/assets/images/jeidian.png
new file mode 100644
index 0000000..e9a0ddb
Binary files /dev/null and b/assets/images/jeidian.png differ
diff --git a/assets/images/xiufu.png b/assets/images/xiufu.png
new file mode 100644
index 0000000..ab6cc6d
Binary files /dev/null and b/assets/images/xiufu.png differ
diff --git a/pmcalendar.php b/pmcalendar.php
index ee9ad4e..0426cff 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -307,7 +307,7 @@ if ($act == 'newevent') {
width: 100px;
height: 40px;
position: relative;
- top: 40px;
+ top: 90px;
color: #6fb3e0;
margin: 0 auto;
cursor: pointer;
@@ -382,13 +382,52 @@ if ($act == 'newevent') {
.data_box {
display: none;
}
+ .data_tab {
+ width: 240px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ position: relative;
+ top: 40px;
+ z-index:1000;
+ float:right;
+ }
+ .data-box { width: 50px; text-align:center; }
+ .data-box img { width:28px; height: 28px; margin: 0 auto; }
+ .data-box .data-name { font-size: 15px; color:#5fadff; text-align:center; }
+ .data-box .data-num { font-size: 14px; color:#a0a0a0; text-align:center; }

修复数据
+
+
+

+
+
17
+
+
+
+

+
+
17
+
+
+
+

+
+
17
+
+
+
+

+
+
17
+
+
-
+
@@ -1327,15 +1366,21 @@ if ($act == 'newevent') {
// $("#cptext").val(res.yanfa_remark)
// res.chanpin_remark = res.chanpin_remark.replace('\\','')
console.log(res.chanpin_remark)
- var chanpin_remark =JSON.parse(res.chanpin_remark)
- var yunying_remark = JSON.parse(res.yunying_remark);
- var yanfa_remark = JSON.parse(res.yanfa_remark);
- document.getElementById("cptext").innerHTML = chanpin_remark.msg;
- document.getElementById("yytext").innerHTML = yunying_remark.msg;
- document.getElementById("yftext").innerHTML = yanfa_remark.msg;
- document.getElementById("cptime").innerHTML = chanpin_remark.date;
- document.getElementById("yytime").innerHTML = chanpin_remark.date;
- document.getElementById("yftime").innerHTML = chanpin_remark.date;
+ if(res.chanpin_remark != ""){
+ var chanpin_remark =JSON.parse(res.chanpin_remark)
+ document.getElementById("cptext").innerHTML = chanpin_remark.msg;
+ document.getElementById("cptime").innerHTML = chanpin_remark.date;
+ }
+ if(res.yunying_remark!=""){
+ var yunying_remark = JSON.parse(res.yunying_remark);
+ document.getElementById("yytext").innerHTML = yunying_remark.msg;
+ document.getElementById("yytime").innerHTML = chanpin_remark.date;
+ }
+ if(res.yanfa_remark != ""){
+ var yanfa_remark = JSON.parse(res.yanfa_remark);
+ document.getElementById("yftext").innerHTML = yanfa_remark.msg;
+ document.getElementById("yftime").innerHTML = chanpin_remark.date;
+ }
var fujian = JSON.parse(res.fujian);
// console.log(fujian);