From d6a0abe9024f87fc517a2b71df0f17c5cadc41a0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 29 Jul 2022 16:02:25 +0800
Subject: [PATCH] 合并冲突

---
 src/views/mapPattern/index.vue |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/views/mapPattern/index.vue b/src/views/mapPattern/index.vue
index a33ad27..89376b7 100644
--- a/src/views/mapPattern/index.vue
+++ b/src/views/mapPattern/index.vue
@@ -19,7 +19,7 @@
             </div>
             <div class="out" @click="goToBack">
                 <img src="../../../public/img/out.png" />
-                <span>&nbsp;&nbsp;退出</span>
+                <span>&nbsp;&nbsp;返回</span>
             </div>
         </div>
         <div class="farm-plant">
@@ -38,15 +38,19 @@
         </div>
         <div class="land-info">
             <div class="content">
-                <span>有轮廓的地块:</span>
-                <span
-                    style="font-size: 26px;font-weight: bold;color: #5ABF78;"
-                >&nbsp;{{landIsAreaStatistic[0]}}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span>无轮廓的地块:</span>
-                <span
-                    style="font-size: 26px;font-weight: bold;color: #E3B745;"
-                >&nbsp;{{landIsAreaStatistic[1]}}</span>
+                <div>
+                    有轮廓的地块：
+                    <span
+                        style="font-size: 26px;font-weight: bold;color: #5ABF78;"
+                    >{{landIsAreaStatistic[0]}}</span>
+                </div>
+
+                <div>
+                    无轮廓的地块：
+                    <span
+                        style="font-size: 26px;font-weight: bold;color: #E3B745;"
+                    >{{landIsAreaStatistic[1]}}</span>
+                </div>
             </div>
         </div>
         <div class="farm-land">
@@ -90,7 +94,7 @@
             landList: [],
             farmInfo: {},
             landAreaInfo: {},
-            landIsAreaStatistic: null,
+            landIsAreaStatistic: [0, 0],
         }
 
     },
@@ -179,6 +183,7 @@
         //获取地块轮廓统计信息
         getLandIsAreaStatistic () {
             getLandIsAreaStatistic(this.userInfo.farmId).then(res => {
+                console.log(res)
                 this.landIsAreaStatistic = res.data.data
             })
         }
@@ -264,17 +269,23 @@
     top: 112px;
 
     .content {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
         margin: auto;
+        padding: 0 40px;
         width: 431px;
         height: 56px;
         background: rgba(0, 0, 0, 0.5);
         border-radius: 28px 28px 28px 28px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
         font-size: 16px;
         font-weight: 400;
         color: #ffffff;
+
+        & > div {
+            display: flex;
+            align-items: center;
+        }
     }
 }
 

--
Gitblit v1.9.3