From 72cb889243db432046ceddbbf6bfbc2bf66833dd Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 19 Nov 2021 18:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/setting.js            |  4 ++--
 src/views/order/Order.vue | 41 +++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/setting.js b/src/setting.js
index 670a30d..10c3de9 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -13,10 +13,10 @@ if (isDev) {
     jumpPath = "http://192.168.31.254:8087/"; // 本地调试-需要启动本地判分点系统
 
     // host = "http://39.108.250.202:9000";
-    // host = "http://39.108.250.202:9000";//线上
+    host = "http://39.108.250.202:9000";//线上
     // host = 'http://192.168.31.151:9000'// 榕
     // host = 'http://192.168.31.125:9000'// 坤
-    host = 'http://192.168.31.137:9000'// 赓
+    // host = 'http://192.168.31.137:9000'// 赓
 } else if (isTest) {
     jumpPath = "http://39.108.250.202/judgmentPoint/";
     host = "http://39.108.250.202:9000";
diff --git a/src/views/order/Order.vue b/src/views/order/Order.vue
index e34c524..f32cbe1 100644
--- a/src/views/order/Order.vue
+++ b/src/views/order/Order.vue
@@ -81,12 +81,15 @@
                         </el-table-column>
                         <el-table-column prop="orderContent" label="订单内容" align="center">
                             <template slot-scope="scope">
-                                <el-popover trigger="hover" placement="top" style='width: 500px'>
+                                <el-popover trigger="hover" placement="top" style='width: 500px' v-if='scope.row.orderContent.length >14'>
                                     <p> {{ scope.row.orderContent }}</p>
                                     <div slot="reference" class="name-wrapper">
                                         <el-tag size="medium" class='tags'>{{ scope.row.orderContent }}</el-tag>
                                     </div>
                                 </el-popover>
+                                <span v-else>
+                                    {{ scope.row.orderContent }}
+                                </span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="orderAmount" label="订单金额（元）" align="center">
@@ -180,7 +183,6 @@ export default {
             if (val.length > 5) {
                 val = 5;
             }
-
         },
         getData() {
             let data = {
@@ -253,18 +255,16 @@ export default {
         handleDelete(row) {
             this.$confirm("确定要删除吗？", "提示", {
                 type: "warning"
-            })
-                .then(() => {
-                    var arr = [];
-                    arr.push(row.orderId);
-                    this.$post(this.api.orderDelete, { ids: arr }).then(res => {
-                        this.$message.success("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                })
-                .catch(() => {
+            }).then(() => {
+                var arr = [];
+                arr.push(row.orderId);
+                this.$post(this.api.orderDelete, { ids: arr }).then(res => {
+                    this.$message.success("删除成功");
+                    this.getData();
+                }).catch(res => {
                 });
+            }).catch(() => {
+            });
         },
         // 续签
         handleRenew(row) {
@@ -285,15 +285,14 @@ export default {
                 // 批量删除
                 this.$confirm("确定要删除吗？", "提示", {
                     type: "warning"
-                })
-                    .then(() => {
-                        this.$post(this.api.orderDelete, { ids: this.multipleSelection }).then(res => {
-                            this.multipleSelection = [];
-                            this.$message.success("删除成功");
-                            this.getData();
-                        }).catch(err => {
-                        });
+                }).then(() => {
+                    this.$post(this.api.orderDelete, { ids: this.multipleSelection }).then(res => {
+                        this.multipleSelection = [];
+                        this.$message.success("删除成功");
+                        this.getData();
                     }).catch(err => {
+                    });
+                }).catch(err => {
                 });
             } else {
                 this.$message.error("请先选择订单 ！");