From 4ade37283f06a39057992828e13058ef804ae606 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 16:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
index 81b22a2..00ed863 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
@@ -159,7 +159,6 @@
                                 size="small"
                                 :key="tag.label"
                                 v-for="tag in tags.tags"
-                                closable
                                 :disable-transitions="false"
                                 @close="handleClose(tag)">
                             {{tag.label}}
@@ -173,7 +172,7 @@
                                 @keyup.enter.native="handleInputConfirm"
                                 @blur="handleInputConfirm"
                         ></el-input>
-                        <el-button v-else class="button-new-tag" size="mini" @click="showInput">+</el-button>
+<!--                        <el-button v-else class="button-new-tag" size="mini" @click="showInput">+</el-button>-->
                     </el-row>
                     <el-row style="padding: 10px 0;">
                         <h4>消费门店</h4>

--
Gitblit v1.9.1