companyProjecet.git

			@@ -27,6 +27,13 @@
			<el-tag :type="tagType(row.status_text.status)">{{ row.status_text.status_text }}</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="audit_status" label="审核状态" width="100">
			<template slot-scope="{ row }">
			<el-tag :type="auditStatusType(row.audit_status_text.status)">
			{{ row.audit_status_text.text }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="create_time" label="创建时间" width="140"></el-table-column>
			<el-table-column prop="status" label="是否显示" width="100">
			<template slot-scope="scope">
			@@ -38,7 +45,7 @@
			<el-button @click="onDetail(scope.row.activity_id, false)" type="text" size="small">查看</el-button>
			<el-button @click="qrcode(scope.row)" type="text" size="small">核销码</el-button>
			<el-button @click="onDetail(scope.row.activity_id, true)" type="text" size="small">编辑</el-button>
			<el-button @click="onDelete(scope.row)" type="text" size="small">删除</el-button>
			<el-button @click="onDelete(scope.row.activity_id)" type="text" size="small">删除</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -168,7 +175,7 @@
			})
			.then(() => {
			self.loading = true;
			BranchApi.delete(
			BranchApi.deleteActivity(
			{
			activity_id: e
			},
			@@ -205,6 +212,11 @@
			return this.tagTypeData[e];
			},

			auditStatusType(e) {
			const typeMap = { 0: 'warning', 10: 'success', 20: 'danger' };
			return typeMap[e] \|\| 'info';
			},

			qrcode(row){
			this.code_id = row.activity_id;
			this.isQrcode = true;