diff --git a/src/api/system/dashboard.js b/src/api/system/dashboard.js
index ebab240..bceb89c 100644
--- a/src/api/system/dashboard.js
+++ b/src/api/system/dashboard.js
@@ -73,3 +73,14 @@ export function getBillDailyAmount(params) {
params
})
}
+
+/**
+ * 按商户统计分成
+ */
+export function getBonusGroupByMch(params) {
+ return request({
+ url: '/system/dashboard/bonusGroupByMch',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/src/api/system/user.js b/src/api/system/user.js
index f2f76ef..83b72e8 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -132,4 +132,4 @@ export function deptTreeSelect() {
url: '/system/user/deptTree',
method: 'get'
})
-}
+}
\ No newline at end of file
diff --git a/src/views/ss/dashboard/components/BonusDashboard.vue b/src/views/ss/dashboard/components/BonusDashboard.vue
new file mode 100644
index 0000000..5d7ad1d
--- /dev/null
+++ b/src/views/ss/dashboard/components/BonusDashboard.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+ {{ scope.row.arrivalName || '-' }}
+
+
+
+
+ {{ scope.row.totalAmount.toFixed(2) }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ss/dashboard/index.vue b/src/views/ss/dashboard/index.vue
new file mode 100644
index 0000000..4f31e53
--- /dev/null
+++ b/src/views/ss/dashboard/index.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/article/index.vue b/src/views/system/article/index.vue
index bbb8483..6bc2ad0 100644
--- a/src/views/system/article/index.vue
+++ b/src/views/system/article/index.vue
@@ -1,123 +1,123 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
@@ -208,6 +208,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 20,
+ orderByColumn: "createTime",
+ isAsc: "desc",
classify: null,
title: null,
},
@@ -221,14 +223,35 @@ export default {
title: [
{ required: true, message: "标题不能为空", trigger: "blur" }
],
- }
+ },
+ defaultProps: {
+ children: "children",
+ label: "label"
+ },
+ classifyName: null,
};
},
+ watch: {
+ // 根据名称筛选分类树
+ classifyName(val) {
+ this.$refs.tree.filter(val);
+ }
+ },
created() {
this.getList();
this.getClassifyTree();
},
methods: {
+ // 节点单击事件
+ handleNodeClick(data) {
+ this.queryParams.classifyAncestorId = data.id;
+ this.handleQuery();
+ },
+ // 筛选节点
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
+ },
/** 查询文章列表 */
getList() {
this.loading = true;
diff --git a/src/views/system/articleClassify/index.vue b/src/views/system/articleClassify/index.vue
index eb08896..4ecbd46 100644
--- a/src/views/system/articleClassify/index.vue
+++ b/src/views/system/articleClassify/index.vue
@@ -57,6 +57,12 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
+
+
+
+
+
+
@@ -104,6 +110,13 @@
+
+
+
+
+
+
+
diff --git a/src/views/system/channel/components/ChannelEditDialog.vue b/src/views/system/channel/components/ChannelEditDialog.vue
index 63a4255..d5b126f 100644
--- a/src/views/system/channel/components/ChannelEditDialog.vue
+++ b/src/views/system/channel/components/ChannelEditDialog.vue
@@ -67,6 +67,12 @@
+
+
+
+
+
+
diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue
index af6d41d..e6ed8c7 100644
--- a/src/views/system/model/index.vue
+++ b/src/views/system/model/index.vue
@@ -270,9 +270,6 @@ export default {
{ required: true, message: "型号标签不能为空", trigger: "blur" },
{ min: 1, type: 'array', message: "型号标签不能为空", trigger: "blur" }
],
- productId: [
- { required: true, message: "OneNet产品ID不能为空", trigger: "blur" }
- ],
sort: [
{ required: true, message: "排序不允许为空", trigger: "blur" }
],
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 63fcd78..e753b16 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -44,17 +44,6 @@
v-hasPermi="['system:notice:add']"
>新增
-
- 修改
-
+
+
+