Browse Source

7.10 16:05提交

李万涛 2 years ago
parent
commit
c3d37b5fce
2 changed files with 20 additions and 16 deletions
  1. 6 4
      pages/user/commission/commission-log2.vue
  2. 14 12
      pages/user/commission/withdraw.vue

+ 6 - 4
pages/user/commission/commission-log2.vue

xqd xqd
@@ -67,10 +67,12 @@
 								<view class="log-name">{{ item.title }}</view>
 								<view class="log-notice">{{ item.created_at }}</view>
 
-								<view class="nextUser">
-									<image class="nextAvatar" src="/static/images/head.jpg" mode=""></image>
+								<view class="nextUser" v-if="item.source_user">
+									<image class="nextAvatar"
+										:src="item.source_user.avatar!=''?item.source_user.avatar:'/static/images/head.jpg'"
+										mode=""></image>
 									<view class="nextUserName">
-										{{item.description.mobile}}
+										{{item.source_user.nickname }}
 									</view>
 								</view>
 							</view>
@@ -388,7 +390,7 @@
 		.nextUserName {
 			font-size: 24rpx;
 			color: #ccc;
-			font-weight: 600;
+			// font-weight: 600;
 		}
 	}
 

+ 14 - 12
pages/user/commission/withdraw.vue

xqd xqd xqd xqd xqd xqd
@@ -249,10 +249,8 @@
 		computed: {
 			...mapGetters(['appInfo', 'userInfo'])
 		},
-		async onLoad(o) {
-			this.withDrawType = o.type
-
-			if (o.type == 1) {
+		async onShow() {
+			if (this.withDrawType == 1) {
 				let ress1 = await taskCount()
 				if (ress1.code == 0) {
 					console.log('提现-任务佣金汇总返回值', ress1);
@@ -267,7 +265,9 @@
 					console.log('推广-可提现金额', this.enableMoney);
 				}
 			}
-
+		},
+		async onLoad(o) {
+			this.withDrawType = o.type
 
 			let ress = await sysParms()
 			console.log('提现页系统参数返回值', ress, ress.msg, this.$IMG_URL + '/imgs/wallet/bank_type.png');
@@ -330,10 +330,10 @@
 						icon: 'none'
 					})
 				}
-				if (this.selectedWithdrawType == 1) {
-					this.$u.toast('银行卡提现暂未开通');
-					return;
-				}
+				// if (this.selectedWithdrawType == 1) {
+				// 	this.$u.toast('银行卡提现暂未开通');
+				// 	return;
+				// }
 				if (this.selectedWithdrawType == 1) {
 					if (!this.cardNum || !this.realname) {
 						this.$u.toast('请上传提现信息');
@@ -353,7 +353,8 @@
 					amount: this.money,
 
 					real_name: this.realname,
-					qrcode_url: this.paymentcode
+					qrcode_url: this.paymentcode,
+					card_num: this.cardNum
 				});
 				let parms = {}
 				if (this.selectedWithdrawType == 1) {
@@ -363,7 +364,7 @@
 						amount: this.money,
 
 						real_name: this.realname,
-						cardNum: this.cardNum
+						card_num: this.cardNum
 					}
 				} else {
 					parms = {
@@ -377,7 +378,8 @@
 				}
 				let ress = await applyWithdraw(parms)
 				console.log('申请提现返回值', ress, ress.msg);
-				if (ress.code == 0) {
+				// if (ress.code == 0) {
+				if (ress.code == '提交成功') {
 					uni.showToast({
 						title: '提现申请成功'
 					})