companyProjecet.git

			@@ -25,28 +25,28 @@
			<div class="table-wrap">
			<el-table :data="tableData" style="width: 100%" v-loading="loading">
			<el-table-column prop="log_id" label="ID" width="80"></el-table-column>
			<el-table-column prop="user.nickName" label="用户信息">
			<el-table-column prop="vipUser.nickName" label="用户信息">
			<template slot-scope="scope">
			<div class="d-s-c">
			<div class="head-img mr10">
			<img :src="scope.row.user.avatarUrl" alt="" />
			<img :src="scope.row.vipUser.avatarUrl" alt="" />
			</div>
			<div>
			<p>{{ scope.row.user.nickName }}</p>
			<p>{{ scope.row.vipUser.nickName }}</p>
			<p class="gray9">ID: {{ scope.row.user_id }}</p>
			</div>
			</div>
			</template>
			</el-table-column>
			<el-table-column prop="old_grade.name" label="变更前等级">
			<el-table-column prop="oldGrade.name" label="变更前等级">
			<template slot-scope="scope">
			<span v-if="scope.row.old_grade">{{ scope.row.old_grade.name }}</span>
			<span v-if="scope.row.oldGrade">{{ scope.row.oldGrade.name }}</span>
			<span v-else class="gray9">无</span>
			</template>
			</el-table-column>
			<el-table-column prop="new_grade.name" label="变更后等级">
			<el-table-column prop="grade.name" label="变更后等级">
			<template slot-scope="scope">
			<span v-if="scope.row.new_grade">{{ scope.row.new_grade.name }}</span>
			<span v-if="scope.row.grade">{{ scope.row.grade.name }}</span>
			<span v-else class="gray9">无</span>
			</template>
			</el-table-column>
			@@ -57,7 +57,7 @@
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="remark" label="备注"">
			<el-table-column prop="remark" label="备注">
			<template slot-scope="scope">
			<span>{{ scope.row.remark \|\| '无' }}</span>
			</template>
			@@ -133,4 +133,4 @@
			};
			</script>

			<style></style>
			<style></style>