更新

pages.json

@@ -286,6 +286,14 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/mine/myAccount/billView",
+			"style": {
+				"navigationBarTitleText": "提现详情",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 			"path": "pages/mine/myAccount/withdrawal",

pages/mine/index.vue

@@ -172,7 +172,7 @@
 						if (res.data) {
 							this.CargoOwner = res.data
 							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回' || res
-								.data.authenticationStatus == '未认证') {
+								.data.authenticationStatus == '未认证'||res.data.authenticationStatus == '已过期') {
 								this.status = false
 							} else {
 								this.status = true

pages/mine/manageBankCards/addBankCard.vue

@@ -259,6 +259,7 @@
 					})
 					return true
 				}
+				
 				if (uni.$u.test.rangeLength(this.dataDetails.bankDeposit,[4,25])) {
 					this.$refs.uToast.show({
 						type: 'error',

pages/mine/myAccount/bill.vue

@@ -7,7 +7,7 @@
 		<u-picker :show="dataShow" :columns="columns" @confirm="dataChange" @cancel="dataShow = false"
 			@close="dataShow = false"></u-picker>
 		<view v-if='formlist.length>0' class="dataInfo_css">
-			<view class="formData" v-for="(item,index) in formlist">
+			<view class="formData" v-for="(item,index) in formlist" @click="billSee(item)">
 				<view class="flex row">
 					<view class="left-text">{{item.types}}</view>
 					<view class="flex right-text">
@@ -16,18 +16,18 @@
 				</view>
 				<view class="flex">
 					<view class="order_no">
-						{{item.orderNo?item.orderNo:""}}
+						
+						<text v-if="item.types == '提现'">{{item.status}}</text>
+						<text v-else>{{item.orderNo?item.orderNo:""}}</text>
+						
 					</view>
 					<view class="date_css">
 						{{item.createDate}}
 					</view>
-
 				</view>
-
 			</view>
 		</view>
 		<view v-else class="noBill">暂无账单</view>
-
 	</view>
 </template>
 
@@ -64,6 +64,11 @@
 
 		},
 		methods: {
+			billSee(val){
+				if(val.types == '提现'){
+					uni.$u.route('/pages/mine/myAccount/billView?id=' + val.id)
+				}
+			},
 			dataChange(e) {
 				this.data = e.value[0]
 				this.dataShow = false

pages/mine/myAccount/billView.vue

@@ -0,0 +1,92 @@
+<template>
+	<view class="center">
+		<view class="formData">
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">提现金额</view>
+				<view class="flex right">
+					<u--input placeholder="暂无" inputAlign='right' border="none"
+						v-model="dataInfo.amountMoney" readonly>
+					</u--input>
+					<text v-if="dataInfo.amountMoney" style="margin-left: 10rpx;">元</text>
+				</view>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">发起时间</view>
+				<view class="flex right">
+					<u--input placeholder="暂无" inputAlign='right' border="none"
+						v-model="dataInfo.createDate" readonly>
+					</u--input>
+				</view>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">到账时间</view>
+				<view class="flex right">
+					<u--input placeholder="暂无" inputAlign='right' border="none"
+						v-model="dataInfo.paymentDate" readonly>
+					</u--input>
+				</view>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">流水号</view>
+				<view class="flex right">
+					<u--input placeholder="暂无" inputAlign='right' border="none"
+						v-model="dataInfo.serialNumber" readonly>
+					</u--input>
+				</view>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">到账银行</view>
+				<view class="flex right">
+					<u--input placeholder="暂无" inputAlign='right' border="none"
+						v-model="dataInfo.bankDeposit" readonly>
+					</u--input>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				id:"",
+				dataInfo:{}
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		onShow() {},
+		methods:{
+			getList(){
+				this.$request.baseRequest('get', '/hyCargoOwnerCapitalInfo/gethyCargoOwnerCapitalInfo', {
+					id: this.id
+				}).then(res => {
+					this.dataInfo = res.data
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.center{
+		padding: 20rpx 0;
+		background: #F5F6FA;
+		height: calc(100vh - 10vh);
+	}
+	.formData{
+		padding: 20rpx 40rpx;
+		background: #ffffff;
+		.left{
+			text-align: left;
+			width: 20%;
+		}
+		.right{
+			text-align: right;
+			width: 80%;
+		}
+	}
+</style>

pages/mine/myAccount/withdrawal.vue

@@ -52,7 +52,7 @@
 				</view>
 			</view>
 			<view class="flex row">
-				<view class="left-text">收款人姓名</view>
+				<view class="left-text">收款方</view>
 				<view class="flex right-text">
 					<u--input placeholder="自动获取" inputAlign='right' border="none" clearable
 						v-model="formInfo.cardholderName">

pages/order/signContract.vue

@@ -49,8 +49,8 @@
 			</view> -->
 			<view class='row-between'>
 				<!-- 后加 -->
-				<view class="gray">服务费（元）</view>
-				<view class="">{{dataDetails.serviceCharge}}</view>
+				<view class="gray">收费比例（%）</view>
+				<view class="">{{chargeProportion}}</view><!-- 暂时写死6% -->
 			</view>
 		</view>
 		<view class="wrapper content3">
@@ -118,11 +118,12 @@
 						disabled: false
 					},
 				],
+				chargeProportion:"",//收费比例
 			};
 		},
 		onLoad(options) {
 			that = this
-			console.log(options)
+			that.chargeProportion =uni.getStorageSync("firstAuthentication").chargeProportion*100//收费比例从缓存中取
 			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
 			// this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.ctx = uni.createCanvasContext("handWriting");

pages/release/release.vue

@@ -1040,7 +1040,7 @@
 					if (currecttime < datetime || currecttime > datetime1) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "请选择今天到往后六个月之内的日期！",
+							message: "请选择未来六个月之内的日期！",
 						})
 					} else {
 						this.dataObj.taskValidity = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

uni_modules/uview-ui/libs/function/test.js

@@ -133,7 +133,10 @@ function range(value, param) {
  * 验证一个长度范围[min, max]
  */
 function rangeLength(value, param) {
-    return value.length >= param[0] && value.length <= param[1]
+	let check = value.length >= param[0] && value.length <= param[1]
+	//如果value长度小于min个或max 返回true  (不符合条件)
+	//符合条件返回false
+    return !check
 }
 
 /**