From 58d63637b67a7c565618379268da604e6231fc4c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/pages/withdrawal/withdrawal.vue |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/small-program/pages/withdrawal/withdrawal.vue b/small-program/pages/withdrawal/withdrawal.vue
index 0f9b211..6e76dcd 100644
--- a/small-program/pages/withdrawal/withdrawal.vue
+++ b/small-program/pages/withdrawal/withdrawal.vue
@@ -102,7 +102,8 @@
 				    fail: (res) => {
 					  console.log("22222222222222",res)
 				      uni.showToast({
-				      	title:'瀵逛笉璧凤紝鎻愮幇澶辫触銆�'+res.err_msg
+				      	title:'瀵逛笉璧凤紝鎻愮幇澶辫触銆�',
+						icon: 'none'
 				      })
 				    },
 				  });
@@ -122,6 +123,7 @@
 				);	 */			      
 			},
 			submit() {
+				var that = this;
 				  if(!this.canTransfer){
 					  uni.showToast({
 					  	title:'鎮ㄧ殑寰俊鐗堟湰杩囦綆锛岃鏇存柊鑷虫渶鏂扮増鏈娇鐢ㄨ鍔熻兘銆�'
@@ -142,22 +144,26 @@
 					  this.changing1 = false
 					  return
 				  }
-				  this.changing1 = true
-				  var that = this
-				  var param ={amount:this.amount,name:this.name }
-				  that.$u.api.applyWithdrawal(param)
-				  .then(res =>{
-						if(res.code ===200){
-							that.wxMerchantTransfer(res.data);
-							// uni.navigateTo({
-							// 	url: '/pages/withdrawal-successful/withdrawal-successful'
-							// })
-						} 
-				   }).finally(() => {
-						that.changing1 = false
-						that.tips=''
-						that.amount =null
-					})
+				  uni.requestSubscribeMessage({
+				  	tmplIds: ['fNJy4545hcrH83bP3a1vszs7XEKWjXMsrfr2XCNsql0'],
+				  	success(res) {
+				  		this.changing1 = true
+				  		var param ={amount:that.amount,name:that.name }
+				  		that.$u.api.applyWithdrawal(param)
+				  		.then(res =>{
+							if(res.code ===200){
+								that.wxMerchantTransfer(res.data);
+								// uni.navigateTo({
+								// 	url: '/pages/withdrawal-successful/withdrawal-successful'
+								// })
+							} 
+				  		 }).finally(() => {
+							that.changing1 = false
+							that.tips=''
+							that.amount =null
+						})
+				  	}
+				  })
 			},
 			
 		}

--
Gitblit v1.9.3