lsc 2 vuotta sitten
vanhempi
commit
25283576dd
5 muutettua tiedostoa jossa 90 lisäystä ja 24 poistoa
  1. 54 11
      css/gm/Desktop.css
  2. 23 11
      gm.html
  3. BIN
      img/icon/gm/cancel.png
  4. BIN
      img/icon/gm/notice.png
  5. 13 2
      js/Desktop/Onload.js

+ 54 - 11
css/gm/Desktop.css

@@ -391,37 +391,70 @@ body div ::-webkit-scrollbar-resizer:vertical {
     display: block;
     display: block;
 }
 }
 
 
-.U_MD_D_BD_notice {
+.U_MD_D_BD_notice_img {
+    height: 20px !important;
+    margin-right: 5px;
     display: none;
     display: none;
-    padding: 5px 10px;
+}
+
+.U_MD_D_BD_notice_img>img {
+    width: 100%;
+    height: 100%;
+}
+
+.U_MD_D_BD_notice {
+    /* display: none; */
+    /* padding: 5px 10px; */
     background-color: #00000085;
     background-color: #00000085;
     position: absolute;
     position: absolute;
     right: 0;
     right: 0;
     top: 50px;
     top: 50px;
-    border-radius: 3px;
+    border-radius: 10px;
     width: 300px;
     width: 300px;
 }
 }
 
 
+.U_MD_D_BD_notice:hover {
+    background-color: #000000a2;
+}
+
+.U_MD_D_BD_notice_title {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    font-size: 15px;
+    padding: 13px 15px;
+    box-sizing: border-box;
+    background: rgb(44, 44, 44);
+    justify-content: space-between;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+}
+
+.U_MD_D_BD_notice_title {
+    cursor: pointer;
+}
+
 .U_MD_D_BD_noticeBox {
 .U_MD_D_BD_noticeBox {
-    padding: 5px 0;
+    padding: 10px 15px;
     width: 100%;
     width: 100%;
     box-sizing: border-box;
     box-sizing: border-box;
     font-size: 15px;
     font-size: 15px;
     cursor: pointer;
     cursor: pointer;
 }
 }
 
 
+.U_MD_D_BD_noticeBox+.U_MD_D_BD_noticeBox {
+    border-top: 1px solid #5f5f5f84;
+}
+
 .U_MD_D_BD_noticeBox_title {
 .U_MD_D_BD_noticeBox_title {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
 }
 }
 
 
-.U_MD_D_BD_noticeBox_title>span:nth-child(1) {
-    color: #979797;
-}
 
 
-.U_MD_D_BD_noticeBox_title>span:nth-child(2) {
-    margin-left: 8px;
-    width: calc(100% - 68px);
+.U_MD_D_BD_noticeBox_title>span:nth-child(1)  {
+    /* margin-left: 8px; */
+    width: calc(100%);
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
     white-space: nowrap;
     white-space: nowrap;
@@ -433,12 +466,22 @@ body div ::-webkit-scrollbar-resizer:vertical {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
 }
 }
-.U_MD_D_BD_noticeBox_content span{
+
+.U_MD_D_BD_noticeBox_content span {
     width: calc(100%);
     width: calc(100%);
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
     white-space: nowrap;
     white-space: nowrap;
     word-break: break-word;
     word-break: break-word;
+    color: #979797;
+
+}
+
+.U_MD_D_BD_noticeBox_time {
+    margin-top: 5px;
+    width: 100%;
+    color: #979797;
+    font-size: 14px;
 }
 }
 
 
 .U_MD_D_BZMD {
 .U_MD_D_BZMD {

+ 23 - 11
gm.html

@@ -98,10 +98,12 @@
                             <div class="register" onclick="U.MD.U.L.register();" title="注册" style="margin-left: 5px;">
                             <div class="register" onclick="U.MD.U.L.register();" title="注册" style="margin-left: 5px;">
                                 注册
                                 注册
                             </div>
                             </div>
-                            <div class="avatar" onclick="U.MD.D.I.openApplication('my')"><img src="./img/icon/avatar.png" alt=""></div>
+                            <div class="avatar" onclick="U.MD.D.I.openApplication('my')"><img
+                                    src="./img/icon/avatar.png" alt=""></div>
                             <div class="userName"
                             <div class="userName"
                                 style="max-width: 86px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                                 style="max-width: 86px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                             </div>
                             </div>
+                            <div class="U_MD_D_BD_notice_img" onclick="U.MD.D.OpenNotice();"><img src="./img/icon/gm/notice.png" alt=""></div>
                             <div class="exit" onclick="U.MD.U.LO.logoutSystem();" title="退出"
                             <div class="exit" onclick="U.MD.U.LO.logoutSystem();" title="退出"
                                 style="display: none;margin-left: 5px;color: #888888;">
                                 style="display: none;margin-left: 5px;color: #888888;">
                                 退出
                                 退出
@@ -115,18 +117,28 @@
                         <img class="U_MD_D_BD_QRcodeShareImg" src="./img/QRcodeShare.png" alt="Alternate Text" />
                         <img class="U_MD_D_BD_QRcodeShareImg" src="./img/QRcodeShare.png" alt="Alternate Text" />
                     </div>
                     </div>
                     <div class="U_MD_D_BD_notice" onclick="U.MD.D.I.openApplication('messageGM')">
                     <div class="U_MD_D_BD_notice" onclick="U.MD.D.I.openApplication('messageGM')">
-                        <!-- <div class="U_MD_D_BD_noticeBox">
-                            <div class="U_MD_D_BD_noticeBox_title"><span>消息通知</span><span>相向而行,幸福光明</span></div>
-                            <div class="U_MD_D_BD_noticeBox_content"><span>相向而行,幸福光明</span></div>
+                        <div class="U_MD_D_BD_notice_title">
+                            <span>消息通知</span>
+                            <img src="./img/icon/gm/cancel.png" alt="" onclick="U.MD.D.cancelNotice()">
                         </div>
                         </div>
-                        <div class="U_MD_D_BD_noticeBox">
-                            <div class="U_MD_D_BD_noticeBox_title"><span>消息通知</span><span>新项目:巧“焊”天工</span></div>
-                            <div class="U_MD_D_BD_noticeBox_content"><span>成功发布了,快去学习中心看看吧。</span></div>
+                        <div class="U_MD_D_BD_noticeBox_box">
+                            <div class="U_MD_D_BD_noticeBox">
+                                <div class="U_MD_D_BD_noticeBox_title"><span>相向而行,幸福光明</span></div>
+                                <div class="U_MD_D_BD_noticeBox_content"><span>相向而行,幸福光明</span></div>
+                                <div class="U_MD_D_BD_noticeBox_time"><span>2023-06-04 15:06</span></div>
+                            </div>
+                            <div class="U_MD_D_BD_noticeBox">
+                                <div class="U_MD_D_BD_noticeBox_title"><span>新项目:巧“焊”天工</span></div>
+                                <div class="U_MD_D_BD_noticeBox_content"><span>成功发布了,快去学习中心看看吧。</span></div>
+                                <div class="U_MD_D_BD_noticeBox_time"><span>2023-06-04 15:06</span></div>
+                            </div>
+                            <div class="U_MD_D_BD_noticeBox">
+                                <div class="U_MD_D_BD_noticeBox_title"><span>新项目:巧“焊”天工</span></div>
+                                <div class="U_MD_D_BD_noticeBox_content"><span>成功发布了,快去学习中心看看吧。</span></div>
+                                <div class="U_MD_D_BD_noticeBox_time"><span>2023-06-04 15:06</span></div>
+
+                            </div>
                         </div>
                         </div>
-                        <div class="U_MD_D_BD_noticeBox">
-                            <div class="U_MD_D_BD_noticeBox_title"><span>消息通知</span><span>新项目:巧“焊”天工</span></div>
-                            <div class="U_MD_D_BD_noticeBox_content"><span>成功发布了,快去学习中心看看吧。</span></div>
-                        </div> -->
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="U_MD_D_B" __top__="false" id="U_MD_D_B">
                 <div class="U_MD_D_B" __top__="false" id="U_MD_D_B">

BIN
img/icon/gm/cancel.png


BIN
img/icon/gm/notice.png


+ 13 - 2
js/Desktop/Onload.js

@@ -483,6 +483,17 @@ U.MD.D.stopSafari = function () {
     });
     });
 }
 }
 
 
+U.MD.D.OpenNotice = function(){
+    let box = $('.U_MD_D_BD_notice')[0]
+    box.style.display = 'block'
+}
+
+U.MD.D.cancelNotice = function(){
+    U.UF.EV.stopBubble();
+    let box = $('.U_MD_D_BD_notice')[0]
+    box.style.display = 'none'
+}
+
 U.MD.D.getNotice = function () {
 U.MD.D.getNotice = function () {
     // a77e9404-efec-11e9-96f9-028edca3b798&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=undefined&role=1
     // a77e9404-efec-11e9-96f9-028edca3b798&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=undefined&role=1
     var uid = US.userInfo.userid,
     var uid = US.userInfo.userid,
@@ -490,9 +501,9 @@ U.MD.D.getNotice = function () {
         org = US.userInfo.org;
         org = US.userInfo.org;
     U.A.Request(US.Config.pbl + "selectNotice?uid=" + uid + "&oid=" + oid + "&org=" + org + "&page=1", [], function (res) {
     U.A.Request(US.Config.pbl + "selectNotice?uid=" + uid + "&oid=" + oid + "&org=" + org + "&page=1", [], function (res) {
         if (res.value && res.value[0].length > 0) {
         if (res.value && res.value[0].length > 0) {
-            let box = $('.U_MD_D_BD_notice')[0]
+            let box = $('.U_MD_D_BD_noticeBox_box')[0]
             let _res = res.value[0]
             let _res = res.value[0]
-            box.style.display = 'block'
+            $('.U_MD_D_BD_notice')[0].style.display = 'block'
             box.innerHTML = ''
             box.innerHTML = ''
             var num = _res.length > 3 ? 3 : _res.length
             var num = _res.length > 3 ? 3 : _res.length
             for (var i = 0; i < num; i++) {
             for (var i = 0; i < num; i++) {