shish %!s(int64=5) %!d(string=hai) anos
pai
achega
1b5cf86faa

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/css/chunk-527e0f58.b394cde5.css


+ 1 - 1
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.4e346dcf.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.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.4e346dcf.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.9c3db9b8.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.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.9c3db9b8.js"></script></body></html>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/app.9c3db9b8.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-527e0f58.c76d2a3e.js


+ 8 - 11
hd/src/views/order/components/sel-order.vue

@@ -318,10 +318,9 @@
 				<el-button type="primary" size="small" @click="orderClassConfirmFn">确认</el-button>
 			</div>
 		</el-dialog>
-
 		<!-- 配送单 -->
 		<div class="print-html">
-			<table border="1" width="780" style="border:solid 1px black;border-collapse:collapse">
+			<table border="1" width="750" style="border:solid 1px black;border-collapse:collapse">
 				<tr>
 					<td style="padding: 10px;width: 100px;">配送时间:</td>
 					<td style="padding-left: 10px;" colspan="2">{{ deliver.data.reachDate }}</td>
@@ -666,32 +665,30 @@ export default {
 				let LODOP = getLodop();
 				LODOP.PRINT_INIT('配送单');
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.ADD_PRINT_TEXT(470, 10, 350, 200, `店铺地址:${this.shopInfo.address}`);
-				LODOP.ADD_PRINT_TEXT(470, 400, 350, 600, `电话:${this.deliver.data.telephone}`);
+				LODOP.ADD_PRINT_TEXT(90, 10, 350, 200, `地址:${this.shopInfo.address}`);
+				LODOP.ADD_PRINT_TEXT(60, 400, 350, 600, `电话:${this.deliver.data.telephone}`);
 				LODOP.ADD_PRINT_TEXT(
-					470,
-					590,
+					60,
+					10,
 					470,
 					600,
 					`制单时间:${this.deliver.data.printTime}`
 				);
 				LODOP.SET_PRINT_STYLE('FontSize', 20);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.name}配送单`);
+				LODOP.ADD_PRINT_TEXT(20, 10, 790, 30, `${this.shopInfo.name}配送单`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.ADD_PRINT_TEXT(160, 500, 100, 20, `No ${this.deliver.data.sendNum}`);
+				LODOP.ADD_PRINT_TEXT(60, 680, 100, 20, `No ${this.deliver.data.sendNum}`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
-
 				LODOP.ADD_PRINT_HTM(
-					200,
+					120,
 					10,
 					790,
 					600,
 					document.querySelector('.print-html').innerHTML
 				);
 				LODOP.PREVIEW();
-				// LODOP.PRINT();
 			});
 		}
 	}

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio