From 6b518a55d76806a3e5b8e5809abbbfd9baad97ca Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 1 Apr 2021 04:01:41 +0300 Subject: [PATCH] * Fix bug. --- module/automation/view/browse.html.php | 4 ++-- module/common/lang/menu.php | 1 + module/story/control.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/automation/view/browse.html.php b/module/automation/view/browse.html.php index 264edfb25f..6d635716bb 100644 --- a/module/automation/view/browse.html.php +++ b/module/automation/view/browse.html.php @@ -41,14 +41,14 @@ .block-zendata {width: 96%; display: inline-block; padding: 30px 40px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;} .block-zendata p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;} .block-zendata li {width: 100%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;} -.qr-code {margin-top: 20px; padding: 20px 0px 20px 60px; box-shadow: 2px 2px 5px #e2dede;} +.qr-code {margin-top: 20px; padding: 20px 0px 20px 58px; box-shadow: 2px 2px 5px #e2dede;} .qr-code-img {width: 90px; height: 90px; display: inline-block; float: left;} .qr-code-details {display: inline-block; margin: 10px 0px 0px 10px;} .qr-code-details div{margin: 5px 0px;} .qr-code-group {color: #898989;} @media screen and (max-height: 768px) { - .qr-code {padding: 20px 0px 20px 45px;} + .qr-code {padding: 20px 0px 20px 43px;} .block-details li {width: 50%;} .block-details-line li {width: 100%;} .ztf-download-trait div {width: 47%;} diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 372158f140..9aa7e71463 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -543,3 +543,4 @@ $lang->navGroup->action = 'admin'; $lang->navGroup->search = 'search'; $lang->navGroup->index = 'index'; $lang->navGroup->tree = 'tree'; +$lang->navGroup->misc = 'misc'; diff --git a/module/story/control.php b/module/story/control.php index 0dcbb673db..9bdfe2f914 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -103,7 +103,8 @@ class story extends control $this->send($response); } - $storyID = $storyResult['id']; + $storyID = $storyResult['id']; + $productID = $this->post->product ? $this->post->product : $productID; if($storyResult['status'] == 'exists') { $response['message'] = sprintf($this->lang->duplicate, $this->lang->story->common); @@ -159,7 +160,6 @@ class story extends control if($objectID == 0) { setcookie('storyModule', 0, 0, $this->config->webRoot, '', false, false); - $productID = $this->post->product ? $this->post->product : $productID; $branchID = $this->post->branch ? $this->post->branch : $branch; $response['locate'] = $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=unclosed¶m=0&type=$type&orderBy=id_desc"); if($this->session->storyList) $response['locate'] = $this->session->storyList;