merge

pages/wallet/extract.vue

@@ -26,7 +26,8 @@
 				<view style="flex: 1;">
 					<view class="inputTxt">提现数量</view>
 					<input class="input_num" v-model="withdraw_input" @input='inputNum' type="number"
-						placeholder-style="color:#999;font-weight:normal; font-size:34rpx;" placeholder="请输入提现数量" />
+						placeholder-style="color:#999;font-weight:normal; font-size:34rpx;" 
+						placeholder="请输入提现数量" :disabled="balance===0" />
 				</view>
 				<view class="all" @click="all">全部提现</view>
 			</view>
@@ -84,16 +85,30 @@
 			//  输入提现能量球数量
 			inputNum(e) {
 				let number = Number(e.detail.value)
-				if (number <= this.balance) {
+				console.log(number, this.balance)
+				if (number <= Number(this.balance)) {
 					this.total = Number(e.detail.value) * this.cost
+				} else {
+					this.total = 0
+					if (Number(this.balance) === 0) {
+						uni.showToast({
+							title: '当前不能提现',
+							icon: 'none',
+							duration: 2000
+						});
+						this.withdraw_input = 0
+						this.total = 0
 					} else {
 						uni.showToast({
 							title: '最大值能超过' + this.balance + '',
 							icon: 'none',
 							duration: 2000
 						});
-					this.withdraw_input = ''
+						this.withdraw_input = this.balance
-					this.total = 0
+						this.total = this.balance * this.cost
+					}
+
+
 				}
 
 			},
@@ -108,6 +123,7 @@
 						icon: 'none',
 						duration: 2000
 					})
+					this.withdraw_input = 0
 				}
 			},
 			// 提现
@@ -321,10 +337,12 @@
 				color: #666;
 				margin-right: 20rpx;
 			}
-			.inputTxt{
+
+			.inputTxt {
 				color: #999;
 				padding-bottom: 20rpx;
 			}
+
 			.input_num {
 				font-size: 60rpx;
 				color: #3a3a3a;

pages/wallet/fragment.vue

@@ -45,7 +45,7 @@
 				<image src="/static/imgs/record-icon.png" mode="widthFix" class="record-icon" />
 				<view class="">
 					<view class="record-list-item-top">
-						<view class="title ellipsis-2">{{item.remark}}</view>
+						<view class="title ellipsis-1">{{item.remark}} <span class='tags'>{{item.frozen.text}}</span></view>
 						<view class="money" >{{item.amount}}</view>
 					</view>
 					<view class="record-list-item-date">{{item.created_at}}</view>
@@ -222,7 +222,11 @@
 				justify-content: space-between;
 				box-sizing: border-box;
 				width: 600rpx;
-
+				.tags{
+					padding-left: 20rpx;
+					color: #ff5500;
+					font-size: 24rpx;
+				}
 				.title {
 					font-size: 28rpx;
 					width: 600rpx;