From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/b2-standard.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index dcba552..8d611f3 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -74,7 +74,7 @@
 
 	.standard .has-gutter .el-table__cell .cell {
 		line-height: 38px;
-		background-color: #fafafa;
+		background-color: #f8f8f8;
 	}
 
 	.standard .has-gutter .el-table__cell {
@@ -590,7 +590,6 @@
 				}).then(res => {
 					this.tableLoad = false
 					this.standardList = res.data.standardMethodList
-					this.productList = res.data.standardProductList
 				})
 			},
 			getPower() {

--
Gitblit v1.9.3