zhengkaixin 2 年之前
父节点
当前提交
fd291a26e5
共有 2 个文件被更改,包括 21 次插入6 次删除
  1. 16 6
      pages/charge/index.vue
  2. 5 0
      pages/user/recharge.vue

+ 16 - 6
pages/charge/index.vue

@@ -461,7 +461,7 @@
 					})
 					})
 				}
 				}
 			},
 			},
-			confirm() {
+			confirm(bl) {
 				uni.showLoading({
 				uni.showLoading({
 					title: "加载中",
 					title: "加载中",
 					mask: true,
 					mask: true,
@@ -485,15 +485,21 @@
 				API.startCharging(submitForm).then((res) => {
 				API.startCharging(submitForm).then((res) => {
 					
 					
 					if(res.data.status=="5"){
 					if(res.data.status=="5"){
-						uni.hideLoading()
-						this.showmodal2=true;
+						uni.hideLoading()
+						
+						
 						this.recordId=res.data.recordId;
 						this.recordId=res.data.recordId;
 					
 					
 						var fee=res.data.fee;
 						var fee=res.data.fee;
 					
 					
 						
 						
 						this.fee=(fee-this.user.availableBalance).toFixed(2);
 						this.fee=(fee-this.user.availableBalance).toFixed(2);
-						//this.otherNum_f=this.fee;
+						//this.otherNum_f=this.fee;
+						if(bl){
+							this.wxpay();
+						}else{
+							this.showmodal2=true;
+						}
 					}else{
 					}else{
 						this.gotoUrl("pages/index/index");
 						this.gotoUrl("pages/index/index");
 					}
 					}
@@ -576,8 +582,12 @@
 						}
 						}
 					});
 					});
 				} else {
 				} else {
-
-					this.showmodel = true;
+					if( this.listTypeIndex==0){
+						this.showmodel = true;
+					}else{
+						this.confirm(true)
+					}
+					
 				}
 				}
 
 
 
 

+ 5 - 0
pages/user/recharge.vue

@@ -84,6 +84,11 @@
 			this.init();
 			this.init();
 		},
 		},
 		methods: {
 		methods: {
+			toRefundList() {
+				uni.navigateTo({
+					url: '/pages/user/refundList'
+				})
+			},
 			submit(){
 			submit(){
 				uni.showLoading({
 				uni.showLoading({
 					title: "加载中",
 					title: "加载中",