Merge branch 'ty_urgent' into test

Helius

2020-12-20 4c47534eda0702136016312666b46578bfb6368b

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

@@ -734,6 +734,9 @@
            // 请求会员信息
            vipInfoFn(key) {
                let _this = this;
                if (!key) {
                    key = _this.vipInfo.phone;
                }
                // 请求用户信息
                $.AjaxProxy({
                    p: {
@@ -763,6 +766,9 @@

                    _this.tags.tags = data.labels;
                    _this.projTableQueryFn();
                    _this.serviceOrderTableQueryFn();
                    _this.orderTableDataQueryFn();
                    _this.skinCheckTableDataQueryFn();
                });
            },
            addLabelFn(key) {