优化

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

@@ -52,9 +52,7 @@
 									<el-button type="primary" @click="printOrderFn(index)"
 										>有配送单</el-button
 									>
-									<el-button type="primary" @click="fillFormFn"
-										>填单</el-button
-									>
+									<el-button type="primary" @click="fillFormFn">填单</el-button>
 								</div>
 								<div v-else>
 									<!-- <span>配送用户信息</span> -->
@@ -579,9 +577,9 @@ export default {
 				});
 		},
 		addressFn(item) {
-			console.log(item);
 			this.orderForm.latitude = item.location.lat;
 			this.orderForm.longitude = item.location.lng;
+			this.orderForm.receiveAddress = item.title;
 		},
 		submitOrderFn() {
 			this.$service.order
@@ -636,6 +634,8 @@ export default {
 		// 填单
 		fillFormFn() {
 			this.orderDialog = true;
+			const { shopProvince, shopCity } = this.relateData.merchant;
+			this.addressArr = [shopProvince, shopCity];
 		},
 		// 发货
 		sendShipFn() {

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

@@ -3,7 +3,8 @@
 		<cl-crud @load="onLoad">
 			<template #table-column-gatheringCode="{scope}">
 				<el-link
-					v-if="scope.row.gatheringCode"
+					type="primary"
+					v-if="scope.row.wxPayInit == '1'"
 					@click="download('gatheringCode', scope.row.id)"
 					>下载</el-link
 				>
@@ -11,7 +12,8 @@
 
 			<template #table-column-applyMemberCode="{scope}">
 				<el-link
-					v-if="scope.row.applyMemberCode"
+					type="primary"
+					v-if="scope.row.miniAuth == '1'"
 					@click="download('applyMemberCode', scope.row.id)"
 					>下载</el-link
 				>