From 18083f5080f9a628064b7b865fd101130b100280 Mon Sep 17 00:00:00 2001
From: bibi <541660090@qq.com>
Date: Mon, 24 Jan 2022 16:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/Workorder/index.js              |   1 +
 src/api/basic/department/index.js             |   1 +
 src/api/basic/estate/index.js                 |  34 ++++
 src/api/shop/order/index.js                   |  11 ++
 src/permission.js                             |   1 +
 src/router/basic.js                           |  22 +--
 src/router/index.js                           |  13 +-
 src/router/{smartMall.js => shop.js}          |  12 +-
 src/views/Basic/Authority/index.vue           |  14 +-
 src/views/Basic/Employee/depend/config.js     |  19 ++-
 src/views/Basic/Employee/index.vue            |  19 ++-
 .../EstateInfo/_buildingManage/index.vue      |  52 +++---
 .../EstateInfo/_houseManage/depend/config.js  |  11 --
 .../Basic/EstateInfo/_houseManage/index.vue   |  61 ++++---
 src/views/Layout/index.vue                    |  17 +-
 src/views/Layout/yMenu/index.vue              |   5 +-
 .../AccumulatePoints/index.vue                |   0
 .../{ShopMall => Shop}/AfterSale/index.vue    |   0
 .../BusinessManage/index.vue                  |   0
 .../{ShopMall => Shop}/GoodsManage/index.vue  |   0
 src/views/Shop/OrderManage/depend/config.js   | 154 ++++++++++++++++++
 src/views/Shop/OrderManage/index.vue          | 147 +++++++++++++++++
 src/views/ShopMall/OrderManage/index.vue      |   0
 23 files changed, 497 insertions(+), 97 deletions(-)
 create mode 100644 src/api/shop/order/index.js
 rename src/router/{smartMall.js => shop.js} (57%)
 rename src/views/{ShopMall => Shop}/AccumulatePoints/index.vue (100%)
 rename src/views/{ShopMall => Shop}/AfterSale/index.vue (100%)
 rename src/views/{ShopMall => Shop}/BusinessManage/index.vue (100%)
 rename src/views/{ShopMall => Shop}/GoodsManage/index.vue (100%)
 create mode 100644 src/views/Shop/OrderManage/depend/config.js
 create mode 100644 src/views/Shop/OrderManage/index.vue
 delete mode 100644 src/views/ShopMall/OrderManage/index.vue

diff --git a/src/api/basic/Workorder/index.js b/src/api/basic/Workorder/index.js
index b7add86..7c3e298 100644
--- a/src/api/basic/Workorder/index.js
+++ b/src/api/basic/Workorder/index.js
@@ -1,6 +1,7 @@
 import httpService from "@/request"
 
 // 工单
+// list
 export function name(params) {
 	return httpService({
 		url: ` `,
diff --git a/src/api/basic/department/index.js b/src/api/basic/department/index.js
index 756f94e..3ac96c9 100644
--- a/src/api/basic/department/index.js
+++ b/src/api/basic/department/index.js
@@ -1,5 +1,6 @@
 import httpService from "@/request"
 
+// 组织
 // 所有的组织架构
 export function departmentList(params) {
 	return httpService({
diff --git a/src/api/basic/estate/index.js b/src/api/basic/estate/index.js
index b2a96bf..58ad023 100644
--- a/src/api/basic/estate/index.js
+++ b/src/api/basic/estate/index.js
@@ -1,5 +1,6 @@
 import httpService from "@/request"
 
+// 房产 楼栋
 // 楼栋列表
 export function buildingList(params) {
 	return httpService({
@@ -8,6 +9,15 @@ export function buildingList(params) {
 		params: params,
 	})
 }
+// 楼栋删除
+export function buildingDel(params) {
+	return httpService({
+		url: `/user/building/deleteBuilding`,
+		method: 'post',
+		data: params,
+	})
+}
+
 // 房屋列表
 export function houseList(params) {
 	return httpService({
@@ -16,3 +26,27 @@ export function houseList(params) {
 		params: params,
 	})
 }
+// 房屋列表
+export function houseInsert(params) {
+	return httpService({
+		url: `/user/estate/insert`,
+		method: 'post',
+		data: params,
+	})
+}
+// 房屋删除
+export function houseDel(params) {
+	return httpService({
+		url: `/user/estate/delete`,
+		method: 'post',
+		data: params,
+	})
+}
+// 房屋租聘切换
+export function isEnableLease(params) {
+	return httpService({
+		url: `/user/estate/isEnableLease`,
+		method: 'get',
+		params: params,
+	})
+}
diff --git a/src/api/shop/order/index.js b/src/api/shop/order/index.js
new file mode 100644
index 0000000..385aeba
--- /dev/null
+++ b/src/api/shop/order/index.js
@@ -0,0 +1,11 @@
+import httpService from "@/request"
+
+// 订单
+// list
+export function orderList(params) {
+	return httpService({
+		url: `/user/shopOrder/list`,
+		method: 'get',
+		params: params,
+	})
+}
diff --git a/src/permission.js b/src/permission.js
index c59cf80..a9ca5e2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -12,6 +12,7 @@ router.beforeEach((to, from, next) => {
 		next('/login');
 	} else {
 		next();
+		NProgress.done()
 	}
 })
 
diff --git a/src/router/basic.js b/src/router/basic.js
index 44c4a4f..9cb94ed 100644
--- a/src/router/basic.js
+++ b/src/router/basic.js
@@ -26,17 +26,17 @@ export default [
 		hide: false,
 		component: resolve => require(['@/views/Basic/Authority'], resolve),
 		meta: {title: '权限管理'},
-		children: [
-			{
-				path: '/Authority/_details',
-				name: "Authority_details",
-				title: "账单管理-详情",
-				icon: 'profile',
-				hide: true,
-				component: resolve => require(['@/views/Basic/Authority/_details'], resolve),
-				meta: {title: '账单管理-详情'},
-			}
-		]
+		// children: [
+		// 	{
+		// 		path: '/Authority/_details',
+		// 		name: "Authority_details",
+		// 		title: "账单管理-详情",
+		// 		icon: 'profile',
+		// 		hide: true,
+		// 		component: resolve => require(['@/views/Basic/Authority/_details'], resolve),
+		// 		meta: {title: '账单管理-详情'},
+		// 	}
+		// ]
 	},
 	{
 		path: '/EstateInfo',
diff --git a/src/router/index.js b/src/router/index.js
index 7f0cf8a..5e13ea3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -18,7 +18,7 @@ Vue.use(Router);
 import Layout from "@/views/Layout"
 import basic from "./basic" // 基础功能
 // import payment from "./payment" // 缴费管理
-// import smartMall from "./smartMall" // 智慧商城
+import shop from "./shop" // 智慧商城
 // import operation from "./operation" // 运营管理
 import setting from "./setting" // 设置
 
@@ -45,6 +45,17 @@ const router = [
 			...setting,
 		]
 	},
+	{
+		path: "/shop",
+		name: "shop",
+		title: "智慧商城",
+		component: Layout,
+		redirect: '/OrderManage',
+		meta: {title: '智慧商城'},
+		children: [
+			...shop,
+		]
+	},
 	{
 		path: "/login",
 		name: "Login",
diff --git a/src/router/smartMall.js b/src/router/shop.js
similarity index 57%
rename from src/router/smartMall.js
rename to src/router/shop.js
index ba6146b..5aac4d8 100644
--- a/src/router/smartMall.js
+++ b/src/router/shop.js
@@ -6,4 +6,14 @@
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /LittleBeeSaas/src/router/smartMall.js
  */
-export default []
\ No newline at end of file
+export default [
+	{
+		path: '/OrderManage',
+		name: "OrderManage",
+		title: "订单列表",
+		hide: false,
+		icon: 'container',
+		component: resolve => require(['@/views/Shop/OrderManage'], resolve),
+		meta: {title: '订单列表'}
+	},
+]
\ No newline at end of file
diff --git a/src/views/Basic/Authority/index.vue b/src/views/Basic/Authority/index.vue
index b6ab32f..ac1d21a 100644
--- a/src/views/Basic/Authority/index.vue
+++ b/src/views/Basic/Authority/index.vue
@@ -67,17 +67,13 @@ export default {
 	},
 	data() {
 		return {
+			pagination,
+			columns,
+			searchForm,
 			tableChoosed: [],
 			roleList: [],
-			// 分页
-			pagination: pagination,
-			//   列
-			columns: columns,
-			searchForm:searchForm,
-			//   数据
-			tableData: [],
-			ActionsList: [
-			],
+			tableData: [],	//   数据
+			ActionsList: [],
 		};
 	},
 	mounted() {
diff --git a/src/views/Basic/Employee/depend/config.js b/src/views/Basic/Employee/depend/config.js
index b872818..05341b4 100644
--- a/src/views/Basic/Employee/depend/config.js
+++ b/src/views/Basic/Employee/depend/config.js
@@ -6,12 +6,12 @@ export const columns = [
 	{
 		title: "真实名称",
 		dataIndex: "actualName",
-		width: "16%",
+		width: "12%",
 	},
 	{
 		title: "手机号",
 		dataIndex: "tel",
-		width: "16%",
+		width: "14%",
 	},
 	{
 		title: "所属部门",
@@ -21,7 +21,22 @@ export const columns = [
 	{
 		title: "岗位",
 		dataIndex: "positionName",
+		width: "10%",
+	},
+	{
+		title: "状态",
+		dataIndex: "status",
 		width: "16%",
+		customRender: function (status) {
+			switch (status) {
+			case 1:
+				return '正常'
+			case 2:
+				return '停用'
+			default:
+				break;
+			}
+		}
 	},
 	{
 		title: "备注",
diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue
index 6d4cd37..a561c22 100644
--- a/src/views/Basic/Employee/index.vue
+++ b/src/views/Basic/Employee/index.vue
@@ -90,6 +90,7 @@
             <span slot="action" slot-scope="text,scope">
               <a-space size="small">
                 <a class="ant-dropdown-link" @click="edit(scope)">编辑</a>
+				<a-switch @change="enableUser(scope.id)" :checked='scope.status ===1'></a-switch>
                 <a class="ant-dropdown-link" @click="resetPsw(scope.id)">重置密码</a>
               </a-space>
             </span>
@@ -209,7 +210,8 @@ import {
 	departmentUpdate,
 	departmentDel,
 	findToUser,
-	rePassword
+	rePassword,
+	userEnable
 } from "@/api/basic/department";
 
 export default {
@@ -218,9 +220,9 @@ export default {
 	},
 	data() {
 		return {
-			columns: columns,
-			pagination: pagination,
-			searchForm: searchForm,
+			columns,
+			pagination,
+			searchForm,
 			searchStr: "",
 			searchValue: "",
 			rules: {
@@ -363,6 +365,15 @@ export default {
 				});
 			}
 		},
+		async enableUser(id){
+			const res = await userEnable({manageUserId:id})
+			if(res.code === 200){
+				this.$message.success(res.msg)
+				this.getData()
+			}else{
+				this.$message.error(res.msg)
+			}
+		},
 		handleCancel() {
 			this.show.addDepartment = false;
 			this.$refs.ruleForm.resetFields();
diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue
index dd716ea..5a112fe 100644
--- a/src/views/Basic/EstateInfo/_buildingManage/index.vue
+++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue
@@ -26,7 +26,7 @@
           <template v-slot:actionBox="data">
             <a-space size="small">
               <a class="ant-dropdown-link" @click='detail(data)'>详情</a>
-              <a class="ant-dropdown-link" @click='del(data)'>删除</a>
+              <a class="ant-dropdown-link" @click='del([data.data.id])'>删除</a>
             </a-space>
           </template>
         </commonTable>
@@ -136,10 +136,13 @@
 
 <script>
 import { columns,pagination,searchForm} from "./depend/config"
-import { buildingList } from "@/api/basic/estate"
+import { buildingList,buildingDel } from "@/api/basic/estate"
 export default {
 	data() {
 		return {
+			pagination,
+			columns,
+			searchForm,
 			drawerConfig:{
 				addShow:false,
 				detailShow:false,
@@ -154,26 +157,8 @@ export default {
 				name:[{required:true,message:'请输入楼栋',trigger:'blur'}],
 				fileList:[{required:true}]
 			},
-			fileList: [
-				{
-					uid: '-1',
-					name: 'xxx.png',
-					url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
-				},
-				{
-					uid: '-2',
-					name: 'yyy.png',
-					status: 'done',
-					url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
-					thumbUrl: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
-				},
-			],
+			fileList: [],
 			tableChoosed: [],
-			// 分页
-			pagination: pagination,
-			//   列
-			columns:columns,
-			searchForm:searchForm,
 			unitData:[],
 			unitColumns: [
 				{
@@ -222,10 +207,6 @@ export default {
 					label: "批量删除",
 					value: 1,
 				},
-				{
-					label: "批量导出",
-					value: 2,
-				},
 			],
 		};
 	},
@@ -274,19 +255,30 @@ export default {
 			pager.pageSize = pagination.pageSize;
 			this.pagination = pager;
 		},
-		del(data) {
+		del(ids) {
 			this.$confirm({
 				title: "是否删除",
-				// okText:'删除',
-				// cancelText:'取消',
 				icon: "",
 				onOk: function () {
-					console.log(data);
+					buildingDel({buildingIds:ids}).then(res=>{
+						if(res.code === 200){
+							this.$message.success(res.msg)
+						}else{
+							this.$message.error(res.msg)
+						}
+					})
 				},
 			});
 		},
 		Actions(data) {
-			console.log(data);
+			let ids =[]
+			for(const item of this.tableChoosed){
+				ids.push(item.id)
+			}
+			// 批量删除
+			if(data===1){
+				this.del(ids)
+			}
 		},
 		selectionChoosed(data) {
 			console.log(data);
diff --git a/src/views/Basic/EstateInfo/_houseManage/depend/config.js b/src/views/Basic/EstateInfo/_houseManage/depend/config.js
index a9aeb31..001596d 100644
--- a/src/views/Basic/EstateInfo/_houseManage/depend/config.js
+++ b/src/views/Basic/EstateInfo/_houseManage/depend/config.js
@@ -59,14 +59,3 @@ export const pagination = {
 	showSizeChanger: true,
 	showQuickJumper: true,
 }
-export function del(data) {
-	this.$confirm({
-		title: "是否删除",
-		// okText:'删除',
-		// cancelText:'取消',
-		icon: "",
-		onOk: function () {
-			console.log(data);
-		},
-	});
-}
\ No newline at end of file
diff --git a/src/views/Basic/EstateInfo/_houseManage/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue
index 04ec4c2..7b7f73d 100644
--- a/src/views/Basic/EstateInfo/_houseManage/index.vue
+++ b/src/views/Basic/EstateInfo/_houseManage/index.vue
@@ -48,7 +48,7 @@
         :scroll="{ x: 1300 }"
         :row-selection="{
           selectedRowKeys: selectedRowKeys,
-          onChange: selectionChoosed,
+          onChange: onSelectChange,
         }"
         :row-key="
           (record, index) => {
@@ -71,7 +71,7 @@
         <span slot="action" slot-scope="text, row">
           <a-space>
             <a class="ant-dropdown-link" @click='edit(row)'>编辑</a>
-            <a class="ant-dropdown-link" @click='del(row)'>删除</a>
+            <a class="ant-dropdown-link" @click='del([row.id])'>删除</a>
           </a-space>
         </span>
         <span slot="tags" slot-scope="tag">
@@ -82,7 +82,7 @@
           </a-tag>
         </span>
         <span slot="switch" slot-scope="switchV, row">
-          <a-switch :checked="switchV === 1" @change="enable(row)"></a-switch>
+          <a-switch :checked="switchV === 1" @change="handleEnable(row)"></a-switch>
         </span>
       </a-table>
     </div>
@@ -250,8 +250,8 @@ function getBase64(file) {
 		reader.onerror = error => reject(error);
 	});
 }
-import { columns,pagination,searchForm, del } from "./depend/config"
-import { houseList } from '@/api/basic/estate'
+import { columns,pagination,searchForm } from "./depend/config"
+import { houseList, houseDel, isEnableLease} from '@/api/basic/estate'
 export default {
 	data() {
 		return {
@@ -324,10 +324,10 @@ export default {
 					label: "批量删除",
 					value: 1,
 				},
-				{
-					label: "批量导出",
-					value: 2,
-				},
+				// {
+				// 	label: "批量导出",
+				// 	value: 2,
+				// },
 			],
 		};
 	},
@@ -361,8 +361,16 @@ export default {
 		handleChange({ fileList }) {
 			this.fileList = fileList;
 		},
-		enable(data) {
-			console.log(data);
+		handleEnable: async function(data) {
+			const res = await isEnableLease({
+				estateId:data.id
+			})
+			if(res.code===200){
+				this.$message.success(res.msg)
+				this.getData()
+			}else{
+				this.$message.error(res.msg)
+			}
 		},
 		handleTableChange(pagination) {
 			console.log(pagination);
@@ -371,17 +379,30 @@ export default {
 			pager.pageSize = pagination.pageSize;
 			this.pagination = pager;
 		},
-		// del(data) {
-       
-		// },
-		del:del,
+		del(ids) {
+			this.$confirm({
+				title: "是否删除",
+				icon: "",
+				onOk: function () {
+					houseDel({estateIds:ids}).then(res=>{
+						if(res.code === 200){
+							this.$message.success(res.msg)
+						}else{
+							this.$message.error(res.msg)
+						}
+					})
+				},
+			});
+		},
 		Actions(data) {
-			console.log(data);
-			this.activeAction = undefined;
+			// 批量删除
+			if(data===1){
+				this.del(this.selectedRowKeys)
+				this.activeAction = undefined;
+			}
 		},
-		selectionChoosed(data) {
-			console.log(data);
-			this.tableChoosed = data;
+		 onSelectChange(selectedRowKeys) {
+			this.selectedRowKeys = selectedRowKeys;
 		},
 		addClose(){
 			this.drawerConfig.addShow = false;
diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue
index ff8e94a..2829581 100644
--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@@ -43,15 +43,21 @@ export default {
 	components: {
 		yMenu,
 	},
+	mounted(){
+		this.$router.push({ name: sessionStorage.getItem('routerName') });
+		this.tagActive = Number(sessionStorage.getItem('index'))
+	},
 	watch: {
 		$route: {
 			handler(val) {
 				this.tags = val.matched;
+				sessionStorage.setItem('routerName',val.name)
 			},
 			immediate: true,
 		},
 		tagActive:{
 			handler(val) {
+				// console.log(val);
 				sessionStorage.setItem('modal',this.menuTags[val].value)
 			},
 			immediate: true,
@@ -66,13 +72,13 @@ export default {
 					label: "基础功能",
 					value: "basic"
 				},
-				{
-					label: "缴费管理",
-					value: "payment"
-				},
+				// {
+				// 	label: "缴费管理",
+				// 	value: "payment"
+				// },
 				{
 					label: "智慧商城",
-					value: "smartMall"
+					value: "shop"
 				},
 				// {
 				//     label: "运营管理",
@@ -92,6 +98,7 @@ export default {
 		},
 		handlerTags(n) {
 			this.tagActive = n;
+			sessionStorage.setItem('index',n)
 		}
 	},
 };
diff --git a/src/views/Layout/yMenu/index.vue b/src/views/Layout/yMenu/index.vue
index e869dc9..e5ffbba 100644
--- a/src/views/Layout/yMenu/index.vue
+++ b/src/views/Layout/yMenu/index.vue
@@ -104,7 +104,6 @@ export default {
 		handlerSelect({selectedKeys}) {
 			this.selectedKeys = selectedKeys;
 			this.setSelectedKeys(selectedKeys);
-            
 		},
 		handlerOpen(val) {
 			this.setOpenKeys(val);
@@ -140,7 +139,7 @@ export default {
 						icon: arr[i].icon || ''
 					}
 					menus.push(obj)
-				} 
+				}
 				if(arr[i].children) {
 					let obj = {
 						key: this.indexPath,
@@ -156,7 +155,7 @@ export default {
 			}
 			// console.log(menus);
 		}
-        
+
 	}
 };
 </script>
diff --git a/src/views/ShopMall/AccumulatePoints/index.vue b/src/views/Shop/AccumulatePoints/index.vue
similarity index 100%
rename from src/views/ShopMall/AccumulatePoints/index.vue
rename to src/views/Shop/AccumulatePoints/index.vue
diff --git a/src/views/ShopMall/AfterSale/index.vue b/src/views/Shop/AfterSale/index.vue
similarity index 100%
rename from src/views/ShopMall/AfterSale/index.vue
rename to src/views/Shop/AfterSale/index.vue
diff --git a/src/views/ShopMall/BusinessManage/index.vue b/src/views/Shop/BusinessManage/index.vue
similarity index 100%
rename from src/views/ShopMall/BusinessManage/index.vue
rename to src/views/Shop/BusinessManage/index.vue
diff --git a/src/views/ShopMall/GoodsManage/index.vue b/src/views/Shop/GoodsManage/index.vue
similarity index 100%
rename from src/views/ShopMall/GoodsManage/index.vue
rename to src/views/Shop/GoodsManage/index.vue
diff --git a/src/views/Shop/OrderManage/depend/config.js b/src/views/Shop/OrderManage/depend/config.js
new file mode 100644
index 0000000..0780547
--- /dev/null
+++ b/src/views/Shop/OrderManage/depend/config.js
@@ -0,0 +1,154 @@
+/**
+ * 配置
+ * 表格列
+ */
+export const columns = [
+	{
+		title: "订单号",
+		dataIndex: "code",
+		width: "15%",
+	},
+	{
+		title: "创建时间",
+		dataIndex: "createDate",
+		width: "15%",
+	},
+	{
+		title: "付款方式",
+		dataIndex: "payType",
+		width: "15%",
+		customRender: function (payType) {
+			switch (payType) {
+			case 1:
+				return '支付宝'
+			case 2:
+				return '微信'
+			case 3:
+				return '现金'
+			case 4:
+				return 'pos'
+			case 5:
+				return '预缴扣除'
+			case 6:
+				return '银行卡'
+			case 7:
+				return '支票'
+			case 8:
+				return '转账'
+			case 9:
+				return '开发商代付'
+			default:
+				break;
+			}
+		}
+	},
+	// {
+	// 	title: "jcook订单号",
+	// 	dataIndex: "jcookCode",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "支付宝交易号",
+	// 	dataIndex: "tradeNo",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "交易状态",
+	// 	dataIndex: "tradeStatus",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "支付人名称",
+	// 	dataIndex: "payName",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "支付人联系方式",
+	// 	dataIndex: "payTel",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "付款方式",
+	// 	dataIndex: "payType",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "付款金额",
+	// 	dataIndex: "payPrice",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "运费",
+	// 	dataIndex: "freightFee",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "收货人",
+	// 	dataIndex: "receiverName",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "收货人联系方式",
+	// 	dataIndex: "receiverTel",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "所在地区名称",
+	// 	dataIndex: "locationName",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "详细地址",
+	// 	dataIndex: "addressDetail",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "运费",
+	// 	dataIndex: "freightFee",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "运费",
+	// 	dataIndex: "freightFee",
+	// 	width: "15%",
+	// },
+	// {
+	// 	title: "房屋类型",
+	// 	dataIndex: "manageEstateTypeName",
+	// 	width: "15%",
+	// },
+	{
+		title: "操作",
+		dataIndex: "action",
+		key: "action",
+		width: "180",
+		fixed: "right",
+		scopedSlots: { customRender: "action" },
+	},
+]
+// 搜索项
+export const searchForm = {
+	code: "",
+	jcookCode: '',
+	tradeStatus:null
+}
+// 分页
+export const pagination = {
+	current: 1,
+	total: 0,
+	pageSize: 10,
+	showTotal: (total) => `共 ${total} 条`,
+	showSizeChanger: true,
+	showQuickJumper: true,
+}
+export function del(data) {
+	this.$confirm({
+		title: "是否删除",
+		// okText:'删除',
+		// cancelText:'取消',
+		icon: "",
+		onOk: function () {
+			console.log(data);
+		},
+	});
+}
\ No newline at end of file
diff --git a/src/views/Shop/OrderManage/index.vue b/src/views/Shop/OrderManage/index.vue
new file mode 100644
index 0000000..2cd4db7
--- /dev/null
+++ b/src/views/Shop/OrderManage/index.vue
@@ -0,0 +1,147 @@
+<template>
+	<div>
+		<div class="cardTitle">订单列表</div>
+		<div class="search-box">
+			<a-row>
+				<a-col :span="20">
+				<a-space size="large">
+					<a-input style="width: 200px" placeholder="请输入订单号" />
+					<a-input style="width: 200px" placeholder="请输入jcook订单号" />
+					<a-select style="width: 200px" v-model="searchForm.tradeStatus" placeholder="请选择交易状态" ></a-select>
+					<a-button type="primary" @click='getData'>查 询</a-button>
+					<a-button>重 置</a-button>
+				</a-space>
+				</a-col>
+				<a-col :span="4">
+				<!-- <a-button class="add-btn" @click="">添加</a-button> -->
+				</a-col>
+			</a-row>
+		</div>
+		<a-table :columns="columns" :data-source="tableData" :rowKey="record=>record.id">>
+			<div slot="expandedRowRender" slot-scope="record" class="orderInfo">
+			<a-descriptions title="商品信息">
+					<a-descriptions-item label="UserName">
+					{{record.freightFee}}
+					</a-descriptions-item>
+					<a-descriptions-item label="Telephone">
+					1810000000
+					</a-descriptions-item>
+					<a-descriptions-item label="Live">
+					Hangzhou, Zhejiang
+					</a-descriptions-item>
+					<a-descriptions-item label="Remark">
+					empty
+					</a-descriptions-item>
+					<a-descriptions-item label="Address">
+					No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China
+					</a-descriptions-item>
+				</a-descriptions>
+			</div>
+			<span slot="action" slot-scope="text, record" class="action-col">
+				<a-space>
+					<a @click='detail(record)'>查看详情</a>
+					<a @click='remark(record)'>备注</a>
+				</a-space>
+			</span>
+		</a-table>
+	</div>
+</template>
+<script>
+import { orderList } from  '@/api/shop/order'
+import { columns,pagination,searchForm } from './depend/config'
+export default {
+	data() {
+		return {
+			tableData:[],
+			columns,
+			pagination,
+			searchForm
+		};
+	},
+	mounted() {
+		// this.getData()
+		this.tableData =[{
+			"id":1,
+			"code":"123456",
+			"jcookCode":"123131241",
+			"tradeNo":"12123",
+			"tradeStatus":1,
+			"payName":"张三",
+			"payTel":"13738611460",
+			"payType":1,
+			"payPrice":13,
+			"freightFee":4,
+			"receiverName":"王五",
+			"receiverTel":"13738611465",
+			"locationName":"宁波镇海",
+			"addressDetail":"深蓝大厦",
+			"remake":null,
+			"createName":"张三",
+			"createDate":'2022-2-2'
+		},{
+			"id":2,
+			"code":"123456",
+			"jcookCode":"123131241",
+			"tradeNo":"12123",
+			"tradeStatus":1,
+			"payName":"张三",
+			"payTel":"13738611460",
+			"payType":1,
+			"payPrice":13,
+			"freightFee":4,
+			"receiverName":"王五",
+			"receiverTel":"13738611465",
+			"locationName":"宁波镇海",
+			"addressDetail":"深蓝大厦",
+			"remake":null,
+			"createName":"张三",
+			"createDate":'2022-2-2'
+		},{
+			"id":3,
+			"code":"123456",
+			"jcookCode":"123131241",
+			"tradeNo":"12123",
+			"tradeStatus":1,
+			"payName":"张三",
+			"payTel":"13738611460",
+			"payType":1,
+			"payPrice":13,
+			"freightFee":4,
+			"receiverName":"王五",
+			"receiverTel":"13738611465",
+			"locationName":"宁波镇海",
+			"addressDetail":"深蓝大厦",
+			"remake":null,
+			"createName":"张三",
+			"createDate":'2022-2-2'
+		},
+		]
+	},
+	methods: {
+		async getData(){
+			const res  = await orderList({
+				pageNum: this.pagination.current,
+				size: this.pagination.pageSize,
+				code:this.searchForm.code,
+				jcookCode:this.searchForm.jcookCode,
+				tradeStatus:this.searchForm.tradeStatus,
+			})
+			this.tableData = res.data.rows
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+.orderInfo{
+	// background-color:red;
+}
+/deep/tr.ant-table-expanded-row, tr.ant-table-expanded-row:hover{
+	// z-index: 999;
+	position: relative;
+}
+/deep/.action-col{
+	position: relative;
+	// background-color:red;
+	// z-index: 1;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/ShopMall/OrderManage/index.vue b/src/views/ShopMall/OrderManage/index.vue
deleted file mode 100644
index e69de29..0000000