update

admin-update/src/assets/iconfont/iconfont.json

@@ -259,7 +259,7 @@
     },
     {
       "icon_id": "12321967",
-      "name": "邀请有礼",
+      "name": "老带新",
       "font_class": "yaoqingyouli",
       "unicode": "e773",
       "unicode_decimal": 59251

admin-update/src/constant/constant.js

@@ -77,7 +77,7 @@ const _CONST_MAP = {
 		},
 		{
 			label: '已完成',
-			value: 4
+			value: 5
 		}
 	],
 	// 后台审核账号
@@ -121,6 +121,13 @@ const _CONST_MAP = {
 			label: '审核未通过',
 			value: 3
 		}
+	],
+	// 来源
+	SOURCE_TYPE: [
+		{
+			label: '',
+			value: 0
+		}
 	]
 };
 

admin-update/src/mock/userInfo.js

@@ -421,18 +421,6 @@ let menu = {
 			viewPath: 'views/staff/operate.vue',
 			keepAlive: 1
 		},
-		// 设置
-		{
-			id: '10',
-			parentId: null,
-			name: '设置',
-			type: 0,
-			icon: 'iconshezhi',
-			orderNum: 10,
-			router: '/goods/list',
-			viewPath: 'views/goods/goods-list.vue',
-			keepAlive: 1
-		},
 		{
 			id: '101',
 			parentId: '10',
@@ -469,14 +457,26 @@ let menu = {
 		{
 			id: '11',
 			parentId: null,
-			name: '代理',
+			name: '开店邀请',
 			type: 1,
 			icon: 'iconyaoqingyouli',
-			orderNum: 11,
+			orderNum: 10,
 			router: '/pages/admin/my-invite',
 			viewPath: 'views/my-invite/index.vue',
 			keepAlive: 1
 		},
+		// 设置
+		{
+			id: '10',
+			parentId: null,
+			name: '设置',
+			type: 0,
+			icon: 'iconshezhi',
+			orderNum: 11,
+			router: '/goods/list',
+			viewPath: 'views/goods/goods-list.vue',
+			keepAlive: 1
+		},
 		// {
 		// 	id: '12',
 		// 	parentId: null,

admin-update/src/views/goods/goods-list.vue

@@ -1,245 +1,245 @@
 <template>
-    <div class="app-list-content">
-        <cl-crud class="liu-crud-wrap" @load="onLoad">
-            <template #slot-tabs="{ scope }">
-                <el-tabs
-                        class="liu-tabs"
-                        type="border-card"
-                        v-model="tabIndex"
-                        @tab-click="handleClick"
-                >
-                    <el-tab-pane
-                            v-for="(item, index) in tabsData"
-                            :key="index"
-                            :label="item.text"
-                            :name="item.key"
-                    >
-                    </el-tab-pane>
-                </el-tabs>
-            </template>
+	<div class="app-list-content">
+		<cl-crud class="liu-crud-wrap" @load="onLoad">
+			<template #slot-tabs="{ scope }">
+				<el-tabs
+					class="liu-tabs"
+					type="border-card"
+					v-model="tabIndex"
+					@tab-click="handleClick"
+				>
+					<el-tab-pane
+						v-for="(item, index) in tabsData"
+						:key="index"
+						:label="item.text"
+						:name="item.key"
+					>
+					</el-tab-pane>
+				</el-tabs>
+			</template>
 
-            <template #table-column-avatarUrl="{scope}">
-                <cl-avatar
-                        shape="square"
-                        :size="40"
-                        :src="scope.row.smallImgList[0] | default_avatar"
-                        :style="{ margin: 'auto' }"
-                ></cl-avatar>
-            </template>
+			<template #table-column-avatarUrl="{scope}">
+				<cl-avatar
+					shape="square"
+					:size="40"
+					:src="scope.row.smallImgList[0] | default_avatar"
+					:style="{ margin: 'auto' }"
+				></cl-avatar>
+			</template>
 
-            <template #table-column-goodsName="{scope}">
-                <span>{{ scope.row.goodsName }}</span>
-                <!-- <span>二维码</span> -->
-                <span class="short-link" @click="openLinkFn(scope.row)">链接</span>
-            </template>
+			<template #table-column-goodsName="{scope}">
+				<span>{{ scope.row.goodsName }}</span>
+				<!-- <span>二维码</span> -->
+				<span class="short-link" @click="openLinkFn(scope.row)">链接</span>
+			</template>
 
-            <!-- 添加商品 -->
-            <template #slot-add-goods-btn="{scope}">
-                <el-button type="primary" size="mini" @click="addFn">添加</el-button>
-            </template>
+			<!-- 添加商品 -->
+			<template #slot-add-goods-btn="{scope}">
+				<el-button type="primary" size="mini" @click="addFn">添加</el-button>
+			</template>
 
-            <!-- 状态 -->
-            <template #table-column-status="{scope}">
-                <span>{{ scope.row.status == 1 ? '上架' : '下架' }}</span>
-            </template>
+			<!-- 状态 -->
+			<template #table-column-status="{scope}">
+				<span>{{ scope.row.status == 1 ? '上架' : '下架' }}</span>
+			</template>
 
-            <!-- 修改 -->
-            <template #slot-modify="{scope}">
-                <el-button type="text" @click="addFn(2,scope.row)">修改</el-button>
-            </template>
+			<!-- 修改 -->
+			<template #slot-modify="{scope}">
+				<el-button type="text" @click="addFn(2, scope.row)">修改</el-button>
+			</template>
 
-            <!-- 下架 -->
-            <template #slot-takeOff="{scope}">
-                <el-button type="text" @click="downFn(scope.row)">下架</el-button>
-            </template>
-        </cl-crud>
-        <!-- 添加商品 -->
-        <el-dialog title="商品短链接：" :visible.sync="dialogFormVisible" width="40%">
-            <div>
-                <el-input v-model="sortLink" :disabled="true"></el-input>
-            </div>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sendPhoneFn">发到手机</el-button>
-            </div>
-        </el-dialog>
-    </div>
+			<!-- 下架 -->
+			<template #slot-takeOff="{scope}">
+				<el-button type="text" @click="downFn(scope.row)">下架</el-button>
+			</template>
+		</cl-crud>
+		<!-- 添加商品 -->
+		<el-dialog title="商品短链接：" :visible.sync="dialogFormVisible" width="40%">
+			<div>
+				<el-input v-model="sortLink" :disabled="true"></el-input>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="dialogFormVisible = false">取 消</el-button>
+				<el-button type="primary" @click="sendPhoneFn">发到手机</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                app: null,
-                dialogFormVisible: false,
-                sortLink: '',
-                operateData: {},
-                tabIndex: '-1',
-                tabsData: [
-                    {
-                        text: '全部',
-                        key: '-1'
-                    },
-                    {
-                        text: '上架',
-                        key: '1'
-                    },
-                    {
-                        text: '下架',
-                        key: '0'
-                    }
-                ]
-            };
-        },
-        methods: {
-            handleClick(tab, e) {
-                console.log(tab, e);
-                this.app.refresh({type: this.tabIndex});
-            },
-            // 打开链接
-            openLinkFn(item) {
-                this.operateData = item;
-                this.sortLink = item.shortUrl || '';
-                this.dialogFormVisible = true;
-            },
-            sendPhoneFn() {
-                this.$service.goods.sendPhone({id: this.operateData.id}).then(res => {
-                    this.$message.success('发送成功！');
-                    this.dialogFormVisible = false;
-                });
-            },
-            // 添加商品
-            addFn(type, data) {
-                let query = {}
-                if (type === 2) {
-                    query.id = data.id
-                    query.editType =type
-                }
-                this.$router.push({path: `/goods/add/`,query});
-            },
-            downFn(item) {
-                this.$confirm('是否下架该商品?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                })
-                    .then(() => {
-                        this.$service.goods
-                            .changeStatus({
-                                id: item.id,
-                                status: item.status == 0 ? 1 : 0
-                            })
-                            .then(res => {
-                                item.status = item.status == 0 ? 1 : 0;
-                                this.$message.success('操作成功！');
-                            })
-                            .catch(e => {
-                                this.$message.error(e);
-                            });
-                    })
-                    .catch(() => {
-                        this.$message({
-                            type: 'info',
-                            message: '已取消删除'
-                        });
-                    });
-            },
-            // cl-crud 组件
-            onLoad({ctx, app}) {
-                this.app = app;
-                ctx.service(this.$service.goods)
-                    .set('table', {
-                        columns: [
-                            {
-                                prop: 'id',
-                                label: 'ID',
-                                align: 'center'
-                            },
-                            {
-                                prop: 'avatarUrl',
-                                label: '封面',
-                                align: 'center'
-                            },
-                            {
-                                prop: 'goodsName',
-                                label: '标题',
-                                align: 'center',
-                                'min-width': 180
-                            },
-                            {
-                                prop: 'inTurn',
-                                label: '顺序',
-                                align: 'center'
-                            },
-                            {
-                                prop: 'price',
-                                label: '价格',
-                                align: 'center',
-                                emptyText: '无',
-                                'min-width': 150
-                            },
-                            {
-                                prop: 'actualSold',
-                                label: '销量',
-                                align: 'center'
-                            },
-                            {
-                                prop: 'viewNum',
-                                label: '浏览量',
-                                align: 'center'
-                            },
-                            {
-                                prop: 'status',
-                                label: '状态',
-                                align: 'center'
-                            },
-                            {
-                                prop: 'createDate',
-                                label: '创建时间',
-                                align: 'center'
-                            }
-                        ],
-                        // 操作列
-                        op: {
-                            visible: true, // 是否显示
-                            // 同 element-ui Table-column Attributes
-                            props: {
-                                width: 150,
-                                align: 'center',
-                                fixed: 'right',
-                                label: '操作'
-                            },
-                            // 布局，请移步 `layout`
-                            layout: ['slot-modify', 'slot-takeOff']
-                        }
-                    })
-                    .set('dict', {
-                        search: {
-                            keyWord: 'goodsName'
-                        }
-                    })
-                    .set('search', {
-                        key: {
-                            placeholder: '商品名称'
-                        }
-                    })
-                    .set('layout', [
-                        ['slot-tabs'],
-                        ['search-key', 'flex1', 'refresh-btn', 'slot-add-goods-btn'],
-                        ['data-table'],
-                        ['flex1', 'pagination']
-                    ])
-                    .done();
-                app.refresh({status: this.tabIndex});
-            }
-        }
-    };
+export default {
+	data() {
+		return {
+			app: null,
+			dialogFormVisible: false,
+			sortLink: '',
+			operateData: {},
+			tabIndex: '-1',
+			tabsData: [
+				{
+					text: '全部',
+					key: '-1'
+				},
+				{
+					text: '上架',
+					key: '1'
+				},
+				{
+					text: '下架',
+					key: '0'
+				}
+			]
+		};
+	},
+	methods: {
+		handleClick(tab, e) {
+			console.log(tab, e);
+			this.app.refresh({ type: this.tabIndex });
+		},
+		// 打开链接
+		openLinkFn(item) {
+			this.operateData = item;
+			this.sortLink = item.shortUrl || '';
+			this.dialogFormVisible = true;
+		},
+		sendPhoneFn() {
+			this.$service.goods.sendPhone({ id: this.operateData.id }).then(res => {
+				this.$message.success('发送成功！');
+				this.dialogFormVisible = false;
+			});
+		},
+		// 添加商品
+		addFn(type, data) {
+			let query = {};
+			if (type === 2) {
+				query.id = data.id;
+				query.editType = type;
+			}
+			this.$router.push({ path: `/goods/add/`, query });
+		},
+		downFn(item) {
+			this.$confirm('是否下架该商品?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.$service.goods
+						.changeStatus({
+							id: item.id,
+							status: item.status == 0 ? 1 : 0
+						})
+						.then(res => {
+							item.status = item.status == 0 ? 1 : 0;
+							this.$message.success('操作成功！');
+						})
+						.catch(e => {
+							this.$message.error(e);
+						});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					});
+				});
+		},
+		// cl-crud 组件
+		onLoad({ ctx, app }) {
+			this.app = app;
+			ctx.service(this.$service.goods)
+				.set('table', {
+					columns: [
+						{
+							prop: 'id',
+							label: 'ID',
+							align: 'center'
+						},
+						{
+							prop: 'avatarUrl',
+							label: '封面',
+							align: 'center'
+						},
+						{
+							prop: 'goodsName',
+							label: '标题',
+							align: 'center',
+							'min-width': 180
+						},
+						{
+							prop: 'inTurn',
+							label: '顺序',
+							align: 'center'
+						},
+						{
+							prop: 'price',
+							label: '价格',
+							align: 'center',
+							emptyText: '无',
+							'min-width': 150
+						},
+						{
+							prop: 'actualSold',
+							label: '销量',
+							align: 'center'
+						},
+						{
+							prop: 'viewNum',
+							label: '浏览量',
+							align: 'center'
+						},
+						{
+							prop: 'status',
+							label: '状态',
+							align: 'center'
+						},
+						{
+							prop: 'createDate',
+							label: '创建时间',
+							align: 'center'
+						}
+					],
+					// 操作列
+					op: {
+						visible: true, // 是否显示
+						// 同 element-ui Table-column Attributes
+						props: {
+							width: 150,
+							align: 'center',
+							fixed: 'right',
+							label: '操作'
+						},
+						// 布局，请移步 `layout`
+						layout: ['slot-modify', 'slot-takeOff']
+					}
+				})
+				.set('dict', {
+					search: {
+						keyWord: 'goodsName'
+					}
+				})
+				.set('search', {
+					key: {
+						placeholder: '商品名称'
+					}
+				})
+				.set('layout', [
+					['slot-tabs'],
+					['search-key', 'flex1', 'refresh-btn', 'slot-add-goods-btn'],
+					['data-table'],
+					['flex1', 'pagination']
+				])
+				.done();
+			app.refresh({ status: this.tabIndex });
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-    .short-link {
-        color: $mainColor;
-        margin-left: 10px;
-        cursor: pointer;
-    }
+.short-link {
+	color: $mainColor;
+	margin-left: 10px;
+	cursor: pointer;
+}
 </style>

admin-update/src/views/member/components/detail-draw.vue

@@ -1,10 +1,10 @@
 <template>
 	<el-drawer
-		title="我是标题"
+		title="客户详情"
 		:visible.sync="showStatus"
 		size="70%"
 		:before-close="closeFn"
-		:with-header="false"
+		custom-class="member-draw-wrap"
 	>
 		<div class="head-wrap">
 			<div class="head-left">
@@ -146,9 +146,17 @@ export default {
 };
 </script>
 
+<style lang="scss">
+.member-draw-wrap {
+	.el-drawer__header {
+		margin-bottom: 20px;
+	}
+}
+</style>
 <style lang="scss" scoped>
 .head-wrap {
 	@include disFlex(center, flex-start);
+	border-top: 1px solid $borderColor;
 	border-bottom: 1px solid $borderColor;
 	padding: 0 10px;
 	.head-left {

admin-update/src/views/member/list.vue

@@ -55,9 +55,9 @@
 				<el-button type="text" @click="upgradeShowFn(scope.row)">升级</el-button>
 			</template>
 			<!-- 发货 -->
-			<template #slot-ship="{scope}">
+			<!-- <template #slot-ship="{scope}">
 				<el-button type="text" @click="$message('开发中...')">发货</el-button>
-			</template>
+			</template> -->
 		</cl-crud>
 		<!-- 充值 -->
 		<el-dialog
@@ -157,7 +157,7 @@
 </template>
 
 <script>
-import { mapGetters ,mapActions} from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import cardName from './components/card-name';
 import detailDraw from './components/detail-draw';
 export default {
@@ -212,13 +212,11 @@ export default {
 	},
 	created() {
 		// this.$store.dispatch('getLevel');
-		this.getLevel()
+		this.getLevel();
 	},
 	mounted() {},
 	methods: {
-        ...mapActions([
-            'getLevel',
-        ]),
+		...mapActions(['getLevel']),
 		handleClick(tab, e) {
 			console.log(tab, e);
 			this.app.refresh({ type: this.tabIndex });

admin-update/src/views/order/components/order-detail.vue

@@ -1,21 +1,160 @@
 <template>
 	<div class="order-detail">
-		<div class="order-list">
-			<div class="label">订单号</div>
-			<div class="value">201911232495</div>
-		</div>
-		<div class="order-list">
-			<div class="label">下单时间</div>
-			<div class="value">2019-10-10 20:00:00</div>
-		</div>
-		<div class="order-list">
-			<div class="label">商品名称</div>
-			<div class="value">美人尖</div>
-		</div>
-		<div class="order-list">
-			<div class="label">金额</div>
-			<div class="value">￥390</div>
-		</div>
+		<!-- 抽屉 -->
+		<el-drawer
+			:visible.sync="showOrderDetail"
+			size="1000px"
+			:before-close="closeFn"
+			custom-class="order-draw-wrap"
+		>
+			<template slot="title">
+				<div class="title-status-wrap">
+					<div class="title-text">订单详情</div>
+					<div class="title-status">
+						<span>当前订单状态：</span>
+						<span>{{ orderOperate.status | constantfilter('ORDER_STATUS') }}</span>
+					</div>
+				</div>
+			</template>
+			<div class="order-manage-wrap">
+				<!-- 信息 -->
+				<div class="card-wrap">
+					<div class="card-tit">基本信息</div>
+					<div class="card-body">
+						<el-table :data="data">
+							<el-table-column
+								property="orderSn"
+								label="订单编号"
+								width="280px"
+							></el-table-column>
+							<el-table-column property="sendCost" label="运费"></el-table-column>
+							<el-table-column property="actPrice" label="原价"></el-table-column>
+							<el-table-column property="prePrice" label="实付款"></el-table-column>
+							<el-table-column
+								property="sourceType"
+								label="订单来源"
+							></el-table-column>
+							<el-table-column
+								property="totalRecharge"
+								label="订单类型"
+							></el-table-column>
+						</el-table>
+						<el-table :data="data">
+							<el-table-column
+								property="sendType"
+								label="配送方式"
+								width="280px"
+							></el-table-column>
+							<el-table-column property="payWay" label="支付方式"></el-table-column>
+							<el-table-column property="grade" label="获得成长值"></el-table-column>
+							<el-table-column property="bookName" label="下单客户"></el-table-column>
+							<el-table-column label="客户打分">
+								<template slot-scope="scope"
+									><el-rate v-model="scope.row.totalFlow" disabled> </el-rate>
+								</template>
+							</el-table-column>
+							<el-table-column property="evaluate" label="客户评价"></el-table-column>
+						</el-table>
+					</div>
+				</div>
+				<!-- 收花人信息 -->
+				<div class="card-wrap">
+					<div class="card-tit">收花人信息</div>
+					<div class="card-body">
+						<el-table :data="data">
+							<el-table-column
+								property="receiveUserName"
+								label="昵称"
+							></el-table-column>
+							<el-table-column
+								property="receiveMobile"
+								label="手机号"
+							></el-table-column>
+							<el-table-column property="deadline" label="收花时间">
+								<template slot-scope="scope">
+									<span>{{ scope.row.deadline | formatTime }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column
+								property="receiveFullAddress"
+								label="地址"
+								width="280px"
+							></el-table-column>
+						</el-table>
+					</div>
+				</div>
+				<!-- 订花人信息 -->
+				<div class="card-wrap">
+					<div class="card-tit">订花人信息</div>
+					<div class="card-body">
+						<el-table :data="data">
+							<el-table-column property="bookName" label="昵称"></el-table-column>
+							<el-table-column property="bookMobile" label="手机号"></el-table-column>
+							<el-table-column
+								property="reachDate"
+								label="送到时间"
+							></el-table-column>
+							<el-table-column property="cardInfo" label="祝福语"></el-table-column>
+						</el-table>
+					</div>
+				</div>
+				<!-- 商品信息 -->
+				<div class="card-wrap">
+					<div class="card-tit">商品信息</div>
+					<div class="card-body">
+						<el-table :data="data.goodsInfoList" show-summary>
+							<el-table-column label="商品图片">
+								<template slot-scope="scope">
+									<cl-avatar
+										shape="square"
+										:size="40"
+										:src="scope.row.smallCoverUrl | default_avatar"
+										:style="{ margin: 'auto' }"
+									></cl-avatar>
+								</template>
+							</el-table-column>
+							<el-table-column property="title" label="商品名称"></el-table-column>
+							<el-table-column property="goodsId" label="ID"></el-table-column>
+							<el-table-column
+								property="goodsStyleName"
+								label="属性"
+							></el-table-column>
+							<el-table-column property="num" label="数量"></el-table-column>
+							<el-table-column property="unitPrice" label="库存"></el-table-column>
+							<el-table-column property="unitPrice" label="小计"></el-table-column>
+						</el-table>
+					</div>
+				</div>
+				<!-- 费用信息 -->
+				<div class="card-wrap">
+					<div class="card-tit">费用信息</div>
+					<div class="card-body">
+						<el-table :data="data">
+							<el-table-column property="prePrice" label="商品合计"></el-table-column>
+							<el-table-column property="sendCost" label="运费"></el-table-column>
+							<el-table-column property="prePrice" label="应付款"></el-table-column>
+							<el-table-column property="growth" label="随机优惠"></el-table-column>
+						</el-table>
+						<el-table :data="data">
+							<el-table-column
+								property="totalExpend"
+								label="会员优惠"
+							></el-table-column>
+							<el-table-column
+								property="totalBuyNum"
+								label="手动改价"
+							></el-table-column>
+							<el-table-column property="balance" label="优惠券"></el-table-column>
+							<el-table-column label="实付款">
+								<template slot-scope="scope">
+									<span class="app-price">{{ scope.row.prePrice }}</span>
+								</template>
+							</el-table-column>
+						</el-table>
+					</div>
+				</div>
+			</div>
+		</el-drawer>
 	</div>
 </template>
 
@@ -23,15 +162,74 @@
 export default {
 	name: 'order-detail',
 	props: {
-		info: {
+		orderOperate: {
 			type: Object,
 			default: () => {}
 		}
+	},
+	data() {
+		return {
+			showOrderDetail: false,
+			data: []
+		};
+	},
+	methods: {
+		init() {
+			console.log('蒋小姐额', this.orderOperate);
+			this.$service.order.info({ id: this.orderOperate.id }).then(res => {
+				console.log('江总', res);
+				this.data = [res];
+				this.showOrderDetail = true;
+			});
+		},
+		closeFn() {
+			this.showOrderDetail = false;
+		}
 	}
 };
 </script>
 
+<style lang="scss">
+.order-draw-wrap {
+	.el-drawer__header {
+		margin-bottom: 20px;
+	}
+	.el-table__header-wrapper {
+		.el-table__header tr,
+		.el-table__header th {
+			background-color: #f7f7f7;
+		}
+	}
+}
+</style>
 <style lang="scss" scoped>
-.order-detail {
+.order-draw-wrap {
+	.title-status-wrap {
+		@include disFlex(center, flex-start);
+		.title-text {
+			margin-right: 200px;
+		}
+		.title-status {
+			color: red;
+		}
+	}
+}
+.order-manage-wrap {
+	height: calc(100vh - 64px);
+	overflow-y: auto;
+	padding-bottom: 20px;
+}
+.card-wrap {
+	// padding: 0 20px;
+	margin: 20px;
+	// border: 1px solid $borderColor;
+	// border-bottom: 0;
+	.card-tit {
+		font-size: 16px;
+		margin-bottom: 6px;
+	}
+	.card-body {
+		border: 1px solid $borderColor;
+	}
 }
 </style>

admin-update/src/views/order/list.vue

@@ -87,6 +87,9 @@
 			<!-- 操作 -->
 			<!-- 发货 -->
 			<template #slot-column-option="{scope}">
+				<template>
+					<el-button type="text" @click="detailShowFn(scope.row)">详情</el-button>
+				</template>
 				<template v-if="scope.row.status == 4 || scope.row.status == 0">
 					<el-button type="text" size="small" disabled>免发货</el-button>
 					<el-button type="text" size="small" disabled>发货</el-button>
@@ -111,27 +114,20 @@
 				</template>
 			</template>
 		</cl-crud>
+		<!-- 用户详情 -->
+		<order-detail ref="orderDetail" :orderOperate="optionData" />
 		<!-- 发货状态 -->
 		<sel-order ref="selOrder" :orderData="optionData" />
-		<!-- <el-drawer
-			title="发货管理"
-			:visible.sync="showShipMnage"
-			size="440px"
-			:before-close="closeFn"
-			custom-class="ship-draw-wrap"
-		>
-			<div class="ship-manage-wrap">
-				<sel-order :shipData="shipData" />
-			</div>
-		</el-drawer> -->
 	</div>
 </template>
 
 <script>
 import SelOrder from './components/sel-order';
+import OrderDetail from './components/order-detail';
 export default {
 	components: {
-		SelOrder
+		SelOrder,
+		OrderDetail
 	},
 	data() {
 		return {
@@ -166,9 +162,9 @@ export default {
 				}
 			],
 			// dialog
-			optionData: {},
+			optionData: {}
 			// drawer
-			showShipMnage: false
+			// 详情drawer
 			// shipData: []
 		};
 	},
@@ -201,8 +197,12 @@ export default {
 				this.$refs.selOrder.init();
 			});
 		},
-		closeFn() {
-			this.showShipMnage = false;
+		// 详情 drawer
+		detailShowFn(item) {
+			this.optionData = item;
+			setTimeout(() => {
+				this.$refs.orderDetail.init();
+			});
 		},
 		// dialog
 		// crud