From 1639e0ec9a4b4b371d0a57b04e5e57805b4d9c11 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sat, 25 Mar 2023 11:34:50 +0800
Subject: [PATCH] 2023-3-25

---
 .../src/views/build/community/index.vue              |  2 +-
 .../src/views/build/wuyeCompany/index.vue            |  2 +-
 mallplusui-web-admin/src/views/cms/subject/index.vue | 12 +-----------
 mallplusui-web-admin/src/views/oms/order/index1.vue  |  7 +++++++
 .../src/views/oms/order/orderStatistic.vue           |  7 +++++++
 .../src/views/pms/productCate/index.vue              |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/mallplusui-web-admin/src/views/build/community/index.vue b/mallplusui-web-admin/src/views/build/community/index.vue
index be23960..3f43e61 100644
--- a/mallplusui-web-admin/src/views/build/community/index.vue
+++ b/mallplusui-web-admin/src/views/build/community/index.vue
@@ -272,7 +272,7 @@
 				})
 			},
 			handleDelete(index, row) {
-				this.$confirm('是否要删除该品牌', '提示', {
+				this.$confirm('是否要删除该取货点', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
diff --git a/mallplusui-web-admin/src/views/build/wuyeCompany/index.vue b/mallplusui-web-admin/src/views/build/wuyeCompany/index.vue
index f4fd6ae..3a8ca81 100644
--- a/mallplusui-web-admin/src/views/build/wuyeCompany/index.vue
+++ b/mallplusui-web-admin/src/views/build/wuyeCompany/index.vue
@@ -175,7 +175,7 @@
                 this.$router.push({path: '/build/updateWuyeCompany', query: {id: row.id}})
             },
             handleDelete(index, row) {
-                this.$confirm('是否要删除该品牌', '提示', {
+                this.$confirm('是否要删除该社区', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
diff --git a/mallplusui-web-admin/src/views/cms/subject/index.vue b/mallplusui-web-admin/src/views/cms/subject/index.vue
index 9e200cf..59468c2 100644
--- a/mallplusui-web-admin/src/views/cms/subject/index.vue
+++ b/mallplusui-web-admin/src/views/cms/subject/index.vue
@@ -133,16 +133,6 @@
         name: 'subjectList',
         data() {
             return {
-                operates: [
-                    {
-                        label: "显示品牌",
-                        value: "showSubject"
-                    },
-                    {
-                        label: "隐藏品牌",
-                        value: "hideSubject"
-                    }
-                ],
                 operateType: null,
                 listQuery: {
                     keyword: null,
@@ -219,7 +209,7 @@
                 this.$router.push({path: '/cms/updateSubject', query: {id: row.id}})
             },
             handleDelete(index, row) {
-                this.$confirm('是否要删除该品牌', '提示', {
+                this.$confirm('是否要删除该条资讯', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue
index b704f83..f5f06e4 100644
--- a/mallplusui-web-admin/src/views/oms/order/index1.vue
+++ b/mallplusui-web-admin/src/views/oms/order/index1.vue
@@ -121,6 +121,9 @@
 			<el-card class="operate-container" shadow="never">
 				<i class="el-icon-tickets"></i>
 				<span>数据列表</span>
+				<el-button  style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
+					导出Excel
+				</el-button>
 			</el-card>
 			<!-- <div class="batch-operate-container">
 				<el-checkbox v-model="printChecked" @change="batchSelection"
@@ -710,6 +713,10 @@
 					default:
 						break;
 				}
+			},
+			// 导出
+			doExport(){
+				
 			},
 			handleExportOption(val) {
 				let list = this.checkList;
diff --git a/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue b/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue
index 8a711fc..6c94fbd 100644
--- a/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue
+++ b/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue
@@ -115,6 +115,9 @@
 			<el-card class="operate-container" shadow="never">
 				<i class="el-icon-tickets"></i>
 				<span>数据列表</span>
+				<el-button  style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
+					导出Excel
+				</el-button>
 			</el-card>
 			<div class="table-container">
 				<el-table ref="orderTable" :data="list" style="width: 100%;" v-loading="listLoading" border>
@@ -379,6 +382,10 @@
 					this.caculateInfo = response.data;
 				});
 			},
+			// 导出
+			doExport(){
+				
+			}
 
 		}
 	};
diff --git a/mallplusui-web-admin/src/views/pms/productCate/index.vue b/mallplusui-web-admin/src/views/pms/productCate/index.vue
index 8383dca..40fa330 100644
--- a/mallplusui-web-admin/src/views/pms/productCate/index.vue
+++ b/mallplusui-web-admin/src/views/pms/productCate/index.vue
@@ -215,7 +215,7 @@
 				});
 			},
 			handleDelete(index, row) {
-				this.$confirm('是否要删除该品牌', '提示', {
+				this.$confirm('是否要删除该分类', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'