From 5e43281d1d7a103c8f211ae5c86df7c89466e13b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 14:16:59 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html |    8 ++------
 1 files changed, 2 insertions(+), 6 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..ec5869c 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,15 +172,12 @@
                                 @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>
                         <el-row style="text-align: center">
-                            <el-col :span="10" v-for="item in vipInfo.shopNames">
-                                <el-avatar size="small" :src="circleUrl"></el-avatar>
-                                <span class="col-style">{{item}}</span>
-                            </el-col>
+                                <el-tag v-for="item in vipInfo.shopNames" >{{item}}</el-tag>
                         </el-row>
                     </el-row>
                 </el-row>

--
Gitblit v1.9.1