From 5da41e927e8db844a6ba2a3a914e8a31155d3c81 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Mon, 25 Nov 2024 19:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0CompleteAudit=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/order.js                                    |  4 ++++
 api/user.js                                     |  2 +-
 bundle/pages/user_spread/user_spread.vue        | 14 +++++++++-----
 .../subsidy_shop/components/subsidy-item.vue    | 10 ++++++++++
 components/order-dialog/order-dialog.vue        |  4 ----
 components/order-list/order-list.vue            | 17 +++++++++++++----
 pages/payment/payment.vue                       |  3 ++-
 7 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/api/order.js b/api/order.js
index 89c5174..c01dbb1 100644
--- a/api/order.js
+++ b/api/order.js
@@ -111,3 +111,7 @@ export function cancelLocalOrder(data) {
 export function localOrderList(data) {
 	return request.post('localStore/localOrderList', data)
 }
+
+export function completeAudit(data) {
+	return request.post('gh/CompleteAudit', data)
+}
diff --git a/api/user.js b/api/user.js
index 2a275b0..aae6c70 100644
--- a/api/user.js
+++ b/api/user.js
@@ -412,4 +412,4 @@ export function getScheme() {
 
 export function distributionPay(data) {
     return request.post("pay/distributionPay", data)
-}
+}
\ No newline at end of file
diff --git a/bundle/pages/user_spread/user_spread.vue b/bundle/pages/user_spread/user_spread.vue
index 1dec711..5c875be 100644
--- a/bundle/pages/user_spread/user_spread.vue
+++ b/bundle/pages/user_spread/user_spread.vue
@@ -741,6 +741,7 @@
 
 				applyDistribute(params).then((res) => {
 					if (res.code == 1) {
+						const id = res.data.id
 						gh({
 							money,
 							partner_id: partner.id,
@@ -754,7 +755,9 @@
 									signType: result.data.signType,
 									timeStamp: result.data.timeStamp,
 								}
-								this.handleWechatPay(pay, result.data.alog_id);
+								const alog_id = result.data.alog_id
+								
+								this.handleWechatPay(pay, alog_id, id);
 							}
 						})
 					}
@@ -762,21 +765,22 @@
 			},
 			
 			// 微信支付
-			handleWechatPay(data, alog_id) {
+			handleWechatPay(data, alog_id, id) {
 				wxpay(data).then(res => {
 					console.log('res=', res)
-					this.handPayResult(res, alog_id)
+					this.handPayResult(res, alog_id, id)
 				}).catch(err => {
 					console.log('err=', err)
 				})
 			},
 			
 			// 支付后处理
-			handPayResult(result, alog_id) {
+			handPayResult(result, alog_id, id) {
 				if (result === 'success') {
 					this.successPopup = true
 					checkReturn({
-						alog_id
+						alog_id,
+						id
 					})
 				} else if (result === 'fail') {
 					this.cancelPopup = true
diff --git a/bundle_b/pages/subsidy_shop/components/subsidy-item.vue b/bundle_b/pages/subsidy_shop/components/subsidy-item.vue
index b7d5eee..2ceea8f 100644
--- a/bundle_b/pages/subsidy_shop/components/subsidy-item.vue
+++ b/bundle_b/pages/subsidy_shop/components/subsidy-item.vue
@@ -36,6 +36,16 @@
 							<text class="sm info-color">消费订单金额：</text>
 							<text class="sm money-color">￥{{item.order_price}}</text>
 						</view>
+						
+						<view>
+							<text class="sm info-color">提现金额：</text>
+							<text class="sm money-color">￥{{item.withdrawal_amount}}</text>
+						</view>
+						
+						<view>
+							<text class="sm info-color">可使用金额：</text>
+							<text class="sm money-color">￥{{item.available_amount}}</text>
+						</view>
 				<!-- 		<view style="margin-left: 40rpx;">
 							<text class="sm info-color">商家最高补贴：</text>
 							<text class="sm money-color">￥{{item.subsidy_price}}</text>
diff --git a/components/order-dialog/order-dialog.vue b/components/order-dialog/order-dialog.vue
index 7ff5968..eefb8ed 100644
--- a/components/order-dialog/order-dialog.vue
+++ b/components/order-dialog/order-dialog.vue
@@ -47,7 +47,3 @@
 		}
 	}
 </script>
-
-<style>
-
-</style>
diff --git a/components/order-list/order-list.vue b/components/order-list/order-list.vue
index e1107a6..1f58f49 100644
--- a/components/order-list/order-list.vue
+++ b/components/order-list/order-list.vue
@@ -94,7 +94,7 @@
 						</view>
 						<view v-if="item.take_btn" class="m-l-20">
 							<button size="sm" class="btn plain br60 primary red" hover-class="none"
-								@tap.stop="comfirmOrder(item.id)">确认收货</button>
+								@tap.stop="comfirmOrder(item.id, item.shop.id)">确认收货</button>
 						</view>
 					</view>
 				</router-link>
@@ -113,7 +113,8 @@
 		getOrderList,
 		cancelOrder,
 		delOrder,
-		confirmOrder
+		confirmOrder,
+		completeAudit
 	} from '@/api/order';
 	
 	export default {
@@ -172,7 +173,7 @@
 					title: '提交中',
 					mask: true
 				})
-				const { type, orderId } = this
+				const { type, orderId, shopId } = this
 				let res = null
 				switch (type) {
 					case 0:
@@ -185,6 +186,13 @@
 				
 					case 2:
 						res = await confirmOrder(orderId);
+						if (shopId == 17) {
+							completeAudit({
+								id: orderId,
+								type: 1
+							})
+						}
+				
 						break;
 				}
 				
@@ -211,8 +219,9 @@
 				});
 			},
 
-			comfirmOrder(id) {
+			comfirmOrder(id, shopId) {
 				this.orderId = id
+				this.shopId = shopId
 				this.type = 2
 				this.$nextTick(() => {
 					this.dialogOpen();
diff --git a/pages/payment/payment.vue b/pages/payment/payment.vue
index 56d3c2a..ed4c97b 100644
--- a/pages/payment/payment.vue
+++ b/pages/payment/payment.vue
@@ -218,7 +218,8 @@
 			handPayResult(result, data) {
 				if (result === 'success' && this.shopId == 17) {
 					checkReturn({
-						alog_id: data.alog_id
+						alog_id: data.alog_id,
+						type: 1
 					})
 				}
 				// 页面出栈