5 年前 · 1bdfdb982b
--- a/hd/dist/shop/css/chunk-5989f8bc.85f20047.css
+++ b/hd/dist/shop/css/chunk-5989f8bc.85f20047.css
--- a/hd/dist/shop/css/chunk-7723cd10.f429fba6.css
+++ b/hd/dist/shop/css/chunk-7723cd10.f429fba6.css
--- a/hd/dist/shop/index.html
+++ b/hd/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.586d90f5.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="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.586d90f5.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.ced29516.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="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.ced29516.js"></script></body></html>
			
--- a/hd/dist/shop/js/app.ced29516.js
+++ b/hd/dist/shop/js/app.ced29516.js
--- a/hd/dist/shop/js/chunk-2d225482.133b7a45.js
+++ b/hd/dist/shop/js/chunk-2d225482.133b7a45.js
--- a/hd/dist/shop/js/chunk-2d225482.84b39d4a.js
+++ b/hd/dist/shop/js/chunk-2d225482.84b39d4a.js
--- a/hd/dist/shop/js/chunk-5989f8bc.14c2753f.js
+++ b/hd/dist/shop/js/chunk-5989f8bc.14c2753f.js
--- a/hd/dist/shop/js/chunk-7723cd10.4e8e6358.js
+++ b/hd/dist/shop/js/chunk-7723cd10.4e8e6358.js
--- a/hd/dist/shop/js/chunk-7884804c.6d40d76c.js
+++ b/hd/dist/shop/js/chunk-7884804c.6d40d76c.js
--- a/hd/dist/shop/js/chunk-7d785d18.af986606.js
+++ b/hd/dist/shop/js/chunk-7d785d18.af986606.js
--- a/hd/src/sass/order/list.vue
+++ b/hd/src/sass/order/list.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				 	<div class="app-list-content">
			
 
				 		<x-crud class="liu-crud-wrap" @load="onLoad">
			
 
				-			<template #slot-tabs="{ scope }">
			
 
				+			<template #slot-tabs>
			
 
				 				<el-tabs
			
 
				 					class="liu-tabs"
			
 
				 					type="border-card"
			
@@ -19,15 +19,18 @@
 
				 
			
 
				 			<!-- 订花人 -->
			
 
				 			<template #table-column-bookName="{scope}">
			
 
				-				<div class="flex-center">
			
 
				+				<div v-if="scope.row.bookName !=''" class="flex-center">
			
 
				 					<cl-avatar
			
 
				 						shape="square"
			
 
				 						:size="40"
			
 
				-						:src="scope.row.bookAvatar | default_avatar"
			
 
				+						:src="scope.row.bookAvatar"
			
 
				 					></cl-avatar>
			
 
				 					<div class="app-margin-left-10">{{ scope.row.bookName }}</div>
			
 
				 					<div class="app-margin-left-10">{{ scope.row.bookMobile }}</div>
			
 
				 				</div>
			
 
				+				<div v-else class="flex-center">
			
 
				+					-
			
 
				+				</div>
			
 
				 			</template>
			
 
				 
			
 
				 			<!-- 收花人 -->
			
--- a/hd/src/views/order/list.vue
+++ b/hd/src/views/order/list.vue
@@ -23,10 +23,11 @@
 
				 
			
 
				 			<!-- 订花人 -->
			
 
				 			<template #table-column-bookName="{scope}">
			
 
				-				<div class="book-wrap">
			
 
				+				<div v-if="scope.row.bookName!=''" class="book-wrap">
			
 
				 					<cl-avatar shape="circle" :size="20" :src="scope.row.bookAvatar"></cl-avatar>
			
 
				 					<div style="width:58px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{ scope.row.bookName }}</div>
			
 
				 				</div>
			
 
				+				<div v-else>-</div>
			
 
				 			</template>
			
 
				 
			
 
				 			<!-- 订花人手机号 -->
			
@@ -74,9 +75,10 @@
 
				 
			
 
				 			<!-- 送达时间 -->
			
 
				 			<template #table-column-reachTime="{scope}">
			
 
				-				<span>
			
 
				+				<span v-if="scope.row.requireReachTime !=''">
			
 
				 					{{scope.row.requireReachTime}}
			
 
				 				</span>
			
 
				+				<span v-else>-</span>
			
 
				 			</template>
			
 
				 
			
 
				 			<!-- 通知送到 -->