From 57b31c8612d69fc6c65fedddae80a94dcc09d5ff Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Thu, 2 Dec 2021 14:56:05 +0800
Subject: [PATCH]  * modify card style when in xuanxuan notice

---
 module/bug/js/x.view.js         | 8 ++++++--
 module/bug/view/view.html.php   | 3 +++
 module/story/js/x.view.js       | 8 ++++++--
 module/story/view/view.html.php | 2 ++
 module/task/js/x.view.js        | 8 ++++++--
 module/task/view/view.html.php  | 2 ++
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/module/bug/js/x.view.js b/module/bug/js/x.view.js
index 7d372d2ede..73015cc539 100644
--- a/module/bug/js/x.view.js
+++ b/module/bug/js/x.view.js
@@ -30,8 +30,12 @@ $(function()
 
     if(xuanAction != "<div class='xuancard-actions fixed'>")
     {
-        xuanAction += '</div>';
-        $('body').append(xuanAction);
+        var params = window.location.search;
+        if(params.indexOf('displayNotice=card') == -1)
+        {
+            xuanAction += '</div>';
+            $('body').append(xuanAction);
+        }
     }
     else
     {
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 4639ccf99f..131a90580f 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -14,6 +14,8 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
+<?php echo("<script>console.log('".json_encode($_SERVER["QUERY_STRING"])."');</script>");?>
+<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div class="linkButton" onclick="linkButtonClicked()">
@@ -47,6 +49,7 @@
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div id="scrollContent">
 <?php endif;?>
+<?php endif;?>
 <div id="mainContent" class="main-row">
   <div class="main-col col-8">
     <div class="cell">
diff --git a/module/story/js/x.view.js b/module/story/js/x.view.js
index df0847aed9..a6bb8d7182 100644
--- a/module/story/js/x.view.js
+++ b/module/story/js/x.view.js
@@ -31,8 +31,12 @@ $(function()
 
     if(xuanAction != "<div class='xuancard-actions fixed'>")
     {
-        xuanAction += '</div>';
-        $('body').append(xuanAction);
+        var params = window.location.search;
+        if(params.indexOf('displayNotice=card') == -1)
+        {
+            xuanAction += '</div>';
+            $('body').append(xuanAction);
+        }
     }
     else
     {
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index c107fd4106..807e5899c2 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php $browseLink = $app->session->storyList ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product");?>
 <?php js::set('sysurl', common::getSysUrl());?>
+<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div class="linkButton" onclick="linkButtonClicked()">
@@ -72,6 +73,7 @@
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div id="scrollContent">
 <?php endif;?>
+<?php endif;?>
 <div id="mainContent" class="main-row">
   <div class="main-col col-8">
     <div class="cell">
diff --git a/module/task/js/x.view.js b/module/task/js/x.view.js
index c04574a4c3..9ebf997bc6 100644
--- a/module/task/js/x.view.js
+++ b/module/task/js/x.view.js
@@ -30,8 +30,12 @@ $(function()
 
     if(xuanAction != "<div class='xuancard-actions fixed'>")
     {
-        xuanAction += '</div>';
-        $('body').append(xuanAction);
+        var params = window.location.search;
+        if(params.indexOf('displayNotice=card') == -1)
+        {
+            xuanAction += '</div>';
+            $('body').append(xuanAction);
+        }
     }
     else
     {
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 52d43918f4..243a63e820 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php $browseLink = $app->session->taskList != false ? $app->session->taskList : $this->createLink('execution', 'browse', "executionID=$task->execution");?>
 <?php js::set('sysurl', common::getSysUrl());?>
+<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div class="linkButton" onclick="linkButtonClicked()">
@@ -56,6 +57,7 @@
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div id="scrollContent">
 <?php endif;?>
+<?php endif;?>
 <div id="mainContent" class="main-row">
   <div class="main-col col-8">
     <div class="cell">