优化

ghsApp/src/pagesOrder/detail.vue

@@ -68,12 +68,13 @@
 					<view>取货号码：</view>
 					<view>{{ detailInfo.sendNum }}</view>
 				</view>
-			<view class="order-info_box">
-				<view>创建日期：</view>
-				<view>{{ formatDateDisplay(detailInfo.addTime) }}</view>
-			</view>
-				<view class="order-info_box" v-if="detailInfo.payStatus == 1">
-					<view>账单日期：</view>
+				<view class="order-info_box">
+					<view>开单日期：</view>
+					<view>{{ formatDateDisplay(detailInfo.addTime) }}</view>
+				</view>
+				<!-- 付款日与开单日同一天则不占一行，避免和开单日期重复 -->
+				<view class="order-info_box" v-if="showPayDate">
+					<view>付款日期：</view>
 					<view>
 						{{ formatDateDisplay(detailInfo.payTime) }}
 					</view>
@@ -843,6 +844,21 @@ export default {
 			const final = real - seal
 			return parseFloat((final > 0 ? final : 0).toFixed(2))
 		},
+		/**
+		 * 付款日期栏：已付款且付款日与开单日不是同一天才展示。
+		 */
+		showPayDate() {
+			const info = this.detailInfo
+			if (!info || info.payStatus != 1) {
+				return false
+			}
+			const add = info.addTime
+			const pay = info.payTime
+			if (!add || !pay || pay.indexOf('0000-00-00') >= 0) {
+				return false
+			}
+			return add.substr(0, 10) !== pay.substr(0, 10)
+		},
 	},
 	onShareAppMessage(res) {
 		const purchaseId = this.detailInfo.purchaseId || 0

hdApp/src/admin/billing/affirmGhs.vue

@@ -1089,6 +1089,7 @@ export default {
 			let getType = this.form.sendType == 2 ? 1 : 2
 			//用于计划是否要包装费
 			let itemTotalAmount = this.allPriceFun
+			// 配送要求日走 sendTimeWant；发货时间 sendTime 在付款成功 payAfter 写成当前时刻，这里不传
 			let params = {
 				getType:getType,
 				sendTimeWant:this.sendTimeWant,