分支合并

src/jfw/front/shorturl.go

@@ -161,6 +161,12 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
 			s.T["newBidInfoList"] = tg.GetNewBidInfo()
 			s.T["industryInfoList"] = tg.GetConsult()
 			s.T["hotLabelList"] = tg.GetHotLabel(30)
+<<<<<<< HEAD
+=======
+		}
+		if inWorkDesktop, _ := s.GetInt("inWorkDesktop"); inWorkDesktop == 1 && !strings.Contains(s.Request.URL.String(), "page_workDesktop") {
+			return s.Redirect(fmt.Sprintf("%s%s%s", config.Sysconfig["workDesktopUrl"].(string), config.Sysconfig["webdomain"].(string), url.QueryEscape(strings.Replace(s.Request.URL.String(), "inWorkDesktop=1", "inWorkDesktop=0", 1))))
+>>>>>>> feature/v4.9.5
 		}
 		//P406登录用户标讯详情页改版
 		if userId != "" || PageTypeCheck[stype] {

src/web/staticres/js/header-message.js

@@ -32,6 +32,14 @@ function Message() {
         } else {
           $('#tips').hide();
         }
+        // 待办
+        if (res.toDoUnread) {
+          $('#todoMenu').show()
+          $('#todoTips').show().html(res.toDoUnread > 99 ? '99+' : res.toDoUnread)
+        } else {
+          $('#todoMenu').hide()
+          $('#todoTips').hide()
+        }
       },
       error:function () {}
     })

src/web/staticres/public-pc/css/header-nav-mini.css

@@ -364,7 +364,8 @@ body .menu-vip-button {
 
 
 
-#tips {
+#tips,
+#todoTips {
     display: none;
     position: absolute;
     left: 14px;

src/web/staticres/public-pc/css/header-nav.css

@@ -658,8 +658,8 @@
 #public-nav .iner .jynav li .tips {
   display: none;
   position: absolute;
-  left: 14px;
-  top: 13px;
+  left: 12px;
+  top: 16px;
   height: 18px;
   line-height: 16px;
   padding: 0 4px;

src/web/templates/common/pc-header-nav-brand.html

@@ -114,17 +114,32 @@
             <a href="/swordfish/frontPage/messageCenter/sess/index">
               <div class="img-flex">
                 <img data-theme="light"
-                     src='{{Msg "seo" "cdn"}}/images/index/message.png?v={{Msg "seo" "version"}}'
+                     src='{{Msg "seo" "cdn"}}/images/index/message2_2x.png?v={{Msg "seo" "version"}}'
                      class="jy-nav-msg msg-img1" alt=""/>
                 <img data-theme="dark"
-                     src='{{Msg "seo" "cdn"}}/images/index/message-fff.png?v={{Msg "seo" "version"}}'
+                     src='{{Msg "seo" "cdn"}}/images/index/message2_2x.png?v={{Msg "seo" "version"}}'
                      class="jy-nav-msg msg-img1" alt=""/>
               </div>
-              <img src='{{Msg "seo" "cdn"}}/images/index/message-active.png?v={{Msg "seo" "version"}}'
+              <img src='{{Msg "seo" "cdn"}}/images/index/message2_2x.png?v={{Msg "seo" "version"}}'
                    class="jy-nav-msg msg-img2" alt=""/>
               <span class="tips" id="tips"></span>
             </a>
           </li>
+          <li name="待办" id="todoMenu" style="display: none;margin-left: 16px">
+            <a href="/swordfish/frontPage/messageCenter/sess/index?type=11">
+              <div class="img-flex">
+                <img data-theme="light"
+                     src='{{Msg "seo" "cdn"}}/images/index/todo_2x.png?v={{Msg "seo" "version"}}'
+                     class="jy-nav-msg msg-img1" alt="待办"/>
+                <img data-theme="dark"
+                     src='{{Msg "seo" "cdn"}}/images/index/todo_2x.png?v={{Msg "seo" "version"}}'
+                     class="jy-nav-msg msg-img1" alt="待办"/>
+              </div>
+              <img src='{{Msg "seo" "cdn"}}/images/index/todo_2x.png?v={{Msg "seo" "version"}}'
+                   class="jy-nav-msg msg-img2" alt=""/>
+              <span class="tips" id="todoTips"></span>
+            </a>
+          </li>
           <li class="slider"></li>
         </ul>
             <div class='useronline' id="login" style="float:left;">

src/web/templates/common/pc-header-nav-mini.html

@@ -49,6 +49,15 @@
                             <span class="tips" id="tips" style="display: none">99+</span>
                         </a>
                     </li>
+                    <li class="menu-item message-menu" id="todoMenu" style="display: none;">
+                      <a class="message-menu-link" href="/swordfish/frontPage/messageCenter/sess/index?type=11">
+                          <div class="icon-img-message">
+                              <img src="/images/index/todo_2x.png" class="message-img" alt="待办">
+                              <img src="/images/index/todo_2x.png" class="message-img-active" alt="待办">
+                          </div>
+                          <span class="tips" id="todoTips" style="display: none">99+</span>
+                      </a>
+                    </li>
                     <li class="menu-item avatar-menu nav-avatar login-show" style="display: none;">
                         <div class="avatar-img-container">
                             <img data-user-avatar src="/common-module/public/image/auto.png" alt="">