Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -95,6 +95,14 @@
        .el-autocomplete {
            display: block !important;
        }

        .vip-info {
            padding: 30px 20px;
        }

        .vip-info p {
            line-height: 30px;
        }
    </style>

</head>
@@ -182,7 +190,7 @@
            <el-main style="background-color: white; margin-right: 15px; padding: 20px 30px;">
                <el-tabs v-model="activeName" type="card" @tab-click="tabHandleClick">
                    <el-tab-pane label="会员信息" name="vipInfo">
                        <el-row>
                        <el-row class="vip-info">
                            <el-col :span="10">
                                <p>生日 : {{vipInfo.birthday1}}</p>
                                <p>会员状态 : {{vipInfo.vipState}}</p>