diff --git a/resources/frontend/src/views/goods/combination.vue b/resources/frontend/src/views/goods/combination.vue
index 96864f6..0ca47e8 100644
--- a/resources/frontend/src/views/goods/combination.vue
+++ b/resources/frontend/src/views/goods/combination.vue
@@ -23,12 +23,12 @@
:on-error="uploadError" style="display:inline-block;margin: 0 15px 0 0;">
组合商品导入
- 新增组合商品
+ 新增组合商品
-
+
![]()
@@ -40,8 +40,8 @@
-
-
+
+
{{ scope.row.stock }}
@@ -65,9 +65,9 @@
-->
-
-
-
+
+
+
编辑
@@ -148,6 +148,7 @@
}]
},
skus: [],
+ is_admin: false,
remoteLoading: false
}
},
@@ -170,6 +171,7 @@
this.Paginationdata = res.data.meta
this.currentPage = res.data.meta.current_page
this.per_page = parseInt(res.data.meta.per_page)
+ this.is_admin = res.data.manage && res.data.manage.is_admin
this.loading = false
})
},
@@ -293,11 +295,6 @@
float: right;
}
- ::v-deep .cell {
- display: flex;
- align-items: center;
- }
-
.commodityimg {
width: 59px;
height: 59px;
@@ -306,12 +303,14 @@
display: block;
margin-right: 12px;
}
-
.Img {
width: 100%;
height: 100%;
}
-
+ ::v-deep .flex .cell{
+ display: flex;
+ align-items: center;
+ }
::v-deep .btn11 {
padding: 0;
width: 14px;
diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index 9b3f0bf..ba3c83e 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -554,7 +554,7 @@
chooseList: [],
showUpdate: false,
commitLoading: false,
- is_admin: localStorage.getItem('roleName') == '超级管理员' || localStorage.getItem('roleName') == '系统管理员',
+ is_admin: false,
showAdd: false,
showEdit: false,
curId: 0
@@ -599,6 +599,7 @@
this.sku_code = {
sku_code: this.shopsData
}
+ this.is_admin = res.data.manage && res.data.manage.is_admin
this.loading = false
})
},
diff --git a/resources/frontend/src/views/plat/orderList.vue b/resources/frontend/src/views/plat/orderList.vue
index 0710bf3..c94c130 100644
--- a/resources/frontend/src/views/plat/orderList.vue
+++ b/resources/frontend/src/views/plat/orderList.vue
@@ -83,7 +83,7 @@
筛选
重置筛选
-
+ 打印
配货单导出