5 tahun lalu · 62e8ac12fd
--- a/ghs/dist/shop/css/chunk-02781014.00bc2fe8.css
+++ b/ghs/dist/shop/css/chunk-02781014.00bc2fe8.css
--- a/ghs/dist/shop/css/chunk-06373476.01c689fa.css
+++ b/ghs/dist/shop/css/chunk-06373476.01c689fa.css
--- a/ghs/dist/shop/css/chunk-31880848.61241497.css
+++ b/ghs/dist/shop/css/chunk-31880848.61241497.css
@@ -1 +0,0 @@
 
															-.el-dialog .el-dialog__header[data-v-75f828a1]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-75f828a1]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-75f828a1]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-75f828a1]{font-size:18px}.el-dialog .el-dialog__body[data-v-75f828a1]{padding:20px}.el-dialog .el-dialog__footer[data-v-75f828a1]{padding-bottom:15px}.shop-list[data-v-75f828a1]{height:100%}
														
--- a/ghs/dist/shop/css/chunk-3869b97e.169f374e.css
+++ b/ghs/dist/shop/css/chunk-3869b97e.169f374e.css
--- a/ghs/dist/shop/css/chunk-38ef729b.e14b2afb.css
+++ b/ghs/dist/shop/css/chunk-38ef729b.e14b2afb.css
--- a/ghs/dist/shop/css/chunk-42e96d3a.945c2cc2.css
+++ b/ghs/dist/shop/css/chunk-42e96d3a.945c2cc2.css
--- a/ghs/dist/shop/css/chunk-45c24cd4.53a66838.css
+++ b/ghs/dist/shop/css/chunk-45c24cd4.53a66838.css
--- a/ghs/dist/shop/css/chunk-4d9ce943.848f5672.css
+++ b/ghs/dist/shop/css/chunk-4d9ce943.848f5672.css
--- a/ghs/dist/shop/css/chunk-557ab80c.d299bfb0.css
+++ b/ghs/dist/shop/css/chunk-557ab80c.d299bfb0.css
--- a/ghs/dist/shop/css/chunk-5cd0cb96.81bb8de7.css
+++ b/ghs/dist/shop/css/chunk-5cd0cb96.81bb8de7.css
@@ -0,0 +1 @@
 
															+.el-dialog .el-dialog__header[data-v-58257349]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-58257349]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-58257349]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-58257349]{font-size:18px}.el-dialog .el-dialog__body[data-v-58257349]{padding:20px}.el-dialog .el-dialog__footer[data-v-58257349]{padding-bottom:15px}.shop-list[data-v-58257349]{height:100%}
														
--- a/ghs/dist/shop/css/chunk-6b3748c2.e5bab566.css
+++ b/ghs/dist/shop/css/chunk-6b3748c2.e5bab566.css
--- a/ghs/dist/shop/css/chunk-7686f352.157554ab.css
+++ b/ghs/dist/shop/css/chunk-7686f352.157554ab.css
--- a/ghs/dist/shop/css/chunk-8585a4da.93c877ba.css
+++ b/ghs/dist/shop/css/chunk-8585a4da.93c877ba.css
--- a/ghs/dist/shop/css/chunk-9952f446.40de1887.css
+++ b/ghs/dist/shop/css/chunk-9952f446.40de1887.css
--- a/ghs/dist/shop/css/chunk-a7cc629a.817adbf6.css
+++ b/ghs/dist/shop/css/chunk-a7cc629a.817adbf6.css
--- a/ghs/dist/shop/css/chunk-b44bc7e4.7d579804.css
+++ b/ghs/dist/shop/css/chunk-b44bc7e4.7d579804.css
--- a/ghs/dist/shop/css/chunk-c11a07d4.c1ae4f77.css
+++ b/ghs/dist/shop/css/chunk-c11a07d4.c1ae4f77.css
--- a/ghs/dist/shop/css/chunk-f7679182.94c6be15.css
+++ b/ghs/dist/shop/css/chunk-f7679182.94c6be15.css
--- a/ghs/dist/shop/index.html
+++ b/ghs/dist/shop/index.html
@@ -43,4 +43,4 @@
 
															 			.once .sub-title {
														
 
															 				color: #ababab;
														
 
															 				font-size: 12px;
														
 
															-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.e7484c6a.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.e7484c6a.js"></script></body></html>
														
 
															+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.aa97ed8f.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.aa97ed8f.js"></script></body></html>
														
--- a/ghs/dist/shop/js/app.aa97ed8f.js
+++ b/ghs/dist/shop/js/app.aa97ed8f.js
--- a/ghs/dist/shop/js/chunk-02781014.8de6bfe5.js
+++ b/ghs/dist/shop/js/chunk-02781014.8de6bfe5.js
--- a/ghs/dist/shop/js/chunk-06373476.4604fce6.js
+++ b/ghs/dist/shop/js/chunk-06373476.4604fce6.js
--- a/ghs/dist/shop/js/chunk-0e9e0547.3d8a97fa.js
+++ b/ghs/dist/shop/js/chunk-0e9e0547.3d8a97fa.js
--- a/ghs/dist/shop/js/chunk-12505f6e.aecb10b8.js
+++ b/ghs/dist/shop/js/chunk-12505f6e.aecb10b8.js
--- a/ghs/dist/shop/js/chunk-1c00496a.699369b3.js
+++ b/ghs/dist/shop/js/chunk-1c00496a.699369b3.js
--- a/ghs/dist/shop/js/chunk-1c00496a.e39eefd9.js
+++ b/ghs/dist/shop/js/chunk-1c00496a.e39eefd9.js
--- a/ghs/dist/shop/js/chunk-31880848.ea5d6254.js
+++ b/ghs/dist/shop/js/chunk-31880848.ea5d6254.js
--- a/ghs/dist/shop/js/chunk-3869b97e.6659ea30.js
+++ b/ghs/dist/shop/js/chunk-3869b97e.6659ea30.js
--- a/ghs/dist/shop/js/chunk-38ef729b.43f19c62.js
+++ b/ghs/dist/shop/js/chunk-38ef729b.43f19c62.js
--- a/ghs/dist/shop/js/chunk-42e96d3a.25b2bb4f.js
+++ b/ghs/dist/shop/js/chunk-42e96d3a.25b2bb4f.js
--- a/ghs/dist/shop/js/chunk-45c24cd4.4ea6f102.js
+++ b/ghs/dist/shop/js/chunk-45c24cd4.4ea6f102.js
--- a/ghs/dist/shop/js/chunk-48ae46ac.39392826.js
+++ b/ghs/dist/shop/js/chunk-48ae46ac.39392826.js
--- a/ghs/dist/shop/js/chunk-4d9ce943.7032f7f5.js
+++ b/ghs/dist/shop/js/chunk-4d9ce943.7032f7f5.js
--- a/ghs/dist/shop/js/chunk-557ab80c.08489155.js
+++ b/ghs/dist/shop/js/chunk-557ab80c.08489155.js
--- a/ghs/dist/shop/js/chunk-5b387fbb.21948d32.js
+++ b/ghs/dist/shop/js/chunk-5b387fbb.21948d32.js
--- a/ghs/dist/shop/js/chunk-5c629d9e.dd8d8df2.js
+++ b/ghs/dist/shop/js/chunk-5c629d9e.dd8d8df2.js
--- a/ghs/dist/shop/js/chunk-5cd0cb96.bb32235c.js
+++ b/ghs/dist/shop/js/chunk-5cd0cb96.bb32235c.js
@@ -0,0 +1 @@
 
															+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5cd0cb96"],{c3d3:function(e,t,n){"use strict";n.r(t);var o=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"shop-list"},[n("x-crud",{on:{load:e.onLoad}})],1)},a=[],l=n("6abc"),c=(n("5b12"),n("9b5f"),n("5880")),i={data:function(){return{crud:null}},computed:Object(l["a"])({},Object(c["mapGetters"])(["shopInfo"])),methods:{onLoad:function(e){var t=this,n=e.ctx,o=e.app;this.crud=o,n.service({page:function(e){return t.$service.shop.list(e).then((function(t){return{list:t.list,pagination:{page:e.page,size:20,total:0}}}))}}).set("table",{columns:[{label:"ID",prop:"id",align:"center"},{label:"名称",prop:"shopName",align:"center"},{label:"营业时间",prop:"openTime",align:"center"},{label:"联系电话",prop:"telephone",align:"center"},{label:"累计收入",prop:"totalIncome",align:"center"},{label:"地址",prop:"fullAddress",align:"center"}],op:{visible:!0,props:{width:250,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["flex1","refresh-btn"],["data-table"]]).on("info",(function(e,t){var n=t.done;console.log(e),n(Object(l["a"])(Object(l["a"])({},e),{},{openTime:e.openTime.split("-"),provinceCity:[e.province,e.city]}))})).done(),o.refresh()}}},r=i,p=(n("fcea"),n("5d22")),s=Object(p["a"])(r,o,a,!1,null,"58257349",null);t["default"]=s.exports},fc29:function(e,t,n){},fcea:function(e,t,n){"use strict";n("fc29")}}]);
														
--- a/ghs/dist/shop/js/chunk-6b3748c2.ceaa8378.js
+++ b/ghs/dist/shop/js/chunk-6b3748c2.ceaa8378.js
--- a/ghs/dist/shop/js/chunk-7686f352.29538bc9.js
+++ b/ghs/dist/shop/js/chunk-7686f352.29538bc9.js
--- a/ghs/dist/shop/js/chunk-7f4a453c.13ae54a5.js
+++ b/ghs/dist/shop/js/chunk-7f4a453c.13ae54a5.js
--- a/ghs/dist/shop/js/chunk-7f4a453c.a17dd097.js
+++ b/ghs/dist/shop/js/chunk-7f4a453c.a17dd097.js
--- a/ghs/dist/shop/js/chunk-8585a4da.2ec90e46.js
+++ b/ghs/dist/shop/js/chunk-8585a4da.2ec90e46.js
--- a/ghs/dist/shop/js/chunk-9952f446.99377442.js
+++ b/ghs/dist/shop/js/chunk-9952f446.99377442.js
--- a/ghs/dist/shop/js/chunk-a7cc629a.7c57f301.js
+++ b/ghs/dist/shop/js/chunk-a7cc629a.7c57f301.js
--- a/ghs/dist/shop/js/chunk-b44bc7e4.f3bad5fc.js
+++ b/ghs/dist/shop/js/chunk-b44bc7e4.f3bad5fc.js
--- a/ghs/dist/shop/js/chunk-c11a07d4.f59fbcc5.js
+++ b/ghs/dist/shop/js/chunk-c11a07d4.f59fbcc5.js
--- a/ghs/dist/shop/js/chunk-f7679182.c7acda5f.js
+++ b/ghs/dist/shop/js/chunk-f7679182.c7acda5f.js
--- a/ghs/src/components/chat/index.vue
+++ b/ghs/src/components/chat/index.vue
@@ -368,8 +368,9 @@ export default {
 
															     .global_kd_button {
														
 
															         position fixed;
														
 
															-        bottom: 30px;
														
 
															-        right: 50px;
														
 
															+        bottom: 35px;
														
 
															+        right: 70px;
														
 
															+        z-index:9999;
														
 
															     }
														
 
															 }
														
 
															-</style>
														
 
															+</style>
														
--- a/ghs/src/views/order/components/order-detail.vue
+++ b/ghs/src/views/order/components/order-detail.vue
@@ -17,100 +17,65 @@
 
															 				</div>
														
 
															 			</template>
														
 
															 			<div class="order-manage-wrap">
														
 
															-				<!-- 信息 -->
														
 
															+
														
 
															+				<!-- 花材信息 -->
														
 
															 				<div class="card-wrap">
														
 
															-					<div class="card-tit">基本信息</div>
														
 
															+					<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="prePrice" label="合计"></el-table-column>
														
 
															-							<el-table-column property="actPrice" 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="客户打分">
														
 
															+						<el-table :data="data[0].product" show-summary>
														
 
															+							<el-table-column label="花材图片">
														
 
															 								<template slot-scope="scope">
														
 
															-									<el-rate v-model="scope.row.grade" disabled></el-rate>
														
 
															+									<cl-avatar
														
 
															+										shape="square"
														
 
															+										:size="30"
														
 
															+										:src="scope.row.cover"
														
 
															+									></cl-avatar>
														
 
															 								</template>
														
 
															 							</el-table-column>
														
 
															-							<el-table-column property="evaluate" label="客户评价"></el-table-column>
														
 
															+							<el-table-column property="name" label="花材名称"></el-table-column>
														
 
															+							<el-table-column property="property" label="属性"></el-table-column>
														
 
															+							<el-table-column property="num" 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-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">
														
 
															-								<template slot-scope="scope">
														
 
															-									<span>{{scope.row.receiveAddress}}{{scope.row.receiveFloor}}（{{ scope.row.receiveFullAddress }}）</span>
														
 
															-								</template>
														
 
															-							</el-table-column>
														
 
															-							<el-table-column property="print" label="操作" width="110px">
														
 
															-								<!-- <el-button type="primary" icon="el-icon-printer"></el-button> -->
														
 
															-							</el-table-column>
														
 
															+							<el-table-column property="customName" label="名称"></el-table-column>
														
 
															+							<el-table-column property="customMobile" label="手机号"></el-table-column>
														
 
															+							<el-table-column property="customAddress" label="地址" width="280px"></el-table-column>
														
 
															 						</el-table>
														
 
															 					</div>
														
 
															 				</div>
														
 
															-				<!-- 订花人信息 -->
														
 
															+
														
 
															+				<!-- 信息 -->
														
 
															 				<div class="card-wrap">
														
 
															-					<div class="card-tit">订花人</div>
														
 
															+					<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 label="要求送达时间">
														
 
															+							<el-table-column property="orderSn" label="订单编号" width="280px"></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="actPrice" label="实付款"></el-table-column>
														
 
															+							<el-table-column property="debt" label="欠款">
														
 
															 								<template slot-scope="scope">
														
 
															-									<template v-if="scope.row.reachDate != '0000-00-00'">
														
 
															-									<span>{{ scope.row.reachDate}}</span>&nbsp;&nbsp;
														
 
															-									<span v-if="scope.row.reachPeriod == 0">上午</span>
														
 
															-									<span v-else-if="scope.row.reachPeriod == 1">下午</span>
														
 
															-									<span v-else>晚上</span>
														
 
															-									<span v-if="scope.row.anonymity == 1">（客户要求匿名）</span>
														
 
															-									</template>
														
 
															+									<span v-if="scope.row.debt == 1">是</span><span v-else></span>
														
 
															 								</template>
														
 
															 							</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="商品图片">
														
 
															+							<el-table-column property="status" label="状态">
														
 
															 								<template slot-scope="scope">
														
 
															-									<cl-avatar
														
 
															-										shape="square"
														
 
															-										:size="40"
														
 
															-										:src="scope.row.smallCoverUrl | default_avatar"
														
 
															-										:style="{ margin: 'auto' }"
														
 
															-									></cl-avatar>
														
 
															+									<span>{{ scope.row.status | constantfilter('ORDER_STATUS') }}</span>
														
 
															 								</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>
														
 
															 					</div>
														
 
															 				</div>
														
 
															+
														
 
															+
														
 
															 			</div>
														
 
															 		</el-drawer>
														
 
															 	</div>
														
@@ -188,4 +153,4 @@ export default {
 
															 		border: 1px solid $borderColor;
														
 
															 	}
														
 
															 }
														
 
															-</style>
														
 
															+</style>
														
--- a/ghs/src/views/order/list.vue
+++ b/ghs/src/views/order/list.vue
@@ -22,31 +22,24 @@
 
															 				>{{ scope.row.orderSn }}</el-link>
														
 
															 			</template>
														
 
															-			<!-- 订花人 -->
														
 
															-			<template #table-column-bookName="{scope}">
														
 
															-				<div class="book-wrap">
														
 
															-					<div style="width:58px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{ scope.row.bookName }}</div>
														
 
															+			<template #table-column-customName="{scope}">
														
 
															+				<div>
														
 
															+					{{ scope.row.customName }}
														
 
															 				</div>
														
 
															 			</template>
														
 
															-			<!-- 订花人手机号 -->
														
 
															-			<template #table-column-bookMobile="{scope}">
														
 
															-				<div v-if="scope.row.bookMobile == ''">-</div>
														
 
															-				<div v-else>{{ scope.row.bookMobile }}</div>
														
 
															+			<template #table-column-customMobile="{scope}">
														
 
															+				<div v-if="scope.row.customMobile == ''">-</div>
														
 
															+				<div v-else>{{ scope.row.customMobile }}</div>
														
 
															 			</template>
														
 
															 			<!-- 状态 -->
														
 
															 			<template #table-column-status="{scope}">
														
 
															-				<el-tag v-if="scope.row.status == 2">待配送</el-tag>
														
 
															-				<el-tag v-else-if="scope.row.status == 3">配送中</el-tag>
														
 
															-				<el-tag v-else-if="scope.row.status == 4">已完成</el-tag>
														
 
															-				<el-tag v-else-if="scope.row.status == 5">已取消</el-tag>
														
 
															-				<el-tag v-else>待付款</el-tag>
														
 
															-			</template>
														
 
															-
														
 
															-			<!-- 进度 -->
														
 
															-			<template #table-column-currentFlow="{scope}">
														
 
															-				<el-progress :percentage="(scope.row.currentFlow/scope.row.totalFlow)*100" :format="formatProgress" ></el-progress>
														
 
															+				<span v-if="scope.row.status == 2">待配送</span>
														
 
															+				<span v-else-if="scope.row.status == 3">配送中</span>
														
 
															+				<span v-else-if="scope.row.status == 4">已完成</span>
														
 
															+				<span v-else-if="scope.row.status == 5">已取消</span>
														
 
															+				<span v-else>待付款</span>
														
 
															 			</template>
														
 
															 			<!-- 送达时间 -->
														
@@ -198,63 +191,72 @@ export default {
 
															 			ctx.service(this.$service.order)
														
 
															 				.set('table', {
														
 
															 					columns: [
														
 
															-						// {
														
 
															-						// 	type: 'selection',
														
 
															-						// 	align: 'center',
														
 
															-						// 	width: '60'
														
 
															-						// },
														
 
															 						{
														
 
															 							prop: 'orderSn',
														
 
															 							label: '单号',
														
 
															 							align: 'center',
														
 
															-							width: '260'
														
 
															+							width: '160'
														
 
															+						},
														
 
															+						{
														
 
															+							prop: 'prePrice',
														
 
															+							label: '总价',
														
 
															+							align: 'center',
														
 
															+							width: '130'
														
 
															+						},
														
 
															+						{
														
 
															+							prop: 'actPrice',
														
 
															+							label: '实付款',
														
 
															+							align: 'center',
														
 
															+							emptyText: '无',
														
 
															+							width: '130'
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'bookName',
														
 
															-							label: '订花人',
														
 
															+							prop: 'customName',
														
 
															+							label: '客户',
														
 
															 							align: 'center',
														
 
															-							width: '120'
														
 
															+							width: '150'
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'bookMobile',
														
 
															+							prop: 'customMobile',
														
 
															 							label: '手机号',
														
 
															 							align: 'center',
														
 
															-							width: '110'
														
 
															+							width: '150'
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'reachTime',
														
 
															-							label: '送达时间',
														
 
															+							prop: 'bigNum',
														
 
															+							label: '数量',
														
 
															 							align: 'center',
														
 
															-							width: 120
														
 
															+							width: '150'
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'prePrice',
														
 
															-							label: '总价',
														
 
															-							align: 'center'
														
 
															+							prop: 'sendType',
														
 
															+							label: '配送方式',
														
 
															+							align: 'center',
														
 
															+							width: '150'
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'actPrice',
														
 
															-							label: '实付款',
														
 
															+							prop: 'reachTime',
														
 
															+							label: '送达时间',
														
 
															 							align: 'center',
														
 
															-							emptyText: '无',
														
 
															-							'min-width': 100
														
 
															+							width: 120
														
 
															 						},
														
 
															 						{
														
 
															 							prop: 'sendNum',
														
 
															 							label: '编号',
														
 
															 							align: 'center',
														
 
															-							width: 80
														
 
															+							width: 110
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'currentFlow',
														
 
															-							label: '进度',
														
 
															+							prop: 'status',
														
 
															+							label: '状态',
														
 
															 							align: 'center',
														
 
															-							width: 180
														
 
															+							width: 110
														
 
															 						},
														
 
															 						{
														
 
															-							prop: 'status',
														
 
															-							label: '状态',
														
 
															-							align: 'center'
														
 
															+							prop: 'shopAdminName',
														
 
															+							label: '开单人',
														
 
															+							align: 'center',
														
 
															+							width: 110
														
 
															 						}
														
 
															 					],
														
@@ -269,7 +271,6 @@ export default {
 
															 						// 同 element-ui Table-column Attributes
														
 
															 						props: {
														
 
															 							width: 150,
														
 
															-							height: 128,
														
 
															 							align: 'center',
														
 
															 							fixed: 'right',
														
 
															 							label: '操作'
														
@@ -279,7 +280,7 @@ export default {
 
															 					}
														
 
															 				})
														
 
															 				.set('search', {
														
 
															-					key: { placeholder: '订单号 / 订花人手机号' }
														
 
															+					key: { placeholder: '订单号 / 姓名，支持拼音首字母搜索' }
														
 
															 				})
														
 
															 				.set('layout', [
														
 
															 					['slot-tabs'],
														
@@ -365,4 +366,4 @@ export default {
 
															 		top: 9px;
														
 
															 	}
														
 
															 }
														
 
															-</style>
														
 
															+</style>