更新

pages.json

@@ -72,8 +72,15 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
-
 		},
+		{
+			"path": "pages/news/feedbackResults",
+			"style": {
+				"navigationBarTitleText": "反馈处理结果",
+				"enablePullDownRefresh": false
+			}
+		},
+		
 		// {
 		// 	"path": "pages/goodSource/index",
 		// 	"style": {
@@ -257,6 +264,47 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/mine/myAccount/bill",
+			"style": {
+				"navigationBarTitleText": "账单",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/mine/myAccount/withdrawal",
+			"style": {
+				"navigationBarTitleText": "提现",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/mine/myAccount/bankList",
+			"style": {
+				"navigationBarTitleText": "收款账户",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/mine/myAccount/index",
+			"style": {
+				"navigationBarTitleText": "我的账户",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "账单",
+							"fontSize": "14",
+							"width":"80rpx"
+						}]
+					}
+				}
+			}
+		
 		},
 		{
 			"path": "pages/mine/cargoowner/addEnerprise",
@@ -489,7 +537,7 @@
 		}, {
 			"path": "pages/order/fk",
 			"style": {
-				"navigationBarTitleText": "反馈",
+				"navigationBarTitleText": "投诉",
 				"enablePullDownRefresh": false
 			}
 

pages/mine/company/addcompany.vue

@@ -10,10 +10,10 @@
 			</view>
 		</u-navbar> -->
 		<view v-show="videoPlay">
-			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange" ></video>
+			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange"></video>
 		</view>
 		<view style='margin:10px 0 0 19px;font-size:12px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
-		
+
 		<view class='content1'>
 			<view class="title">上传营业执照</view>
 			<view style='position:relative;' @click="uploadImg(1)">
@@ -50,7 +50,7 @@
 			</view>
 
 		</view>
-<view class='wrap'>
+		<view class='wrap'>
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">企业名称</view>
 				<view class="flex right">
@@ -75,7 +75,7 @@
 					</u--input>
 				</view>
 			</view>
-			<view class="flex mt20 align-center">
+			<!-- <view class="flex mt20 align-center">
 				<view class="left">注册实缴金额</view>
 				<view class="flex right align-center">
 					<u--input placeholder="输入企业注册实缴金额" inputAlign='left' border="none"
@@ -83,7 +83,7 @@
 					</u--input>
 					<view>万元</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4 -->
 		<!-- dataDetails.videoAddressUrl -->
@@ -98,7 +98,8 @@
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
-					<u-button type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传</u-button>
+					<u-button type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
+					</u-button>
 				</view>
 			</view>
 			<!-- <video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video> -->
@@ -107,9 +108,9 @@
 					<u-icon size="40" name="play-circle-fill" @click="videoShow()"></u-icon>
 				</view>
 			</view>
-		
+
 		</view>
-		
+
 		<view class='content3'>
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">申请开通平台垫付运费业务</view>
@@ -130,21 +131,21 @@
 					</u-radio-group>
 				</view>
 			</view>
-				<view class="title">{{dataDetails.landOwnership=='自有'?'上传房产证':'上传租赁合同（扫描件或图片）'}}</view>
-				<view style='position:relative;'>
-					<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
-						<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
-					</view>
-					<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;'
-						class="preview-card-img picture">
-						<view @click.stop="delCard(2)">
-							<image class='del-card' src="@/static/images/common/quxiao@2x.png">
-							</image>
-						</view>
-						<image class="uploadimage uploadimage-small" :src="dataDetails.propertyAddressUrl" mode="aspectFit">
+			<view class="title">{{dataDetails.landOwnership=='自有'?'上传房产证':'上传租赁合同（扫描件或图片）'}}</view>
+			<view style='position:relative;'>
+				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
+					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
+				</view>
+				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;'
+					class="preview-card-img picture">
+					<view @click.stop="delCard(2)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
+					<image class="uploadimage uploadimage-small" :src="dataDetails.propertyAddressUrl" mode="aspectFit">
+					</image>
 				</view>
+			</view>
 			<view v-if="dataDetails.landOwnership=='租赁'" class="flex border-bottom mt20 align-center">
 				<view class="left-text">场地租赁截止日期</view>
 				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
@@ -157,7 +158,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 		</view>
 		<view class="content4">
 
@@ -386,13 +387,13 @@
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.registeredPaidAmount)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "注册实缴金额不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.dataDetails.registeredPaidAmount)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "注册实缴金额不能为空！",
+				// 	})
+				// 	return true
+				// }
 				if (uni.$u.test.isEmpty(this.dataDetails.businessLicenseAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -416,7 +417,7 @@
 				}
 
 				if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
-					.propertyAddressUrl)) {
+						.propertyAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "房产证或租赁合同不能为空！",
@@ -534,17 +535,20 @@
 													'/cargoOwnerInfo/api/licenseShibie', {
 														licenseImg: result,
 													}).then(res => {
-														if(res.code == '200'){
-															if(res.data.validPeriod == '29991231'){
-																_this.dataDetails.businessTermDate = '长期'
-															}
-															_this.dataDetails.unifiedSocialCreditCode = res.data.regNum
-															_this.dataDetails.legalPersonName = res.data.licensePerson
-															_this.dataDetails.companyName = res.data.licenseName
-															console.log(res)
-															_this.$forceUpdate()
+													if (res.code == '200') {
+														if (res.data.validPeriod == '29991231') {
+															_this.dataDetails.businessTermDate = '长期'
 														}
-														
+														_this.dataDetails.unifiedSocialCreditCode = res
+															.data.regNum
+														_this.dataDetails.legalPersonName = res.data
+															.licensePerson
+														_this.dataDetails.companyName = res.data
+															.licenseName
+														console.log(res)
+														_this.$forceUpdate()
+													}
+
 												})
 												.catch(res => {
 													uni.$u.toast(res.message);
@@ -581,17 +585,20 @@
 													'/cargoOwnerInfo/api/licenseShibie', {
 														licenseImg: result,
 													}).then(res => {
-														if(res.code == '200'){
-															if(res.data.validPeriod == '29991231'){
-																_this.dataDetails.businessTermDate = '长期'
-															}
-															_this.dataDetails.unifiedSocialCreditCode = res.data.regNum
-															_this.dataDetails.legalPersonName = res.data.licensePerson
-															_this.dataDetails.companyName = res.data.licenseName
-															console.log(res)
-															_this.$forceUpdate()
+													if (res.code == '200') {
+														if (res.data.validPeriod == '29991231') {
+															_this.dataDetails.businessTermDate = '长期'
 														}
-														
+														_this.dataDetails.unifiedSocialCreditCode = res
+															.data.regNum
+														_this.dataDetails.legalPersonName = res.data
+															.licensePerson
+														_this.dataDetails.companyName = res.data
+															.licenseName
+														console.log(res)
+														_this.$forceUpdate()
+													}
+
 												})
 												.catch(res => {
 													uni.$u.toast(res.message);

pages/mine/company/index.vue

@@ -15,9 +15,16 @@
 					<view v-if='item.status=="已驳回"' class='status reject'>{{item.status}}</view>
 					<view v-if='item.status=="已过期"' class='status reject'>{{item.status}}</view>
 				</view>
-				<view class="row2">
-					<image v-if='item.status!="审核中"' @click='edit(item)' style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png"></image>
-					<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/del.png"></image>
+				<view class="flex">
+					<view class="lookAccount" @click="seeAccount(item)">
+						查看账户
+					</view>
+					<view class="row2">
+						<image v-if='item.status!="审核中"' @click='edit(item)'
+							style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png"></image>
+						<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
+							src="@/static/mine/company/del.png"></image>
+					</view>
 				</view>
 			</view>
 			<view class='footer'>
@@ -32,16 +39,16 @@
 		mapState
 	} from 'vuex';
 	export default {
-		
+
 		data() {
 			return {
-				company:[]
+				company: []
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
-		onLoad(){
+		onLoad() {
 			var _this = this;
 			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');
@@ -49,116 +56,143 @@
 			this.getList()
 		},
 		methods: {
+			seeAccount(item){
+				uni.$u.route("/pages/mine/myAccount/index?id=" + item.id + "&companyId=" + item.id)
+			},
 			goDetailPage(src) {
 				uni.$u.route(src);
 			},
-			edit(item){
-				this.goDetailPage('/pages/mine/company/editcompany?id='+item.id)
+			edit(item) {
+				this.goDetailPage('/pages/mine/company/editcompany?id=' + item.id)
 			},
-			del(item){
+			del(item) {
 				uni.showLoading({
 					title: '加载中',
-					mask:true
+					mask: true
 				})
-				var _this=this
-				this.$request.baseRequest('post', '/companyInfo/api/deleteCompany', {id:item.id}).then(res => {
-					uni.hideLoading()
-					uni.$u.toast('删除成功')
-					this.getList()
-				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none',
-						duration: 2000
+				var _this = this
+				this.$request.baseRequest('post', '/companyInfo/api/deleteCompany', {
+						id: item.id
+					}).then(res => {
+						uni.hideLoading()
+						uni.$u.toast('删除成功')
+						this.getList()
 					})
-				});
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			},
-			goDetailPage(src){
+			goDetailPage(src) {
 				uni.$u.route(src);
 			},
-			getList(){
+			getList() {
 				uni.showLoading({
 					title: '加载中',
-					mask:true
+					mask: true
 				})
-				var _this=this
-				this.$request.baseRequest('get', '/companyInfo/selectCompany', {commonId:this.userInfo.id}).then(res => {
-					uni.hideLoading()
-					this.company=res.data
-				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none',
-						duration: 2000
+				var _this = this
+				this.$request.baseRequest('get', '/companyInfo/selectCompany', {
+						commonId: this.userInfo.id
+					}).then(res => {
+						uni.hideLoading()
+						this.company = res.data
 					})
-				});
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	page{
-		background:#F5F6FA;
+	page {
+		background: #F5F6FA;
 	}
-	.zanwu{
-		width:235px;
-		height:235px;
+
+	.zanwu {
+		width: 235px;
+		height: 235px;
 	}
-	.add{
-		width:106px;height:42px;
-		margin:36px auto 0;
-		color:#fff;
-		
-		background:url(../../../static/mine/company/Mask@3x.png);
-		background-size:100%;
-		line-height:42px ;
+
+	.add {
+		width: 106px;
+		height: 42px;
+		margin: 36px auto 0;
+		color: #fff;
+
+		background: url(../../../static/mine/company/Mask@3x.png);
+		background-size: 100%;
+		line-height: 42px;
 	}
-	.wrap{
-		background:#fff;
-		border-radius:10rpx;
-		padding:24rpx;
+
+	.wrap {
+		background: #fff;
+		border-radius: 10rpx;
+		padding: 24rpx;
 		box-sizing: border-box;
 		margin-top: 20rpx;
-		.row2{
+
+		.lookAccount {
+			color: #2772FB;
+			font-size: 26rpx;
 			margin-top: 112rpx;
+			width: 50%;
+		}
+
+		.row2 {
+			margin-top: 112rpx;
+			width: 50%;
 			display: flex;
 			justify-content: flex-end;
 		}
-		
+
 	}
-	.status{
-		font-size:26rpx;
-		padding:5rpx 18rpx;
-		color:#fff;
-		border-radius:20rpx;
+
+	.status {
+		font-size: 26rpx;
+		padding: 5rpx 18rpx;
+		color: #fff;
+		border-radius: 20rpx;
 	}
-	.status.passed{
-		background:#25E491;
+
+	.status.passed {
+		background: #25E491;
 	}
-	.status.aduit{
-		background:#FE8031;
+
+	.status.aduit {
+		background: #FE8031;
 	}
-	.status.reject{
-		background:#FC5A51;
+
+	.status.reject {
+		background: #FC5A51;
 	}
-	.content{
+
+	.content {
 		padding: 20rpx;
 	}
-	.footer{
-		position:fixed;
-		background:#fff;
-		width:100%;
-		bottom:0;
-		left:0;
-		padding:15px 15px 30px;
+
+	.footer {
+		position: fixed;
+		background: #fff;
+		width: 100%;
+		bottom: 0;
+		left: 0;
+		padding: 15px 15px 30px;
 		box-sizing: border-box;
 	}
-	.newlyIncreased{
+
+	.newlyIncreased {
 		width: 100%;
 		height: 80rpx;
 		margin: 0 auto;

pages/mine/index.vue

@@ -32,6 +32,7 @@
 					</view>
 				</view>
 			</view>
+			
 			<view class='flex operate flex-space-around'>
 				<view class='flex items-center' @click="toMyRelease">
 					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodefabu.png"
@@ -44,6 +45,16 @@
 				</view>
 			</view>
 			<view class="content1">
+				<view class="flex flex-space-between content1-item"
+					@click="goDetailPage('/pages/mine/myAccount/index')">
+					<view class='flex items-center'>
+						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
+							width="20px" height="20px"></u--image>我的账户
+					</view>
+					<view>
+						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					</view>
+				</view>
 				<view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/company/index')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodegongsi.png"
@@ -83,6 +94,17 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view>
+			
+				<view class="flex flex-space-between content1-item"
+					@click="goDetailPage('/pages/mine/manageBankCards/index')">
+					<view class='flex items-center'>
+						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
+							width="20px" height="20px"></u--image>我的银行卡
+					</view>
+					<view>
+						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					</view>
+				</view>
 		<!-- 		<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/driverEvaluation')">
 					<view class='flex items-center'>

pages/mine/manageBankCards/addBankCard.vue

@@ -1,44 +1,76 @@
 <template>
 	<view class="content">
 		<view class="content3 flex s-row">
-			<view class="flex flex-space-between width100">
-				上传银行卡正面
+			<!-- <view class="title">上传银行卡卡号页</view>
+			<view @click="uploadImg" class="picture picture3" v-if="!dataDetails.payeeAddressUrl">
+				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+				<view class="text">上传银行卡卡号页</view>
 			</view>
 
-			<u-button type="primary" @click="uploadImg(3)">上传银行卡号页</u-button>
-			<view class="flex flex-space-between width100">
-				<view>银行卡卡号</view>
+			<view v-if="dataDetails.payeeAddressUrl" @click.stop="uploadImg" class="preview-card-img picture">
+				<view @click.stop="delCard">
+					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+					</image>
+				</view>
+				<image class="" :src="dataDetails.payeeAddressUrl" mode="aspectFit"></image>
+			</view> -->
+			<view class="flex row">
+				<view class="left-text">卡号</view>
 				<view class="flex">
-					<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="dataDetails.name">
+					<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
 					</u--input>
-					<u--image src="../../static/images/xiangji-2.png" width="40px" height="40px" @click='photograph'>
-					</u--image>
+				</view>
+				<view class="" @click="uploadImg">
+					相机
 				</view>
 			</view>
-			<view class="flex flex-space-between width100">
-				<view>开户行</view>
-				<view class="flex">
-					<u--input placeholder="输入开户行" inputAlign='right' border="none" v-model="dataDetails.name">
+			<view class="flex row">
+				<view class="left-text">开户行</view>
+				<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
+				</u--input>
+			</view>
+			<view class="flex row">
+				<view class="left-text khzh-styel">开户支行</view>
+				<view class="flex align-center" v-if="isShowManualInput">
+					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
+						v-model="dataDetails.bankDepositBranch">
 					</u--input>
+					<view @click="manualInput" class="type">选择支行</view>
+				</view>
+				<view class="flex align-center" v-if="!isShowManualInput">
+					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
+					</u--input> -->
+					<view class="select-bankzh" @click="selectZhbank">
+						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
+					</view>
+					<view @click="manualInput" class="type">手动输入</view>
 				</view>
+
 			</view>
-			<view class="flex flex-space-between width100">
-				<view>开户支行</view>
+			<view class="flex row noborder">
+				<view class="left-text">持卡人姓名</view>
 				<view class="flex">
-					<u--input placeholder="选择开户支行" inputAlign='right' border="none" v-model="dataDetails.name">
+					<u--input placeholder="输入持卡人姓名" inputAlign='left' border="none"
+						v-model="dataDetails.cardholderName">
 					</u--input>
-					<view>手动输入</view>
 				</view>
 			</view>
-			<view class="flex flex-space-between width100">
-				<view>收款人</view>
+			<view class="flex row noborder">
+				<view class="left-text">持卡人身份证号</view>
 				<view class="flex">
-					<u--input placeholder="输入收款人姓名" inputAlign='right' border="none" v-model="dataDetails.name">
+					<u--input placeholder="输入持卡人身份证号" inputAlign='left' border="none"
+						v-model="dataDetails.cardholderIdNumber" maxlength="18">
 					</u--input>
 				</view>
 			</view>
+			<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'
+				@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
+			</u-picker>
+			<view class="" style="color: red;font-size: 26rpx;margin-top: 20rpx;">*收款人须为司机本人</view>
 		</view>
-		<view class="" @click="submit">提交</view>
+
+		<u-toast ref="uToast"></u-toast>
+		<view class="submit-btn" @click="submit">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
@@ -49,36 +81,94 @@
 	import upload from '@/components/upload.vue';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	var _this;
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		components: {},
 		data() {
 			return {
-				uploadType: '',
+
 				isShowimgType: false,
 				dataDetails: {
-					name: '阿萨啊',
-					carNumberList: [{
-						kahao: '',
-						addressUrl: ''
-					}],
-					bankList: [{
-						yhk: '',
-						kh: '',
-						khh: '',
-						khzh: '',
-						skr: ''
-					}],
+					commonId: '',
+					// payeeAddressUrl: '',
+					bankCard: '',
+					bankDeposit: '',
+					bankDepositBranch: '',
 				},
-				imagesrc: ''
+				imagesrc: '',
+				columns: [
+
+				],
+				isShowBank: false,
+				isShowManualInput: false,
+				index: '',
+				id: "", //司机身份证号
+				name: "" //司机姓名
 			};
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		onLoad() {
 			_this = this;
+			// this.dataDetails.driverId = this.userInfo.driverId
+			_this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', { //查身份证号
+				phone: uni.getStorageSync("userInfo").phone
+			}).then(res => {
+				this.id = res.data.cardNumber
+				this.name = res.data.name
+			})
 		},
 		methods: {
+			delCard() {
+				_this.dataDetails.payeeAddressUrl = ''
+				_this.$forceUpdate()
+			},
+			uploadImg(type, ) {
+				this.uploadType = type
+				this.isShowimgType = true
+
+			},
+			zhBankClose() {
+				this.isShowBank = false
+			},
+			// 选择支行
+			selectZhbank() {
+				if (uni.$u.test.isEmpty(this.columns)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请先上传银行卡！",
+					})
+					return true
+				}
+
+				this.isShowBank = true
+			},
+			confirmBank(e) {
+				console.log(e)
+				this.dataDetails.bankDepositBranch = e.value[0]
+				this.isShowBank = false
+			},
+			manualInput() {
+				if (this.isShowManualInput) {
+					if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请填写卡号！",
+						})
+						return true
+					}
+					this.isShowBank = true
+
+				} else {
+					this.isShowBank = false
+				}
+				this.isShowManualInput = !this.isShowManualInput
+			},
 			//设置图片
 			setImage(e) {
-				// 
 				console.log(e);
 				//显示在页面
 				//this.imagesrc = e.path;
@@ -92,9 +182,8 @@
 			},
 			//保存图片到相册，方便核查
 			savePhoto(path) {
-				// 
 				this.imagesrc = path;
-				uploadImage('image',path, 'appData/',
+				uploadImage(path, 'appData/',
 					result => {
 						// 上传成功
 						console.log('图片地址', result)
@@ -111,114 +200,171 @@
 				// 	}
 				// });
 			},
-			uploadImg(type) {
+			uploadImg() {
 
-				this.uploadType = type
 				this.isShowimgType = true
 			},
-			photograph() {
-				console.log('拍照')
-				let that = this;
-				uni.chooseImage({
-					count: 1,
-					success: function(res) {
-						console.log(JSON.stringify(res.tempFilePaths));
-						uploadImage('image',res.tempFilePaths[0], 'appData/',
-							result => {
-								// 上传成功
-								console.log('图片地址', result)
-							}
-						)
-					}
-				});
-
+			validate() {
+				// true 为校验不通过
+				// if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "请上传银行卡卡号页！",
+				// 	})
+				// 	return true
+				// }
+				if (uni.$u.test.isEmpty(this.dataDetails.bankCard)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "银行卡卡号不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.bankDeposit)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户行不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户支行不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.cardholderName)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "持卡人姓名不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.cardholderIdNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "持卡人身份证号不能为空！",
+					})
+					return true
+				}
 			},
+
 			imgTypeSelect(val) {
 				console.log(val)
-				console.log(this.uploadType)
 				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功
 									console.log('图片地址', result)
-									switch (this.uploadType) {
-										case 0:
-											console.log('人车合影')
-											break
-										case 1:
-											console.log('身份正面')
-											break
-										case 2:
-											console.log('身份反面')
-											break
-										case 3:
-											console.log('银行卡')
-											break
-										case 4:
-									}
+									_this.$request.baseRequest('get',
+											'/driverInfo/bankShibie', {
+												bankImg: result,
+											}).then(res => {
+											console.log(res)
+											_this.dataDetails.payeeAddressUrl = result
+											if (res.data.bankNo) {
+												_this.dataDetails.bankCard = res.data.bankNo
+											}
+											if (res.data.bankName) {
+												_this.dataDetails.bankDeposit = res.data.bankName
+											}
+
+											// 开户支行LIst
+											if (res.data.bankNameZhihang) {
+												_this.columns.push(res.data
+													.bankNameZhihang)
+
+											}
+											_this.$forceUpdate()
+										})
+										.catch(res => {
+											uni.$u.toast(res.message);
+										});
 								}
 							)
 						}
 					});
 
 				} else {
-					switch (this.uploadType) {
-						case 0:
-							console.log('人车合影')
-							break
-						case 1:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=face');
-							console.log('身份正面')
-							break
-						case 2:
-							console.log('身份反面')
-							break
-						case 3:
-							console.log('银行卡')
-							break
-						case 4:
-					}
+					uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
 				}
 
 			},
-			//身份证正面
-			getImgUrl1(src) {
-				// console.log(src)
-				// console.log('------------res-----------')
-				// let that = this;
-				// that.id[0] = src
-				// that.id1 = src
-				// that.certificates = false
-				// that.personImgs.personImg = that.id[0]
-				// that.$api.doRequest('get', '/driverViewInfo/personShibie', that
-				// 	.personImgs).then(res => {
-				// 	if (res.data.data.recPerson != null) {
-				// 		if (res.data.data.recPerson != "") {
-				// 			that.$set(that.DriverViewInfo, 'driverName', res
-				// 				.data.data.recPerson)
-				// 		}
-				// 	}
-				// 	if (res.data.data.recPersonNo != null) {
-				// 		if (res.data.data.recPersonNo != "") {
-				// 			that.$set(that.DriverViewInfo, 'numberCard', res
-				// 				.data.data.recPersonNo)
+			submit() {
+				let that = this
+				// // 获取银行卡颜色
+				// let _obj = {
+				// 	"input":this.dataDetails.payeeAddressUrl
+				// }
+				// this.$request.baseRequest('post', '/ClothingColorController/recognition', _obj)
+				// 	.then(res => {
+				// 		if (res.code == '200') {
+				// 			this.dataDetails.cardColor = res.data
+
+				// 		} else {
+				// 			uni.$u.toast(res.message);
 				// 		}
-				// 	}
-				// }).catch(res => {
-				// 	uni.showToast({
-				// 		title: res.data.message,
-				// 		icon: 'none',
-				// 		duration: 2000
+
 				// 	})
-				// })
-			},
-			submit(){
-				console.log(' tijia')
+				// 	.catch(res => {
+				// 		uni.$u.toast(res.message);
+				// 	});
+				if (that.validate()) return //校验  511303198809243079
+				if (that.dataDetails.cardholderName != this.name) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "收款人须为司机本人！",
+					})
+					return
+				} else {
+					that.$request.baseRequest('get', '/driverPayeeInfo/bankCradShibie', { //三要素验证
+						name: that.dataDetails.cardholderName, //持卡人姓名
+						idCard: this.id, //司机身份证号
+						accountNo: that.dataDetails.bankCard //卡号
+					}).then(response => {
+						if (response.data.distinguishNum == "01") {
+							that.dataDetails.commonId = uni.getStorageSync("userInfo").id
+							delete that.dataDetails.payeeAddressUrl
+							that.$request.baseRequest('post', '/hyCargoOwnerPayeeInfo/api/addPayee',
+									that.dataDetails).then(res => {
+									if (res.code == '200') {
+										let params = {
+											type: 'success',
+											message: "提交成功",
+										}
+										that.$refs.uToast.show({
+											...params
+										})
+										//uni.$u.route('/pages/mine/manageBankCards/index');
+										uni.navigateBack({
+											delta: 1
+										});
+					
+									} else {
+										uni.$u.toast(res.message);
+									}
+					
+								})
+								.catch(res => {
+									uni.$u.toast(res.message);
+								});
+						} else {
+							uni.$u.toast(res.data.distinguish);
+						}
+					})
+				}
+				
+
+
+
+
+
 			},
 		},
 	};
@@ -229,4 +375,113 @@
 		width: 32rpx;
 		height: 32rpx;
 	}
+
+	.content {
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+
+	.content3 {
+		background: white;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.left-text {
+			// background: red;
+			width: 290rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
+		}
+
+		.row {
+			border-bottom: 1px solid #EEEEEE;
+			padding-bottom: 28rpx;
+			margin-top: 26rpx;
+
+			.ch-style {}
+		}
+
+		.row-ch {
+			padding-right: 180rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	.title {
+		color: #999999;
+		margin: 20rpx 0;
+	}
+
+	.picture {
+		margin-top: 20rpx;
+		background: #F5F6FA;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #6A7282;
+		width: 100%;
+		height: 440rpx;
+		position: relative;
+
+		.text {
+			margin-top: 20rpx;
+		}
+	}
+
+	.xj-image {
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.picture3 {
+		background: url(../../../static/images/mine/yhkzm.png);
+		background-size: 100% 100%;
+	}
+
+	.select-bankzh {
+		width: 230rpx;
+		// height: 48rpx;
+	}
+
+	.type {
+		background: #2772FB;
+		border-radius: 10rpx;
+		color: white;
+		box-sizing: border-box;
+		padding: 4rpx 10rpx;
+		font-size: 26rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 68rpx;
+	}
+
+	.submit-btn {
+		position: fixed;
+		bottom: 40rpx;
+		width: 90%;
+		background: #2772FB;
+		color: white;
+		text-align: center;
+		margin-left: 5%;
+		padding: 30rpx 0;
+		border-radius: 50rpx;
+	}
+
+	.del-card {
+		position: absolute;
+		top: -10rpx;
+		right: -6rpx;
+		width: 80rpx;
+		height: 80rpx;
+		z-index: 9;
+	}
+
+	.preview-card-img {
+		// /deep/uni-image>div, uni-image>img {
+		//     transform: scale(1.5) rotate(-90deg);
+		// }
+	}
 </style>

pages/mine/manageBankCards/editBankCard.vue

@@ -1,20 +1,313 @@
-<!-- 添加银行卡 -->
 <template>
-	<view>
-		修改银行卡
+	<view class="content">
+		<view class="content3 flex s-row">
+			<view class="title">上传银行卡卡号页</view>
+			<view @click="uploadImg" class="picture picture3">
+				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+				<view class="text">上传银行卡卡号页</view>
+			</view>
+			<!-- <u-button type="primary" @click="uploadImg(3,index)">上传银行卡号页</u-button> -->
+			<!-- 			<image class="preview" :src="item.payeeAddressUrl" mode="aspectFit"
+				style="width:710rpx:height:710rpx;margin: 20rpx;"> </image> -->
+			<view class="flex row">
+				<view class="left-text">银行卡卡号</view>
+				<view class="flex">
+					<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
+					</u--input>
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text">开户行</view>
+				<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
+				</u--input>
+			</view>
+			<view class="flex row">
+				<view class="left-text khzh-styel">开户支行</view>
+				<view class="flex align-center" v-if="isShowManualInput">
+					<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='left' border="none"
+						v-model="dataDetails.bankDepositBranch">
+					</u--input>
+					<view @click="manualInput" class="type">选择支行</view>
+				</view>
+				<view class="flex align-center" v-if="!isShowManualInput">
+					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
+					</u--input> -->
+					<view class="select-bankzh" @click="selectZhbank">选择开户支行</view>
+					<view @click="manualInput" class="type">手动输入</view>
+				</view>
+
+			</view>
+			<view class="flex row noborder">
+				<view class="left-text">收款人</view>
+				<view class="flex">
+					<u--input placeholder="输入收款人姓名" inputAlign='left' border="none" v-model="dataDetails.payeeName">
+					</u--input>
+				</view>
+			</view>
+			<u-picker :show="isShowBank" :columns="bankType[index]" :closeOnClickOverlay='true' @close='zhBankClose'
+				@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
+			</u-picker>
+		</view>
+
+		<u-toast ref="uToast"></u-toast>
+		<view class="submit-btn" @click="submit">提交</view>
+		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
+			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
+		</u-action-sheet>
 	</view>
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	var _this;
 	export default {
+		components: {},
 		data() {
 			return {
-				
+				isShowimgType: false,
+				dataDetails: {},
+				imagesrc: '',
+				bankType: [],
+				isShowBank: false,
+				isShowManualInput: false,
+				index: ''
 			};
+		},
+		onLoad() {
+			_this = this;
+		},
+		methods: {
+			manualInput() {
+				if (this.isShowManualInput) {
+					if (uni.$u.test.isEmpty(this.bankType[this.index])) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请先上传银行卡！",
+						})
+						return true
+					}
+					this.isShowBank = true
+
+				} else {
+					this.isShowBank = false
+				}
+				this.isShowManualInput = !this.isShowManualInput
+			},
+			//设置图片
+			setImage(e) {
+				console.log(e);
+				//显示在页面
+				//this.imagesrc = e.path;
+				if (e.dotype == 'idphoto') {
+					_this.zjzClipper(e.path);
+				} else if (e.dotype == 'watermark') {
+					_this.watermark(e.path);
+				} else {
+					_this.savePhoto(e.path);
+				}
+			},
+			//保存图片到相册，方便核查
+			savePhoto(path) {
+				this.imagesrc = path;
+				uploadImage(path, 'appData/',
+					result => {
+						// 上传成功
+						console.log('图片地址', result)
+					}
+				)
+				//保存到相册
+				// uni.saveImageToPhotosAlbum({
+				// 	filePath: path,
+				// 	success: () => {
+				// 		uni.showToast({
+				// 			title: '已保存至相册',
+				// 			duration: 2000
+				// 		});
+				// 	}
+				// });
+			},
+			uploadImg() {
+
+				this.isShowimgType = true
+			},
+			photograph() {
+				console.log('拍照')
+				let that = this;
+				uni.chooseImage({
+					count: 1,
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage(res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功
+								console.log('图片地址', result)
+							}
+						)
+					}
+				});
+
+			},
+			imgTypeSelect(val) {
+				console.log(val)
+				if (val.name == '相册') {
+					uni.chooseImage({
+						count: 1,
+						sourceType: this.$helper.chooseImage.sourceType,
+						success: function(res) {
+							console.log(JSON.stringify(res.tempFilePaths));
+							uploadImage(res.tempFilePaths[0], 'appData/',
+								result => {
+									// 上传成功
+									console.log('图片地址', result)
+
+								}
+							)
+						}
+					});
+
+				} else {
+
+				}
+
+			},
+			//身份证正面
+			getImgUrl1(src) {
+				// console.log(src)
+				// console.log('------------res-----------')
+				// let that = this;
+				// that.id[0] = src
+				// that.id1 = src
+				// that.certificates = false
+				// that.personImgs.personImg = that.id[0]
+				// that.$api.doRequest('get', '/driverViewInfo/personShibie', that
+				// 	.personImgs).then(res => {
+				// 	if (res.data.data.recPerson != null) {
+				// 		if (res.data.data.recPerson != "") {
+				// 			that.$set(that.DriverViewInfo, 'driverName', res
+				// 				.data.data.recPerson)
+				// 		}
+				// 	}
+				// 	if (res.data.data.recPersonNo != null) {
+				// 		if (res.data.data.recPersonNo != "") {
+				// 			that.$set(that.DriverViewInfo, 'numberCard', res
+				// 				.data.data.recPersonNo)
+				// 		}
+				// 	}
+				// }).catch(res => {
+				// 	uni.showToast({
+				// 		title: res.data.message,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	})
+				// })
+			},
+			submit() {
+				console.log(' tijia')
+			},
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.row4-img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.content {
+		padding: 20rpx;
+	}
+
+	.content3 {
+		background: white;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.left-text {
+			// background: red;
+			width: 290rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
+		}
+
+		.row {
+			border-bottom: 1px solid #EEEEEE;
+			padding-bottom: 28rpx;
+			margin-top: 26rpx;
+
+			.ch-style {}
+		}
+
+		.row-ch {
+			padding-right: 180rpx;
+			box-sizing: border-box;
 		}
 	}
-</script>
 
-<style lang="scss">
+	.title {
+		color: #999999;
+		margin: 20rpx 0;
+	}
+
+	.picture {
+		margin-top: 20rpx;
+		background: #F5F6FA;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #6A7282;
+	}
+
+	.picture {
+		width: 100%;
+		height: 440rpx;
+
+		.text {
+			margin-top: 20rpx;
+		}
+	}
 
+	.xj-image {
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.picture3 {
+		background: url(../../../static/images/mine/yhkzm.png);
+		background-size: 100% 100%;
+	}
+
+	.select-bankzh {
+		width: 230rpx;
+		// height: 48rpx;
+	}
+
+	.type {
+		background: #2772FB;
+		border-radius: 10rpx;
+		color: white;
+		box-sizing: border-box;
+		padding: 4rpx 10rpx;
+		font-size: 26rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 68rpx;
+	}
+
+	.submit-btn {
+		position: fixed;
+		bottom: 40rpx;
+		width: 90%;
+		background: #2772FB;
+		color: white;
+		text-align: center;
+		margin-left: 5%;
+		padding: 30rpx 0;
+		border-radius: 50rpx;
+	}
 </style>

pages/mine/manageBankCards/index.vue

@@ -1,24 +1,44 @@
 <template>
 	<view class="content">
-		<view class="" v-for="(item,index) in 4" :key='index'>
-			<view class="flex">
-				<view class="">中国银行</view>
-				<view>鲅鱼圈支行</view>
+		<view class="top-title flex flex-space-between">
+			<view class="left flex">
+				<view class="text1">我的卡</view>
+				<view class="text2">（共{{bankList?bankList.length:0}}张）</view>
 			</view>
-			<view class="flex">收款人：张三</view>
-			<view class="flex flex-end">112 312 312 3123 1231 3123</view>
-			<view>
-				<view>
-					<radio :value="value" />
-					<view>设为默认收款账户</view>
+
+			<view @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>
+		<!-- <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-item" :style='{"background-image":"url("+item.cardColor+")"}'>
+				<view class="flex flex-end number carNumber">{{item.bankCard}}</view>
+				<view class="flex align-center">
+					<!-- @/static/images/mine/bank/gflogo.png -->
+					<image class="img left" :src="item.imgLogo" mode='widthFix'>
+					</image>
+					<view class="right">
+						<view class="text1">{{item.bankDeposit}}</view>
+						<view class="text2">收款人：{{item.cardholderName}}</view>
+					</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 @click="edit">修改</view>
-					<view>删除</view>
+					<u-icon name="trash" size="24" @click="del(item,index)"></u-icon>
 				</view>
 			</view>
 		</view>
-		<view @click="addBankCard">添加银行卡</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>
 	</view>
 </template>
@@ -30,7 +50,11 @@
 	export default {
 		data() {
 			return {
-				value: '111'
+				bankList: [],
+				obj:{},
+				index:null,
+				isShowAlert:false,
+				alertTitle:'确认删除该银行卡？'
 			};
 		},
 		computed: {
@@ -40,8 +64,146 @@
 			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');
 			}
+			this.init();
 		},
 		methods: {
+			confirmClick(){
+				this.isShowAlert = false
+				this.$request.baseRequest('post', '/hyCargoOwnerPayeeInfo/api/deletePayee', {
+						id: this.obj.id
+					}).then(res => {
+						if (res.code == '200') {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "删除成功！",
+							})
+							this.bankList.splice(this.index, 1)
+						}
+				
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			cancelClick(){
+				this.isShowAlert = false
+			},
+			radioChange(val) {
+				for (let i = 0; i < this.bankList.length; i++) {
+					if (val.id == this.bankList[i].id) {
+						this.bankList[i].defaultFlag = 1
+						this.$request.baseRequest('post', '/hyCargoOwnerPayeeInfo/api/setDefault', val).then(res => {
+								if (res.code == '200') {
+									this.$refs.uToast.show({
+										type: 'success',
+										message: "设置成功！",
+									})
+								} else {
+									uni.$u.toast(res.message);
+								}
+
+							})
+							.catch(res => {
+								uni.$u.toast(res.message);
+							});
+
+					} else {
+						this.bankList[i].defaultFlag = 0
+					}
+				}
+			},
+			number(value){
+			  if(value&&value.length>8) {
+			    let reg = /^(\d{4})(\d*)(\d{4})$/;
+			    let str = value.replace(reg, (a, b, c, d)=> {
+			      return b + c.replace(/\d/g, "*") + d;
+			    });
+			    return str
+			  }else {
+			    return value
+			  }
+			},
+			init() {
+				this.$request.baseRequest('get', '/hyCargoOwnerPayeeInfo/selectPayee', {
+						commonId: this.userInfo.id,
+						pageSize: 10,
+						currentPage: 1,
+					}).then(res => {
+						if (res.code == '200') {
+							this.bankList = res.data.records
+							for (let i = 0; i < this.bankList.length; i++) {
+								let _obj = this.bankList[i]
+								_obj.bankCard = this.number(_obj.bankCard)
+								switch (_obj.bankDeposit) {
+									case "建设银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										break
+									case "招商银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/zhaoshang.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "中国银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "邮政银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/youzhenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										break
+									case "交通银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/jiaotognlogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										break
+									case "工商银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "农业银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										break
+									case "民生银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/minshenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										break
+									case "中信银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/zhongxinlogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "广发银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "华夏银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/huaxia.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "兴业银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/xingye.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										break
+									default:
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt.png"
+										break
+								}
+							}
+							this.$forceUpdate()
+						} else {
+							uni.$u.toast(res.message);
+						}
+
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
 			addBankCard() {
 				uni.$u.route('/pages/mine/manageBankCards/addBankCard');
 			},
@@ -56,11 +218,95 @@
 					...params
 				})
 			},
+			del(val, index) {
+				this.obj = val
+				this.index = index
+				this.isShowAlert = true
+		
+			}
 		},
 
 	}
 </script>
 
 <style lang="scss">
+	.content {
+		background: white;
+		padding: 20rpx;
+	}
 
+	.top-title {
+		margin: 0 0 20rpx 0;
+
+		.left {
+			.text1 {
+				font-size: 29rpx;
+				color: #1F1F1F;
+				font-weight: 700;
+			}
+
+			.text2 {
+				font-size: 29rpx;
+				color: #999999;
+			}
+		}
+	}
+
+	.card-list {
+		padding: 0 20rpx;
+
+		.number {
+			color: white;
+		}
+	}
+
+	.add-bankcard {
+		background: #EEF4FF;
+		color: #2772FB;
+		font-weight: 700;
+		font-size: 26rpx;
+		align-items: center;
+		padding: 4rpx 10rpx 4rpx 20rpx;
+		border-radius: 30rpx;
+
+	}
+
+	.card-list-item {
+		// background: url(../../../static/images/mine/bank/zsbg.png) center no-repeat;
+		background-size: cover;
+		padding: 60rpx 43rpx 100rpx 43rpx;
+		border-radius: 20rpx;
+		.carNumber{
+			margin-bottom: 20rpx;
+		}
+
+		.img {
+			width: 80rpx;
+			height: 80rpx;
+			margin-right: 20rpx;
+		}
+
+		.right {
+			.text1 {
+				font-size: 36rpx;
+				font-weight: 700;
+				color: #FFFFFF;
+			}
+
+			.text2 {
+				// font-size: 24rpx;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+		}
+	}
+
+	.row2 {
+		margin: 20rpx 0;
+	}
+
+	.default-card {
+		// font-size: 28rpx;
+		color: #333333;
+	}
 </style>

pages/mine/myAccount/bankList.vue

@@ -0,0 +1,318 @@
+<template>
+	<view class="content">
+		<view class="top-title flex flex-space-between">
+			<!-- <view class="left flex">
+				<view class="text1">我的卡</view>
+				<view class="text2">（共{{bankList?bankList.length:0}}张）</view>
+			</view> -->
+
+			<view @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>
+		<!-- <image src="../../../static/images/mine/bank/nongyelogo.png" mode=""></image> -->
+		<view class="card-list" v-for="(item,index) in bankList" :key='index' @click="bankCheng(item)">
+			<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">
+					<!-- @/static/images/mine/bank/gflogo.png -->
+					<image class="img left" :src="item.imgLogo" mode='widthFix'>
+					</image>
+					<view class="right">
+						<view class="text1">{{item.bankDeposit}}</view>
+						<view class="text2">收款人：{{item.cardholderName}}</view>
+					</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>
+					<u-icon name="trash" size="24" @click="del(item,index)"></u-icon>
+				</view>
+			</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>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				bankList: [],
+				obj:{},
+				index:null,
+				isShowAlert:false,
+				alertTitle:'确认删除该银行卡？'
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onLoad() {
+			if (!this.hasLogin) {
+				uni.$u.route('/pages/public/login');
+			}
+			this.init();
+		},
+		methods: {
+			bankCheng(item){
+				uni.setStorageSync("bankInfo",item)
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			confirmClick(){
+				this.isShowAlert = false
+				this.$request.baseRequest('post', '/hyCargoOwnerPayeeInfo/api/deletePayee', {
+						id: this.obj.id
+					}).then(res => {
+						if (res.code == '200') {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "删除成功！",
+							})
+							this.bankList.splice(this.index, 1)
+						}
+				
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			cancelClick(){
+				this.isShowAlert = false
+			},
+			radioChange(val) {
+				for (let i = 0; i < this.bankList.length; i++) {
+					if (val.id == this.bankList[i].id) {
+						this.bankList[i].defaultFlag = 1
+						this.$request.baseRequest('post', '/hyCargoOwnerPayeeInfo/api/setDefault', val).then(res => {
+								if (res.code == '200') {
+									this.$refs.uToast.show({
+										type: 'success',
+										message: "设置成功！",
+									})
+								} else {
+									uni.$u.toast(res.message);
+								}
+
+							})
+							.catch(res => {
+								uni.$u.toast(res.message);
+							});
+
+					} else {
+						this.bankList[i].defaultFlag = 0
+					}
+				}
+			},
+			number(value){
+			  if(value&&value.length>8) {
+			    let reg = /^(\d{4})(\d*)(\d{4})$/;
+			    let str = value.replace(reg, (a, b, c, d)=> {
+			      return b + c.replace(/\d/g, "*") + d;
+			    });
+			    return str
+			  }else {
+			    return value
+			  }
+			},
+			init() {
+				this.$request.baseRequest('get', '/hyCargoOwnerPayeeInfo/selectPayee', {
+						commonId: this.userInfo.id,
+						pageSize: 10,
+						currentPage: 1,
+					}).then(res => {
+						if (res.code == '200') {
+							this.bankList = res.data.records
+							for (let i = 0; i < this.bankList.length; i++) {
+								let _obj = this.bankList[i]
+								_obj.bankCard = this.number(_obj.bankCard)
+								switch (_obj.bankDeposit) {
+									case "建设银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										break
+									case "招商银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/zhaoshang.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "中国银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "邮政银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/youzhenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										break
+									case "交通银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/jiaotognlogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										break
+									case "工商银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "农业银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										break
+									case "民生银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/minshenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										break
+									case "中信银行":
+										this.bankList[i].imgLogo =
+											"../../../static/images/mine/bank/zhongxinlogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "广发银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "华夏银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/huaxia.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										break
+									case "兴业银行":
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/xingye.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										break
+									default:
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt.png"
+										break
+								}
+							}
+							this.$forceUpdate()
+						} else {
+							uni.$u.toast(res.message);
+						}
+
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			addBankCard() {
+				uni.$u.route('/pages/mine/manageBankCards/addBankCard');
+			},
+			edit() {
+				uni.$u.route('/pages/mine/manageBankCards/editBankCard');
+				let params = {
+					type: 'success',
+					message: "修改成功",
+					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+				}
+				this.$refs.uToast.show({
+					...params
+				})
+			},
+			del(val, index) {
+				this.obj = val
+				this.index = index
+				this.isShowAlert = true
+		
+			}
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background: white;
+		padding: 20rpx;
+	}
+
+	.top-title {
+		margin: 0 0 20rpx 0;
+
+		.left {
+			.text1 {
+				font-size: 29rpx;
+				color: #1F1F1F;
+				font-weight: 700;
+			}
+
+			.text2 {
+				font-size: 29rpx;
+				color: #999999;
+			}
+		}
+	}
+
+	.card-list {
+		padding: 0 20rpx;
+
+		.number {
+			color: white;
+		}
+	}
+
+	.add-bankcard {
+		background: #EEF4FF;
+		color: #2772FB;
+		font-weight: 700;
+		font-size: 26rpx;
+		align-items: center;
+		padding: 4rpx 10rpx 4rpx 20rpx;
+		border-radius: 30rpx;
+
+	}
+
+	.card-list-item {
+		// background: url(../../../static/images/mine/bank/zsbg.png) center no-repeat;
+		background-size: cover;
+		padding: 60rpx 43rpx 100rpx 43rpx;
+		border-radius: 20rpx;
+		.carNumber{
+			margin-bottom: 20rpx;
+		}
+
+		.img {
+			width: 80rpx;
+			height: 80rpx;
+			margin-right: 20rpx;
+		}
+
+		.right {
+			.text1 {
+				font-size: 36rpx;
+				font-weight: 700;
+				color: #FFFFFF;
+			}
+
+			.text2 {
+				// font-size: 24rpx;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+		}
+	}
+
+	.row2 {
+		margin: 20rpx 0;
+	}
+
+	.default-card {
+		// font-size: 28rpx;
+		color: #333333;
+	}
+</style>

pages/mine/myAccount/bill.vue

@@ -0,0 +1,124 @@
+<template>
+	<view class="center">
+		<view class="" @click="dataShow = true">{{data}}</view>
+		<u-picker :show="dataShow" :columns="columns" @confirm="dataChange" @cancel="dataShow = false"
+			@close="dataShow = false"></u-picker>
+		<view class="formData" v-for="(item,index) in formlist">
+			<view class="flex row">
+				<view class="left-text">{{item.types}}</view>
+				<view class="flex right-text">
+						{{item.amountMoney}}
+				</view>
+			</view>
+			<view class="date_css">
+				{{item.createDate}}
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: "", //1个人  2 企业
+				companyId: "",
+				pageSize: 10,
+				currentPage: 1,
+				data: "2022",
+				dataShow: false,
+				value1: Number(new Date()),
+				columns: [
+					["2022", "2023", "2024", "2025", "2026", "2027", "2028", "2029", "2030", "2031", "2032", "2033",
+						"2034", "2035"
+					],
+				],
+				startDate: "",
+				endDate: "",
+				formlist: []
+
+
+			}
+		},
+		onLoad(options) {
+			this.type = options.type
+			this.companyId = options.id
+			this.getList()
+
+		},
+		onShow() {
+
+		},
+		methods: {
+			dataChange(e) {
+				this.data = e.value[0]
+				this.dataShow = false
+				this.getList()
+			},
+			getList() {
+				// commonId ，companyId，date
+				this.startDate = this.data + "-01-01"
+				this.endDate = this.data + "-12-31"
+				if (this.type == 1) { //个人
+					this.$request.baseRequest('get', '/hyCargoOwnerCapitalInfo/selectBill', {
+						commonId: uni.getStorageSync("userInfo").id,
+						startDate: this.startDate,
+						endDate: this.endDate,
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+					}).then(res => {
+						this.formlist = res.data.records
+					})
+				} else if (this.type == 2) {
+					this.$request.baseRequest('get', '/hyCargoOwnerCapitalInfo/selectBill', {
+						companyId: this.companyId,
+						startDate: this.startDate,
+						endDate: this.endDate,
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+					}).then(res => {
+						this.formlist = res.data.records
+
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 20rpx;
+
+		.formData {
+			.tips {
+				text-align: right;
+				border-bottom: 2rpx solid #e6e6e6;
+				height: 60rpx;
+			}
+
+			.row {
+				margin: 30rpx 0;
+			}
+
+			.left-text {
+				// background: red;
+				width: 40%;
+				color: #333333;
+				display: flex;
+				align-items: center;
+			}
+
+			.right-text {
+				width: 60%;
+				justify-content: flex-end;
+			}
+			.date_css{
+				text-align: right;
+			}
+		}
+	}
+</style>

pages/mine/myAccount/index.vue

@@ -0,0 +1,100 @@
+<template>
+	<view class="center">
+		<view class="" v-if="accountType == '2'">
+			{{dataInfo.companyName}}
+		</view>
+		<view class="flex account">
+			<view class="account_info">
+				可用余额
+				<view class="money">
+					{{dataInfo.accountBalance?dataInfo.accountBalance:0}}元
+				</view>
+			</view>
+			<view class="account_info">
+				已冻结
+				<view class="money">
+					{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}}元
+				</view>
+			</view>
+		</view>
+		<u-button type="primary" text="提现" @click="withdrawal"></u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataInfo: {},
+				accountType: '', //accountType  1个人 2企业
+				id:"",//如果是企业  公司id
+
+			}
+		},
+		onLoad(options) {
+			if (options.id) { //我的企业进来的
+				this.accountType = '2'
+				this.id = options.id
+				console.log(this.dataInfo)
+			} else {  //个人账户
+				this.accountType = '1'
+			}
+		},
+		onShow() {
+			
+				this.getList()
+			
+
+		},
+		onNavigationBarButtonTap(e) {
+			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType)
+		},
+		methods: {
+			getList() {
+				if(this.accountType == '1'){
+					this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccount', {
+						commonId: uni.getStorageSync("userInfo").id
+					}).then(res => {
+						this.dataInfo = res.data
+					})
+				}else if(this.accountType == '2'){
+					this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccountBalance', {
+						id:this.id,
+						flag:this.accountType
+					}).then(res => {
+						this.dataInfo = res.data
+					})
+				}
+			},
+			withdrawal() {
+				if(this.accountType == '1'){
+					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.dataInfo.id +"&flag=" + this.accountType)
+				}else if(this.accountType == '2'){
+					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.id +"&flag=" + this.accountType)
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 20rpx;
+
+		.account {
+			margin-top: 30rpx;
+
+			.account_info {
+				width: 50%;
+				text-align: center;
+			}
+
+			.money {
+				margin: 40rpx;
+			}
+		}
+
+
+	}
+</style>

pages/mine/myAccount/withdrawal.vue

@@ -0,0 +1,245 @@
+<template>
+	<view class="center">
+		<view class="formData">
+			<view class="flex row">
+				<view class="left-text">提现金额</view>
+				<view class="flex right-text">
+					<u--input placeholder="输入提现金额" inputAlign='right' border="none" clearable
+						v-model="formInfo.amountMoney" type="number">
+					</u--input>
+				</view>
+			</view>
+			<view class="tips">
+				可提现金额{{usableMoney}}元,<span style="color: #007AFF;" @click="writeIn">全部提现</span>
+			</view>
+			<view class="flex row">
+				<view class="left-text">提现到银行卡</view>
+				<view class="flex right-text" @click="bankChange">
+					{{formInfo.bankDeposit?formInfo.bankDeposit:"请选择收款账户"}} {{bankNo}}
+					<image src="../../../static/images/myimg/gengduo1@3x.png" mode=""
+						style="width: 20rpx;height: 30rpx;top: 10rpx;margin-left: 10rpx;"></image>
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text">开户行</view>
+				<view class="flex right-text">
+					<u--input placeholder="自动获取" inputAlign='right' border="none" clearable
+						v-model="formInfo.bankDeposit">
+					</u--input>
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text">开户支行</view>
+				<view class="flex right-text">
+					<u--input placeholder="自动获取" inputAlign='right' border="none" clearable
+						v-model="formInfo.bankDepositBranch">
+					</u--input>
+				</view>
+			</view>
+			<view class="flex row ">
+				<view class="left-text">账号</view>
+				<view class="flex right-text">
+					<u--input placeholder="自动获取" inputAlign='right' border="none" clearable v-model="formInfo.bankCard">
+					</u--input>
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text">收款人姓名</view>
+				<view class="flex right-text">
+					<u--input placeholder="自动获取" inputAlign='right' border="none" clearable
+						v-model="formInfo.cardholderName">
+					</u--input>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast"></u-toast>
+		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			@cancel="cancelClick"></u-modal>
+		<u-button type="primary" text="提交" @click="submit"></u-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				formInfo: {},
+				bankNo: "",
+				flag: "", //1个人2公司
+				id: "",
+				usableMoney: 0, //可提现的
+				isShowAlert: false,
+				alertTitle: "",
+				alertContent: "",
+				showCancelButton: true,
+			}
+		},
+		onLoad(options) {
+			this.flag = options.flag
+			this.id = options.id
+			this.getList()
+		},
+		onShow() {
+			if (uni.getStorageSync("bankInfo")) {
+				let obj = uni.getStorageSync("bankInfo")
+				this.formInfo.bankDeposit = obj.bankDeposit
+				this.formInfo.bankDepositBranch = obj.bankDepositBranch
+				this.formInfo.bankCard = obj.bankCard
+				this.formInfo.cardholderName = obj.cardholderName
+				this.bankNo = obj.bankCard.substring(obj.bankCard.length - 4)
+			} else {
+				this.defaultBank()
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		methods: {
+			defaultBank() { //查询默认银行卡
+				this.$request.baseRequest('get', '/hyCargoOwnerPayeeInfo/getPayee', {
+					commonId: this.userInfo.id
+				}).then(res => {
+					if (res.data) {
+						this.formInfo.bankDeposit = res.data.bankDeposit
+						this.formInfo.bankDepositBranch = res.data.bankDepositBranch
+						this.formInfo.bankCard = res.data.bankCard
+						this.formInfo.cardholderName = res.data.cardholderName
+						this.bankNo = res.data.bankCard.substring(res.data.bankCard.length - 4)
+					}
+					this.$forceUpdate()
+				})
+			},
+			bankChange() { //选择银行卡
+				uni.$u.route("/pages/mine/myAccount/bankList")
+			},
+			getList() {
+				this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccountBalance', {
+					id: this.id,
+					flag: this.flag
+				}).then(res => {
+					this.usableMoney = Number(res.data.accountBalance) - Number(res.data.frozenAmount)
+				})
+			},
+			writeIn() {
+				this.formInfo.amountMoney = this.usableMoney
+				this.$forceUpdate()
+			},
+			validate() {
+				if (uni.$u.test.isEmpty(this.formInfo.amountMoney)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "提现金额不能为空！",
+					})
+					return true
+				}
+				if (Number(this.usableMoney) < Number(this.formInfo.amountMoney)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "提现金额超出可用余额！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.formInfo.bankDeposit)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收款开户行不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.formInfo.bankDepositBranch)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收款开户支行不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.formInfo.bankCard)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收款卡号不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.formInfo.bankCard)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收款人姓名不能为空！",
+					})
+					return true
+				}
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			submit() {
+				if (this.validate()) return
+				this.formInfo.flag = this.flag //个人1   企业2
+				this.isShowAlert = true
+				this.alertTitle = "确定提现？"
+
+			},
+			confirmClick() {
+				if (this.flag == 1) {
+					this.formInfo.commonId = this.userInfo.id //用户id
+					this.formInfo.accountId = this.id //个人  个人信息id
+				} else if (this.flag == 2) {
+					this.formInfo.companyId = this.id //公司id
+					this.formInfo.accountId = this.id //公司id
+				}
+				this.$request.baseRequest('post', '/hyCargoOwnerCapitalInfo/api/withdrawal', this.formInfo).then(res => {
+					if (res.code == 200) {
+						this.isShowAlert = false
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "提现成功！",
+							complete() {
+								uni.navigateBack({
+									delta: 1
+								})
+							}
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 20rpx;
+
+		// .row {
+		// 	margin: 30rpx;
+		// }
+		.formData {
+			.tips {
+				text-align: right;
+				border-bottom: 2rpx solid #e6e6e6;
+				height: 60rpx;
+			}
+
+			.row {
+				margin: 30rpx 0;
+			}
+
+			.left-text {
+				// background: red;
+				width: 40%;
+				color: #333333;
+				display: flex;
+				align-items: center;
+			}
+
+			.right-text {
+				width: 60%;
+				justify-content: flex-end;
+			}
+		}
+
+	}
+</style>

pages/news/feedbackResults.vue

@@ -0,0 +1,169 @@
+<template>
+	<view class="center">
+		<view class="feedback_info">
+			<view class="flex row">
+				<view class="left-text" v-if="type == '投诉结果'">反馈时间</view>
+				<view class="left-text" v-else>举报时间</view>
+				<view class="flex right-text">
+					{{formData.createDate}}
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text" v-if="type == '投诉结果'">反馈对象</view>
+				<view class="left-text" v-else>举报对象</view>
+				<view class="flex right-text">
+					{{formData.passive}}
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text" v-if="type == '投诉结果'">反馈内容</view>
+				<view class="left-text" v-else>举报内容</view>
+				<view class="flex right-text">
+					{{formData.content}}
+				</view>
+			</view>
+			<view class="flex row">
+				<view class="left-text">处理结果</view>
+				<view class="flex right-text">
+					{{formData.processingResults}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="">您对处理结果是否满意</view>
+				<view class="flex score_css">
+					<u-rate :count="count" v-model="scoreValue" @change="scoreChange">
+					</u-rate>
+					<span style="margin-left: 30rpx;">{{score}}</span>
+
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast"></u-toast>
+		<u-modal :show="showPips" :title="title" :content='content' showCancelButton @close="showPips = false"
+			@cancel="showPips=false" @confirm="confirmSubmit"></u-modal>
+		<u-button type="primary" text="提交" @click="submit"></u-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				count: "5",
+				scoreValue: "",
+				id: "",
+				type: "",
+				formData: {},
+				score: "非常满意",
+				showPips: false,
+				title: "",
+				content: ""
+
+			}
+		},
+		onShow() {
+			this.getList()
+
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.type = options.type
+			if (this.type == '举报结果') {
+				uni.setNavigationBarTitle({
+					title: '举报处理结果'
+				})
+			}
+		},
+		methods: {
+			submit() {
+				if (this.formData.processingResultsSatisfaction == null) { //未提交过
+					this.title = "确定提交反馈结果？"
+					this.showPips = true
+					this.formData.processingResultsSatisfaction = this.scoreValue
+					this.formData.editFlag = 1
+				} else { //提交过
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "您已提交过了哦！"
+					})
+					return
+				}
+			},
+			confirmSubmit() {
+				this.$request.baseRequest('post', '/feedbackReport/api/editInfo', this.formData).then(res => {
+					if (res.code == 200) {
+						this.showPips = false
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "提交成功！",
+							complete() {
+								uni.navigateBack({
+									delta: 1
+								})
+							}
+						})
+					}
+				})
+			},
+
+			scoreChange(e) {
+				this.scoreValue = e
+				if (this.scoreValue == 1) {
+					this.score = "极不满意"
+				} else if (this.scoreValue == 2) {
+					this.score = "不满意"
+				} else if (this.scoreValue == 3) {
+					this.score = "一般"
+				} else if (this.scoreValue == 4) {
+					this.score = "满意"
+				} else if (this.scoreValue == 5) {
+					this.score = "非常满意"
+				}
+			},
+			getList() {
+				this.$request.baseRequest('get', '/feedbackReport/getInfo', {
+					id: this.id
+				}).then(res => {
+					this.formData = res.data
+					this.scoreValue = "5"
+				})
+
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 20rpx;
+
+		.feedback_info {
+			.row {
+				margin: 30rpx 0;
+			}
+
+			.left-text {
+				// background: red;
+				width: 40%;
+				color: #333333;
+				display: flex;
+				align-items: center;
+			}
+
+			.right-text {
+				width: 60%;
+				justify-content: flex-end;
+			}
+
+			.date_css {
+				text-align: right;
+			}
+
+			.score_css {
+				margin-top: 15rpx;
+			}
+		}
+
+	}
+</style>

pages/news/index.vue

@@ -159,6 +159,9 @@
 					});
 			},
 			read(val) {
+				if(val.newsType == "投诉结果" || val.newsType == "举报结果"){
+					uni.$u.route("/pages/news/feedbackResults?id=" + val.bussId + "&type=" + val.newsType)
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true

pages/order/driverDetail.vue

@@ -143,7 +143,7 @@
 				show: false,
 				objectInfo: {},
 				columns: [
-					['反馈', '举报']
+					['投诉', '举报']
 				],
 				list: [],
 				list1: [{
@@ -173,7 +173,7 @@
 		methods: {
 			confirmBtn(e) {
 				console.log(e.value)
-				if (e.value == '反馈') {
+				if (e.value == '投诉') {
 					uni.$u.route('/pages/order/fk', {
 						val: JSON.stringify(this.dataObj)
 					});
@@ -225,7 +225,6 @@
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
-						debugger
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
 						that.total = res.data.total

pages/order/fk.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="row1 flex flex-space-between">
-			<view>被反馈人</view>
+			<view>被投诉人</view>
 			<view class='flex'>
 				<image :src="dataDetails.driverPortrait" mode="widthFix" class="img"></image>
 				<view>{{dataDetails.driverName}}</view>
@@ -9,7 +9,7 @@
 		</view>
 		<u-line class="line"></u-line>
 		<view class="row2">
-			<view class="title">反馈信息</view>
+			<view class="title">投诉信息</view>
 			<u--textarea v-model="value1" placeholder="输入要反馈的内容,10-300字" count maxlength='300'></u--textarea>
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
@@ -38,7 +38,6 @@
 		},
 		onLoad(options) {
 			this.dataDetails = JSON.parse(options.val)
-			console.log(this.dataDetails)
 			this.imgList = []
 		},
 		methods: {
@@ -47,11 +46,16 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
+					    initiator:this.dataDetails.cargoOwner,
+						initiatorNumber:this.dataDetails.cargoOwnerPhone,
 						commonId: this.userInfo.id,
-						name: this.dataDetails.driverName,
+						passive: this.dataDetails.driverName,
+						passiveNumber: this.dataDetails.driverPhone,
+						passiveCommonId:this.dataDetails.commonId,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 1,
+						objectFlag:1,
 					}).then(res => {
 						let that = this
 						uni.hideLoading()

pages/order/index.vue

@@ -103,7 +103,7 @@
 						</view>
 						<view class="flex align-center">
 							<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
-							<view class="car">{{good.freightInfo.freight?good.freightInfo.freight:good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
+							<view class="car">{{good.freightInfo?good.freightInfo.freight:good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
 						</view>
 						<!-- 		<view class="right">
 							<view class="flex fontsize-26 row">

pages/order/jb.vue

@@ -47,11 +47,16 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-						name: this.dataDetails.driverName,
-							commonId: this.userInfo.id,
+						initiator:this.dataDetails.cargoOwner,
+						initiatorNumber:this.dataDetails.cargoOwnerPhone,
+						commonId: this.userInfo.id,
+						passive: this.dataDetails.driverName,
+						passiveNumber: this.dataDetails.driverPhone,
+						passiveCommonId:this.dataDetails.commonId,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 2,
+						objectFlag:1,
 					}).then(res => {
 						let that = this
 						uni.hideLoading()

pages/order/signContract.vue

@@ -174,7 +174,6 @@
 												delta:1
 											})
 											if (res.code == 200) {
-												debugger
 												// that.contractSrc = res.data
 												// uni.downloadFile({
 												// 	url: res.data,

pages/release/release.vue

@@ -75,6 +75,33 @@
 				<view class="right"><input type="text" class="input" value="" placeholder="输入货物名称"
 						v-model="dataObj.goodsName" /></view>
 			</view>
+			<view class="row">
+				<view class="left">收货联系人</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入收货联系人姓名" class="input" v-model="dataObj.receiver" />
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货联系人电话</view>
+				<view class="right flex">
+					<input type="number" maxlength="11" placeholder="输入收货联系人手机号" class="input"
+						v-model="dataObj.receiverPhone" />
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货人身份证号</view>
+				<view class="right flex">
+					<input type="number" maxlength="11" placeholder="输入收货人身份证号" class="input"
+						v-model="dataObj.receiverIdcard" />
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货方信用代码（选填）</view>
+				<view class="right flex">
+					<input type="number" maxlength="11" placeholder="输入收货方信用代码" class="input"
+						v-model="dataObj.receiverCreditCode" />
+				</view>
+			</view>
 			<view class="flex row">
 				<view class="left-text">运费计算方式</view>
 				<u-radio-group placement="row" v-model="dataObj.billingMethod" class="select-type">
@@ -113,19 +140,7 @@
 						v-model="dataObj.senderPhone" />
 				</view>
 			</view>
-			<view class="row">
-				<view class="left">收货联系人</view>
-				<view class="right flex">
-					<input type="text" value="" placeholder="输入收货联系人姓名" class="input" v-model="dataObj.receiver" />
-				</view>
-			</view>
-			<view class="row">
-				<view class="left">收货联系人电话</view>
-				<view class="right flex">
-					<input type="number" maxlength="11" placeholder="输入收货联系人手机号" class="input"
-						v-model="dataObj.receiverPhone" />
-				</view>
-			</view>
+			
 			<view class="row">
 				<view class="left">重量（吨）</view>
 				<view class="right flex">
@@ -474,6 +489,28 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataObj.receiver)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收货联系人不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataObj.receiverPhone)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收货联系人电话不能为空！",
+					})
+					return true
+				}
+				
+				if (uni.$u.test.isEmpty(this.dataObj.receiverIdcard)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收货人身份证不能为空！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataObj.freightPrice)) {
 					this.$refs.uToast.show({
 						type: 'error',