Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

 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>
@@ -1372,10 +1368,10 @@
            /********** 顶部按钮 start **********/

            dateFormat(row, column) {
                return moment(column.yyTime).format("YYYY-MM-DD HH:mm");
                return moment(row.yyTime).format("YYYY-MM-DD HH:mm");
            },
            oderTimeFormat(row, column) {
                return moment(column.orderTime).format("YYYY-MM-DD HH:mm:ss");
                return moment(row.orderTime).format("YYYY-MM-DD HH:mm:ss");
            },
        }
    });