Merge branch 'main' of http://47.109.71.130:3000/attiya/ebike-ui

ebike-user/components/bike-pay/bike-pay.vue

@@ -72,11 +72,13 @@
 	}
 	const handlePaymentClick = () => {
 		console.log('支付按钮被点击');
-		const params = {
+		
-			"orderId": props.orderId
+		// const params = {
-		}
+		// 	"orderId": props.orderId
-		api.callPaymentApi("wxPayment/prepay", params).then(res => {
+		// } 
+		api.callPaymentApi("wxPayment/prepay?orderId="+props.orderId, {},"get").then(res => {
 			if (res.code == 200) {
+				debugger;
 				wx.requestPayment({
 					"timeStamp": res.data.timeStamp,
 					"nonceStr": res.data.nonceStr,
@@ -88,10 +90,10 @@
 						checkPaymentStatus();
 					},
 					"fail": function(res) {  
-						showModelMessage("支付失败")
+						console.log("fail", res)
 					},
 					"complete": function(res) { 
-						showModelMessage("支付失败") 
+						console.log("complete",res)
 					}
 				})
 			}else{

ebike-user/pages/user/views/PaymentFeedback.vue

@@ -31,9 +31,9 @@
 					<view class="button-with-border" @click="gotoRefundRequest">
 						申请退款
 					</view>
-					<view class="button-with-border">
+					<!-- <view class="button-with-border">
 						已关锁仍计费
-					</view>
+					</view> -->
 				</view>
 			</view>
 

ebike-user/pages/user/views/RefundRequest.vue

@@ -52,7 +52,7 @@
 			"orderId": orderId.value,
 			"reason": reason.value
 		}
-		api.callPaymentApi("wxPayment/refund", params).then(res => {
+		api.callPaymentApi("wxPayment/refundApply", params).then(res => {
 			if (res.code == 200) {
 				// 显示退款成功的提示
 				uni.showToast({