+
{{ item.productName }}
- (退 - {{ item.refundNum }})
+ (退 - {{ item.refundNum }})
{{ item.skuName }}
@@ -73,12 +87,12 @@
- 详情
- 开票
+ 详情
+ 开票
结账
@@ -106,7 +120,7 @@
-
+
@@ -317,7 +331,9 @@ function showdetail(row: OrderInfoVo) {
.goods_info {
.row {
display: flex;
-
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
&:not(:first-child) {
margin-top: 10px;
}
@@ -331,8 +347,7 @@ function showdetail(row: OrderInfoVo) {
flex: 1;
display: flex;
flex-direction: column;
- padding-left: 10px;
-
+ margin-top: 2px;
.sku {
color: #999;
}
diff --git a/src/views/product/category.vue b/src/views/product/category.vue
index 0508e84..6546862 100644
--- a/src/views/product/category.vue
+++ b/src/views/product/category.vue
@@ -7,39 +7,73 @@
@reset-click="handleResetClick" /> -->
-
+
{{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+
+
+
+ 无
+
{{ scope.row[scope.prop] }}
-
+
-
+
-
+
-
+
{{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -96,7 +130,6 @@ async function handleEditClick(row: IObject) {
const data = await UserAPI.getunitinfo(row.id);
editModalRef.value?.setFormData(data);
editModalRef.value?.setModalVisible();
-
}
// 其他工具栏
function handleToolbarClick(name: string) {
diff --git a/src/views/product/categoryconfig/content.ts b/src/views/product/categoryconfig/content.ts
index 18cce75..4740b7a 100644
--- a/src/views/product/categoryconfig/content.ts
+++ b/src/views/product/categoryconfig/content.ts
@@ -26,8 +26,8 @@ const contentConfig: IContentConfig = {
// },
// exportAction: UserAPI.export,
modifyAction: function (params) {
- console.log(1111112222222222222)
- let obj = { sort: "1", ...params }
+ console.log(1111112222222222222);
+ let obj = { sort: "1", ...params };
return UserAPI.update(obj);
},
@@ -44,13 +44,17 @@ const contentConfig: IContentConfig = {
// return res.list;
// },
pk: "id",
- toolbar: [
- "add",
- ],
+ toolbar: ["add"],
cols: [
// { type: "selection", width: 50, align: "center" },
{ label: "分类名称", align: "center", prop: "name" },
- { label: "分类图片", align: "center", prop: "pic", templet: "image" },
+ {
+ label: "分类图片",
+ align: "center",
+ prop: "pic",
+ slotName: "slotNameimage",
+ templet: "custom",
+ },
{
label: "状态",
align: "center",