Merge remote-tracking branch 'origin/master'

public/js/public_notice.js

@@ -18,11 +18,17 @@ layui.use([], function () {
             if ($(".layui-layout.layui-layout-admin").hasClass("admin-nav-mini")) {
                 left = 240
             }
+            let right1=300
+            let right2=200
+            if(window.location.origin.indexOf("wms.")!=-1||window.location.origin.indexOf("order.")!=-1){
+                right1=450
+                right2=365
+            }
             const css = `
             .nrtx{line-height:38px;}
 .noticeitemxo{margin-right:30px;cursor: pointer;}
-.fbggank{position:fixed;top:0;right:365px;z-index:9999;top:9px;}            
-#ann_box{position:fixed;top:0;left:${left}px;right:450px;height:50px;line-height:50px;background:rgba(0,0,0,0);color:#333;overflow:hidden;z-index:9999;font-size:14px;}
+.fbggank{position:fixed;top:0;right:${right2}px;z-index:9999;top:9px;}            
+#ann_box{position:fixed;top:0;left:${left}px;right:${right1}px;height:50px;line-height:50px;background:rgba(0,0,0,0);color:#333;overflow:hidden;z-index:9999;font-size:14px;}
 #ann_txt{white-space:nowrap;display:inline-block;padding-left:100%;animation:ann_scroll 200s linear infinite;}
 @keyframes ann_scroll{0%{transform:translateX(0)}100%{transform:translateX(-100%)}}`;
             const html = `<div id="ann_box"><div id="ann_txt"></div></div><a class="layui-btn layui-btn-sm fbggank" href="http://message.ichunt.net/manage/businessNotice" target="_blank">发布公告</a>`;
@@ -36,7 +42,7 @@ layui.use([], function () {
                 domains_='http://message.liexindev.net'
             }
             if(window.location.origin.indexOf("ichunt.")!=-1){
-                domains_='https://message.ichunt.net'
+                domains_='//message.ichunt.net'
             }
             
             $.ajax({