diff --git a/src/layout/component/transverseAside.vue b/src/layout/component/transverseAside.vue
index 3b86eaf..24dbed4 100644
--- a/src/layout/component/transverseAside.vue
+++ b/src/layout/component/transverseAside.vue
@@ -204,6 +204,7 @@ export default {
let asideList = getMenuSider(this.columnsAsideList, HeadName)[0].children;
const resData = this.setSendChildren(HeadName);
if (resData.length <= 0) return false;
+ console.log('=======',resData.item);
this.onColumnsAsideDown(resData.item[0].k);
this.bus.$emit('oneCatName', resData.item[0].title);
this.bus.$emit('setSendColumnsChildren', asideList || []);
@@ -219,7 +220,7 @@ export default {
::v-deep .el-scrollbar__bar.is-horizontal {
height: 0;
}
-.el-menu-horizontal-warp {
+.el-menu-horizontal-warp {
.el-menu.el-menu--horizontal {
display: flex;
height: 100%;
@@ -305,7 +306,7 @@ export default {
width: 65px;
border-radius: 0;
margin-top: 0px;
-
+
}
}
}
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index daf56b0..9ea1798 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -82,7 +82,7 @@
搜索
- 重置
+ 重置
@@ -133,16 +133,18 @@
/>
+
+
{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}
-
+
-
+
this.getList(""));
},
// 扣除保证金
diff --git a/src/views/merchant/shoptype/index.vue b/src/views/merchant/shoptype/index.vue
index 6058083..0ebc191 100644
--- a/src/views/merchant/shoptype/index.vue
+++ b/src/views/merchant/shoptype/index.vue
@@ -35,8 +35,18 @@
审核不通过
-
-
+
+
+ {{ scope.row.check_name }}
+ -
+
+
+
+
+ {{ scope.row.check_phone }}
+ -
+
+
@@ -66,7 +76,8 @@
-
+
@@ -77,7 +88,7 @@
+ style="width:100%;" :disabled="title == '详情' ? true : false">
@@ -107,7 +118,8 @@
取消
- 提交
+ 提交
@@ -162,7 +174,7 @@ export default {
// 审核
handleAudit(e) {
this.auditForm = e;
- this.auditForm.status =1;
+ this.auditForm.status = 1;
this.statusAuditVisible = true;
this.title = '修改审核状态';
},