From ef3d1f2e631f9e31f5f6797c1b084c360f8efe87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 6 Dec 2022 09:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue   |  2 +-
 src/views/system/order/index.vue  |  5 +++++
 src/views/system/order/indexjs.js | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index f79f0d5..8aa4a6c 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -82,7 +82,7 @@ export default {
             [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
             [{ align: [] }],                                 // 对齐方式
             ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["link", "image"]                       // 链接、图片、视频
           ],
         },
         placeholder: "请输入内容",
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 12e10da..4a6bf5f 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -296,6 +296,11 @@
             query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
           "
         >
+          <el-input
+            v-model="query.serviceLocationName"
+            disabled
+            style="width: 250px"
+          />
         </el-form-item>
       </el-form>
       <div
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index fde8da8..0fed66e 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -143,7 +143,7 @@ export default {
             });
             this.map.add(layer);
             var labelMarker = new AMap.LabelMarker({
-                name: "",
+                name: query.serviceLocationName,
                 position: [query.serveLocationLongitude, query.serveLocationLatitude],
                 icon: {
                     type: "image",
@@ -156,15 +156,15 @@ export default {
                     retina: true,
                 },
                 text: {
-                    content: "",
+                    content: query.serviceLocationName,
                     direction: "top",
                     offset: [0, 0],
                     style: {
                         fontSize: 13,
                         fontWeight: "normal",
-                        fillColor: "#fff",
+                        fillColor: "black",
                         padding: "2, 5",
-                        backgroundColor: "#22884f",
+                        backgroundColor: "",
                     },
                 },
             });
@@ -415,4 +415,4 @@ export default {
             );
         },
     },
-};
\ No newline at end of file
+};