From fb2ab14849e68960f342e1d33b623450159ecb0b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 27 Sep 2022 17:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCommunityManagement/AppCommunityManagement.vue          | 1 +
 src/project/pingchang/AppNucleicAcidSampling/Add.vue           | 3 +--
 .../AppNucleicAcidSampling/AppNucleicAcidSampling.vue          | 2 +-
 src/project/pingchang/AppNucleicAcidSampling/Detail.vue        | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index 4d617e7b..f0b9766b 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -196,6 +196,7 @@ export default {
       width: 100%;
       background: #FFF;
       border-radius: 16px;
+      margin-bottom: 24px;
       .top {
         padding: 32px 32px 24px 32px;
         position: relative;
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Add.vue b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
index a7ea8c5b..a44dd76c 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Add.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
@@ -111,8 +111,7 @@ export default {
     this.form.createUserPhone = this.user.phone
 
     var myDate = new Date();
-    this.form.createTime = `${myDate.getFullYear()}-${this.isNum(myDate.getMonth()+1)}-${this.isNum(myDate.getDate())} 
-    ${this.isNum(myDate.getHours())}:${this.isNum(myDate.getMinutes())}:${this.isNum(myDate.getSeconds())}`
+    this.form.createTime = `${myDate.getFullYear()}-${this.isNum(myDate.getMonth()+1)}-${this.isNum(myDate.getDate())} ${this.isNum(myDate.getHours())}:${this.isNum(myDate.getMinutes())}:${this.isNum(myDate.getSeconds())}`
   },
   onShow() {
     document.title = '核酸采样'
diff --git a/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue b/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue
index 6bf35f47..bf1209ef 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue
@@ -164,7 +164,7 @@ export default {
       width: 100%;
       background: #FFF;
       border-radius: 16px;
-      margin-bottom: 32px;
+      margin-bottom: 24px;
       .top {
         padding: 32px 32px 24px 32px;
         position: relative;
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
index 50ac1173..e215eec2 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
@@ -47,7 +47,8 @@
       </div>
     </div>
     <div class="btn-height"></div>
-    <div class="footer" v-if="info.status != 2 && isHideBtn != 1" @click="toAdd">采样</div>
+    <!-- v-if="info.status != 2 && isHideBtn != 1"  -->
+    <div class="footer" @click="toAdd">采样</div>
   </div>
 </template>