['免手续费']

pages/coupons/add.vue

@@ -125,8 +125,8 @@
 				],
 				timeIndex		: 0,
 				times			: [
-					{ type: 2, text: '固定时间（区间范围）' },
-					{ type: 1, text: '延期券（用户领取后有效天数）' }
+					{ type: 1, text: '固定时间（区间范围）' },
+					{ type: 2, text: '延期券（用户领取后有效天数）' }
 				],
 				showDatePicker	: false,	// 活动弹出层时间
 				datePickerValue	: [],		// 活动时间
@@ -211,7 +211,7 @@
 					days			: this.timeNumber,
 					goodsable_ids	: this.coupongoods
 				}
-				
+				console.log(valuss)
 				pushCoupons(valuss).then(res => {
 					uni.showModal({
 						title		: '提示',

pages/wallet/extract.vue

@@ -34,7 +34,7 @@
 		</view>
 		<view class="total" v-if="total">≈ ￥{{total.toFixed(2)}} </view>
 		<view class="btn" @click="actions">提现至银行卡</view>
-		<view class="des">预计5- 10个工作日到账 手续费: {{tax}}%</view>
+		<view class="des">预计5- 10个工作日到账 手续费: {{tax === '0'?'免手续费':tax+'%'}}</view>
 	</view>
 </template>
 
@@ -74,6 +74,7 @@
 					this.cost = res.cost
 					this.bank_accounts = res.bank_accounts.length
 					this.withdraw_input = Number(res.balance)
+					this.total = Number(res.balance) * Number(res.cost)
 					uni.setStorageSync('refresh', false)
 				}).catch(err => {
 					uni.showToast({
@@ -148,7 +149,7 @@
 				}
 				uni.showModal({
 					title: '温馨提示',
-					content: '您是否确认提现，将会扣除' + this.tax + '%手续费',
+					content:this.tax === '0'?'您是否确认提现，交易将免手续费':'您是否确认提现，将会扣除' + this.tax + '%手续费',
 					confirmColor: '#7c52fc',
 					cancelColor: '#cacaca',
 					cancelText: '我再想想',

pages/wallet/withdrawList.vue

@@ -11,9 +11,7 @@
 			</view>
 			<view class="record-mouth-year">
 				<view class="record-type-right">
-					<view class="record-title">当前能量球</view>
-					<view class="record-money">{{account || '0.00'}} </view>
-				</view>
+					<view class="record-title">当前能量球
 						<view class="record-type-left">
 							<u-picker mode="time" v-model="show" :params="params" @confirm='confirm' title='筛选日期'
 								start-year='2021' :end-year='currentYear' />
@@ -23,6 +21,10 @@
 							</view>
 						</view>
 					</view>
+					<view class="record-money">{{account || '0.00'}} </view>
+				</view>
+
+			</view>
 			<!-- <view class="record-title">碎片个数</view>
 			<view class="record-money"><span>￥</span>{{account || '0.00'}}</view> -->
 		</view>
@@ -337,6 +339,12 @@
 			font-size: 28rpx;
 			color: #fff;
 			padding: 0 0 20rpx 0;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			width: 100%;
+			justify-content: space-between;
+			box-sizing: border-box;
 		}
 
 		.record-money {
@@ -381,11 +389,13 @@
 				font-size: 30rpx;
 				padding-top: 10rpx;
 				color: $text-price;
+
 				.left-des {
 					color: #999;
 					font-size: 26rpx;
 					margin-left: 20rpx;
 				}
+
 				span:nth-child(2) {
 					color: #C0C0C0;
 					font-weight: normal;