前端

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://apitest.eliangeyun.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages.json

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

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/manageBankCards/index.vue

@@ -2,18 +2,17 @@
 	<view class="content">
 		<view class="top-title flex flex-space-between">
 			<view class="left flex">
-				<view class="text1">我的卡</view>
+				<view class="mybank_title">我的银行卡</view>
 				<!-- <view class="text2">（共{{bankList?bankList.length:0}}张）</view> -->
 			</view>
-			<view v-if='bankList.length==0' @click="addBankCard" class="add-bankcard flex">
-				
+			<!-- <view v-if='bankList.length==0' @click="addBankCard" class="add-bankcard flex">
 				<view class="car-text">添加银行卡</view>
 				<u-icon class="icon" name="plus-circle-fill" color="#2979ff" size="24"></u-icon>
-			</view>
-			<view v-else><image style='width:17px;height:17px;' @click="del()" src="../../../static/mine/sanchu.png" mode=""></image></view>
+			</view> -->
+			<view v-if="bankList.length > 0"><image style='width:17px;height:17px;margin-top: 10rpx;' @click="del()" src="../../../static/mine/sanchu.png" mode=""></image></view>
 		</view>
 		<!-- <image src="../../../static/images/mine/bank/nongyelogo.png" mode=""></image> -->
-		<view class="card-list" v-for="(item,index) in bankList" :key='index'>
+		<view class="card-list" v-for="(item,index) in bankList" :key='index' v-if="bankList.length > 0">
 			<view class="card-list-item" :style='{"background-image":"url("+item.cardColor+")"}'>
 				<view class="flex flex-end number carNumber">{{item.bankCard}}</view>
 				<view class="flex align-center">
@@ -26,17 +25,20 @@
 					</view>
 				</view>
 			</view>
-
 			<view class="flex flex-space-between row2 align-center">
 				<view class="flex align-center">
 					<!-- <radio :checked="item.defaultFlag==1" @click='radioChange(item)' />
 					<view class="default-card">设为默认收款账户</view> -->
 				</view>
 				<view>
-					
 				</view>
 			</view>
 		</view>
+		<view class="nobank" v-if="bankList.length == 0">
+			<image src="../../../static/mine/bank/noBank.png" mode="" class="nobank_img"></image>
+			<view class="text_css">您还没有银行卡哦，快来添加吧~</view>
+			<view class="add_btn" @click="addBankCard">去添加</view>
+		</view>
 		<!-- <view @click="addBankCard">添加银行卡</view> -->
 		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
@@ -339,4 +341,32 @@
 		// font-size: 28rpx;
 		color: #333333;
 	}
+	.mybank_title{
+		font-size: 40rpx;
+		font-weight: 600;
+	}
+	.nobank{
+		// height: calc(100vh - 13vh);
+		// background: red;
+		text-align: center;
+		.nobank_img{
+			width: 344rpx;
+			height: 228rpx;
+			margin-top: 350rpx;
+		}
+		.text_css{
+			font-size: 30rpx;
+			color: #333333;
+			margin-top: 90rpx;
+		}
+		.add_btn{
+			background: #2772FB;
+			width: 212rpx;
+			height: 86rpx;
+			margin: 74rpx auto;
+			line-height: 86rpx;
+			border-radius: 43rpx;
+			color: #FFFFFF;
+		}
+	}
 </style>

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/index.vue

@@ -146,6 +146,7 @@
 						<!-- confirmLoading(good,3) -->
 						<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal" @click.stop="toDetail(good.id)"
 							>确认装车</view>
+						<view v-if="good.cargoOwnerStatus=='司机驳回运费信息'" class="start normal" @click.stop="toDetail(good.id)">确认运费</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
 						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'" @click.stop="$helper.contactCustomerService()">
 							联系客服</view>

pages/order/orderDetails.vue

@@ -44,6 +44,7 @@
 				</u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
+				<u-button class="btn" text="确认运费" @click="freightOk()" v-if="dataObj.cargoOwnerStatus=='司机驳回运费信息'"></u-button>
 				<!-- <u-button class="btn" text="确认卸车" @click="confirmLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button> -->
 				<u-button class="btn" text="付款" @click="closed"
@@ -188,7 +189,7 @@
 			<view class='row-between'>
 				<view class="row-left-text gray">合计应付运费</view>
 				<view class="row-right-text">
-					{{dataObj.hyCarrierInfo.totalFreight}}{{dataObj.hyCarrierInfo.totalFreight?"元":""}}
+					 <u--input placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
 				</view>
 			</view>
 			<view class='row-between'>
@@ -286,9 +287,27 @@
 		           </u--textarea>
 				   <view class='termination' :class="{'active':value2.length>0}" @click='termination'>终止</view>
 			</view>
-		           
 		</u-popup>
 		<u-toast ref="uToast"></u-toast>
+		<!-- <u-popup :show="moneyShow" mode="center" @close="close" @open="open">
+			<view class="freight">
+				<view class="freight_text">
+					合计运费
+				</view>
+				<u--input v-model="totalFreight" placeholder="请输入合计运费"></u--input>
+				<view class="freight_up">
+					<view class="freight_item">取消</view>
+					<view class="freight_item">确定</view>
+				</view>
+			</view>
+			
+		</u-popup> -->
+		<u-modal :show="moneyShow"  title="合计运费" showCancelButton @confirm="moneyClick" @close="moneyclose"
+			@cancel="moneyclose">
+					<view class="slot-content">
+						<u--input v-model="totalFreight" type="number" placeholder="请输入合计运费"></u--input>
+					</view>
+		</u-modal>
 		<!-- 		<view v-if="lookAlert" class="look-contract" @click="lookAlert==false">
 			<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
 			<u-button class="btn" text="签名"></u-button>
@@ -374,6 +393,8 @@
 				selectColor: 'black',
 				lineColor: '#1A1A1A', // 颜色
 				lineSize: 5, // 笔记倍数
+				moneyShow:false,
+				totalFreight:""
 			}
 
 		},
@@ -395,9 +416,33 @@
 			this.getList()
 		},
 		methods: {
+			moneyClick(){
+				this.moneyShow = false
+				if(this.dataObj.cargoOwnerStatus == "司机驳回运费信息"){
+					this.$request.baseRequest('post', '/orderInfo/api/confirmFreight', {
+							 id: this.dataObj.id,
+							 typeFlag:1,
+							 totalFreight:this.totalFreight
+						}).then(res => {
+							if (res.code == 200) {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: "确认成功",
+								})
+								this.getList()
+							}
+						})
+				}
+			},
+			moneyclose(){
+				this.moneyShow = false
+				this.totalFreight = ""
+			},
+			freightOk(){
+					this.moneyShow = true
+			},
 			radioChange(n) {
 				console.log('radioChange', n);
-			
 			},
 			closepopup(){
 				this.show=false
@@ -516,9 +561,13 @@
 			confirmUnLoading(type) {
 				this.type=type
 				if(type == 4){
-					this.alertTitle = '确认卸车？'
-					this.confirmText = '确定'
-					this.isShowAlert = true
+					if(this.totalFreight){
+						this.alertTitle = '确认卸车？'
+						this.confirmText = '确定'
+						this.isShowAlert = true
+					}else{
+						this.moneyShow = true
+					}
 				}else if(type == 6){
 					this.alertTitle = '确定驳回卸车信息？'
 					this.confirmText = '确定'
@@ -573,9 +622,11 @@
 					if (this.type == 3) _flag = 1
 					if (this.type == 4) _flag = 2
 					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
-							id: this.dataObj.id,
+							orderId: this.dataObj.id,
+							id: this.dataObj.hyCarrierInfo.id,
 							loadingFlag: _flag,
-							flag: 1
+							flag: 1,
+							totalFreight:this.totalFreight,
 						}).then(res => {
 							if (res.code == 200) {
 								this.$refs.uToast.show({
@@ -773,10 +824,13 @@
 			getList() {
 				this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
 					id: this.id,
-
 				}).then(res => {
 					if (res.code == 200) {
 						this.dataObj = res.data
+						if(this.dataObj.hyCarrierInfo.totalFreight){//货主确定卸车输入的 合计运费
+							this.totalFreight = this.dataObj.hyCarrierInfo.totalFreight
+						}
+						
 						// 承运信息显示
 						if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
 							.cargoOwnerStatus != "已终止") {
@@ -1189,4 +1243,23 @@
 		background: #2772FB;
 		color: white;
 	}
+	.freight{
+		.freight_text{
+			font-size: 34rpx;
+			font-weight: 600;
+			margin-bottom: 20rpx;
+		}
+		.freight_up{
+			display: flex;
+			border-top: 1px solid #EEEEEE;
+			height: 60rpx;
+			background: red;
+			margin-top: 10px;
+		}
+		.freight_item{
+			width: 50%;
+			text-align: center;
+			line-height: 50rpx;
+		}
+	}
 </style>

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

@@ -1042,7 +1042,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
 }
 
 /**