四月25日测试问题，跟踪处理

App.vue

@@ -113,20 +113,19 @@
 	/* #ifndef APP-NVUE */
 	@import "/style/uni.css";
 	/* 官方ui库 */
-	@import "/style/animate.min.css";
+	/* @import "/style/animate.min.css"; */
 	/* 第三方动画库 */
-	/* @import "/style/icon.css";	 */
+	@import "/style/icon.css";
 	/* 自定义图标库 */
-	@import 'https://at.alicdn.com/t/font_1807257_t3nqcuysmns.css';
+	/* @import 'https://at.alicdn.com/t/font_1807257_t3nqcuysmns.css'; */
 	@import "/style/common.css";
 	/* 公共样式库 */
 	@import "/style/zcm-main.css";
+
 	/* UI基础库 */
 	/* @import "/style/input.scss"; */
 	/* 基础表单样式*/
 	/* #endif */
-
-
 	/* #ifdef H5 */
 	/* 修复H5底部导航挡住内容bug */
 	uni-app {

components/common/kxj-watermark/kxj-watermark.vue

@@ -0,0 +1,124 @@
+<template>
+	<view class="watermarks"
+		:style="{'opacity': opacity,'height':height,'position': position, 'bottom': bottom, 'z-index': zindex }">
+		<view class="watermarksshell">
+			<block v-for="(t, i) in count" :key="'watermark' + i">
+				<view :style="{ transform: 'rotate(' + rotate + 'deg)' }">
+					<image v-if="logo != '' || logo != 'none'" :src="logo"
+						:style="{ width: size * texts.length + 'em', height: size * texts.length + 'em', float: 'left' }">
+					</image>
+					<view
+						:style="{ 'padding-left': logo != '' || logo != 'none' ? size * texts.length + 0.2 + 'em' : 0 + 'em' }">
+						<view v-for="(text, c) in texts" :key="'wmtext' + c"
+							:style="{ color: color, 'font-size': size + 'em', 'line-height': size + 'em' }">{{ text }}
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'kxj-watermark',
+		props: {
+			//水印类型:fixation固定，follow随动
+			type: {
+				type: String,
+				default: 'fixation'
+			},
+
+			//高度，只有当type=follow时才需要设置
+			height: {
+				type: String,
+				default: '92%'
+			},
+
+			//水印内容
+			texts: {
+				type: Array,
+				//required:true, //必填参数
+				default: () => ['']
+			},
+
+			//图标，自带三种颜色的图标
+			logo: {
+				type: String,
+				default: ''
+			},
+
+			//设置水印数量（密集度）,最好设置为偶数,数字越大水印越密集
+			count: {
+				type: Number,
+				default: 12
+			},
+
+			//透明度,0到1之间。
+			opacity: {
+				type: Number,
+				default: 0.2
+			},
+
+			//文字大小,单位是em
+			size: {
+				type: Number,
+				default: 1
+			},
+
+			//文字颜色
+			color: {
+				type: String,
+				default: '#d9d9d9'
+			},
+
+			//旋转角度
+			rotate: {
+				type: Number,
+				default: -30
+			},
+
+			//层级
+			zindex: {
+				type: String,
+				default: '996'
+			}
+		},
+
+		data() {
+			return {
+				position: 'fixed',
+				width: '150%',
+				bottom: 0
+			};
+		},
+		beforeMount() {
+			if (this.type === 'follow') {
+				this.position = 'absolute';
+				(this.width = '150%'), (this.bottom = 'auto');
+			}
+		}
+	};
+</script>
+
+<style lang="css">
+	.watermarks {
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.watermarksshell {
+		display: flex;
+		flex-wrap: wrap;
+		pointer-events: none;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 150%;
+		height: 130%;
+	}
+</style>

components/modules/carInsure/OCRComponent/OCRComponent.vue

@@ -154,6 +154,7 @@
 			},
 			userocrInt2() {
 				let Info = Object.assign({}, this.userfront, this.userback)
+				console.log(Info);
 				if (this.isEmptyObject(Info)) {
 					uni.showToast({
 						icon: 'none',
@@ -430,7 +431,7 @@
 											})
 										}
 										break;
-									case 'applicantInfo':
+									case 'policyHolderInfo':
 										if (this.applicantInfoPositiveList.some(v => v.imageType ==
 												'C03')) {
 											this.applicantInfoPositiveList.map(val => {
@@ -445,7 +446,7 @@
 											})
 										}
 										break;
-									case 'InsuredInfo':
+									case 'insuredPersonInfo':
 										if (this.InsuredInfoPositiveList.some(v => v.imageType == 'C04')) {
 											this.InsuredInfoPositiveList.map(val => {
 												if (val.imageType == 'C04') {
@@ -537,7 +538,7 @@
 											})
 										}
 										break;
-									case 'applicantInfo':
+									case 'policyHolderInfo':
 										if (this.applicantInfoPositiveList.some(v => v.imageType ==
 												'D03')) {
 											this.applicantInfoPositiveList.map(val => {
@@ -552,7 +553,7 @@
 											})
 										}
 										break;
-									case 'InsuredInfo':
+									case 'insuredPersonInfo':
 										if (this.InsuredInfoPositiveList.some(v => v.imageType == 'D04')) {
 											this.InsuredInfoPositiveList.map(val => {
 												if (val.imageType == 'D04') {

components/uni-forms-item/uni-forms-item.vue

@@ -414,7 +414,6 @@
 
 	.uni-forms-item--border {
 		margin-bottom: 0;
-		padding: 10px 15px;
 		border-top: 1px #eee solid;
 	}
 

components/uni-forms/uni-forms.vue

@@ -432,9 +432,7 @@
 </script>
 
 <style scoped>
-	.uni-forms--top {
-		padding: 10px 15px;
-	}
+	.uni-forms--top {}
 
 	.uni-forms {
 		/* max-width: 400px; */

components/uni-icons/icons.js

@@ -1,132 +0,0 @@
-export default {
-	"pulldown": "\ue588",
-	"refreshempty": "\ue461",
-	"back": "\ue471",
-	"forward": "\ue470",
-	"more": "\ue507",
-	"more-filled": "\ue537",
-	"scan": "\ue612",
-	"qq": "\ue264",
-	"weibo": "\ue260",
-	"weixin": "\ue261",
-	"pengyouquan": "\ue262",
-	"loop": "\ue565",
-	"refresh": "\ue407",
-	"refresh-filled": "\ue437",
-	"arrowthindown": "\ue585",
-	"arrowthinleft": "\ue586",
-	"arrowthinright": "\ue587",
-	"arrowthinup": "\ue584",
-	"undo-filled": "\ue7d6",
-	"undo": "\ue406",
-	"redo": "\ue405",
-	"redo-filled": "\ue7d9",
-	"bars": "\ue563",
-	"chatboxes": "\ue203",
-	"camera": "\ue301",
-	"chatboxes-filled": "\ue233",
-	"camera-filled": "\ue7ef",
-	"cart-filled": "\ue7f4",
-	"cart": "\ue7f5",
-	"checkbox-filled": "\ue442",
-	"checkbox": "\ue7fa",
-	"arrowleft": "\ue582",
-	"arrowdown": "\ue581",
-	"arrowright": "\ue583",
-	"smallcircle-filled": "\ue801",
-	"arrowup": "\ue580",
-	"circle": "\ue411",
-	"eye-filled": "\ue568",
-	"eye-slash-filled": "\ue822",
-	"eye-slash": "\ue823",
-	"eye": "\ue824",
-	"flag-filled": "\ue825",
-	"flag": "\ue508",
-	"gear-filled": "\ue532",
-	"reload": "\ue462",
-	"gear": "\ue502",
-	"hand-thumbsdown-filled": "\ue83b",
-	"hand-thumbsdown": "\ue83c",
-	"hand-thumbsup-filled": "\ue83d",
-	"heart-filled": "\ue83e",
-	"hand-thumbsup": "\ue83f",
-	"heart": "\ue840",
-	"home": "\ue500",
-	"info": "\ue504",
-	"home-filled": "\ue530",
-	"info-filled": "\ue534",
-	"circle-filled": "\ue441",
-	"chat-filled": "\ue847",
-	"chat": "\ue263",
-	"mail-open-filled": "\ue84d",
-	"email-filled": "\ue231",
-	"mail-open": "\ue84e",
-	"email": "\ue201",
-	"checkmarkempty": "\ue472",
-	"list": "\ue562",
-	"locked-filled": "\ue856",
-	"locked": "\ue506",
-	"map-filled": "\ue85c",
-	"map-pin": "\ue85e",
-	"map-pin-ellipse": "\ue864",
-	"map": "\ue364",
-	"minus-filled": "\ue440",
-	"mic-filled": "\ue332",
-	"minus": "\ue410",
-	"micoff": "\ue360",
-	"mic": "\ue302",
-	"clear": "\ue434",
-	"smallcircle": "\ue868",
-	"close": "\ue404",
-	"closeempty": "\ue460",
-	"paperclip": "\ue567",
-	"paperplane": "\ue503",
-	"paperplane-filled": "\ue86e",
-	"person-filled": "\ue131",
-	"contact-filled": "\ue130",
-	"person": "\ue101",
-	"contact": "\ue100",
-	"images-filled": "\ue87a",
-	"phone": "\ue200",
-	"images": "\ue87b",
-	"image": "\ue363",
-	"image-filled": "\ue877",
-	"location-filled": "\ue333",
-	"location": "\ue303",
-	"plus-filled": "\ue439",
-	"plus": "\ue409",
-	"plusempty": "\ue468",
-	"help-filled": "\ue535",
-	"help": "\ue505",
-	"navigate-filled": "\ue884",
-	"navigate": "\ue501",
-	"mic-slash-filled": "\ue892",
-	"search": "\ue466",
-	"settings": "\ue560",
-	"sound": "\ue590",
-	"sound-filled": "\ue8a1",
-	"spinner-cycle": "\ue465",
-	"download-filled": "\ue8a4",
-	"personadd-filled": "\ue132",
-	"videocam-filled": "\ue8af",
-	"personadd": "\ue102",
-	"upload": "\ue402",
-	"upload-filled": "\ue8b1",
-	"starhalf": "\ue463",
-	"star-filled": "\ue438",
-	"star": "\ue408",
-	"trash": "\ue401",
-	"phone-filled": "\ue230",
-	"compose": "\ue400",
-	"videocam": "\ue300",
-	"trash-filled": "\ue8dc",
-	"download": "\ue403",
-	"chatbubble-filled": "\ue232",
-	"chatbubble": "\ue202",
-	"cloud-download": "\ue8e4",
-	"cloud-upload-filled": "\ue8e5",
-	"cloud-upload": "\ue8e6",
-	"cloud-download-filled": "\ue8e9",
-	"headphones":"\ue8bf",
-	"shop":"\ue609"
-}

components/yzhua006-update/app-update.vue

@@ -44,6 +44,8 @@
 				popup_show: false, //弹窗是否显示
 				platform: "", //ios or android
 				version: "", //当前软件版本
+				wgtLatestVersion: "", //最新资源
+				apkLatestVersion: "", //最新整包
 				need_update: false, // 是否更新
 				downing: false, //是否下载中
 				downstatus: 0, //0未下载  1已开始 2已连接到资源  3已接收到数据  4下载完成
@@ -51,8 +53,10 @@
 				fileSize: 0, //文件大小
 				downSize: 0, //已下载大小
 				viewObj: null, //原生遮罩view
-				force: false,
+				force: true,
 				width: "",
+				wgtInfo: {},
+				apkInfo: {},
 			};
 		},
 		created() {
@@ -102,50 +106,53 @@
 			// 获取线上版本信息
 			async getUpdateInfo() {
 				//向后台发起请求，获取最新版本号
-				var data = {
-					appid: "__UNI__D4FE29A"
-				}
-				let res = await this.$http.get('/sysVersion/queryMaxNum', data);
-				vm.update_info = res.data;
-				if (vm.update_info.updateflag == '1') {
-					vm.force = true;
-				} else {
-					vm.force = false;
-				}
-				if (!vm.update_info.platform) {
-					// 后台未配置当前系统的升级数据
-				} else {
-					vm.checkUpdate(); //检查是否更新
-				}
-				// uni.request({	
-				// 	url: 'http://test.baoxianzhanggui.com:8080/sysVersion/queryMaxNum', //仅为示例，并非真实接口地址。
-				// 	method: 'GET',
-				// 	data:{
-
-				// 	},
-				// 	success: (res) => {
-				// 		console.log(res)
-				// 		// 这里的返回的数据跟后台约定
-				// 		let data = {
-				// 			os: 'android',
-				// 			version: '1.0.116', //最新版本
-				// 			note: '我是安卓升级说明<br>我是安卓升级说明我是安卓升级说明',
-				// 			download_url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-75149e67-2f9b-4973-bdb4-b3781786fe84/3bec1254-6778-4d91-83dd-1ac206adbf74.apk', //下载地址 (微信测试)
-				// 		};
-				// 		vm.update_info = data;
-				// 		if (!vm.update_info.os) {
-				// 			// 后台未配置当前系统的升级数据
-				// 		} else {
-				// 			console.log('后台返回的当前系统的升级参数', vm.update_info);
-				// 			vm.checkUpdate(); ///检查是否更新
-				// 		}
-				// 	}
-				// });
+				let apkquote = await this.$http.post('/sysVersion/findPage', {
+					pageNum: 1,
+					pageSize: 50,
+					columnFilters: {
+						apptype: {
+							name: "apptype",
+							value: "apk",
+						}
+					}
+				});
+				vm.apkInfo = apkquote.data.content[0];
+				vm.apkLatestVersion = apkquote.data.content[0].versionno;
+				let wgtquote = await this.$http.post('/sysVersion/findPage', {
+					pageNum: 1,
+					pageSize: 50,
+					columnFilters: {
+						apptype: {
+							name: "apptype",
+							value: "wgt",
+						}
+					}
+				});
+				vm.wgtInfo = wgtquote.data.content[0];
+				vm.wgtLatestVersion = wgtquote.data.content[0].versionno;
+				vm.checkUpdate(); //检查是否更新
+				// var data = {
+				// 	appid: "__UNI__D4FE29A"
+				// }
+				// let res = await this.$http.get('/sysVersion/queryMaxNum', data);
+				// vm.update_info = res.data;
+				// if (vm.update_info.updateflag == '1') {
+				// 	vm.force = true;
+				// } else {
+				// 	vm.force = false;
+				// }
+				// if (!vm.update_info.platform) {
+				// 	// 后台未配置当前系统的升级数据
+				// } else {
+				// 	
+				// }
 			},
 			// 检查是否更新
 			checkUpdate() {
-				vm.need_update = vm.compareVersion(vm.version, vm.update_info.versionno); // 检查是否需要升级
-				if (vm.need_update) {
+				let apkneed = vm.compareVersion(vm.version, vm.apkLatestVersion); // 检查包版本
+				let wgtneed = vm.compareVersion(vm.version, vm.wgtLatestVersion); // 检查资源版本
+				if (apkneed) {
+					vm.update_info = vm.apkInfo;
 					vm.popup_show = true; //线上版本号大于当前安装的版本号  显示升级框
 					//页面是否有原生tabbar组件
 					// 创建原生view用来遮罩tabbar的点击事件 (如果是没有用原生的tabbar这一步可以取消)
@@ -158,6 +165,23 @@
 						backgroundColor: "rgba(0,0,0,.6)"
 					});
 					vm.viewObj.show() //显示原生遮罩
+				} else {
+					if (wgtneed) {
+						vm.update_info = vm.wgtInfo;
+						vm.popup_show = true; //线上版本号大于当前安装的版本号  显示升级框
+						//页面是否有原生tabbar组件
+						// 创建原生view用来遮罩tabbar的点击事件 (如果是没有用原生的tabbar这一步可以取消)
+						vm.viewObj = new plus.nativeObj.View('viewObj', {
+							bottom: '0px',
+							left: '0px',
+							height: '10px',
+							width: '100%',
+							position: "fixed",
+							backgroundColor: "rgba(0,0,0,.6)"
+						});
+						vm.viewObj.show() //显示原生遮罩
+					}
+
 				}
 			},
 

config/baseUrl.js

@@ -5,18 +5,18 @@ if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
-	// baseUrl = "http://192.168.0.253:8082";
-	// baseUrl = "http://192.168.0.115:8080"; //凯森
-	// baseUrl = "http://192.168.1.101:8080"; //武
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //正式
+	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
+	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
-	// baseUrl = "http://192.168.0.115:8080"; //凯森
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //正式
+	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
+	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 }

config/login.js

@@ -14,10 +14,8 @@ let userInfo = {
 let lastPageUrl = "";
 // 会员号密码一级手机号验证码登录
 async function login(options = {}) {
-	console.log(options);
 	// 请求登录
 	let res = await $http.post(options.url, options.data);
-	console.log(res);
 	if (res.code != '200') {
 		return Promise.resolve(res);
 	} else {

manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "1.7.3",
-	"versionCode": 173,
+	"versionName": "1.7.7",
+	"versionCode": 177,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"

node_modules/uview-ui/components/u-car-keyboard/u-car-keyboard.vue

@@ -31,14 +31,23 @@
 			random: {
 				type: Boolean,
 				default: false
-			}
+			},
+			keyboardType: {
+				type: Boolean,
+				default: false,
+			},
 		},
 		data() {
 			return {
 				// 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称
-				abc: false
+				abc: this.keyboardType
 			};
 		},
+		watch: {
+			keyboardType(newVal) {
+				this.abc = newVal;
+			}
+		},
 		computed: {
 			areaList() {
 				let data = [

node_modules/uview-ui/components/u-keyboard/u-keyboard.vue

@@ -1,6 +1,6 @@
 <template>
-	<u-popup class="" :mask="mask" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
-	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :zIndex="uZIndex">
+	<u-popup class="" :mask="mask" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value"
+		length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :zIndex="uZIndex">
 		<slot />
 		<view class="u-tooltip" v-if="tooltip">
 			<view class="u-tooltip-item u-tooltip-cancel" hover-class="u-tooltip-cancel-hover" @tap="onCancel">
@@ -9,15 +9,18 @@
 			<view v-if="showTips" class="u-tooltip-item u-tooltip-tips">
 				{{tips ? tips : mode == 'number' ? '数字键盘' : mode == 'card' ? '身份证键盘' : '车牌号键盘'}}
 			</view>
-			<view v-if="confirmBtn" @tap="onConfirm" class="u-tooltip-item u-tooltips-submit" hover-class="u-tooltips-submit-hover">
+			<view v-if="confirmBtn" @tap="onConfirm" class="u-tooltip-item u-tooltips-submit"
+				hover-class="u-tooltips-submit-hover">
 				{{confirmBtn ? confirmText : ''}}
 			</view>
 		</view>
 		<block v-if="mode == 'number' || mode == 'card'">
-			<u-number-keyboard :random="random" @backspace="backspace" @change="change" :mode="mode" :dotEnabled="dotEnabled"></u-number-keyboard>
+			<u-number-keyboard :random="random" @backspace="backspace" @change="change" :mode="mode"
+				:dotEnabled="dotEnabled"></u-number-keyboard>
 		</block>
 		<block v-else>
-			<u-car-keyboard :random="random" @backspace="backspace" @change="change"></u-car-keyboard>
+			<u-car-keyboard :random="random" @backspace="backspace" @change="change"
+				:keyboardType="keyboardType"></u-car-keyboard>
 		</block>
 	</u-popup>
 </template>
@@ -54,6 +57,11 @@
 				type: String,
 				default: 'number'
 			},
+			keyboardType: {
+				type: Boolean,
+				default: false,
+			},
+
 			// 是否显示键盘的"."符号
 			dotEnabled: {
 				type: Boolean,
@@ -128,6 +136,8 @@
 		data() {
 			return {
 				//show: false
+				InputIndex: this.currentInputIndex,
+				internalKeyboardType: this.keyboardType
 			}
 		},
 		computed: {
@@ -137,7 +147,7 @@
 		},
 		methods: {
 			change(e) {
-				this.$emit('change', e);
+				this.$emit('change', e, );
 			},
 			// 键盘关闭
 			popupClose() {
@@ -172,7 +182,7 @@
 
 <style lang="scss" scoped>
 	@import "../../libs/css/style.components.scss";
-	
+
 	.u-keyboard {
 		position: relative;
 		z-index: 1003;
@@ -214,4 +224,4 @@
 	.u-tooltip-cancel-hover {
 		color: #333333;
 	}
-</style>
+</style>

node_modules/uview-ui/components/u-select/u-select.vue

@@ -26,12 +26,17 @@
 						{{confirmText}}
 					</view>
 				</view>
-				<view v-if="searchShow && mode==='single-column'" class="u-select__content__body__search">
+				<!-- 	<view  class="u-select__content__body__search">
 					<view class="u-content dis j-s a-c">
 						<u-icon name="search" color="rgb(96, 98, 102)" size="30"></u-icon>
 						<u-input v-model="searchInput" type="text" placeholder="输入关键词搜索" />
 					</view>
+				</view> -->
+				<view v-if="searchShow && mode==='single-column'" class="u-select__content__body__search"
+					style="padding: 10px;">
+					<u-search placeholder="输入关键字模糊查询" v-model="searchInput" :show-action="false"></u-search>
 				</view>
+
 				<view class="u-select__body">
 					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector"
 						@pickstart="pickstart" @pickend="pickend">
@@ -439,19 +444,5 @@
 				}
 			}
 		}
-
-		&__content__body__search {
-			padding: 20px;
-
-			.u-content {
-				padding: 0 10px;
-				background-color: rgb(242, 242, 242);
-				border-radius: 53px;
-
-				.u-input {
-					margin-left: 10px;
-				}
-			}
-		}
 	}
 </style>

pages.json

@@ -75,18 +75,11 @@
 		{
 			"path": "pages/my/my",
 			"style": {
-				"navigationBarTitleText": "我的",
 				"navigationBarTextStyle": "white",
-				"backgroundColor": "#343740",
-				"navigationBarBackgroundColor": "#343740",
+				"enablePullDownRefresh": false, //开启下拉刷新
+				"navigationStyle": "custom",
 				"app-plus": {
-					"scrollIndicator": "none", //隐藏滚动条
-					"bounce": "none", //关闭反弹效果
-					"titleNView": {
-						"buttons": [{
-							"type": "menu"
-						}]
-					}
+					"titleNView": false
 				}
 			}
 		}, {
@@ -534,22 +527,19 @@
 			"style": {
 				"navigationBarTitleText": "我的钱包",
 				"navigationBarTextStyle": "white",
-				"backgroundColor": "#343740",
-				"navigationBarBackgroundColor": "#343740",
+				"backgroundColor": "#0052FF",
+				"navigationBarBackgroundColor": "#0052FF",
 				"app-plus": {
 					"scrollIndicator": "none",
-					"bounce": "none",
-					"titleNView": {
-						"buttons": [{
-							"type": "menu"
-						}]
-					}
+					"bounce": "none"
 				}
 			}
 		}, {
 			"path": "pages/wallet/bindBank",
 			"style": {
-				"navigationBarTitleText": "添加银行卡",
+				"backgroundColor": "#F8FAFE",
+				"navigationBarBackgroundColor": "#F8FAFE",
+				"navigationBarTitleText": "",
 				"app-plus": {
 					"scrollIndicator": "none",
 					"bounce": "none"
@@ -570,6 +560,8 @@
 			"path": "pages/wallet/withdraw",
 			"style": {
 				"navigationBarTitleText": "余额提现",
+				"backgroundColor": "#F8FAFE",
+				"navigationBarBackgroundColor": "#F8FAFE",
 				"enablePullDownRefresh": true,
 				"app-plus": {
 					"scrollIndicator": "none",
@@ -590,7 +582,7 @@
 		{
 			"path": "pages/wallet/billDetails1",
 			"style": {
-				"navigationBarTitleText": "手续费明细",
+				"navigationBarTitleText": "手续金额明细",
 				"app-plus": {
 					"scrollIndicator": "none",
 					"bounce": "none"
@@ -600,7 +592,7 @@
 		{
 			"path": "pages/wallet/billDetails2",
 			"style": {
-				"navigationBarTitleText": "车险金额明细",
+				"navigationBarTitleText": "跟单金额明细",
 				"app-plus": {
 					"scrollIndicator": "none",
 					"bounce": "none"
@@ -609,7 +601,7 @@
 		}, {
 			"path": "pages/wallet/billDetails3",
 			"style": {
-				"navigationBarTitleText": "推广佣金明细",
+				"navigationBarTitleText": "推广金额明细",
 				"app-plus": {
 					"scrollIndicator": "none",
 					"bounce": "none"

pages/carInsure2/Information.vue

@@ -43,7 +43,7 @@
 						</view>
 					</view>
 					<uni-forms :rules="carRules" :value="carInfo" ref="carForm" validate-trigger="bind"
-						err-show-type="toast" label-width="100">
+						style="padding: 0 15px;" err-show-type="toast" label-width="100">
 						<uni-forms-item label="车牌号: ">
 							<input class="uni-input-input textColor" placeholder="输入车牌号" v-model="carInfo.licenseNo"
 								placeholder-style="font-size:28upx" @input="upperCaseType('licenseNo')" />
@@ -89,8 +89,8 @@
 								@confirm="e=> Dateconfirm(e,'carInfo','issueDate')"></u-picker>
 						</uni-forms-item>
 						<uni-forms-item v-if="carInfo.transferFlag" required label="转移登记日期" name="transferDate">
-							<u-input type="select" :select-open="transferDateShow" v-model="carInfo.transferDate"
-								placeholder="请选择过户日期" @click="transferDateShow = true"
+							<u-input type="select" :custom-style="{textAlign:'right'}" :select-open="transferDateShow"
+								v-model="carInfo.transferDate" placeholder="请选择过户日期" @click="transferDateShow = true"
 								placeholder-style="color:#808080"></u-input>
 							<u-picker v-model="transferDateShow" mode="time" :params="params" :end-year="endYear"
 								:end-month="endMonth" @confirm="e=> Dateconfirm(e,'carInfo','transferDate')"></u-picker>
@@ -103,13 +103,56 @@
 							<input class="uni-input-input textColor" placeholder="请输入核定载质量" v-model="carInfo.limitLoad"
 								placeholder-style="font-size:28upx" />
 						</uni-forms-item>
+						<uni-forms-item label="使用性质: " required name="carnature">
+							<u-input v-model="carInfo1.carnature" type="select" :select-open="carnatureShow"
+								@click="carnatureShow = true" :custom-style="{textAlign:'right'}"
+								placeholder-style="color:#808080" placeholder="请选择使用性质" />
+							<u-select mode="single-column" :list="natureOfVehicleUseoptions" v-model="carnatureShow"
+								label-name="dictTag" value-name="dictValue"
+								@confirm="dictionaryConfirm($event,'carnature')"></u-select>
+						</uni-forms-item>
+						<uni-forms-item label="能源种类: " required name="energyType">
+							<u-input v-model="carInfo1.energyType" type="select" :select-open="energyTypeShow"
+								@click="energyTypeShow = true" :custom-style="{textAlign:'right'}"
+								placeholder-style="color:#808080" placeholder="请选择能源种类" />
+							<u-select mode="single-column" :list="energyTypeoptions" v-model="energyTypeShow"
+								label-name="dictTag" value-name="dictValue"
+								@confirm="dictionaryConfirm($event,'energyType')"></u-select>
+						</uni-forms-item>
+						<uni-forms-item label="车辆用途: " required name="vehicleUse">
+							<u-input v-model="carInfo1.vehicleUse" type="select" :select-open="vehicleUseShow"
+								@click="vehicleUseShow = true" :custom-style="{textAlign:'right'}"
+								placeholder-style="color:#808080" placeholder="请选择车辆用途" />
+							<u-select v-if="carInfo.carnature=='01'" mode="single-column"
+								:list="businessVehicleUseoptions" v-model="vehicleUseShow" label-name="dictTag"
+								value-name="dictValue" @confirm="dictionaryConfirm($event,'vehicleUse')"></u-select>
+							<u-select v-else mode="single-column" :list="outOfBusinessVehicleUseoptions"
+								v-model="vehicleUseShow" label-name="dictTag" value-name="dictValue"
+								@confirm="dictionaryConfirm($event,'vehicleUse')"></u-select>
+						</uni-forms-item>
+						<uni-forms-item label="车辆类型: " required name="cartype">
+							<u-input v-model="carInfo1.cartype" type="select" :select-open="cartypeShow"
+								@click="cartypeShow = true" :custom-style="{textAlign:'right'}"
+								placeholder-style="color:#808080" placeholder="请选择车辆类型" />
+							<u-select mode="single-column" :list="trafficManagementVehicleTypeoptions"
+								v-model="cartypeShow" label-name="dictTag" value-name="dictValue"
+								@confirm="dictionaryConfirm($event,'cartype')"></u-select>
+						</uni-forms-item>
+						<uni-forms-item label="车辆种类: " required name="cimodelclass">
+							<u-input v-model="carInfo1.cimodelclass" type="select" :select-open="cimodelclassShow"
+								@click="cimodelclassShow = true" :custom-style="{textAlign:'right'}"
+								placeholder-style="color:#808080" placeholder="请选择车辆种类" />
+							<u-select mode="single-column" :list="vehicleTypeoptions" v-model="cimodelclassShow"
+								label-name="dictTag" value-name="dictValue"
+								@confirm="dictionaryConfirm($event,'cimodelclass')"></u-select>
+						</uni-forms-item>
 						<uni-forms-item label="年款: ">
 							<input class="uni-input-input textColor" placeholder="请输入年款" v-model="carInfo.caryear"
 								placeholder-style="font-size:28upx" />
 						</uni-forms-item>
 						<uni-forms-item label="座位数: ">
-							<input class="uni-input-input textColor" placeholder="请输入座位数" v-model="carInfo.seatCount"
-								placeholder-style="font-size:28upx" />
+							<input class="uni-input-input textColor" placeholder="请输入座位数" maxlength="1"
+								v-model="carInfo.seatCount" placeholder-style="font-size:28upx" />
 						</uni-forms-item>
 						<uni-forms-item label="排量: ">
 							<input class="uni-input-input textColor" placeholder="请输入排量" v-model="carInfo.enginedesc"
@@ -127,7 +170,7 @@
 						</uni-forms-item>
 						<uni-forms-item label="是否过户: ">
 							<view class="d-flex j-end a-c" style="height:100%">
-								<u-switch v-model="carInfo.transferFlag" active-color="#ea552d " size="30"
+								<u-switch v-model="carInfo.transferFlag" active-color="#0052FF " size="30"
 									@change="transferFlagchange"></u-switch>
 							</view>
 						</uni-forms-item>
@@ -141,7 +184,7 @@
 				<view class="top-ocr dis j-c a-c" v-show="!ownerimg">
 					<image src="../../static/image/car-insure/Frame1.png" mode="">
 					</image>
-					<text @tap="ocrIdentify('ownerInfo')" style="margin-left: 5px;">点击上传/拍摄行驶证 自动填写信息</text>
+					<text @tap="ocrIdentify('ownerInfo')" style="margin-left: 5px;">点击上传/拍摄身份证 自动填写信息</text>
 				</view>
 				<view v-show="!ownersExpand  && !ownerimg" class="btn-collapse dis a-c j-c"
 					@click="expand('ownersExpand')">
@@ -149,7 +192,7 @@
 					<u-icon name="arrow-down" size="30" color="rgb(60 60 60 / 60%)" style="margin-left: 5px;"></u-icon>
 				</view>
 				<view v-show="ownersExpand">
-					<view v-if=" ownerimg" class="movable-view dis f-c a-c">
+					<view v-show=" ownerimg" class="movable-view dis f-c a-c">
 						<movable-area>
 							<movable-view direction="all" out-of-bounds :scale="true">
 								<image :src="ownerimg" mode=""
@@ -173,7 +216,7 @@
 						</view>
 					</view>
 					<uni-forms :rules="ownerRules" :value="ownerInfo" ref="ownerForm" validate-trigger="bind"
-						err-show-type="toast" label-width="80">
+						style="padding: 0 15px;" err-show-type="toast" label-width="80">
 						<uni-forms-item name="name" required label="姓名: ">
 							<input class="uni-input-input textColor" placeholder="请输入姓名" v-model="ownerInfo.name"
 								maxlength="5" placeholder-style="font-size:28upx" />
@@ -234,105 +277,112 @@
 			<view class=" dis j-s a-c">
 				<text class="title">投保人信息</text>
 				<view class="dis a-c j-c">
-					<view class="status-data" :class="item.value==applicantholder? 'active':''"
+					<view class="status-data" :class="item.value==policyHolderholder? 'active':''"
 						v-for="(item,index) in holderstatusList" @tap="applicantholderClick(item.value)" :key="index">
 						{{item.label}}
 					</view>
 				</view>
 			</view>
-			<view v-show="applicantholder=='99'" class="collapse">
-				<view class="top-ocr dis j-c a-c" v-show="!applicantimg">
-					<image src="../../static/image/car-insure/Frame1.png" mode="">
-					</image>
-					<text @tap="ocrIdentify('policyHolderInfo')" style="margin-left: 5px;">点击上传/拍摄行驶证 自动填写信息</text>
-				</view>
-				<view v-show="!applicantExpand && !applicantimg" class="btn-collapse dis a-c j-c"
-					@click="expand('applicantExpand')">
-					<text>展开手动输入投保人信息</text>
-					<u-icon name="arrow-down" size="30" color="rgb(60 60 60 / 60%)" style="margin-left: 5px;"></u-icon>
-				</view>
-				<view v-show="applicantExpand">
-					<view v-if=" applicantimg" class="movable-view dis f-c a-c">
-						<movable-area>
-							<movable-view direction="all" out-of-bounds :scale="true">
-								<image :src="applicantimg" mode=""
-									:style="{width:'100%',height:'100%',transform:`rotate(-${user2deg}deg)`}">
-								</image>
-							</movable-view>
-						</movable-area>
-						<view class="operate-img dis j-s a-c">
-							<view class="dis a-c" @tap="rotatefront('user2deg')">
-								<image src="/static/image/car-insure/rotate1.png" mode=""></image>
-								左转
-							</view>
-							<view class="dis a-c" @tap="ocrIdentify('policyHolderInfo')">
-								<image src="/static/image/car-insure/upload.png" mode=""></image>
-								上传
-							</view>
-							<view class="dis a-c" @tap="rotateback('user2deg')">
-								<image src="/static/image/car-insure/rotate2.png" mode=""></image>
-								右转
+			<uni-forms :rules="policyHolderRules" :value="policyHolderInfo" ref="policyHolderForm"
+				validate-trigger="bind" err-show-type="toast" label-width="80">
+				<view v-show="policyHolderholder=='99'" class="collapse">
+					<view class="top-ocr dis j-c a-c" v-show="!policyHolderimg">
+						<image src="../../static/image/car-insure/Frame1.png" mode="">
+						</image>
+						<text @tap="ocrIdentify('policyHolderInfo')" style="margin-left: 5px;">点击上传/拍摄身份证 自动填写信息</text>
+					</view>
+					<view v-show="!policyHolderExpand && !policyHolderimg" class="btn-collapse dis a-c j-c"
+						@click="expand('policyHolderExpand')">
+						<text>展开手动输入投保人信息</text>
+						<u-icon name="arrow-down" size="30" color="rgb(60 60 60 / 60%)"
+							style="margin-left: 5px;"></u-icon>
+					</view>
+					<view v-show="policyHolderExpand">
+						<view v-show=" policyHolderimg" class="movable-view dis f-c a-c">
+							<movable-area>
+								<movable-view direction="all" out-of-bounds :scale="true">
+									<image :src="policyHolderimg" mode=""
+										:style="{width:'100%',height:'100%',transform:`rotate(-${user2deg}deg)`}">
+									</image>
+								</movable-view>
+							</movable-area>
+							<view class="operate-img dis j-s a-c">
+								<view class="dis a-c" @tap="rotatefront('user2deg')">
+									<image src="/static/image/car-insure/rotate1.png" mode=""></image>
+									左转
+								</view>
+								<view class="dis a-c" @tap="ocrIdentify('policyHolderInfo')">
+									<image src="/static/image/car-insure/upload.png" mode=""></image>
+									上传
+								</view>
+								<view class="dis a-c" @tap="rotateback('user2deg')">
+									<image src="/static/image/car-insure/rotate2.png" mode=""></image>
+									右转
+								</view>
 							</view>
 						</view>
+						<view style="padding: 0 15px;">
+							<uni-forms-item name="name" required label="姓名: ">
+								<input class="uni-input-input textColor" placeholder="请输入姓名"
+									v-model="policyHolderInfo.name" maxlength="5" placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item name="identifyType" required label="证件类型:">
+								<view class="dis a-c j-end" style="width:100%;height: 100%;">
+									身份证
+								</view>
+							</uni-forms-item>
+							<uni-forms-item required name="identifyNumber" label="证件号: ">
+								<input class="uni-input-input textColor" placeholder="请输入证件号"
+									v-model="policyHolderInfo.identifyNumber" maxlength="18"
+									@blur="binddata('identifyNumber', $event.detail.value,'policyHolderInfo')"
+									placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item required name="age" label="年龄: ">
+								<input class="uni-input-input textColor" disabled placeholder="请输入年龄"
+									v-model="policyHolderInfo.age" maxlength="18" placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item name="gender" required label="性别:">
+								<u-input v-model="policyHolderInfo.gender" type="select"
+									:select-open="applicantgenderShow" @click="applicantgenderShow = true"
+									:custom-style="{textAlign:'right'}" placeholder-style="color:#808080"
+									placeholder="请选择性别" />
+								<u-select mode="single-column" :list="genderList" v-model="applicantgenderShow"
+									@confirm="e=>genderConfirm(e,'policyHolderInfo')"></u-select>
+							</uni-forms-item>
+							<uni-forms-item required name="mobile" label="手机号: ">
+								<input class="uni-input-input textColor" placeholder="请输入手机号"
+									v-model="policyHolderInfo.mobile" maxlength="11"
+									placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item required name="addr" label="地址: ">
+								<u-input type="textarea" v-model="policyHolderInfo.addr"
+									:custom-style="{textAlign:'right'}" placeholder-style="color:#808080"
+									placeholder="请输入地址" />
+							</uni-forms-item>
+							<uni-forms-item name="email" label="邮箱: ">
+								<input class="uni-input-input textColor" placeholder="请输入邮箱"
+									v-model="policyHolderInfo.email" placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item required label="有效期起期" name="identifyValidDate">
+								<u-input type="select" :select-open="applicantDateShow"
+									v-model="policyHolderInfo.identifyValidDate" placeholder="请选择有效期起期"
+									@click="applicantDateShow = true" :custom-style="{textAlign:'right'}"
+									placeholder-style="color:#808080"></u-input>
+								<u-picker v-model="applicantDateShow" mode="time" :params="params"
+									@confirm="e=> Dateconfirm(e,'policyHolderInfo','identifyValidDate')"></u-picker>
+							</uni-forms-item>
+							<uni-forms-item required label="有效期止期" name="identifyValidEndDate">
+								<u-input v-model="policyHolderInfo.identifyValidEndDate"
+									:custom-style="{textAlign:'right'}" type="select" placeholder="请输入有效期止期"
+									:select-open="applicantEndDateShow" placeholder-style="color:#808080"
+									@click="applicantEndDateShow=true"></u-input>
+								<u-select mode="single-column" :list="endDateList" v-model="applicantEndDateShow"
+									@confirm="e=>endDateConfirm(e,'policyHolderInfo','identifyValidDate','identifyValidEndDate')"></u-select>
+							</uni-forms-item>
+						</view>
 					</view>
-					<uni-forms :rules="applicantRules" :value="policyHolderInfo" ref="applicantForm"
-						validate-trigger="bind" err-show-type="toast" label-width="80">
-						<uni-forms-item name="name" required label="姓名: ">
-							<input class="uni-input-input textColor" placeholder="请输入姓名" v-model="policyHolderInfo.name"
-								maxlength="5" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item name="identifyType" required label="证件类型:">
-							<view class="dis a-c j-end" style="width:100%;height: 100%;">
-								身份证
-							</view>
-						</uni-forms-item>
-						<uni-forms-item required name="identifyNumber" label="证件号: ">
-							<input class="uni-input-input textColor" placeholder="请输入证件号"
-								v-model="policyHolderInfo.identifyNumber" maxlength="18"
-								@blur="binddata('identifyNumber', $event.detail.value,'policyHolderInfo')"
-								placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item required name="age" label="年龄: ">
-							<input class="uni-input-input textColor" disabled placeholder="请输入年龄"
-								v-model="policyHolderInfo.age" maxlength="18" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item name="gender" required label="性别:">
-							<u-input v-model="policyHolderInfo.gender" type="select" :select-open="ownergenderShow"
-								@click="ownergenderShow = true" :custom-style="{textAlign:'right'}"
-								placeholder-style="color:#808080" placeholder="请选择性别" />
-							<u-select mode="single-column" :list="genderList" v-model="ownergenderShow"
-								@confirm="e=>genderConfirm(e,'policyHolderInfo')"></u-select>
-						</uni-forms-item>
-						<uni-forms-item required name="mobile" label="手机号: ">
-							<input class="uni-input-input textColor" placeholder="请输入手机号"
-								v-model="policyHolderInfo.mobile" maxlength="11" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item required name="addr" label="地址: ">
-							<u-input type="textarea" v-model="policyHolderInfo.addr" :custom-style="{textAlign:'right'}"
-								placeholder-style="color:#808080" placeholder="请输入地址" />
-						</uni-forms-item>
-						<uni-forms-item name="email" label="邮箱: ">
-							<input class="uni-input-input textColor" placeholder="请输入邮箱"
-								v-model="policyHolderInfo.email" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item required label="有效期起期" name="identifyValidDate">
-							<u-input type="select" :select-open="applicantDateShow"
-								v-model="policyHolderInfo.identifyValidDate" placeholder="请选择有效期起期"
-								@click="applicantDateShow = true" :custom-style="{textAlign:'right'}"
-								placeholder-style="color:#808080"></u-input>
-							<u-picker v-model="applicantDateShow" mode="time" :params="params"
-								@confirm="e=> Dateconfirm(e,'policyHolderInfo','identifyValidDate')"></u-picker>
-						</uni-forms-item>
-						<uni-forms-item required label="有效期止期" name="identifyValidEndDate">
-							<u-input v-model="policyHolderInfo.identifyValidEndDate" :custom-style="{textAlign:'right'}"
-								type="select" placeholder="请输入有效期止期" :select-open="applicantEndDateShow"
-								placeholder-style="color:#808080" @click="applicantEndDateShow=true"></u-input>
-							<u-select mode="single-column" :list="endDateList" v-model="applicantEndDateShow"
-								@confirm="e=>endDateConfirm(e,'policyHolderInfo','identifyValidDate','identifyValidEndDate')"></u-select>
-						</uni-forms-item>
-					</uni-forms>
 				</view>
-			</view>
+			</uni-forms>
 		</view>
 		<view class="Information " style="padding-bottom: 10px;border-bottom: 1px solid #f2f2f2;">
 			<view class="dis j-s a-c">
@@ -344,101 +394,108 @@
 					</view>
 				</view>
 			</view>
-			<view v-show="Insuredholder=='99'" class="collapse">
-				<view class="top-ocr dis j-c a-c" v-show="!Insuredimg">
-					<image src="../../static/image/car-insure/Frame1.png" mode="">
-					</image>
-					<text @tap="ocrIdentify('insuredPersonInfo')" style="margin-left: 5px;">点击上传/拍摄行驶证 自动填写信息</text>
-				</view>
-				<view v-show="!InsuredExpand && !Insuredimg" class="btn-collapse dis a-c j-c"
-					@click="expand('InsuredExpand')">
-					<text>展开手动输入被保人信息</text>
-					<u-icon name="arrow-down" size="30" color="rgb(60 60 60 / 60%)" style="margin-left: 5px;"></u-icon>
-				</view>
-				<view v-show='InsuredExpand'>
-					<view v-if=" Insuredimg" class="movable-view dis f-c a-c">
-						<movable-area>
-							<movable-view direction="all" out-of-bounds :scale="true">
-								<image :src="Insuredimg" mode=""
-									:style="{width:'100%',height:'100%',transform:`rotate(-${user3deg}deg)`}">
-								</image>
-							</movable-view>
-						</movable-area>
-						<view class="operate-img dis j-s a-c">
-							<view class="dis a-c" @tap="rotatefront('user3deg')">
-								<image src="/static/image/car-insure/rotate1.png" mode=""></image>
-								左转
-							</view>
-							<view class="dis a-c" @tap="ocrIdentify('insuredPersonInfo')">
-								<image src="/static/image/car-insure/upload.png" mode=""></image>
-								上传
-							</view>
-							<view class="dis a-c" @tap="rotateback('user3deg')">
-								<image src="/static/image/car-insure/rotate2.png" mode=""></image>
-								右转
+			<uni-forms :rules="InsuredRules" :value="insuredPersonInfo" ref="InsuredForm" validate-trigger="bind"
+				err-show-type="toast" label-width="80">
+				<view v-show="Insuredholder=='99'" class="collapse">
+					<view class="top-ocr dis j-c a-c" v-show="!Insuredimg">
+						<image src="../../static/image/car-insure/Frame1.png" mode="">
+						</image>
+						<text @tap="ocrIdentify('insuredPersonInfo')" style="margin-left: 5px;">点击上传/拍摄身份证 自动填写信息</text>
+					</view>
+					<view v-show="!InsuredExpand && !Insuredimg" class="btn-collapse dis a-c j-c"
+						@click="expand('InsuredExpand')">
+						<text>展开手动输入被保人信息</text>
+						<u-icon name="arrow-down" size="30" color="rgb(60 60 60 / 60%)"
+							style="margin-left: 5px;"></u-icon>
+					</view>
+					<view v-show='InsuredExpand'>
+						<view v-show=" Insuredimg" class="movable-view dis f-c a-c">
+							<movable-area>
+								<movable-view direction="all" out-of-bounds :scale="true">
+									<image :src="Insuredimg" mode=""
+										:style="{width:'100%',height:'100%',transform:`rotate(-${user3deg}deg)`}">
+									</image>
+								</movable-view>
+							</movable-area>
+							<view class="operate-img dis j-s a-c">
+								<view class="dis a-c" @tap="rotatefront('user3deg')">
+									<image src="/static/image/car-insure/rotate1.png" mode=""></image>
+									左转
+								</view>
+								<view class="dis a-c" @tap="ocrIdentify('insuredPersonInfo')">
+									<image src="/static/image/car-insure/upload.png" mode=""></image>
+									上传
+								</view>
+								<view class="dis a-c" @tap="rotateback('user3deg')">
+									<image src="/static/image/car-insure/rotate2.png" mode=""></image>
+									右转
+								</view>
 							</view>
 						</view>
+						<view style="padding: 0 15px;">
+							<uni-forms-item name="name" required label="姓名: ">
+								<input class="uni-input-input textColor" placeholder="请输入姓名"
+									v-model="insuredPersonInfo.name" maxlength="5"
+									placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item name="identifyType" required label="证件类型:">
+								<view class="dis a-c j-end" style="width:100%;height: 100%;">
+									身份证
+								</view>
+							</uni-forms-item>
+							<uni-forms-item required name="identifyNumber" label="证件号: ">
+								<input class="uni-input-input textColor" placeholder="请输入证件号"
+									v-model="insuredPersonInfo.identifyNumber" maxlength="18"
+									@blur="binddata('identifyNumber', $event.detail.value,'insuredPersonInfo')"
+									placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item required name="age" label="年龄: ">
+								<input class="uni-input-input textColor" disabled placeholder="请输入年龄"
+									v-model="insuredPersonInfo.age" maxlength="18"
+									placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item name="gender" required label="性别:">
+								<u-input v-model="insuredPersonInfo.gender" type="select"
+									:select-open="InsuredgenderShow" @click="InsuredgenderShow = true"
+									:custom-style="{textAlign:'right'}" placeholder-style="color:#808080"
+									placeholder="请选择性别" />
+								<u-select mode="single-column" :list="genderList" v-model="InsuredgenderShow"
+									@confirm="e=>genderConfirm(e,'insuredPersonInfo')"></u-select>
+							</uni-forms-item>
+							<uni-forms-item required name="mobile" label="手机号: ">
+								<input class="uni-input-input textColor" placeholder="请输入手机号"
+									v-model="insuredPersonInfo.mobile" maxlength="11"
+									placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item required name="addr" label="地址: ">
+								<u-input type="textarea" v-model="insuredPersonInfo.addr"
+									:custom-style="{textAlign:'right'}" :auto-height="true"
+									placeholder-style="color:#808080" placeholder="请输入地址" />
+							</uni-forms-item>
+							<uni-forms-item name="email" label="邮箱: ">
+								<input class="uni-input-input textColor" placeholder="请输入邮箱"
+									v-model="insuredPersonInfo.email" placeholder-style="font-size:28upx" />
+							</uni-forms-item>
+							<uni-forms-item required label="有效期起期" name="identifyValidDate">
+								<u-input type="select" :select-open="InsuredDateShow"
+									v-model="insuredPersonInfo.identifyValidDate" placeholder="请选择有效期起期"
+									@click="InsuredDateShow = true" :custom-style="{textAlign:'right'}"
+									placeholder-style="color:#808080"></u-input>
+								<u-picker v-model="InsuredDateShow" mode="time" :params="params"
+									@confirm="e=> Dateconfirm(e,'insuredPersonInfo','identifyValidDate')"></u-picker>
+							</uni-forms-item>
+							<uni-forms-item required label="有效期止期" name="identifyValidEndDate">
+								<u-input v-model="insuredPersonInfo.identifyValidEndDate"
+									:custom-style="{textAlign:'right'}" type="select" placeholder="请输入有效期止期"
+									:select-open="InsuredEndDateShow" placeholder-style="color:#808080"
+									@click="InsuredEndDateShow=true"></u-input>
+								<u-select mode="single-column" :list="endDateList" v-model="InsuredEndDateShow"
+									@confirm="e=>endDateConfirm(e,'insuredPersonInfo','identifyValidDate','identifyValidEndDate')"></u-select>
+							</uni-forms-item>
+						</view>
 					</view>
-					<uni-forms :rules="InsuredRules" :value="insuredPersonInfo" ref="InsuredForm"
-						validate-trigger="bind" err-show-type="toast" label-width="80">
-						<uni-forms-item name="name" required label="姓名: ">
-							<input class="uni-input-input textColor" placeholder="请输入姓名"
-								v-model="insuredPersonInfo.name" maxlength="5" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item name="identifyType" required label="证件类型:">
-							<view class="dis a-c j-end" style="width:100%;height: 100%;">
-								身份证
-							</view>
-						</uni-forms-item>
-						<uni-forms-item required name="identifyNumber" label="证件号: ">
-							<input class="uni-input-input textColor" placeholder="请输入证件号"
-								v-model="insuredPersonInfo.identifyNumber" maxlength="18"
-								@blur="binddata('identifyNumber', $event.detail.value,'insuredPersonInfo')"
-								placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item required name="age" label="年龄: ">
-							<input class="uni-input-input textColor" disabled placeholder="请输入年龄"
-								v-model="insuredPersonInfo.age" maxlength="18" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item name="gender" required label="性别:">
-							<u-input v-model="insuredPersonInfo.gender" type="select" :select-open="ownergenderShow"
-								@click="ownergenderShow = true" :custom-style="{textAlign:'right'}"
-								placeholder-style="color:#808080" placeholder="请选择性别" />
-							<u-select mode="single-column" :list="genderList" v-model="ownergenderShow"
-								@confirm="e=>genderConfirm(e,'insuredPersonInfo')"></u-select>
-						</uni-forms-item>
-						<uni-forms-item required name="mobile" label="手机号: ">
-							<input class="uni-input-input textColor" placeholder="请输入手机号"
-								v-model="insuredPersonInfo.mobile" maxlength="11" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item required name="addr" label="地址: ">
-							<u-input type="textarea" v-model="insuredPersonInfo.addr"
-								:custom-style="{textAlign:'right'}" :auto-height="true"
-								placeholder-style="color:#808080" placeholder="请输入地址" />
-						</uni-forms-item>
-						<uni-forms-item name="email" label="邮箱: ">
-							<input class="uni-input-input textColor" placeholder="请输入邮箱"
-								v-model="insuredPersonInfo.email" placeholder-style="font-size:28upx" />
-						</uni-forms-item>
-						<uni-forms-item required label="有效期起期" name="identifyValidDate">
-							<u-input type="select" :select-open="InsuredDateShow"
-								v-model="insuredPersonInfo.identifyValidDate" placeholder="请选择有效期起期"
-								@click="InsuredDateShow = true" :custom-style="{textAlign:'right'}"
-								placeholder-style="color:#808080"></u-input>
-							<u-picker v-model="InsuredDateShow" mode="time" :params="params"
-								@confirm="e=> Dateconfirm(e,'insuredPersonInfo','identifyValidDate')"></u-picker>
-						</uni-forms-item>
-						<uni-forms-item required label="有效期止期" name="identifyValidEndDate">
-							<u-input v-model="insuredPersonInfo.identifyValidEndDate"
-								:custom-style="{textAlign:'right'}" type="select" placeholder="请输入有效期止期"
-								:select-open="InsuredEndDateShow" placeholder-style="color:#808080"
-								@click="InsuredEndDateShow=true"></u-input>
-							<u-select mode="single-column" :list="endDateList" v-model="InsuredEndDateShow"
-								@confirm="e=>endDateConfirm(e,'insuredPersonInfo','identifyValidDate','identifyValidEndDate')"></u-select>
-						</uni-forms-item>
-					</uni-forms>
 				</view>
-			</view>
+			</uni-forms>
 		</view>
 		<view class="footer-btn">
 			<u-button type="primary" style="background:#0052FF;" @tap="next">下一步</u-button>
@@ -503,11 +560,11 @@
 					firstBeneMan: "", //第一受益人
 					noLicenseFlag: false, //是否新车
 					cartype: "K33", //客车A0 货车H0          
-					carnature: "", //使用性质 家庭自用8A  非营业企业8B   非营业党政机关，事业团体8C  非营业货车8D					
+					carnature: "02", //使用性质 家庭自用8A  非营业企业8B   非营业党政机关，事业团体8C  非营业货车8D					
 					property: "1", //所属性质 1个人 2企业 3个人
 					outOfInsurance: false, //脱保
-					secondhandcarflag: false, //二手车
-					vehicleUse: "" //车辆用途
+					usedCar: false, //二手车
+					vehicleUse: "05" //车辆用途
 				},
 				ownerInfo: {
 					name: "",
@@ -555,7 +612,7 @@
 				//影像信息
 				carimg: "", //显示图片
 				ownerimg: "", //显示图片
-				applicantimg: "", //显示图片
+				policyHolderimg: "", //显示图片
 				Insuredimg: "", //显示图片
 				OCRShow: false,
 				tabsCurrent: 0,
@@ -715,7 +772,7 @@
 						}]
 					},
 				},
-				applicantRules: {
+				policyHolderRules: {
 					name: {
 						rules: [{
 								required: true,
@@ -858,6 +915,7 @@
 						}]
 					},
 				},
+
 				endYear: Year,
 				endMonth: Month,
 				ownergenderShow: false, //性别选择
@@ -875,7 +933,7 @@
 				identifyType: "身份证",
 				carExpand: false,
 				ownersExpand: false,
-				applicantExpand: false,
+				policyHolderExpand: false,
 				InsuredExpand: false,
 				carInfoShow: true, //车辆信息显示
 				headerText: '信息录入',
@@ -883,7 +941,7 @@
 					backgroundColor: 'transparent',
 				},
 				prevScrollTop: 0,
-				applicantholder: "1",
+				policyHolderholder: "1",
 				Insuredholder: "2",
 				holderstatusList: [{
 						label: '同车主',
@@ -938,6 +996,24 @@
 				user2deg: 0, //旋转角度
 				user3deg: 0, //旋转角度
 				routepage: "",
+				carInfo1: {
+					carnature: "非营业",
+					energyType: "燃油",
+					vehicleUse: "家庭自用",
+					cartype: "轿车",
+					cimodelclass: "客车",
+				},
+				carnatureShow: false, //使用性质
+				energyTypeShow: false, //能源种类
+				vehicleUseShow: false, //车辆用途
+				cartypeShow: false, //车辆类型
+				cimodelclassShow: false, //车辆种类
+				natureOfVehicleUseoptions: [],
+				vehicleTypeoptions: [],
+				trafficManagementVehicleTypeoptions: [],
+				energyTypeoptions: [],
+				businessVehicleUseoptions: [],
+				outOfBusinessVehicleUseoptions: [],
 			}
 		},
 		watch: {
@@ -964,6 +1040,7 @@
 
 		},
 		onLoad(params) {
+
 			let pages = getCurrentPages(); // 当前页面路由
 			if (pages.length > 1) {
 				let beforePage = pages[pages.length - 2].route; // 上一个页面路由
@@ -979,11 +1056,11 @@
 					if (!!data) {
 						let info = JSON.parse(JSON.stringify(data));
 						let page = this.routepage;
-						console.log(page);
 						switch (page) {
 							case 'pages/carInsure2/entry':
 								this.carInfoShow = false;
 								this.carInfo = info.carInfo; //车辆信息
+								this.ownerInfo.name = info.carInfo.carOwner; //车主
 								this.carInfoPositiveList = info.carInfoPositiveList; //车辆
 								break;
 							case 'pages/carInsure2/quote':
@@ -1000,6 +1077,10 @@
 								this.insuredPersonInfoPositiveList = info.insuredPersonInfoPositiveList; //被保人
 								this.carExpand = true;
 								this.ownersExpand = true;
+								this.policyHolderExpand = true;
+								this.InsuredExpand = true;
+								this.policyHolderholder = "99";
+								this.Insuredholder = "99";
 								break;
 							default:
 								break;
@@ -1010,6 +1091,12 @@
 
 				})
 			}
+			this.getDicType("businessVehicleUse"); //车辆用途（营业）
+			this.getDicType("outOfBusinessVehicleUse"); //车辆用途（非营业）
+			this.getDicType("natureOfVehicleUse"); //车辆性质
+			this.getDicType("vehicleType"); //车辆种类
+			this.getDicType("trafficManagementVehicleType"); //车辆类型
+			this.getDicType("energyType"); //能源种类
 		},
 		onPageScroll(e) {
 			this.handleScroll(e);
@@ -1025,6 +1112,28 @@
 			uni.$off('scroll', this.handleScroll);
 		},
 		methods: {
+			async getDicType(type) {
+				let res = await this.$http.get('/sysDict/dictDetails/' + type);
+				if (res.code == 200) {
+					this[type + 'options'] = res.data.ddList;
+					// if (type == "trafficManagementVehicleType") {
+					// 	this.carInfo1.cartype = this.dictionaryMatching(this.trafficManagementVehicleTypeoptions, this
+					// 		.carInfo
+					// 		.cartype)
+					// 	this.carInfo1.cimodelclass = this.dictionaryMatching(this.vehicleTypeoptions,
+					// 		this
+					// 		.carInfo
+					// 		.cimodelclass)
+					// }
+				}
+			},
+			dictionaryConfirm(e, name) {
+				if (name == 'carnature') {
+					this.carInfo1['vehicleUse'] = "";
+				}
+				this.carInfo[name] = e[0].value;
+				this.carInfo1[name] = e[0].label;
+			},
 			async toChooseVin(cctype) {
 				if (cctype == '' || cctype == null) {
 					return uni.showToast({
@@ -1083,6 +1192,7 @@
 				this.carExpand = true;
 			},
 			ownerInfoCallback(obj) {
+				console.log(obj);
 				this.ownerimg = obj.img;
 				this.ownerInfoPositiveList = obj.ImgList;
 				Object.assign(this.ownerInfo, obj.Info);
@@ -1090,13 +1200,15 @@
 				this.ownersExpand = true;
 			},
 			applicantInfoCallback(obj) {
-				this.applicantimg = obj.img;
+				console.log(obj);
+				this.policyHolderimg = obj.img;
 				this.policyHolderInfoPositiveList = obj.ImgList;
 				Object.assign(this.policyHolderInfo, obj.Info);
 				this.OCRShow = false;
-				this.applicantExpand = true;
+				this.policyHolderExpand = true;
 			},
 			InsuredInfoCallback(obj) {
+				console.log(obj);
 				this.Insuredimg = obj.img;
 				this.insuredPersonInfoPositiveList = obj.ImgList;
 				Object.assign(this.insuredPersonInfo, obj.Info);
@@ -1129,8 +1241,8 @@
 			//转变大写(车型/车架号/发动机号)
 			upperCaseType(type) {
 				this.carInfo[type] = this.carInfo[type].toUpperCase();
-				if (type == 'vinNo') {
-					this.carInfo.frameNo = this.carInfo.vinNo.trim();
+				if (type == 'frameNo') {
+					this.carInfo.vinNo = this.carInfo.frameNo.trim();
 				}
 			},
 			//身份证止期（10/20/长期）处理
@@ -1172,7 +1284,7 @@
 			//校验事件
 			next() {
 				//投保人同车主
-				if (this.applicantholder == '1') {
+				if (this.policyHolderholder == '1') {
 					this.setPersonInfoAndImageType('ownerInfo', 'policyHolderInfo', "C03");
 				}
 				if (this.Insuredholder == '1') {
@@ -1181,50 +1293,57 @@
 				if (this.Insuredholder == '2') {
 					this.setPersonInfoAndImageType('policyHolderInfo', 'insuredPersonInfo', "C04");
 				}
-				this.$refs.carForm.submit().then(res => {
-					this.$refs.ownerForm.submit().then(res1 => {
-						this.$refs.applicantForm.submit().then(res2 => {
-							this.$refs.InsuredForm.submit().then(res3 => {
-								this.navigate({
-									url: '/pages/carInsure2/insureItems',
-									success: (res) => {
-										res.eventChannel.emit(
-											"acceptData", {
-												carInfo: this
-													.carInfo,
-												ownerInfo: this
-													.ownerInfo,
-												policyHolderInfo: this
-													.policyHolderInfo,
-												insuredPersonInfo: this
-													.insuredPersonInfo,
-												riskList: this
-													.riskList,
-												kindList: this
-													.kindList,
-												carInfoPositiveList: this
-													.carInfoPositiveList, //车辆
-												ownerInfoPositiveList: this
-													.ownerInfoPositiveList, //车主
-												policyHolderInfoPositiveList: this
-													.policyHolderInfoPositiveList, //投保人
-												insuredPersonInfoPositiveList: this
-													.insuredPersonInfoPositiveList, //被保人
-											})
+				if (this.ownerInfo.name && this.policyHolderInfo.name && this.insuredPersonInfo.name) {
+					this.navigate({
+						url: '/pages/carInsure2/insureItems',
+						success: (res) => {
+							res.eventChannel.emit(
+								"acceptData", {
+									carInfo: this
+										.carInfo,
+									ownerInfo: this
+										.ownerInfo,
+									policyHolderInfo: this
+										.policyHolderInfo,
+									insuredPersonInfo: this
+										.insuredPersonInfo,
+									riskList: this
+										.riskList,
+									kindList: this
+										.kindList,
+									carInfoPositiveList: this
+										.carInfoPositiveList, //车辆
+									ownerInfoPositiveList: this
+										.ownerInfoPositiveList, //车主
+									policyHolderInfoPositiveList: this
+										.policyHolderInfoPositiveList, //投保人
+									insuredPersonInfoPositiveList: this
+										.insuredPersonInfoPositiveList, //被保人
+								})
+
+						}
+					}, "navigateTo", true);
 
-									}
-								}, "navigateTo", true);
+				} else {
+					this.$refs.carForm.submit().then(res => {
+						this.$refs.ownerForm.submit().then(res1 => {
+							this.$refs.policyHolderForm.submit().then(res2 => {
+								this.$refs.InsuredForm.submit().then(res3 => {}).catch(err => {
+									console.log('表单错误信息：', err);
+								})
+							}).catch(err => {
+								console.log('表单错误信息：', err);
 							})
-						})
-					})
-				})
+						}).catch(err => {})
+					}).catch(err => {})
+				}
 			},
 			expand(int) {
 				this[int] = true;
 			},
 			//投保人同车主
 			applicantholderClick(value) {
-				this.applicantholder = value;
+				this.policyHolderholder = value;
 				if (value == '99') {
 					for (let key in this.policyHolderInfo) {
 						if (key !== 'identifyType') {
@@ -1310,7 +1429,7 @@
 	}
 
 	.page {
-		min-height: 100%;
+		height: auto;
 		background: #F8FAFE;
 		padding: 12px 16px 50px 16px;
 	}

pages/carInsure2/carType.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
 		<view class="box">
 			<view class="row " v-for="(item,index) in typeList" :key="index" @tap="chooseVehicleType(index)">
 				<!-- 永安 -->
@@ -37,20 +38,13 @@
 				frameNo: "", //车架号
 				modelName: "", //车型
 				enrollDate: "", //
-				typeList: [{
-					modelName: "大众汽车SVW71612CS轿车",
-					replacementValue: "779000",
-					series: "桑塔纳自动档 ",
-					remark: "豪华版国IV",
-					marketYear: "200000",
-					displacement: "1.5858",
-					ratedPassengerCapacity: "32322",
-
-				}],
+				typeList: [],
+				vehicleType: null,
 			}
 		},
 		async onLoad(options) {
 			if (options.frameNo) {
+				this.vehicleType = options.vehicleType;
 				this.frameNo = decodeURIComponent(options.frameNo);
 				let res = await this.$http.get('/order/carModel/vinSearch?frameNo=' + this.frameNo);
 				this.typeList = res.data;
@@ -113,6 +107,9 @@
 				prevPage.$vm.carInfo.enginedesc = this.typeList[index].displacement; //排量
 				prevPage.$vm.carInfo.powertype = this.typeList[index].fuelType; //燃油种类
 				prevPage.$vm.carInfo.powerScale = this.typeList[index].powerScale; //功率
+				if (this.vehicleType) {
+					prevPage.$vm.vehicleType = this.vehicleType;
+				}
 				uni.navigateBack({ //uni.navigateTo跳转的返回，默认1为返回上一级
 					delta: 1
 				});

pages/carInsure2/entry.vue

@@ -99,7 +99,7 @@
 						</view>
 						<view class="">
 							<uni-forms :rules="carRules" :value="carInfo" ref="carForm" validate-trigger="bind"
-								err-show-type="toast" label-width="100">
+								err-show-type="toast" label-width="100" style="padding: 0 15px;">
 								<uni-forms-item label="车牌号: ">
 									<input class="uni-input-input textColor" placeholder="输入车牌号"
 										v-model="carInfo.licenseNo" placeholder-style="font-size:28upx"
@@ -190,8 +190,9 @@
 									<u-input v-model="carInfo1.cartype" type="select" :select-open="cartypeShow"
 										@click="cartypeShow = true" :custom-style="{textAlign:'right'}"
 										placeholder-style="color:#808080" placeholder="请选择车辆类型" />
-									<u-select mode="single-column" :list="trafficManagementVehicleTypeoptions"
-										v-model="cartypeShow" label-name="dictTag" value-name="dictValue"
+									<u-select mode="single-column" :searchShow="true"
+										:list="trafficManagementVehicleTypeoptions" v-model="cartypeShow"
+										label-name="dictTag" value-name="dictValue"
 										@confirm="dictionaryConfirm($event,'cartype')"></u-select>
 								</uni-forms-item>
 								<uni-forms-item label="车辆种类: " required name="cimodelclass">
@@ -247,7 +248,7 @@
 				</view>
 				<view v-show="!carSwitching" class="content mt-2">
 					<uni-forms :rules="carRules" :value="carInfo" ref="carForm" validate-trigger="bind"
-						err-show-type="toast" label-width="100">
+						style="padding: 0 15px;" err-show-type="toast" label-width="100">
 						<uni-forms-item label="车牌号: ">
 							<input class="uni-input-input textColor" placeholder="输入车牌号" v-model="carInfo.licenseNo"
 								placeholder-style="font-size:28upx" @input="upperCaseType('licenseNo')" />
@@ -332,9 +333,9 @@
 							<u-input v-model="carInfo1.cartype" type="select" :select-open="cartypeShow"
 								@click="cartypeShow = true" :custom-style="{textAlign:'right'}"
 								placeholder-style="color:#808080" placeholder="请选择车辆类型" />
-							<u-select mode="single-column" :list="trafficManagementVehicleTypeoptions"
-								v-model="cartypeShow" label-name="dictTag" value-name="dictValue"
-								@confirm="dictionaryConfirm($event,'cartype')"></u-select>
+							<u-select mode="single-column" :searchShow="true"
+								:list="trafficManagementVehicleTypeoptions" v-model="cartypeShow" label-name="dictTag"
+								value-name="dictValue" @confirm="dictionaryConfirm($event,'cartype')"></u-select>
 						</uni-forms-item>
 						<uni-forms-item label="车辆种类: " required name="cimodelclass">
 							<u-input v-model="carInfo1.cimodelclass" type="select" :select-open="cimodelclassShow"
@@ -389,8 +390,9 @@
 		<OCRComponent :showModal='OCRShow' @closePopup="closePopup" :tabslist="tabslist" @tabschange="OCRtabschange"
 			:tabsCurrent="tabsCurrent" :checkType='checkType' @carCallback="carCallback">
 		</OCRComponent>
-		<u-keyboard ref="uKeyboard" mode="car" v-model="keyboardShow" @change="keyboardchange" @backspace="backspacesss"
-			@confirm="backsconfirm"></u-keyboard>
+		<u-keyboard ref="uKeyboard" mode="car" :keyboardType="keyboardType" v-model="keyboardShow"
+			@change="keyboardchange" @backspace="backspacesss" @confirm="backsconfirm"></u-keyboard>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -405,6 +407,8 @@
 		},
 		data() {
 			return {
+				vehicleType: false, //车型查询调用标识
+				keyboardType: false, //键盘中/英切换标识
 				endYear: Year,
 				endMonth: Month,
 				params: {
@@ -492,9 +496,9 @@
 				carSwitching: true, //true识别 false录入
 				keyboardShow: false,
 				insuranceType: 2,
-				checked: false,
+				checked: true,
 				LicenseInputValue: ['晋', 'A', '', '', '', '', '', ''],
-				currentInputIndex: null,
+				currentInputIndex: 0,
 				carInfoPositiveList: [], //车辆
 				//车辆信息
 				carInfo: {
@@ -538,7 +542,7 @@
 					carnature: "02", //使用性质 家庭自用8A  非营业企业8B   非营业党政机关，事业团体8C  非营业货车8D					
 					property: "1", //所属性质 1个人 2企业 3个人
 					outOfInsurance: false, //脱保
-					secondhandcarflag: false, //二手车
+					usedCar: false, //二手车
 					vehicleUse: "05" //车辆用途
 				},
 				carInfo1: {
@@ -582,6 +586,32 @@
 			this.getDicType("vehicleType"); //车辆种类
 			this.getDicType("trafficManagementVehicleType"); //车辆类型
 			this.getDicType("energyType"); //能源种类
+			if (this.checked) {
+				this.LicenseInputValue.forEach((val, index) => {
+					if (index < 7) {
+						this.$set(this.LicenseInputValue, index, "*");
+					}
+				})
+				let valueList = this.LicenseInputValue;
+				const str = valueList.join("")
+				this.carInfo.licenseNo = str;
+			} else {
+				this.LicenseInputValue.forEach((val, index) => {
+					this.$set(this.LicenseInputValue, index, "");
+				})
+				this.carInfo.licenseNo = "";
+			}
+		},
+		watch: {
+			currentInputIndex(newVal) {
+				switch (newVal) {
+					case 0:
+						this.keyboardType = false;
+						break;
+					default:
+						this.keyboardType = true;
+				}
+			}
 		},
 		methods: {
 			rotatefront(int) {
@@ -630,8 +660,8 @@
 			},
 			upperCaseType(type) {
 				this.carInfo[type] = this.carInfo[type].toUpperCase();
-				if (type == 'vinNo') {
-					this.carInfo.frameNo = this.carInfo.vinNo.trim();
+				if (type == 'frameNo') {
+					this.carInfo.vinNo = this.carInfo.frameNo.trim();
 				}
 			},
 			//
@@ -648,6 +678,7 @@
 
 			//下一步
 			toNext() {
+				console.log(this.vehicleType);
 				switch (this.insuranceType) {
 					case 1:
 						if (!this.carInfo.licenseNo && !this.islicense(this.carInfo.licenseNo)) {
@@ -657,10 +688,7 @@
 								duration: 1500
 							});
 						}
-						this.navigate({
-							url: "/pages/carInsure2/Information?licenseNo=" + encodeURIComponent(this.carInfo
-								.licenseNo)
-						}, "navigateTo", true)
+
 						break;
 					case 2:
 						if (!this.carInfo.licenseNo && !this.carimg) {
@@ -671,18 +699,34 @@
 							});
 						}
 						this.$refs.carForm.submit().then(res => {
-							this.navigate({
-								url: '/pages/carInsure2/Information',
-								success: (res) => {
-									res.eventChannel.emit(
-										"acceptData", {
-											carInfo: this
-												.carInfo,
-											carInfoPositiveList: this
-												.carInfoPositiveList, //车辆
-										})
-								}
-							}, "navigateTo", true);
+							if (this.vehicleType) {
+								this.navigate({
+									url: '/pages/carInsure2/Information',
+									success: (res) => {
+										res.eventChannel.emit(
+											"acceptData", {
+												carInfo: this
+													.carInfo,
+												carInfoPositiveList: this
+													.carInfoPositiveList, //车辆
+											})
+									}
+								}, "navigateTo", true);
+							} else {
+								this.$refs.uToast.show({
+									title: '检测到未精准校验车型，即将跳转到车型界面选择，请等待。。。',
+									type: 'warning',
+									icon: false,
+								})
+								setTimeout(() => {
+									this.navigate({
+										url: '/pages/carInsure2/carType?frameNo=' +
+											encodeURIComponent(this.carInfo.frameNo) +
+											'&vehicleType=true'
+									}, "navigateTo", true);
+								}, 2000)
+
+							}
 						})
 						break;
 					default:
@@ -708,6 +752,7 @@
 			},
 			// 通过车架号获取车型
 			async toChooseVin(cctype) {
+				this.vehicleType = true;
 				if (cctype == '' || cctype == null) {
 					return uni.showToast({
 						icon: 'none',
@@ -763,35 +808,39 @@
 			OCRtabschange(e) {
 				this.tabsCurrent = e;
 			},
-			//键盘退格键
+
 			keyboardchange(val) {
+
 				this.$set(this.LicenseInputValue, this.currentInputIndex, val);
 				if (this.currentInputIndex < 7) {
 					this.currentInputIndex++;
 				}
+
 			},
 			backsconfirm() {
 				let valueList = this.LicenseInputValue;
 				const str = valueList.join("")
 				this.carInfo.licenseNo = str;
 			},
+			//键盘退格键
 			backspacesss() {
 				this.$set(this.LicenseInputValue, this.currentInputIndex, '')
 				if (this.currentInputIndex != 0) this.currentInputIndex--
 			},
 			inputSwitch(e) {
-				this.keyboardShow = true;
 				const {
 					index
 				} = e.currentTarget.dataset;
 				this.currentInputIndex = parseInt(index);
+				this.keyboardShow = true;
+				console.log(this.currentInputIndex);
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.uni-forms-item ::v-deep .uni-input-input {
+	.uni-forms-item .uni-input-input {
 		text-align: end;
 	}
 

pages/carInsure2/insureItems.vue

@@ -134,7 +134,7 @@
 								<view class="cell-title d-flex a-center j-center">{{insureItem.kindName}}</view>
 								<view class="cell-desc d-flex a-center j-center">{{insureItem.amountDesc}}
 									<view class="icon iconfont icon-youjiantou"
-										style="font-size: 24upx;margin-left: 20upx;">
+										style="font-size: 40rpx;margin-left: 20upx;color: #C7C6CA;">
 									</view>
 								</view>
 							</view>
@@ -150,7 +150,8 @@
 					<view class="car-ins-cell d-flex j-sb common-ins-cell" @tap="adjustBIItem(index)">
 						<view class="cell-title d-flex a-center j-center">{{insureItem.kindName}}</view>
 						<view class="cell-desc d-flex a-center j-center">{{insureItem.amountDesc}}
-							<view class="icon iconfont icon-youjiantou" style="font-size: 24upx;margin-left: 20upx;">
+							<view class="icon iconfont icon-youjiantou"
+								style="font-size: 40rpx;margin-left: 20upx;color: #C7C6CA;">
 							</view>
 						</view>
 					</view>
@@ -158,7 +159,7 @@
 			</block>
 		</view>
 		<view class="bottom-btn">
-			<button type="primary" style="background-color: #0052FF;" @tap="toQuote">下一步</button>
+			<u-button type="primary" style="background-color: #0052FF;color: #fff;" @tap="toQuote">下一步</u-button>
 		</view>
 		<!-- 商业选择方案 -->
 		<wyb-popup ref="popupBI" type="bottom" mode="size-fixed" height="900" radius="6" :showCloseIcon="true">
@@ -327,8 +328,8 @@
 					desc: "国家强制规定购买的险种，对第三方的人身或财产损失提供基本保障"
 				},
 				insureList: [{
-						amount: "1",
-						amountDesc: "投保",
+						amount: "0",
+						amountDesc: "不投保",
 						amtList: [{
 							"label": "不投保",
 							"value": "0"
@@ -342,8 +343,8 @@
 						desc: "保险期间内，被保险人或被保险机动车驾驶人在使用被保险机动车过程中，因自然灾害、意外事故、机动车被盗窃、抢劫、抢夺等情况（详见保险条款）造成被保险机动车直接损失，且不属于免除保险人责任的范围，保险人依照本保险合同的约定负责赔偿的险种。"
 					},
 					{
-						amount: "1000000",
-						amountDesc: "100万",
+						amount: "2000000",
+						amountDesc: "200万",
 						amtList: [{
 								label: "不投保",
 								value: "0"
@@ -973,6 +974,7 @@
 								this.jqendDate = this.riskList[0].endDate;
 								this.BIInsureList.amount = "0";
 								this.BIInsureList.amountDesc = "不投保";
+								this.sychecked = false;
 							} else if (this.riskList[0].riskCode == '0510') {
 								this.CIInsureList.amount = "0";
 								this.CIInsureList.amountDesc = "不投保";
@@ -980,6 +982,7 @@
 								this.BIInsureList.amountDesc = "投保";
 								this.systartDate = this.riskList[0].startDate;
 								this.syendDate = this.riskList[0].endDate;
+								this.jqchecked = false;
 							}
 						} else {
 							this.CIInsureList.amount = "1";
@@ -1076,11 +1079,9 @@
 				if (value) {
 					this.BIInsureList.amount = "1";
 					this.BIInsureList.amountDesc = "投保";
-					this.insureList[0].amount = 1;
-					this.insureList[0].amountDesc = "投保";
 					// 三者险
-					this.insureList[1].amount = 1000000;
-					this.insureList[1].amountDesc = "100万";
+					this.insureList[1].amount = 2000000;
+					this.insureList[1].amountDesc = "200万";
 					// 司机险
 					this.insureList[2].amount = 10000;
 					this.insureList[2].amountDesc = "1万";

pages/carInsure2/quote.vue

@@ -9,13 +9,13 @@
 					<text>{{this.carInfo.modelcname}}</text>
 				</view>
 			</view>
-			<view class="carJump" @tap="toCarInfo">修改方案</view>
+			<view class="carJump" @tap="toCarInfo">修改信息</view>
 		</view>
 		<!-- 报价方案 -->
 		<view class="pageContent mt-3">
 			<view class="header dis a-c j-s">
 				<text class="title ">报价方案</text>
-				<text class="color" @tap="toInsureItems">修改方案</text>
+				<text class="color" @tap="toInsureItems">修改险种</text>
 			</view>
 			<view class="quotePlan ">
 				<view class="body">
@@ -67,13 +67,25 @@
 			<view class="header dis a-c j-s mt-3">
 				<text class="title ">投保注意：</text>
 				<view class="dis a-c  f-wrap">
-					<view class="status-data" :class="item.checked? 'active':''" v-for="(item,index) in vehicleTypeList"
-						@tap="immediatelyClick(index)" :key="index">
-						{{item.label}}
+
+					<view class="status-data" :class="carInfo.transferFlag? 'active':''"
+						@tap="immediatelyClick('transferFlag')">
+						过户车
+					</view>
+					<view class="status-data" :class="carInfo.transferFlagBi? 'active':''"
+						@tap="immediatelyClick('transferFlagBi')">
+						商业险过户
+					</view>
+					<view class="status-data" :class="carInfo.outOfInsurance? 'active':''"
+						@tap="immediatelyClick('outOfInsurance')">
+						脱保
+					</view>
+					<view class="status-data" :class="carInfo.usedCar? 'active':''" @tap="immediatelyClick('usedCar')">
+						二手车
 					</view>
 				</view>
 			</view>
-			<view class="quotePlan dis a-c j-s " style="padding: 5px 10px;" v-if="vehicleTypeList[0].checked">
+			<view class="quotePlan dis a-c j-s " style="padding: 5px 10px;" v-if="carInfo.transferFlag">
 				<view>转移登记日期：</view>
 				<u-input type="select" :select-open="transferDateShow" :custom-style="{textAlign:'right'}"
 					v-model="carInfo.transferDate" @click="transferDateShow = true" style="width: 100px;"></u-input>
@@ -109,7 +121,7 @@
 									<text
 										v-show="(totalitem.quoteCode != '200') && (totalitem.quoteCode != '0') && (totalitem.quoteCode != '1')"
 										class="sum" style="color: #999;font-size: 12px;"
-										@click="ErrorMsg(totalitem.msg,totalitem.namesimple)">报价失败，请点击查看</text>
+										@tap.stop.prevent="ErrorMsg(totalitem.msg,totalitem.namesimple)">报价失败，请点击查看</text>
 								</view>
 
 								<view class="dis content  f-c" v-if="totalitem.checked">
@@ -869,23 +881,6 @@
 		},
 		data() {
 			return {
-				vehicleTypeList: [{
-						label: '过户车',
-						checked: false,
-					},
-					{
-						label: '商业险过户',
-						checked: false,
-					},
-					{
-						label: '脱保',
-						checked: false,
-					},
-					{
-						label: '二手车',
-						checked: false,
-					},
-				],
 				shadowStyle: {
 					backgroundImage: "none",
 					paddingTop: "0",
@@ -1719,12 +1714,15 @@
 			syImmediate(value) {
 				if (value) {
 					this.GuidedPopShow = true;
+
+				} else {
+					let list = this.riskList.filter(item => item.riskCode !== "0510");
+					this.riskList = list;
 				}
 			},
-			immediatelyClick(index) {
-				this.vehicleTypeList[index].checked = !this.vehicleTypeList[index].checked;
-				let checked = this.vehicleTypeList[0].checked;
-				if (checked) {
+			immediatelyClick(name) {
+				this.carInfo[name] = !this.carInfo[name];
+				if (this.carInfo[name]) {
 					this.carInfo.transferDate = this.carInfo.issueDate;
 				} else {
 					this.carInfo.transferDate = "";
@@ -2302,6 +2300,22 @@
 						})
 					})
 				}
+				// //险种合并集合
+				// const combinedArray = [
+				// 	...this.riskList.map(item => item.riskCode),
+				// 	...this.kindList.map(item => item.kindCode),
+				// ];
+				// commpanykad.data = commpanykad.data.filter(obj => {
+				// 	obj.agreement = obj.agreement.filter(agreementObj => {
+				// 		// 险种配置为空，则过滤掉该协议
+				// 		if (agreementObj.productsCodes == null) {
+				// 			return false;
+				// 		}
+				// 		return agreementObj.productsCodes.some(item => combinedArray.includes(item));
+				// 	});
+
+				// 	return obj.agreement.length > 0; // 返回true保留，返回false移除该保险公司
+				// });
 				this.totalCompanyList = commpanykad.data;
 			},
 			async toNext() {
@@ -2952,7 +2966,7 @@
 				const companyId = uni.getStorageSync('companyId');
 				let api = apiType === 2 ?
 					"/insurance/crawler/quote" :
-					"anshengquote";
+					"";
 				let ccidenttype = this.totalCompanyList[num]
 					.cnName;
 				let namesimple = this.totalCompanyList[num]

pages/index/index.vue

@@ -9,7 +9,7 @@
 		<!-- 漂浮头部 -->
 		<view class="header" :style="{position:headerPosition,backgroundColor:bgColor}">
 			<view class="scan">
-				<view class="icon iconfont icon-scan" @tap="scan"></view>
+				<view class="icon iconfont icon-saoyisao" @tap="scan"></view>
 			</view>
 			<view class="input">
 				<view class="icon iconfont icon-search"></view>

pages/login/login.vue

@@ -24,7 +24,7 @@
 					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
 						style="width: 200rpx;height: 100%;">
 						<view style="font-size: 40rpx;" class="icon iconfont"
-							:class="isHidePassword?'icon-buxianshimima':'icon-xianshimima'"
+							:class="isHidePassword?'icon-buxianshimima1':'icon-xianshimima1'"
 							@tap="isHidePassword = !isHidePassword"></view>
 					</view>
 				</view>
@@ -117,7 +117,6 @@
 				isLoading: false,
 				show: false,
 				contentSlot: true,
-				defaultid: '', //登录默认会员号
 				status: false, //false代表账号密码登录，true代表手机验证码登录
 				disabled: true, //登录按钮是否可用
 				loading: false, //是否显示按钮加载状态
@@ -163,11 +162,11 @@
 			this.selectTableData();
 			// this.deleteTableData();
 			// #endif
-			this.username = this.defaultid;
 		},
 		//页面显示   
 		onShow() {
-
+			this.openSQL();
+			this.selectTableData();
 			uni.getClipboardData({
 				success: (res) => {
 					let id = (res.data.replace(/(^\s*)|(\s*$)/g, "")).toUpperCase();
@@ -206,14 +205,12 @@
 			}
 		},
 		mounted() {
-			//取出缓存中的账号、密码
+			// //取出缓存中的账号、密码
 			const HBusername = uni.getStorageSync('username');
 			const HBpassword = uni.getStorageSync('password');
-			//有账号、密码就赋值给文本，没有就清空
-			if (HBusername && HBpassword) {
-				this.username = HBusername;
-				this.password = HBpassword;
-			}
+			// //有账号、密码就赋值给文本，没有就清空
+			this.username = HBusername;
+			this.password = HBpassword;
 		},
 		onShow() {
 			this.refreshCaptcha();
@@ -264,7 +261,6 @@
 			changeStatus() {
 				uni.hideKeyboard();
 				this.initInput();
-				this.username = this.defaultid;
 				this.status = !this.status;
 				this.refreshCaptcha();
 			},
@@ -361,14 +357,17 @@
 						captcha: this.imgcode.toLowerCase(),
 						captchaId: this.captchaId,
 					}
-				}).then(res => {
+				}).then(async res => {
 					if (res) {
 						return uni.showToast({
 							title: res.msg,
 							icon: 'none'
 						});
 					} else {
-						this.updateTableData();
+						this.deleteTableData();
+						this.openSQL();
+						this.createTable(); //创建表
+						this.insertTableData(this.username, this.password); //新增表数据
 						socket.init();
 					}
 
@@ -486,7 +485,6 @@
 					provider: 'weixin',
 					onlyAuthorize: true,
 					success: function(loginRes) {
-						console.log(loginRes);
 						that.codeRes(loginRes.code);
 
 					},
@@ -518,11 +516,9 @@
 			openSQL() {
 				// 这个是查询有没有打开数据库
 				let open = DB.isOpen();
-				// if (!open) {
 				DB.openSqlite()
 					.then(res => {})
 					.catch(error => {});
-				// }
 			},
 			// 关闭数据库
 			closeSQL() {
@@ -544,7 +540,7 @@
 				if (open) {
 					this.openSQL();
 					let sql =
-						'"id" INTEGER PRIMARY KEY AUTOINCREMENT,"username" text,"password" text,"defaultid" text,"time" text';
+						'"id" INTEGER PRIMARY KEY AUTOINCREMENT,"username" text,"password" text,"time" text';
 					// 创建表 DB.createTable(表名, 表的列)
 					DB.createTable("chat", sql)
 						.then(res => {
@@ -561,13 +557,12 @@
 					let arr = [{
 						username: user,
 						password: word,
-						defaultid: user,
 					}]
 					arr.map(item => {
 						let time = this.formatDate(new Date().getTime());
 						let sql =
-							`'${item.username}','${item.password}','${item.defaultid}','${time}'`;
-						let condition = "'username','password','defaultid','time'";
+							`'${item.username}','${item.password}','${time}'`;
+						let condition = "'username','password','time'";
 						// 新增 DB.insertTableData(表名, 对应表头列的数据)
 						DB.insertTableData("chat", sql, condition)
 							.then(res => {
@@ -578,6 +573,7 @@
 				} else {}
 			},
 
+
 			// 查询表数据
 			selectTableData() {
 				let open = DB.isOpen();
@@ -588,7 +584,6 @@
 							console.log("contact表数据", res);
 							this.listData = res;
 							this.username = res[0].username;
-							this.defaultid = res[0].defaultid;
 							this.password = res[0].password;
 						})
 						.catch(error => {});
@@ -601,7 +596,7 @@
 				if (open) {
 					let time = this.formatDate(new Date().getTime());
 					let data =
-						`username ='${this.username}',password ='${this.password}',defaultid='${this.username}'`;
+						`username ='${this.username}',password ='${this.password}'`;
 					// 修改表数据 DB.updateTableData(表名, 要修改的列名=修改后列值, 修改条件的列名, 修改条件的列值)
 					DB.updateTableData("chat", data)
 						.then(res => {
@@ -615,15 +610,13 @@
 				} else {}
 			},
 
-			// 删除表数据
+			// 删除表
 			deleteTableData() {
 				let open = DB.isOpen();
 				if (open) {
 					// 删除表 DB.deleteTableData(表名,查询条件列名,查询条件列值)
-					DB.deleteTableData("chat")
-						.then(res => {
-							this.selectTableData();
-						})
+					DB.dropTable("chat")
+						.then(res => {})
 						.catch(error => {});
 				} else {}
 			},

pages/my/my.vue

@@ -2,27 +2,66 @@
 	<view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-
 		<!-- 头部信息Start -->
-		<view class="prodet-intro d-flex" v-show="prodetIntroShow">
-			<view class="icon iconfont icon-notice d-flex a-center j-center"></view>
-			<view class="u-f1">
-				<p class="animate">掌柜爆款百万医疗！众安尊享e生2020版，最高300万一般医疗保障，100种重疾+121种罕见病医疗最高600万保障，四大增值服务，一年低至136元起！点击了解>>
-				</p>
+		<view class="headers " :style="headerStyle">
+			<view class="dis a-c j-c">
+				<text>我的</text>
+				<image @tap="tool" src="/static/image/my/Frame.png" mode=""></image>
 			</view>
-			<view class="icon iconfont icon-cuo d-flex a-center j-center" @tap="controlProdetIntro"></view>
 		</view>
-		<view class="home-info d-flex">
-			<view class="mystatus d-flex a-center j-center">{{userInfo.sysUser.status=='1'?'已认证':'未认证'}}</view>
-			<image :src="avatar" mode="aspectFill" @tap="popupShow = true"></image>
-			<view class="person-info" @tap="openDetail">
-				<h3>{{userInfo.sysUser.name}}</h3>
-				<p>你身边最贴心、最权威的保险咨询专家【个性化签名】</p>
+		<view class="Personnel">
+			<view class="dis a-c" @tap="openDetail">
+				<image :src="avatar" class="avatar" mode=""></image>
+				<view class="info">
+					<view class="dis a-c">
+						<text>{{userInfo.sysUser.name}}</text>
+						<u-tag :text="userInfo.sysUser.status=='1'?'已认证':'未认证'" mode="dark"
+							style="background: linear-gradient( 268deg, #FF8B2F 0%, #FF5A00 100%);" />
+					</view>
+					<text>你身边最贴心，最权威的保险咨询专家。</text>
+				</view>
+			</view>
+			<view class="my-wallet">
+				<view class="wallet-body dis f-c">
+					<view class="dis a-c j-s route">
+						<view class="flex-1 dis f-c a-c" @tap="accountTool('/pages/wallet/wallet')">
+							<image src="/static/image/my/qianbao.png" mode=""></image>
+							<text>钱包</text>
+						</view>
+						<view class="flex-1 dis f-c a-c" @tap="accountTool('/pages/wallet/bankCard')">
+							<image src="/static/image/my/ka.png" mode=""></image>
+							<text>银行卡</text>
+						</view>
+						<view class="flex-1 dis f-c a-c" @tap="accountTool()">
+							<image src="/static/image/my/chongzhi.png" mode="">
+							</image>
+							<text>充值</text>
+						</view>
+					</view>
+					<view class="dis a-c j-s money">
+						<view class="flex-1" @tap="toBillDetails(1)">
+							<text class="d-flex a-center j-center">手续金额</text>
+							<text style="color: #0052FF;font-family: DIN, DIN;"
+								class="d-flex a-center j-center">￥{{handlingFee.toFixed(2)}}</text>
+						</view>
+						<view class="flex-1" @tap="toBillDetails(2)">
+							<text class="d-flex a-center j-center">跟单金额</text>
+							<text style="color: #0052FF; font-family: DIN, DIN;"
+								class="d-flex a-center j-center">￥{{documentary.toFixed(2)}}</text>
+						</view>
+						<view class="flex-1" @tap="toBillDetails(3)">
+							<text class="d-flex a-center j-center">推广金额</text>
+							<text style="color: #0052FF; font-family: DIN, DIN;"
+								class="d-flex a-center j-center">￥{{promotion.toFixed(2)}}</text>
+						</view>
+					</view>
+
+				</view>
 			</view>
 		</view>
 		<!-- 头部信息End -->
 		<!-- 我的订单Start -->
-		<scroll-view scroll-x class="my-orders ">
+		<!-- <scroll-view scroll-x class="my-orders ">
 			<view>
 				<u-grid :col="4" :border="false" align="center">
 					<u-grid-item class="u-grid-iconfont" v-for="(item ,index) in orderTypeList" :index="index"
@@ -31,79 +70,34 @@
 						<view class="grid-text">{{item.text}}</view>
 					</u-grid-item>
 				</u-grid>
-				<!-- 	<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder">
-					<uni-grid-item class="" v-for="(item ,index) in orderTypeList" :index="index" :key="index">
-						<view class="grid-item-box d-flex a-center j-center flex-column">
-							<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor"></view>
-							<text class="text">{{item.text}}</text>
-							<view v-if="item.badge" class="grid-dot" v-show="item.badge>0">
-								<uni-badge :text="(item.badge>99)?'99+':item.badge" :type="item.type" size="small"
-									:inverted="false" />
-							</view>
-						</view>
-					</uni-grid-item>
-				</uni-grid> -->
 			</view>
-		</scroll-view>
+		</scroll-view> -->
 		<!-- 我的订单End -->
-
-		<!-- 广告轮播 -->
-		<view class="swiper-view">
-			<swiper class="swiper" indicator-dots="true" autoplay="true" circular="true"
-				indicator-active-color="#ffffff" :indicator-dots="swiperList.length>1">
-				<swiper-item v-for="swiper in swiperList" :key="swiper.sid">
-					<image mode="aspectFill" :src="swiper.img" lazy-load></image>
-				</swiper-item>
-			</swiper>
-		</view>
-		<!-- 广告End -->
-
-		<!-- 我的钱包Start -->
-		<view class="my-wallet" v-if="sources==1">
-			<view class="header d-flex a-center j-sb">
-				<view>我的钱包</view>
-				<span @tap="toWallet" style="font-size: 24upx;color: #333;">更多</span>
-			</view>
-			<view class="wallet-body d-flex">
-				<view class="flex-1" @tap="toBillDetails(1)">
-					<view class="d-flex a-center j-center">手续费金额</view>
-					<view style="color: #33AAEE;" class="d-flex a-center j-center">￥{{handlingFee}}</view>
-				</view>
-				<view class="flex-1" @tap="toBillDetails(2)">
-					<view class="d-flex a-center j-center">车险金额</view>
-					<view style="color: #33AAEE;" class="d-flex a-center j-center">￥{{documentary}}</view>
-				</view>
-				<view class="flex-1" @tap="toBillDetails(3)">
-					<view class="d-flex a-center j-center">推广费</view>
-					<view style="color: #DA4452;" class="d-flex a-center j-center">￥{{promotion}}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 我的钱包End -->
-
 		<!-- 我的工具Start -->
 		<view class="my-tools">
-			<view class="header d-flex a-center j-sb">
-				<view>我的工具</view>
+			<view class="header ">
+				<text>我的工具</text>
 			</view>
 			<view class="order-body d-flex a-center">
 				<!-- 因为swiper特性的关系，请指定swiper的高度 ，swiper的高度并不会被内容撑开-->
-				<swiper style="height:calc(324upx)" class="swiper" :indicator-dots="(toolsListLength!=1)?true:false">
-					<swiper-item class="swiper" v-for="(count,cindex) of  toolsListLength" :key="count">
-						<uni-grid :column="4" :show-border="false" :square="false" :highlight="false"
-							@change="toTools($event,'toolsList')">
-							<uni-grid-item class="d-flex a-center j-center"
-								v-show="(index>=(cindex)*8) && (index<(cindex+1)*8)" v-for="(item ,index) in toolsList"
-								:index="index" :key="item.text">
-								<view class="grid-item-box d-flex a-center j-center flex-column">
-									<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor">
+				<uni-swiper-dot :info="info" :current="current" field="content" :mode="mode" :dots-styles="dotsStyles">
+					<swiper style="height:calc(324upx)" class="swiper" @change="change">
+						<swiper-item class="swiper" v-for="(count,cindex) of  toolsListLength" :key="count">
+							<uni-grid :column="4" :show-border="false" :square="false" :highlight="false"
+								@change="toTools($event,'toolsList')">
+								<uni-grid-item class="" v-show="(index>=(cindex)*8) && (index<(cindex+1)*8)"
+									v-for="(item ,index) in toolsList" :index="index" :key="item.text">
+									<view class="grid-item-box dis a-c j-c f-c">
+										<view class="icon iconfont" :class="item.icon">
+										</view>
+										<text class="text">{{item.text}}</text>
 									</view>
-									<text class="text">{{item.text}}</text>
-								</view>
-							</uni-grid-item>
-						</uni-grid>
-					</swiper-item>
-				</swiper>
+								</uni-grid-item>
+							</uni-grid>
+						</swiper-item>
+					</swiper>
+				</uni-swiper-dot>
+
 			</view>
 		</view>
 		<!-- 我的工具End -->
@@ -116,15 +110,13 @@
 			<view class="order-body d-flex a-center">
 				<!-- 因为swiper特性的关系，请指定swiper的高度 ，swiper的高度并不会被内容撑开-->
 				<swiper style="height:calc(162upx)" class="swiper" :indicator-dots="(serviceListLength!=1)?true:false">
-					<swiper-item class="swiper" v-for="(count,cindex) of  serviceListLength" :key="count">
+					<swiper-item class="swiper dis a-c" v-for="(count,cindex) of  serviceListLength" :key="count">
 						<uni-grid :column="4" :show-border="false" :square="false" :highlight="false"
 							@change="toTools($event,'serviceList')">
-							<uni-grid-item class="d-flex a-center j-center"
-								v-show="(index>=(cindex)*8) && (index<(cindex+1)*8)"
+							<uni-grid-item v-show="(index>=(cindex)*8) && (index<(cindex+1)*8)"
 								v-for="(item ,index) in serviceList" :index="index" :key="item.text">
-								<view class="grid-item-box d-flex a-center j-center flex-column">
-									<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor">
-									</view>
+								<view class="grid-item-box dis a-c  f-c">
+									<image :src="item.image" mode=""></image>
 									<text class="text">{{item.text}}</text>
 								</view>
 							</uni-grid-item>
@@ -143,15 +135,14 @@
 			<view class="order-body d-flex a-center">
 				<!-- 因为swiper特性的关系，请指定swiper的高度 ，swiper的高度并不会被内容撑开-->
 				<swiper style="height:calc(162upx)" class="swiper" :indicator-dots="(aboutListLength!=1)?true:false">
-					<swiper-item class="swiper" v-for="(count,cindex) of  aboutListLength" :key="count">
+					<swiper-item class="swiper dis a-c" v-for="(count,cindex) of  aboutListLength" :key="count">
 						<uni-grid :column="4" :show-border="false" :square="false" :highlight="false"
 							@change="toTools($event,'aboutList')">
 							<uni-grid-item class="d-flex a-center j-center"
 								v-show="(index>=(cindex)*8) && (index<(cindex+1)*8)" v-for="(item ,index) in aboutList"
 								:index="index" :key="item.text">
 								<view class="grid-item-box d-flex a-center j-center flex-column">
-									<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor">
-									</view>
+									<image :src="item.image" mode=""></image>
 									<text class="text">{{item.text}}</text>
 								</view>
 							</uni-grid-item>
@@ -160,27 +151,15 @@
 				</swiper>
 			</view>
 		</view>
+
 		<!-- 我的关于End -->
 
 		<!-- 菜单Start -->
-		<block v-for="(item,index) in menusList" :key="index">
+		<!-- <block v-for="(item,index) in menusList" :key="index">
 			<my-list-item :item="item" :index="index"></my-list-item>
-		</block>
+		</block> -->
 		<!-- 菜单End -->
 
-		<!-- 头像预览Start -->
-		<z-popup v-model="popupShow" :hideOnBlur="false" type="center" width="600upx" radius="12upx">
-			<view class="popup_title">
-				<text @click="popupShow = false">取消</text>
-				<view>头像预览</view>
-				<text @click="changeAvatar">更换</text>
-			</view>
-			<view class="popup_content">
-				<view class="body d-flex a-center j-center">
-					<image :src="avatar" mode="aspectFill" @longtap="saveAvatar"></image>
-				</view>
-			</view>
-		</z-popup>
 
 	</view>
 </template>
@@ -205,6 +184,23 @@
 
 		data() {
 			return {
+				info: ["", ""],
+				dotsStyles: {
+					backgroundColor: '#E5E5E5',
+					selectedBackgroundColor: '#0052FF',
+				},
+				current: 0,
+				mode: 'default',
+				headerStyle: {
+					backgroundColor: '',
+					backgroundImage: '',
+					backgroundSize: '',
+					backgroundPosition: '',
+					boxShadow: ''
+					// 其他样式属性...
+				},
+				showBackground: false,
+				prevScrollTop: 0,
 				popupShow: false, //头像是否展示
 				mystatusText: "已认证",
 				prodetIntroShow: true, //显示滚动公告
@@ -212,12 +208,7 @@
 				documentary: 0, //车险金额
 				promotion: 0, //推广费
 				avatar: "",
-				//轮播
-				swiperList: [{
-					sid: 0,
-					src: '自定义src0',
-					img: '/static/image/my/ads/ban1.png'
-				}],
+
 
 				orderTypeList: [{
 						icon: 'icon-jixurenwu',
@@ -244,7 +235,6 @@
 						badge: '0',
 						type: "error",
 						orderStage: 2,
-						iconColor: '#DD525E'
 					},
 					{
 						icon: 'icon-peisong',
@@ -253,125 +243,109 @@
 						badge: '0',
 						type: "error",
 						orderStage: 3,
-						iconColor: '#0696FF'
 					},
 				],
 				toolsList: [{
-						icon: 'icon-shandian',
+						icon: 'icon-Frame-1',
 						text: '闪电增员',
 						url: '/pages/tools/addStaff/addStaff',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-tuanduiguanli',
+						icon: 'icon-Frame',
 						text: '团队管理',
 						url: '/pages/tools/team/team',
-						iconColor: '#FFA22A'
 					},
 					{
-						icon: 'icon-kehuguanli',
+						icon: 'icon-Frame-2',
 						text: '客户管理',
 						url: '/pages/tools/customer/customer',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-yejiguanli',
+						icon: 'icon-Frame-3',
 						text: '业绩管理',
 						url: '/pages/tools/achievement/achievement',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-20xiaoshifuwurexian',
+						icon: 'icon-Frame-5',
 						text: '报案服务',
 						url: '/pages/tools/insuranceClaims/insuranceClaims',
-						iconColor: '#DD525E'
 					},
 					{
-						icon: 'icon-qianbao',
-						text: '钱包',
-						url: '/pages/wallet/wallet',
-						iconColor: '#FFA22A'
+						icon: 'icon-Frame-4',
+						text: '掌柜秘书',
+						url: '/pages/tools/messageReminder/messageReminder',
 					},
 					{
-						icon: 'icon-baodan',
+						icon: 'icon-Frame-6',
 						text: '保单',
 						url: '/pages/tools/policy',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-jisuanqi',
+						icon: 'icon-Frame-7',
 						text: '计算器',
 						url: '/pages/tools/calculator/calculator',
-						iconColor: '#0696FF'
-					},
-					{
-						icon: 'icon-xiaomishu',
-						text: '掌柜秘书',
-						url: '/pages/tools/messageReminder/messageReminder',
-						iconColor: '#DD525E'
 					},
 					{
-						icon: 'icon-xiaomishu',
+						icon: 'icon-a-02',
 						text: '海报管理',
 						url: '/pages/tools/poster/poster',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-xiaomishu',
+						icon: 'icon-a-01',
 						text: '优惠劵',
 						url: '/pages/tools/coupon/coupon',
-						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-a-03',
+						text: '掌柜商城',
+					},
+					{
+						icon: 'icon-a-04',
+						text: '车险之家',
+						url: "/pages/carInsure2/entry",
 					}
 				],
 				aboutList: [{
-						icon: 'icon-yejiguanli',
+						image: '/static/image/my/Frame5.png',
 						text: '常见问题',
 						url: '/pages/set/question',
-						iconColor: '#0696FF'
 					},
 					// { icon: 'icon-baodan',text: '意见反馈',url:'/pages/set/suggest',iconColor:'#DD525E'},
 					{
-						icon: 'icon-baodan',
+						image: '/static/image/my/Frame6.png',
 						text: '意见反馈',
 						url: '',
-						iconColor: '#DD525E'
 					},
 					{
-						icon: 'icon-yongjinguanli',
+						image: '/static/image/my/Frame7.png',
 						text: '联系客服',
 						tel: '4006333016',
-						iconColor: '#FFA22A'
 					},
 					{
-						icon: 'icon-qianbao',
+						image: '/static/image/my/Frame8.png',
 						text: '关于我们',
 						url: '/pages/set/about',
-						iconColor: '#0696FF'
 					}
 				],
 				serviceList: [{
-						icon: 'icon-yejiguanli',
+						image: '/static/image/my/Frame1.png',
 						text: '发票申请',
 						popup: '请加微信15513511113,联系客服操作',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-yongjinguanli',
+						image: '/static/image/my/Frame2.png',
 						text: '保单批改',
 						popup: '请加微信15513511113,联系客服操作',
-						iconColor: '#FFA22A'
 					},
 					{
-						icon: 'icon-qianbao',
+						image: '/static/image/my/Frame3.png',
 						text: '申请退保',
 						popup: '请加微信15513511113,联系客服操作',
-						iconColor: '#0696FF'
 					},
 					{
-						icon: 'icon-qianbao',
+						image: '/static/image/my/Frame4.png',
 						text: '自助理赔',
 						popup: '请加微信15513511113,联系客服操作',
-						iconColor: '#0696FF'
 					}
 				],
 				menusList: [{
@@ -391,18 +365,13 @@
 				]
 			}
 		},
-		onNavigationBarButtonTap(e) {
-			if (e.index == 0) {
-				uni.navigateTo({
-					url: "/pages/set/set"
-				})
-			}
-		},
-		computed: {
-			...mapState(['userInfo', "userCheckInfo", "sources"]),
 
+		computed: {
+			...mapState(['userInfo', "userCheckInfo", ]),
 			toolsListLength() {
-				return Math.ceil(this.toolsList.length / 8);
+				// let length = Math.ceil(this.toolsList.length / 8);
+				let list = ["1", "2"]
+				return list;
 			},
 			aboutListLength() {
 				return Math.ceil(this.aboutList.length / 4);
@@ -416,7 +385,8 @@
 			if (this.userInfo.sysUser.headSculpture) {
 				this.avatar = this.$base.baseUrl + this.userInfo.sysUser.headSculpture;
 			} else {
-				this.avatar = "/static/common/avatar.png"
+				this.avatar = "/static/image/my/avatar1.png"
+
 			}
 			if (this.userInfo.sysUser.status == '1') {
 				this.mystatusText = "已认证";
@@ -426,49 +396,57 @@
 		},
 		async onload() {
 			await this.getAdvanceMoney(); //手续费金额
-			await this.getOrderNum(); //获取订单数量
+		},
+		onPageScroll(e) {
+			this.handleScroll(e);
+		},
+		mounted() {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+			uni.$on('scroll', this.handleScroll);
+		},
+		destroyed() {
+			uni.$off('scroll', this.handleScroll);
 		},
 		methods: {
 			...mapMutations(['setUserModules', 'setOrderType', 'setOrderStage']),
-			//获得订单数量
-			async getOrderNum() {
-				var data = {
-					"columnFilters": {
-						"orderstatus": {
-							"name": "orderstatus",
-							"value": ""
-						},
-						"userid": {
-							"name": "userid",
-							// "value": this.userInfo.sysUser.id
-						},
-						"quotestatus": {
-							"name": "quotestatus",
-							"value": '1'
-						}
-					},
-					"pageNum": 1,
-					"pageSize": 1
-				};
-				for (let i = 0; i < this.orderTypeList.length; i++) {
-					data.columnFilters.orderstatus.value = this.orderTypeList[i].orderstatus;
-					let res = await this.$http.post('/insOrder/findPage', data, {
-						load: false
-					});
-					// 请求失败处理
-					if (res.code == 200) {
-						this.orderTypeList[i].badge = res.data.totalSize;
-					} else {
-						this.orderTypeList[i].badge = '0';
-					}
+			//头部颜色变化js
+			change(e) {
+				this.current = e.detail.current;
+			},
+			handleScroll(e) {
+				const scrollTop = e.scrollTop;
+				if (scrollTop > this.prevScrollTop) {
+					// 向下滚动
+					this.showBackground = true; // 显示背景图
+				} else if (scrollTop < 50) {
+					// 在顶部附近，隐藏背景图
+					this.showBackground = false;
+				} else {
+					// 向上滚动
+					this.showBackground = true; // 显示背景图
 				}
+				this.headerStyle.backgroundColor = this.showBackground ? '#fff' : 'transparent';
+				this.headerStyle.backgroundImage = this.showBackground ? 'url("/static/image/my/banner.png")' : '';
+				this.headerStyle.backgroundSize = this.showBackground ? 'cover' : '';
+				this.headerStyle.backgroundPosition = this.showBackground ? 'center' : '';
+				this.prevScrollTop = scrollTop;
 			},
+			tool() {
+				uni.navigateTo({
+					url: "/pages/set/set"
+				})
+			},
+			//获得订单数量
+
 
 			// 预收账户金额查询
 			async getAdvanceMoney() {
-				let res = await this.$http.get('/sysUserAccount/getSysUserAmount?userid=' + this.userInfo.sysUser.id);
+				let res = await this.$http.get('/sysUserAccount/getSysAllAmount?userid=' + this.userInfo.sysUser.id);
 				// 请求失败处理
-				if (res.code == 200) {
+				if (res.code == 200 && res.data) {
 					this.handlingFee = res.data.handlingFee; //手续费
 					this.documentary = res.data.documentary; //非跟单
 					this.promotion = res.data.promotion; //佣金
@@ -478,73 +456,10 @@
 					this.promotion = 0; //佣金
 				}
 			},
-			// 广告滚动
-			controlProdetIntro() {
-				this.prodetIntroShow = !this.prodetIntroShow;
-			},
 
-			//保存头像
-			saveAvatar() {
-				var that = this;
-				uni.saveImageToPhotosAlbum({ //保存图片
-					filePath: that.avatar,
-					success: (res) => {
-						uni.showToast({
-							title: '保存成功',
-						})
-					}
-				})
-			},
 
-			//修改头像
-			async changeAvatar() {
-				let [err, chooseImageRes] = await uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed']
-				});
-				if (!chooseImageRes) return;
-				const isLt2M = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 2;
-				if (!isLt2M) {
-					return uni.showToast({
-						title: '上传图片大小不能超过 2MB!',
-						icon: "none"
-					});
-				}
-				uni.uploadFile({
-					url: this.$base.baseUrl + '/ins/taskImage/uploadFile',
-					filePath: chooseImageRes.tempFilePaths[0],
-					name: "multipartFile",
-					formData: {
-						'type': 'avatar',
-					},
-					header: {
-						Authorization: store.state.token,
-					},
-					success: async (imgRes) => {
-						let data = JSON.parse(imgRes.data);
-						let res = await this.$http.post('/user/modifyingTheAvatar', {
-							imagesId: data.data.id
-						});
-						if (res.code == '200') {
-							this.popupShow = false;
-							let userInfoRes = await this.$http.get('/user/loginUser', {
-								header: {
-									Authorization: store.state.token,
-								}
-							});
-							this.avatar = this.$base.baseUrl + userInfoRes.data.headSculpture;
-							store.commit('setUserModules', {
-								title: 'userInfo',
-								data: {
-									sysUser: {
-										...userInfoRes.data
-									}
-								}
-							})
-						}
-					}
-				});
-			},
+
+
 			//去工具页面
 			toTools(e, listName) {
 				if (this.userInfo.sysUser.status == '2') {
@@ -597,10 +512,22 @@
 
 			},
 
+			accountTool(path) {
+				if (path) {
+					this.navigate({
+						url: path,
+					}, "navigateTo", true)
+				} else {
+					uni.showToast({
+						title: '功能待开发...',
+						icon: "none"
+					});
+				}
+			},
 			// 去账单明细
 			toBillDetails(type) {
 				this.navigate({
-					url: "/pages/wallet/billDetails" + type
+					url: `/pages/wallet/billDetails${type}`,
 				}, "navigateTo", true)
 			},
 			// 去账单明细
@@ -631,7 +558,85 @@
 	@import '@/style/mixin.scss';
 
 	page {
-		background-color: #FEFEFE;
+		background-color: #F8FAFE;
+	}
+
+	.headers {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: auto;
+		width: 100%;
+		z-index: 999999;
+		padding: 16px;
+		padding-top: 50px;
+
+		>view {
+			width: 100%;
+			height: 100%;
+			position: relative;
+		}
+
+		image {
+			position: absolute;
+			right: 0;
+			width: 20px;
+			height: 20px;
+		}
+
+		text {
+			font-size: 18px;
+			font-weight: bold;
+			color: #000;
+		}
+	}
+
+	.Personnel {
+		height: auto;
+		width: 100%;
+		background: #fff;
+		background-image: url("/static/image/my/banner.png");
+		background-size: 100% 100%;
+		padding: 110px 16px 10px 16px;
+
+		.avatar {
+			width: 60px;
+			height: 60px;
+			border-radius: 50%;
+		}
+
+		.info {
+			margin-left: 10px;
+
+			text {
+				margin-right: 10px;
+				color: #333333;
+				font-size: 13px;
+			}
+
+			text:last-child {
+				color: rgba(51, 51, 51, 0.8);
+				font-size: 12px;
+			}
+
+		}
+	}
+
+	.my-tools {
+		padding: 0 16px;
+
+		.header {
+			padding: 10px 0;
+			font-size: 14px;
+			color: #232832;
+			font-weight: bold;
+		}
+
+		.order-body {
+			background: #fff;
+			box-shadow: 0px 4px 10px 0px #DAE3F4;
+			border-radius: 6px;
+		}
 	}
 
 	/* 产品介绍Start */
@@ -689,102 +694,9 @@
 
 	/* 产品介绍End */
 
-	/* 头像预览Start */
-	.popup_box {
-		width: 100%;
-	}
-
-	.popup_title {
-		display: flex;
-		justify-content: space-between;
-		height: 88upx;
-		line-height: 88upx;
-		border-bottom: 2upx solid #ebebeb;
-		padding: 0 20upx;
-		background-color: #FFF;
-	}
-
-	.popup_title view {
-		font-size: 32upx;
-		display: flex;
-		align-items: center;
-	}
-
-	.popup_title text {
-		width: 80upx;
-		flex-shrink: 0;
-		text-align: center;
-	}
-
-	.popup_title text {
-		font-size: 28upx;
-		color: #999;
-	}
-
-	.popup_title text:last-child {
-		color: $themeColor;
-	}
-
-	.popup_content {
-		padding: 40rpx 30rpx;
-		background-color: #FFFFFF;
-		text-align: center;
-	}
 
-	.popup_content .body image {
-		width: 300upx;
-		height: 300upx;
-	}
-
-	/* 头像预览End */
 
 	/* 个人信息Start */
-	.home-info {
-		height: 243upx;
-		padding-top: 25upx;
-		/* background: #343740; */
-		background: url(/static/image/my/infoBg.jpg) no-repeat 50%;
-		background-size: 100% 100%;
-		color: #FFFFFF;
-		position: relative;
-	}
-
-	.home-info .mystatus {
-		position: absolute;
-		top: 100upx;
-		left: 45upx;
-		border-radius: 20upx;
-		z-index: 10;
-		font-size: 20upx;
-		height: 35upx;
-		width: 100upx;
-		background-color: #007AFF;
-	}
-
-	.home-info>image {
-		width: 110upx;
-		height: 110upx;
-		margin: 0upx 20upx 0upx 40upx;
-		border-radius: 50%;
-		flex-shrink: 1;
-	}
-
-	.home-info .person-info {
-		display: inline-block;
-		width: 70%;
-		vertical-align: top;
-		padding-top: 5upx;
-		color: #fff;
-	}
-
-	.home-info .person-info>p {
-		font-size: 24upx;
-		line-height: 30upx;
-		opacity: .4;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
 
 	/* 个人信息End */
 
@@ -800,124 +712,80 @@
 		position: relative;
 		width: 95%;
 		height: 180upx;
-		margin: -80rpx auto 0;
 		background: #FFFFFF;
 		border-radius: 20upx;
 		box-shadow: 0upx 0upx 10upx #efeff4;
 		overflow: hidden;
 	}
 
-	.my-orders .grid-item-box {
-		padding: 20upx 0;
-	}
 
-	.my-orders .grid-item-box .icon {
-		width: 60upx;
-		height: 70upx;
-		font-size: 55upx;
-		color: #1396DB;
-		margin-bottom: 15upx;
-	}
-
-	.u-grid-iconfont .icon {
-		width: 60upx;
-		height: 70upx;
-		font-size: 55upx;
-		color: #1396DB;
-		margin-bottom: 15upx;
-	}
-
-	.u-grid-iconfont .grid-text {
-		font-size: 24upx;
-		color: #666666;
-	}
-
-	.my-orders .grid-item-box .text {
-		font-size: 24upx;
-		color: #666666;
-	}
 
 	/* 我的订单End */
 
 	/* 我的钱包Start */
-	.wallet-body {
-		margin-top: 0upx;
-		padding: 20upx 20upx 0;
-		box-sizing: border-box;
-	}
+	.my-wallet {
+		.wallet-body {
+			width: 100%;
+			height: auto;
+			padding: 8px 16px;
+			background: #FFFFFF;
+			box-shadow: 0px 4px 10px 0px #DAE3F4;
+			border-radius: 6px;
+			margin-top: 10px;
+
+			.route {
+				text {
+					font-size: 12px;
+					color: #333;
+					font-weight: 400;
+				}
 
-	.wallet-body>view {
-		flex-shrink: 1;
-	}
+				image {
+					width: 45px;
+					height: 40px;
+				}
+			}
 
-	.wallet-body>view>view {
-		line-height: 65upx;
-	}
+			.money {
+				padding: 8px 0;
+				background-color: #F9F8FD;
+				border-radius: 4px;
+				margin-top: 8px;
 
-	.wallet-body>view>view:nth-of-type(1) {
-		font-size: 24upx;
-	}
+				text {
+					font-size: 12px;
+					color: #333;
+					font-weight: 400;
+				}
 
-	.wallet-body>view>view:nth-of-type(2) {
-		font-size: 28upx;
-		font-weight: bold;
+			}
+		}
 	}
 
 	/* 我的钱包End */
 
 	/* 小的分项标题Start */
-	.header {
-		margin-top: 30upx;
-		height: 50upx;
-		padding: 0upx 50upx;
-		font-size: 28upx;
-		line-height: 50upx;
-		margin-bottom: 10upx;
-	}
 
-	.header>view:nth-of-type(1) {
-		font-weight: bold;
-	}
 
-	.header>view:nth-of-type(2) {
-		font-size: 24upx;
-		color: #BBBBBB;
-	}
-
-	.header>view:nth-of-type(2) .icon {
-		font-size: 20upx;
-	}
 
 	/* 小的分项标题End */
 
-	.order-body {
-		margin: 15upx 30upx;
-		box-shadow: 0upx 0upx 10upx #efeff4;
-		border-radius: 20upx;
-	}
+
 
 	.grid-item-box {
-		flex: 1;
-		padding: 20upx 0;
-	}
 
-	.grid-item-box .icon {
-		width: 60upx;
-		height: 70upx;
-		font-size: 50upx;
-		color: #1396DB;
-	}
+		.icon {
+			font-size: 26px;
+		}
 
-	.grid-item-box .text {
-		font-size: 24upx;
-		color: #666666;
-	}
+		.text {
+			font-size: 12px;
+		}
 
-	.grid-dot {
-		position: absolute;
-		top: 20upx;
-		right: 25upx;
-		background-color: none;
+		image {
+			width: 32px;
+			height: 32px;
+		}
 	}
 
 	.swiper {

pages/orders1/orders.vue

@@ -4,7 +4,7 @@
 		<view>
 			<view class=" flexd " style="z-index: 99;">
 				<view class="search dis a-c j-s"
-					style="background: linear-gradient( 90deg, #0052FF 0%, #6697FF 100%);padding-top:50px;">
+					style="background: linear-gradient( 90deg, #0052FF 0%, #6697FF 100%);padding-top:55px;">
 					<u-search v-model="pageRequest.licenseNo" @custom="custom" @search="search" :shape="shape"
 						:height='68' bg-color="rgba(255,255,255,0.5)" color="#fff"
 						:input-style="{background:'transparent'}" placeholder-color="#fff" :clearabled="clearabled"
@@ -27,7 +27,7 @@
 							</view>
 							<view class="term">
 								<text>保险公司</text>
-								<view class="dis  a-c f-wrap j-start" style="margin-top: 10px;">
+								<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
 									<view class="status-data" :class="item.id==pageRequest.companyId? 'active':''"
 										v-for="(item,index) in esmInsCompanyList" @tap="companystatusclick(item.id)"
 										:key="index">
@@ -611,7 +611,7 @@
 	.status-data {
 		padding: 4px 10px;
 		box-sizing: border-box;
-		margin: 0 4px 7px 0;
+		margin: 0 4px 4px 0;
 		font-size: 12px;
 		border: 1px solid #eee;
 		cursor: pointer;

pages/orders1/paymentCode.vue

@@ -73,15 +73,16 @@
 						</view>
 					</view>
 				</view>
-				<view class="dis f-c" style="margin-top: 20px;">
-					<!-- #ifdef APP-PLUS -->
-					<u-button type="primary" style="background-color:#0052FF;margin-bottom: 10px;"
-						@click="sendPayCode">发送微信</u-button>
-					<!-- #endif -->
-					<u-button type="primary" style="background-color:#EAEAEA ;color: #0052FF;"
-						@click="navOrder">返回订单</u-button>
-				</view>
+
 			</view>
+			<kxj-watermark type="fixation" color="#333" :texts="texts" :count="12"></kxj-watermark>
+		</view>
+		<view class="dis fixed-bottom f-c" style="margin-top: 20px;">
+			<!-- #ifdef APP-PLUS -->
+			<u-button type="primary" style="background-color:#0052FF;margin-bottom: 10px;"
+				@click="sendPayCode">发送微信</u-button>
+			<!-- #endif -->
+			<u-button type="primary" style="background-color:#EAEAEA ;color: #0052FF;" @click="navOrder">返回订单</u-button>
 		</view>
 	</view>
 </template>
@@ -91,14 +92,19 @@
 		mapState,
 		mapMutations
 	} from "vuex"
+	import kxjWatermark from '@/components/common/kxj-watermark/kxj-watermark.vue'
 	import {
 		pathToBase64,
 		base64ToPath
 	} from '@/common/pdf.js'
 	import QR from "@/common/wxqrcode.js"
 	export default {
+		components: {
+			kxjWatermark
+		},
 		data() {
 			return {
+				texts: [],
 				paycodeimg: "",
 				payImg: "",
 				endDateTime: "",
@@ -175,13 +181,14 @@
 			}
 		},
 		computed: {
-			...mapState(['userInfo', 'token']),
+			...mapState(['userInfo', 'token', 'userLoginId']),
 			getHeight() {
 				let height = uni.getSystemInfoSync().windowHeight;
 				return `height: ${height}px;`;
 			}
 		},
 		async onLoad(data) {
+			this.texts = [this.userLoginId]
 			if (!!data.companyId) {
 				let params = {
 					companyId: data.companyId
@@ -383,19 +390,18 @@
 
 <style lang="scss" scoped>
 	.page {
-		height: 100%;
+		height: 100vh;
 		background: #F8FAFE;
 	}
 
 	.fixed-bottom {
 		position: fixed;
-		bottom: 0;
+		bottom: 20px;
+		left: 0;
+		right: 0;
 		width: 100%;
 		height: 62px;
-		background-color: #FFFFFF;
 		padding: 16px;
-		box-shadow: 0px -4px 10px 0px #DAE3F4;
-		border-radius: 0px 0px 0px 0px;
 	}
 
 	.information {

pages/orders1/quotation.vue

@@ -7,33 +7,29 @@
 					</image>
 					<text style="font-weight: bold;margin-left: 6px; font-size: 16px;">{{dataInfo.inscompany}}报价单</text>
 				</view>
-				<view
-					style="background-color: #fff;box-shadow: inset rgb(218, 227, 244) 0px 1px 4px 0px;border-radius:0 0  6px 6px ;"
-					class="dis f-c p-2 ">
+				<view style="background-color: #fff;border-radius:0 0  6px 6px ;" class="dis f-c p-2 ">
 					<view class="" style="border-bottom: 1px dashed  #EFEFEF;padding-bottom: 10px;">
 						<view style="font-size: 16px;font-weight: bold;" class="dis j-s a-c ">
 							<text style="color: #232832;">{{dataInfo.licenseno}}</text>
 							<text style="color: #FF5600;">￥{{dataInfo.sumpremium}}</text>
 						</view>
 						<text
-							style="color: rgba(51,51,51,0.8);font-size: 14px;font-weight: bold;">{{carinfo.modelcname}}</text>
+							style="color: rgba(51,51,51,0.8);font-size: 14px;font-weight: bold;letter-spacing:2px;">{{carinfo.modelcname}}</text>
 					</view>
 					<view class="dis  Circle" style="padding-top: 10px;">
 						<view style="width: 49%;font-weight: bold;border-right: 1px dashed #EFEFEF;"
-							class="dis f-c a-start ">
-							<text style="font-size: 14px;" v-if="dataInfo.jqstartdate">{{ dataInfo.jqstartdate }}</text>
-							<text v-else>-</text>
+							v-if="dataInfo.jqstartdate" class="dis f-c a-start ">
+							<text style="font-size: 14px;">{{ dataInfo.jqstartdate }}</text>
 							<text style="font-size: 12px;color: rgba(51,51,51,0.8);">交强险起保日期</text>
 						</view>
-						<view style="width: 49%;font-weight: bold;" class="dis f-c a-end">
-							<text style="font-size: 14px;" v-if="dataInfo.systartdate">{{ dataInfo.systartdate }}</text>
-							<text v-else>-</text>
+						<view style="width: 49%;font-weight: bold;" class="dis f-c a-end" v-if="dataInfo.systartdate">
+							<text style="font-size: 14px;">{{ dataInfo.systartdate }}</text>
 							<text style="font-size: 12px;color: rgba(51,51,51,0.8);">商业险起保日期</text>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view style="padding: 0 16px;margin-top: -20px;">
+			<view style="padding:0 16px;margin-top: -20px;">
 				<view class="information">
 					<view class="dis j-s a-c">
 						<text>订单号：</text>
@@ -63,18 +59,18 @@
 						<text>座位数：</text>
 						<text>{{carinfo.seatCount}}</text>
 					</view>
+					<view class="dis j-s a-c" v-if="dataInfo.jqpremium">
+						<text>交强险</text>
+						<text>￥{{dataInfo.jqpremium}}</text>
+					</view>
 					<view class="dis j-s a-c">
 						<text>车船税</text>
-						<text>￥{{dataInfo.taxamount}}</text>
+						<text v-if="dataInfo.taxamount">￥{{dataInfo.taxamount}}</text>
 					</view>
 					<view class="dis j-s a-c" v-if="dataInfo.jypremium">
 						<text>驾意险</text>
 						<text>￥{{dataInfo.jypremium}}</text>
 					</view>
-					<view class="dis j-s a-c" v-if="dataInfo.jqpremium">
-						<text>交强险</text>
-						<text>￥{{dataInfo.jqpremium}}</text>
-					</view>
 					<view class="dis  f-c " v-if="dataInfo.sypremium">
 						<view class="dis j-s a-c">
 							<text>商业险</text>
@@ -113,7 +109,7 @@
 					</view>
 				</view>
 			</view>
-
+			<kxj-watermark type="fixation" color="#333" :texts="texts" :count="12"></kxj-watermark>
 		</view>
 		<view class="fixed-bottom">
 			<u-button type="primary" style="background-color:#0052FF ;" @tap="sendPayCode">发送微信</u-button>
@@ -122,13 +118,22 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import kxjWatermark from '@/components/common/kxj-watermark/kxj-watermark.vue'
 	import {
 		pathToBase64,
 		base64ToPath
 	} from '@/common/pdf.js'
 	export default {
+		components: {
+			kxjWatermark
+		},
 		data() {
 			return {
+				texts: [],
 				payImg: "",
 				posterUrl: "",
 				caricon: "", //carlogo
@@ -199,7 +204,12 @@
 				logoimg: "",
 			}
 		},
+		computed: {
+			...mapState(["userLoginId"])
+
+		},
 		async onLoad(options) {
+			this.texts = [this.userLoginId]
 			this.companyId = options.companyId;
 			let params = {
 				companyId: options.companyId
@@ -610,4 +620,14 @@
 	}
 
 	/* 底部的样式End */
+	.watermark {
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		font-size: 24px;
+		color: rgba(0, 0, 0, 0.3);
+		pointer-events: none;
+		z-index: 9999;
+	}
 </style>

pages/orders1/subOrders.vue

@@ -272,7 +272,7 @@
 						} else {
 							uni.showToast({
 								title: zmres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -288,7 +288,7 @@
 						} else {
 							uni.showToast({
 								title: ycres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -306,7 +306,7 @@
 						} else {
 							uni.showToast({
 								title: grres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -324,7 +324,7 @@
 						} else {
 							uni.showToast({
 								title: djres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -342,7 +342,7 @@
 						} else {
 							uni.showToast({
 								title: bhres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -366,7 +366,7 @@
 				} else {
 					uni.showToast({
 						title: res.msg,
-						icon: 'error',
+						icon: 'none',
 					});
 				}
 			},
@@ -386,7 +386,7 @@
 						} else {
 							uni.showToast({
 								title: zjres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -404,7 +404,7 @@
 						} else {
 							uni.showToast({
 								title: djres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -422,7 +422,7 @@
 						} else {
 							uni.showToast({
 								title: htres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -439,7 +439,7 @@
 						} else {
 							uni.showToast({
 								title: ycres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -457,7 +457,7 @@
 						} else {
 							uni.showToast({
 								title: grres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -475,7 +475,7 @@
 						} else {
 							uni.showToast({
 								title: zmres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -493,7 +493,7 @@
 						} else {
 							uni.showToast({
 								title: bhres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -511,7 +511,7 @@
 						} else {
 							uni.showToast({
 								title: pythonres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;

pages/user/userInfo.vue

@@ -1,95 +1,104 @@
 <template>
-	<view class="page" style="padding: none!important;">
+	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view>
-			<view class="infoTitle">基本信息</view>
+		<view class="basicInfo">
+			<view class="user-set-userinfo-list d-flex a-center j-sb" @tap="popupShow = true">
+				<view>头像</view>
+				<view class="dis a-c">
+					<image src="/static/image/my/avatar1.png" mode="" style="width: 32px;height: 32px;"></image>
+					<u-icon name="arrow-right" color="#C7C6CA" size="28"></u-icon>
+				</view>
+			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>姓名</view>
-				<view class="d-flex a-center info">{{sysUser.name}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{sysUser.name}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>会员号</view>
-				<view class="d-flex a-center info">{{sysUser.id}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{sysUser.id}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>性别</view>
-				<view class="d-flex a-center info">{{sysUser.sex}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{sysUser.sex}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>职级</view>
-				<view class="d-flex a-center info">{{sysUser.jobCode}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{sysUser.jobCode}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>电话</view>
-				<view class="d-flex a-center info">{{sysUser.mobile}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{sysUser.mobile}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>身份证号</view>
-				<view class="d-flex a-center info">{{esmUserInternal.identity}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{esmUserInternal.identity}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>出生日期</view>
-				<view class="d-flex a-center info">{{esmUserInternal.birthday}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{esmUserInternal.birthday}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>居住地址</view>
-				<view class="d-flex a-center info">{{esmUserInternal.addressnow}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{esmUserInternal.addressnow}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>注册时间</view>
-				<view class="d-flex a-center info">{{sysUser.createTime}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{sysUser.createTime}}</text>
 			</view>
 		</view>
-		<view>
-			<view class="infoTitle">影像信息</view>
+		<view class="videoInfo">
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>影像</view>
-				<view class="d-flex a-center info main-text-color" @tap="toAddImageData">查看</view>
-				<view></view>
+				<text class="d-flex a-center   main-text-color" @tap="toAddImageData">查看</text>
 			</view>
 		</view>
-
-		<view style="padding-bottom: 30upx;" v-if="this.userInfo.sysUser.status=='1'">
-			<view class="infoTitle">业务信息</view>
-			<view class="user-set-userinfo-list d-flex a-center j-sb">
-				<view>推荐人</view>
-				<view class="d-flex a-center info">
+		<view class="businessInfo" v-if="this.userInfo.sysUser.status=='1'">
+			<view class="user-set-userinfo-list dis j-s a-c">
+				<view style="width: 100px;">推荐人</view>
+				<text>
 					{{this.userInfo.sysUser.referrerId}}({{this.userInfo.sysUser.referrerName}})
-				</view>
-				<view></view>
+				</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>所属机构</view>
-				<view class="d-flex a-center info">{{this.userInfo.sysUser.deptName}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{this.userInfo.sysUser.deptName}}</text>
 			</view>
 			<view class="user-set-userinfo-list d-flex a-center j-sb">
 				<view>所属团队</view>
-				<view class="d-flex a-center info">{{this.userInfo.sysUser.roleName}}</view>
-				<view></view>
+				<text class="d-flex a-center  ">{{this.userInfo.sysUser.roleName}}</text>
 			</view>
 		</view>
+		<!-- 头像预览Start -->
+		<z-popup v-model="popupShow" :hideOnBlur="false" type="center" width="600upx" radius="12upx">
+			<view class="popup_title">
+				<text @click="popupShow = false">取消</text>
+				<view>头像预览</view>
+				<text @click="changeAvatar">更换</text>
+			</view>
+			<view class="popup_content">
+				<view class="body d-flex a-center j-center">
+					<image :src="avatar" mode="aspectFill" @longtap="saveAvatar"></image>
+				</view>
+			</view>
+		</z-popup>
 
 	</view>
 </template>
 
 <script>
+	import zPopup from '@/components/common/z-popup.vue'
+	import store from '@/store';
 	import {
 		mapState
 	} from "vuex"
 	export default {
+		components: {
+			zPopup,
+		},
 		data() {
 			return {
+				popupShow: false, //头像是否展示
 				sysUser: {},
 				esmUserInternal: {},
 				esmUserAgent: {},
@@ -99,8 +108,17 @@
 				recommenderName: "",
 				recommenderComname: "",
 				recommenderTeam: "",
+				avatar: "",
 			}
 		},
+		onShow() {
+			if (this.userInfo.sysUser.headSculpture) {
+				this.avatar = this.$base.baseUrl + this.userInfo.sysUser.headSculpture;
+			} else {
+				this.avatar = "/static/image/my/avatar1.png"
+			}
+
+		},
 		async onLoad() {
 			var sysUser = {};
 			Object.assign(this.sysUser, this.userInfo.sysUser);
@@ -121,6 +139,67 @@
 			...mapState(['userInfo', 'userCheckInfo']),
 		},
 		methods: {
+			//保存头像
+			saveAvatar() {
+				var that = this;
+				uni.saveImageToPhotosAlbum({ //保存图片
+					filePath: that.avatar,
+					success: (res) => {
+						uni.showToast({
+							title: '保存成功',
+						})
+					}
+				})
+			},
+			//修改头像
+			async changeAvatar() {
+				let [err, chooseImageRes] = await uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed']
+				});
+				if (!chooseImageRes) return;
+				const isLt2M = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 2;
+				if (!isLt2M) {
+					return uni.showToast({
+						title: '上传图片大小不能超过 2MB!',
+						icon: "none"
+					});
+				}
+				uni.uploadFile({
+					url: this.$base.baseUrl + '/ins/taskImage/uploadFile',
+					filePath: chooseImageRes.tempFilePaths[0],
+					name: "multipartFile",
+					formData: {
+						'type': 'avatar',
+					},
+					header: {
+						Authorization: store.state.token,
+					},
+					success: async (imgRes) => {
+						let data = JSON.parse(imgRes.data);
+						let res = await this.$http.post('/user/modifyingTheAvatar', {
+							imagesId: data.data.id
+						});
+						if (res.code == '200') {
+							this.popupShow = false;
+							let userInfoRes = await this.$http.get('/user/loginUser', {
+								header: {
+									Authorization: store.state.token,
+								}
+							});
+							this.avatar = this.$base.baseUrl + userInfoRes.data.headSculpture;
+							store.commit('setUserModules', {
+								title: 'userInfo',
+								data: {
+									sysUser: {
+										...userInfoRes.data
+									}
+								}
+							})
+						}
+					}
+				});
+			},
 			//影像信息
 			toAddImageData() {
 				this.navigate({
@@ -132,12 +211,71 @@
 </script>
 
 <style scoped>
+	/* 头像预览Start */
+	.popup_box {
+		width: 100%;
+	}
+
+	.popup_title {
+		display: flex;
+		justify-content: space-between;
+		height: 88upx;
+		line-height: 88upx;
+		border-bottom: 2upx solid #ebebeb;
+		padding: 0 20upx;
+		background-color: #FFF;
+	}
+
+	.popup_title view {
+		font-size: 32upx;
+		display: flex;
+		align-items: center;
+	}
+
+	.popup_title text {
+		width: 80upx;
+		flex-shrink: 0;
+		text-align: center;
+	}
+
+	.popup_title text {
+		font-size: 28upx;
+		color: #999;
+	}
+
+	.popup_title text:last-child {
+		color: $themeColor;
+	}
+
+	.popup_content {
+		padding: 40rpx 30rpx;
+		background-color: #FFFFFF;
+		text-align: center;
+	}
+
+	.popup_content .body image {
+		width: 300upx;
+		height: 300upx;
+	}
+
+	/* 头像预览End */
 	.page {
-		position: absolute;
 		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-		background-color: #F3F3F3;
+		height: 100vh;
+		padding: 16px;
+		background: #F8FAFE;
+	}
+
+	.basicInfo,
+	.videoInfo,
+	.businessInfo {
+		width: 100%;
+		height: auto;
+		background: #FFFFFF;
+		box-shadow: 0px 4px 10px 0px #DAE3F4;
+		border-radius: 6px;
+		margin-bottom: 10px;
+
 	}
 
 	.infoTitle {
@@ -150,35 +288,27 @@
 		background: #FFF;
 		padding: 15upx 30upx;
 		border-bottom: 1upx solid #F4F4F4;
-	}
-
-	.user-set-userinfo-list>view.info {
-		color: #9B9B9B;
-		width: 100%;
-	}
 
-	.user-set-userinfo-list>view:first-child {
-		width: 190upx;
-		flex-shrink: 0;
-	}
+		text {
+			font-size: 14px;
+			color: rgba(51, 51, 51, 0.8);
+		}
 
-	.user-set-userinfo-list>view:last-child {
-		width: 30upx;
-		flex-shrink: 0;
-	}
+		image {
+			width: 32px;
+			height: 32px;
+			margin-right: 10px;
+			border-radius: 50%;
+		}
 
-	.user-set-userinfo-list>view:last-child>image {
-		width: 80upx;
-		height: 80upx;
-		border-radius: 100%;
 	}
 
-	.user-set-userinfo-list>view:last-child>input {
-		text-align: right;
+	.user-set-userinfo-list:first-child {
+		border-radius: 6px 6px 0 0;
 	}
 
-	.user-set-userinfo-list>view:last-child>view:last-of-type {
-		margin-left: 20upx;
-		color: #9B9B9B;
+	.user-set-userinfo-list:last-child {
+		border: none;
+		border-radius: 0 0 6px 6px;
 	}
 </style>

pages/wallet/bankCard.vue

@@ -1,25 +1,30 @@
 <template>
 	<view class="page">
-		<view class="bankClass dis a-start" v-for="(item,index) in cardPackList" :key="item.id">
-			<view class="top ">
-				<view class="bankLogo">
-					<image src="../../static/icon/bjdcar.png" mode=""></image>
+		<view class="bankClass dis a-start f-c j-s" v-for="(item,index) in cardPackList" :key="index"
+			:style="{background:item.stylelist.background}">
+			<image class="Backgroundimage" src="/static/image/bindBank/img1.png" mode="" style=""></image>
+			<view class="dis j-s">
+				<view class="dis">
+					<view class="logo">
+						<image :src="item.stylelist.logo" mode=""></image>
+					</view>
+					<view class="banktitle dis f-c j-s">
+						<text>{{item.bankAccount}}</text>
+						<text>储蓄卡</text>
+					</view>
 				</view>
+				<image class="tool" src="/static/image/bindBank/tool.png" mode="" @click="delbankCard(item.id)"></image>
 			</view>
-			<view class="botn dis f-c a-s j-s">
-				<view class="bankName dis f-c ">
-					<text>{{item.bankAccount}}</text>
-					<text>储蓄卡</text>
-				</view>
-				<text>···· ···· ···· {{item.bankNumber.slice(-4)}}</text>
-			</view>
-			<view style="margin-left: auto;" @click="delbankCard(item.id)">
-				<u-icon name="trash-fill" color="#fff" size="50"></u-icon>
+			<view class="bank dis j-s a-c">
+				<view>****</view>
+				<view>****</view>
+				<view>****</view>
+				<text>{{item.bankNumber.slice(-4)}}</text>
 			</view>
 		</view>
-		<view class="bankClassadd dis a-c" @click="getbankCard">
-			<u-icon name="plus" color="#000" size="40"></u-icon>
-			<text style="margin-left: 10px;">添加银行卡</text>
+		<view class="fixed">
+			<u-button type="primary" style="background-color:#0052FF ;font-weight: bold;" @tap="getbankCard">+
+				添加银行卡</u-button>
 		</view>
 	</view>
 </template>
@@ -28,7 +33,65 @@
 	export default {
 		data() {
 			return {
+				bankNumber: "",
 				cardPackList: [],
+				bankList: [{
+						bankName: "中国邮政储蓄银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(79, 136, 69, 0.7) 0%, #4f8845 100%)"
+					},
+					{
+						bankName: "中国工商银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(177, 0, 13, 0.7) 0%, #b1000d 100%)"
+					},
+					{
+						bankName: "中国农业银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(86,152, 130, 0.7) 0%, #569882 100%)"
+					},
+					{
+						bankName: "中国银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(157, 32, 40, 0.7) 0%, #9d2028 100%)"
+					},
+					{
+						bankName: "中国建设银行",
+						logo: "/static/image/bankLogo/jianshe.png",
+						background: "linear-gradient(90deg, rgba(6, 89, 159, 0.7) 0%, #06569F 100%)"
+					},
+					{
+						bankName: "招商银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(197, 0, 25, 0.7) 0%, #c50019 100%)"
+					},
+					{
+						bankName: "中国民生银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(84,149, 92, 0.7) 0%, #54955c 100%)"
+					},
+					{
+						bankName: "中国光大银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(93, 30, 131, 0.7) 0%, #5d1e83 100%)"
+					},
+					{
+						bankName: "中信银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(184, 0,22, 0.7) 0%, #b80016 100%)"
+					},
+					{
+						bankName: "华夏银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(216, 12, 24, 0.7) 0%, #d80c18 100%)"
+					},
+					{
+						bankName: "中国交通银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(33, 58, 120, 0.7) 0%, #213a78 100%)"
+					},
+
+				],
 			}
 		},
 		onShow() {
@@ -41,6 +104,14 @@
 			async getcardPack() {
 				let res = await this.$http.get('/userBank/getUserBankList');
 				if (res.code == '200' && res.data) {
+					this.bankList.map(val => {
+						res.data.map(ele => {
+							if (val.bankName == ele.bankAccount) {
+								ele.stylelist = val;
+								return ele;
+							}
+						})
+					})
 					this.cardPackList = res.data;
 				}
 			},
@@ -61,40 +132,73 @@
 				}
 
 			},
+			//银行style数据匹配
+			// bankMatching(Name) {
+			// 	let obj = this.bankList.find(item => item.bankName === Name);
+			// 	return obj;
+			// }
+
+
 		},
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	page {
 		background-color: #f2f2f2;
 	}
 
 	.page {
-		padding: 10px 10px 50px;
+		padding: 10px 16px;
+	}
+
+	.fixed {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 62px;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 10px 0px rgba(0, 0, 0, 0.1);
+		padding: 12px 16px;
 	}
 
-	.bankClass,
-	.bankClassadd {
+	.bankClass {
 		width: 100%;
-		height: 120px;
-		background-color: #c65255;
+		height: 110px;
 		border-radius: 6px;
 		padding: 14px;
-		margin-top: 16px;
+		position: relative;
+
+		.Backgroundimage {
+			width: 94px;
+			height: 86px;
+			position: absolute;
+			right: 0;
+			bottom: 0;
+		}
 
-		.top {
-			margin-top: 4px;
+		>view {
+			width: 100%;
 		}
 
-		.bankLogo {
-			width: 30px;
-			height: 30px;
-			background-color: #f0cdcb;
-			border-radius: 50%;
-			padding: 4px;
-			box-sizing: border-box;
-			margin-right: 10px;
+		.bank {
+			font-size: 18px;
+			color: #fff;
+			line-height: 1;
+
+			view {
+				font-size: 18px;
+				line-height: 1;
+				margin-top: 6px;
+			}
+		}
+
+		.logo {
+			width: 39px;
+			height: 39px;
+			background: #FFFFFF;
+			border-radius: 6px;
 
 			image {
 				width: 100%;
@@ -102,30 +206,27 @@
 			}
 		}
 
-		.botn {
-			.bankName {
-				text {
-					font-size: 16px;
-					color: #fff;
-				}
+		.tool {
+			width: 28px;
+			height: 20px;
+		}
 
-				text:last-child {
-					font-size: 12px;
-					color: #ffffffb5;
-				}
-			}
+		.banktitle {
+			margin-left: 12px;
 
-			text {
-				font-size: 24px;
+			text:first-child {
+				color: #fff;
 				font-weight: bold;
+				font-size: 16px;
+				line-height: 1;
+			}
+
+			text:last-child {
 				color: #fff;
+				font-size: 12px;
+				line-height: 1;
 			}
 		}
 
 	}
-
-	.bankClassadd {
-		background-color: #fff;
-		height: 70px;
-	}
 </style>

pages/wallet/billDetails1.vue

@@ -7,42 +7,33 @@
 			<view class="tx">
 				<view class="tx-grid">
 					<view class="tx-grid-text">
-						<view class="title">手续费</view>
+						<view class="title">可提现（元）</view>
 						<view class="money">
-							<text>{{ handlingFee }}</text>
-							<text class="money-b">元</text>
+							<text v-if="handlingFee">{{ handlingFee }}</text>
+							<text v-else>0.00</text>
 						</view>
 					</view>
 				</view>
-				<view class="tx-grid" @click="toWithdraw"><span class="tx-grid-comm-sign">立即提现</span></view>
+				<view class="tx-grid-comm-sign dis j-c a-c" @click="toWithdraw">
+					<image src="/static/image/bindBank/Frame1.png" mode="" style="width: 18px;height: 18px;"></image>
+					<text>立即提现</text>
+				</view>
 			</view>
-			<view class="palace palace-one">
-				<view class="palace-grid">
-					<view class="palace-grid-text " :class="active==2?'active':''" @tap="changeTab(2)">
-						<view class="palace-grid-text-data">
-							<text>{{ applyAmount.toFixed(2) }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">提现中</view>
-					</view>
+			<view class="palace  dis a-c j-s">
+				<view class="palace-grid dis f-c">
+					<text class="">预收金额</text>
+					<text v-if="willHalding">{{ willHalding}}</text>
+					<text v-else>0.00</text>
 				</view>
-				<view class="palace-grid">
-					<view class="palace-grid-text">
-						<view class="palace-grid-text-data">
-							<text>{{ totalAmount.toFixed(2) }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">累计体现</view>
-					</view>
+				<view class="palace-grid dis f-c">
+					<text class="">提现中</text>
+					<text v-if="withdrawalHalding">{{ withdrawalHalding}}</text>
+					<text v-else>0.00</text>
 				</view>
-				<view class="palace-grid">
-					<view class="palace-grid-text" :class="active==3?'active':''" @tap="changeTab(3)">
-						<view class="palace-grid-text-data">
-							<text>{{ payamount.toFixed(2) }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">已到账</view>
-					</view>
+				<view class="palace-grid dis f-c">
+					<text class="">已提现</text>
+					<text v-if="approvedHalding">{{ approvedHalding}}</text>
+					<text v-else>0.00</text>
 				</view>
 			</view>
 		</view>
@@ -51,67 +42,101 @@
 			<view class="list-view">
 
 				<!-- 查询区域Start -->
-				<view class="queryView d-flex">
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerTypeChange" :value="typeIndex" :range="typeArray">
-							<view class="d-flex a-center">{{typeArray[typeIndex]}}
-								<view class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
+				<view class="queryCriteria dis j-s a-c ">
+					<view class="dis a-c j-c" style="width: 49%;" @click="statusShow=true">
+						<image src="/static/image/bindBank/time.png" mode="" style="width: 18px;height: 18px;"></image>
+						<text>{{statusLabel}}</text>
 					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerYearChange" :value="yearIndex" :range="yearArray">
-							<view class="d-flex a-center">{{yearArray[yearIndex]}}年 <view
-									class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerMonthChange" :value="monthIndex" :range="monthArray">
-							<view class="d-flex a-center">{{monthArray[monthIndex]}}月 <view
-									class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerDateChange" :value="dateIndex" :range="dateArray">
-							<view class="d-flex a-center">{{dateArray[dateIndex]}}日 <view
-									class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<view class="d-flex a-center px-2">合计：0.00</view>
+					<view class="" style="width: 1px;height: 90%;background-color: #D4D0D0;"></view>
+					<view class="dis a-c j-c" style="width: 49%;" @click="timeShow=true">
+						<image src="/static/image/bindBank/date.png" mode="" style="width: 18px;height: 18px;"></image>
+						<text>{{pageRequest.Date}}</text>
 					</view>
 				</view>
 				<!-- 查询区域End -->
-
-				<block v-for="(item,index) in list" :key="index">
-					<view class="list-item" @tap="toBillInfo(index)">
+				<block v-for="(item,index) in list" :key="index" v-if="[2,3].includes(active)">
+					<view class="list-item dis a-c j-s" @tap="toBillInfo(index)">
 						<view class="content-box">
 							<view class="des-box" v-if="active==2">
 								<view class="tit">订单号：{{item.id }}</view>
 								<view class="time">提现时间：{{ item.createTime }}</view>
 							</view>
-
 							<view class="des-box" v-if="active==3">
 								<view class="tit">订单号：{{item.id }}</view>
 								<view class="time">提现时间：{{ item.createTime }}</view>
-								<view class="time">到账时间：{{ item.paytime }}</view>
+								<view class="time" v-if="item.paytime">到账时间：{{ item.paytime }}</view>
+							</view>
+						</view>
+						<view class="money dis f-c a-c j-s" v-if="active==1">
+							<view
+								style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
+								预收</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
+						</view>
+						<view class="money dis f-c a-c j-s " v-if="active==2">
+							<view
+								style="padding: 0 10px;border: 1px solid #FF5600;border-radius: 30px;font-size: 12px;color: #FF5600;">
+								提现中</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
+						</view>
+						<view class="money dis f-c a-c j-s" v-if="active==3">
+							<view
+								style="padding: 0 10px;border: 1px solid #0052FF;border-radius: 30px;font-size: 12px;color: #0052FF;">
+								已提现
 							</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==2">
-							<view>{{item.amount.toFixed(2) }}</view>
-							<view>提现金额</view>
+					</view>
+				</block>
+				<block v-for="(item,index) in yushouList" :key="index" v-else>
+					<view class="list-item dis a-c j-s" @tap="yushouInfo(index)">
+						<view class="">
+							<view class="des-box">
+								<view class="tit">订单号：{{item.id }}</view>
+								<view class="time">签单时间：{{ item.signingTime }}</view>
+								<view class="time">车牌号：{{ item.licenseno }}</view>
+							</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==3">
-							<view>-{{item.amount.toFixed(2) }}</view>
-							<view>提现金额</view>
+						<view class="money dis f-c a-c j-s">
+							<view
+								style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
+								预收</view>
+							<view v-if="item.willAmount">{{item.willAmount }}</view>
+							<view v-else>0.00</view>
 						</view>
 					</view>
 				</block>
 			</view>
 		</z-paging>
+		<u-popup v-model="statusShow" mode="bottom" height="500">
+			<view class="term dis f-c j-s">
+				<view style="padding: 0 16px;">
+					<view class="title dis j-c a-c">
+						<text>状态筛选</text>
+					</view>
+					<text>订单状态</text>
+					<view class="dis  a-c  " style="margin-top: 10px;">
+						<view class="status-data" :class="item.value==active? 'active':''"
+							v-for="(item,index) in statusList" @tap.stop.prevent="statusclick(item)" :key="index">
+							{{item.label}}
+						</view>
+					</view>
+				</view>
+				<view class="operateBtn dis ">
+					<view class="cancel dis a-c j-c" @click="statusShow=false">
+						取消
+					</view>
+					<view class="confirm dis a-c j-c" @click="stausSearch">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<u-picker v-model="timeShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
 	</view>
 </template>
 
@@ -126,15 +151,45 @@
 		},
 		data() {
 			return {
+				statusShow: false, //状态筛选
+				timeShow: false, //日期筛选
+				params: {
+					year: true, //年
+					month: true, //月
+					day: false, //日
+				},
+				//状态筛选list
+				statusLabel: "提现中",
+				statusList: [
+					// {
+					// 	label: '全部',
+					// 	value: 0,
+					// 	src: "/static/image/car-insure/state1.png"
+					// },
+					{
+						label: '预收',
+						value: 1,
+						src: "/static/image/car-insure/state2.png"
+					},
+					{
+						label: '提现中',
+						value: 2,
+						src: "/static/image/car-insure/state3.png"
+					},
+					{
+						label: '已提现',
+						value: 3,
+						src: "/static/image/car-insure/state4.png"
+					},
+				],
+
+				/* 时间筛选相关 */
+				pageRequest: { //查询的默认条件
+					Date: "",
+					pageNum: 1,
+					pageSize: 20,
+				},
 				/* 查询区域Start */
-				typeIndex: 0, //订单的类型选择
-				typeArray: ['车险', '意外险', '寿险'], //订单的类型
-				yearArray: [], //订单的查询年份
-				yearIndex: 0, //订单的年份选择
-				monthArray: [], //订单的查询月份
-				monthIndex: 0, //订单的月份选择
-				dateArray: [], //订单的查询月份
-				dateIndex: 0, //订单的月份选择
 				/* 查询区域End */
 				currentPage: 1, //当前页码
 				pageSize: 5, //每页展示条数
@@ -143,40 +198,16 @@
 				list: [],
 				loadStatus: 0,
 				"handlingFee": 0, //可提现手续费金额
-				"totalAmount": 0, //总计提现
-				"applyAmount": 0, //提现中
-				"payamount": 0, //已到账
+				willHalding: 0,
+				withdrawalHalding: 0,
+				approvedHalding: 0,
+				yushouIds: '',
+				yushouList: [],
 				active: 2,
 			};
 		},
-		onLoad() {
-			// 搜索年选项Start
-			this.yearArray = [(new Date().getFullYear() - 2), (new Date().getFullYear() - 1), new Date().getFullYear(), ]
-			this.yearIndex = this.yearArray.length - 1;
-			// 搜索年选项End
-
-			// 搜索月选项Start
-			var month = new Date().getMonth() + 1;
-			for (var i = 1; i <= month; i++) {
-				if (i < 10) {
-					this.monthArray.push('0' + i);
-				} else {
-					this.monthArray.push(i);
-				}
-			}
-			this.monthIndex = this.monthArray.length - 1;
-			// 搜索月选项End
-			// 搜索日选项Start
-			var date = new Date().getDate();
-			for (var i = 1; i <= date; i++) {
-				if (i < 10) {
-					this.dateArray.push('0' + i);
-				} else {
-					this.dateArray.push(i);
-				}
-			}
-			this.dateIndex = this.dateArray.length - 1;
-			// 搜索日选项End
+		onLoad(params) {
+			this.pageRequest.Date = this.transformTime();
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -187,8 +218,55 @@
 		},
 		onShow() {
 			this.getCarAdvanceMoney();
+			this.getOrdersList(1, 20);
 		},
 		methods: {
+			async stausSearch() {
+				switch (this.active) {
+					case 1:
+						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
+							ids: this.yushouIds,
+							timeFiltering: this.pageRequest.Date,
+							amountType: "1",
+						});
+						if (res.code == 200 && res.data) {
+							this.yushouList = res.data.insFeeOrderNewList;
+							this.statusShow = false;
+						}
+						break;
+					case 2:
+					case 3:
+						await this.getOrdersList(1, 20);
+						this.statusShow = false;
+						break;
+					default:
+						break;
+				}
+			},
+			async startconfirm(e) {
+				this.pageRequest.Date = e.year + '-' + e.month;
+				switch (this.active) {
+					case 1:
+						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
+							ids: this.yushouIds,
+							timeFiltering: this.pageRequest.Date,
+							amountType: "1",
+						});
+						if (res.code == 200 && res.data) {
+							this.yushouList = res.data.insFeeOrderNewList;
+						}
+						break;
+					case 2:
+					case 3:
+						await this.getOrdersList(1, 20);
+						break;
+				}
+			},
+			//状态筛选
+			statusclick(e) {
+				this.active = e.value;
+				this.statusLabel = e.label;
+			},
 			async changeTab(tabIndex) {
 				this.active = tabIndex;
 				this.list = [];
@@ -217,55 +295,51 @@
 					}, "navigateTo", true)
 				}
 			},
-			bindPickerTypeChange(e) {
-				this.typeIndex = e.target.value;
-			},
-			//搜索年发生变化
-			bindPickerYearChange(e) {
-				this.yearIndex = e.target.value;
-				this.monthArray = [];
-				if (this.yearIndex == (this.yearArray.length - 1)) {
-					var month = new Date().getMonth() + 1;
-					for (var i = 1; i <= month; i++) {
-						if (i < 10) {
-							this.monthArray.push('0' + i);
-						} else {
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex = this.monthArray.length - 1;
+			// 预收账户金额查询 
+			async getCarAdvanceMoney() {
+				let res = await this.$http.get('/sysUserAccount/getSysAllAmount');
+				// 请求失败处理
+				if (res.code == 200 && res.data) {
+					this.handlingFee = res.data.handlingFee; //可提现
+					this.willHalding = res.data.willHalding; //预收
+					this.withdrawalHalding = res.data.withdrawalHalding; //提现中
+					this.approvedHalding = res.data.approvedHalding; //已提现
+					this.yushouIds = res.data.ids;
 				} else {
-					for (var i = 1; i <= 12; i++) {
-						if (i < 10) {
-							this.monthArray.push('0' + i);
-						} else {
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex = 0;
+					this.handlingFee = 0; //手续费
+					this.documentary = 0; //非跟单
+					this.promotion = 0; //佣金
 				}
 			},
-			//搜索月发生变化
-			bindPickerMonthChange(e) {
-				this.monthIndex = e.target.value;
-			},
-			bindPickerDateChange(e) {
-				this.dateIndex = e.target.value;
+			toBillInfo(index) {
+				this.navigate({
+					url: '/pages/wallet/billInfo',
+					success: (res) => {
+						res.eventChannel.emit("acceptData", {
+							item: this.list[index],
+							active: this.active,
+						})
+					}
+				}, "navigateTo", true)
 			},
-			// 预收账户金额查询 
-			async getCarAdvanceMoney() {
-				let res = await this.$http.get('/sysUserAccount/getSysUserAmount?userid=' + this.userInfo.sysUser.id);
-				if (res.code == 200) {
-					this.handlingFee = res.data.handlingFee;
-				}
+			yushouInfo(index) {
+				this.navigate({
+					url: '/pages/wallet/billInfo',
+					success: (res) => {
+						res.eventChannel.emit("acceptData", {
+							item: this.yushouList[index],
+							active: this.active,
+						})
+					}
+				}, "navigateTo", true)
 			},
-
 			//获取订单数据Start
 			async getOrdersList(pageNo, pageSize) {
 				var data = {
 					"pageNum": pageNo,
 					"pageSize": pageSize,
 					"amountStatus": '1',
+					[this.active == 2 ? "withdrawalTime" : "timeFiltering"]: this.pageRequest.Date,
 					"auditingStatus": this.active,
 				};
 				let res = await this.$http.post('/sysAmountAuditing/queryAppPage', data);
@@ -274,12 +348,44 @@
 				if (res.code == 200) {
 					if (res.data.content.length > 0) {
 						content = res.data.content;
-						this.applyAmount = content[0].amount
+
 					}
 				}
 				this.$refs.paging.complete(content);
 			},
 			//获取订单数据End
+			//当前时间
+			transformTime(day) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = day ? date.getDate() - day : date.getDate();
+				var strMonth = date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth;
+				return datastr;
+			},
+			transformTime1(month) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = date.getDate();
+				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+
+				var datastr = strYear + "-" + strMonth;
+				console.log(datastr);
+				return datastr;
+			},
 		},
 	};
 </script>
@@ -288,41 +394,139 @@
 	@import '@/style/mixin.scss';
 
 	page {
+		padding: 12px 16px;
 		background-color: #fff;
 	}
 
+	.term {
+
+		height: 100%;
+
+		.title {
+			font-size: 14px;
+			font-weight: bold;
+			color: #232832;
+			padding: 10px 0;
+			border-bottom: 1px solid #f2f2f2;
+		}
+
+		>text {
+			font-size: 13px;
+			font-weight: bold;
+			color: #232832;
+			margin-bottom: 10px;
+		}
+
+		.status-data {
+			padding: 4px 10px;
+			box-sizing: border-box;
+			margin-right: 10px;
+			font-size: 12px;
+			border: 1px solid #eee;
+			cursor: pointer;
+		}
+
+		.operateBtn {
+			font-weight: bold;
+			font-size: 16px;
+
+			.cancel {
+				width: 50%;
+				height: 46px;
+				color: #0052FF;
+				background-color: #EAEAEA;
+			}
+
+			.confirm {
+				width: 50%;
+				height: 46px;
+				color: #fff;
+				background-color: #0052FF;
+			}
+		}
+	}
+
+
+	.active {
+		position: relative;
+		background: rgba(0, 82, 255, 0.1);
+		color: #0052FF;
+		border: 1px solid #0052FF;
+		font-weight: 700;
+	}
+
+	.queryCriteria {
+		width: 100%;
+		height: 32px;
+		background: #FFFBF2;
+		border-radius: 6px;
+		margin-top: 26px;
+		font-size: 14px;
+		color: rgba(51, 51, 51, 0.8);
+
+		text {
+			margin-left: 5px;
+		}
+	}
+
 	.white-box {
-		width: 94%;
-		background: white;
-		border-radius: 10rpx;
-		margin: 20rpx auto 20rpx;
-		box-shadow: 0 6rpx 20rpx #e7e7e7;
+		width: 100%;
+		height: 155px;
+		background: linear-gradient(270deg, #F9D27B 0%, #E5B25F 100%);
+		box-shadow: 0px 10px 20px 0px rgba(224, 179, 106, 0.4);
+		border-radius: 6px;
+		padding: 34rpx 40rpx;
+		position: relative;
+	}
+
+	.palace {
+		color: #fff;
+		margin-top: 8px;
+
+		.palace-grid {
+			font-size: 12px;
+
+			text:last-child {
+				font-size: 14px;
+				font-family: DIN, DIN;
+				font-weight: bold;
+			}
+
+		}
+
 	}
 
 	.white-box .tx {
-		padding-top: 26rpx;
 		overflow: hidden;
 		display: flex;
 		justify-content: space-between;
 		align-content: center;
+		border-bottom: 1px solid #f2f2f2;
 	}
 
 	.white-box .tx .tx-grid {
 		box-sizing: border-box;
 	}
 
-	.white-box .tx .tx-grid:first-child {
-		margin-left: 40rpx;
-	}
 
-	.white-box .tx .tx-grid .tx-grid-comm-sign {
-		display: block;
-		border-radius: 40rpx 0 0 40rpx;
-		font-size: 26rpx;
-		padding: 16rpx 44rpx;
-		background: linear-gradient(to right, rgba($themeColor, 0.8), rgba($themeColor, 0.6));
-		color: #fff;
+
+	.tx-grid-comm-sign {
+		width: 90px;
+		height: 30px;
+		background: rgba(255, 255, 255, 0.6);
+		box-shadow: -1px 4px 4px 0px rgba(204, 149, 57, 0.2);
+		border-radius: 14px 0px 0px 14px;
 		font-weight: bold;
+		position: absolute;
+		right: 0;
+		top: 44px;
+
+		text {
+			font-size: 14px;
+			color: #CC9539;
+			margin-left: 2px;
+		}
+
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text {
@@ -337,69 +541,18 @@
 	.white-box .tx .tx-grid .tx-grid-text .title {
 		font-size: 26rpx;
 		font-weight: normal;
-		color: $themeColor;
+		color: #fff;
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text .money {
-		font-size: 60rpx;
-		color: $themeColor;
-		letter-spacing: 2rpx;
-		margin-bottom: 10rpx;
+		font-size: 24px;
+		color: #fff;
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text .money-b {
 		font-size: 28rpx;
 	}
 
-	.white-box .palace {
-		padding-bottom: 20rpx;
-		overflow: hidden;
-		display: flex;
-		justify-content: center;
-	}
-
-	.white-box .palace .palace-grid {
-		flex: 1;
-		position: relative;
-		box-sizing: border-box;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text {
-		display: block;
-		text-align: center;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text.active {
-		background-color: rgba($themeColor, 0.6);
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-name {
-		font-size: 26rpx;
-		font-weight: normal;
-		color: $themeColor;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text.active .palace-grid-text-name {
-		color: #FFFFFF !important;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-data {
-		font-size: 32rpx;
-		color: $themeColor;
-		letter-spacing: 2rpx;
-		margin-bottom: 5rpx;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text.active .palace-grid-text-data {
-		color: #FFFFFF !important;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-data .palace-grid-text-data-b {
-		font-size: 20rpx;
-	}
 
 	.list-view {
 		position: relative;
@@ -412,9 +565,6 @@
 		padding: 30rpx 28rpx;
 		box-sizing: border-box;
 		background: #fff;
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
 		border-bottom: 1rpx solid #eaeef1;
 	}
 
@@ -422,15 +572,9 @@
 		left: 0 !important;
 	}
 
-	.content-box {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-	}
 
 	.des-box {
 		min-height: 80rpx;
-		padding-left: 28rpx;
 		box-sizing: border-box;
 		vertical-align: top;
 		color: #333;
@@ -459,11 +603,10 @@
 	.money {
 		font-size: 38rpx;
 		font-weight: 500;
-		color: #1E85FE;
+		color: #333;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		padding-left: 20rpx;
 	}
 
 	.less {

pages/wallet/billDetails2.vue

@@ -2,107 +2,141 @@
 	<view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
+
 		<view class="white-box">
 			<view class="tx">
 				<view class="tx-grid">
 					<view class="tx-grid-text">
-						<view class="title">可提现余额</view>
+						<view class="title">可提现（元）</view>
 						<view class="money">
-							<text>{{ documentary }}</text>
-							<text class="money-b">元</text>
+							<text v-if="documentary">{{ documentary }}</text>
+							<text v-else>0.00</text>
 						</view>
 					</view>
 				</view>
-				<view class="tx-grid" @click="toWithdraw"><span class="tx-grid-comm-sign">立即提现</span></view>
+				<view class="tx-grid-comm-sign dis j-c a-c" @click="toWithdraw">
+					<image src="/static/image/bindBank/Frame1.png" mode="" style="width: 18px;height: 18px;"></image>
+					<text>立即提现</text>
+				</view>
 			</view>
-			<view class="palace palace-one">
-				<view class="palace-grid">
-					<view class="palace-grid-text" :class="active==2?'active':''" @tap="changeTab(2)">
-						<view class="palace-grid-text-data">
-							<text>{{ applyAmount.toFixed(2) }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">提现中</view>
-					</view>
+			<view class="palace  dis a-c j-s">
+				<view class="palace-grid dis f-c">
+					<text class="">预收金额</text>
+					<text v-if="willDocumentary">{{ willDocumentary }}</text>
+					<text v-else>0.00</text>
 				</view>
-				<view class="palace-grid">
-					<view class="palace-grid-text">
-						<view class="palace-grid-text-data">
-							<text>{{ totalAmount.toFixed(2) }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">累计提现</view>
-					</view>
+				<view class="palace-grid dis f-c">
+					<text class="">提现中</text>
+					<text v-if="withdrawalDocumentary">{{ withdrawalDocumentary}}</text>
+					<text v-else>0.00</text>
 				</view>
-				<view class="palace-grid">
-					<view class="palace-grid-text" :class="active==3?'active':''" @tap="changeTab(3)">
-						<view class="palace-grid-text-data">
-							<text>{{ payamount.toFixed(2) }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">已到账</view>
-					</view>
+				<view class="palace-grid dis f-c">
+					<text class="">已提现</text>
+					<text v-if="approvedDocumentary">{{ approvedDocumentary }}</text>
+					<text v-else>0.00</text>
 				</view>
 			</view>
 		</view>
-
-		<z-paging auto-show-back-to-top ref="paging" @query="getOrdersList" v-model="list" :default-page-size="20"
+		<z-paging auto-show-back-to-top ref="paging" @query="getOrdersList" :list.sync="list" :default-page-size="20"
 			:mounted-auto-call-reload="true" :style="getHeight">
 			<view class="list-view">
+
 				<!-- 查询区域Start -->
-				<view class="queryView d-flex">
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerYearChange" :value="yearIndex" :range="yearArray">
-							<view class="d-flex a-center">{{yearArray[yearIndex]}}年 <view
-									class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerMonthChange" :value="monthIndex" :range="monthArray">
-							<view class="d-flex a-center">{{monthArray[monthIndex]}}月 <view
-									class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerDateChange" :value="dateIndex" :range="dateArray">
-							<view class="d-flex a-center">{{dateArray[dateIndex]}}日 <view
-									class="icon iconfont icon-xiala"></view>
-							</view>
-						</picker>
+				<view class="queryCriteria dis j-s a-c ">
+					<view class="dis a-c j-c" style="width: 49%;" @click="statusShow=true">
+						<image src="/static/image/bindBank/time.png" mode="" style="width: 18px;height: 18px;"></image>
+						<text>{{statusLabel}}</text>
 					</view>
-					<view class="d-flex a-center j-center">
-						<view class="d-flex a-center px-2">合计：0.00</view>
+					<view class="" style="width: 1px;height: 90%;background-color: #D4D0D0;"></view>
+					<view class="dis a-c j-c" style="width: 49%;" @click="timeShow=true">
+						<image src="/static/image/bindBank/date.png" mode="" style="width: 18px;height: 18px;"></image>
+						<text>{{pageRequest.Date}}</text>
 					</view>
 				</view>
 				<!-- 查询区域End -->
-				<block v-for="(item,index) in list" :key="index">
-					<view class="list-item" @tap="toBillInfo(index)">
-						<view class="content-box">
+				<block v-for="(item,index) in list" :key="index" v-if="[2,3].includes(active)">
+					<view class="list-item dis a-c j-s" @tap="toBillInfo(index)">
+						<view class="">
 							<view class="des-box" v-if="active==2">
 								<view class="tit">订单号：{{item.id }}</view>
 								<view class="time">提现时间：{{ item.createTime }}</view>
 							</view>
-
 							<view class="des-box" v-if="active==3">
 								<view class="tit">订单号：{{item.id }}</view>
 								<view class="time">提现时间：{{ item.createTime }}</view>
-								<view class="time">到账时间：{{ item.paytime }}</view>
+								<view class="time" v-if="item.paytime">到账时间：{{ item.paytime }}</view>
+							</view>
+						</view>
+						<view class="money dis f-c a-c j-s" v-if="active==1">
+							<view
+								style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
+								预收</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
+						</view>
+						<view class="money dis f-c a-c j-s " v-if="active==2">
+							<view
+								style="padding: 0 10px;border: 1px solid #FF5600;border-radius: 30px;font-size: 12px;color: #FF5600;">
+								提现中</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
+						</view>
+						<view class="money dis f-c a-c j-s" v-if="active==3">
+							<view
+								style="padding: 0 10px;border: 1px solid #0052FF;border-radius: 30px;font-size: 12px;color: #0052FF;">
+								已提现
 							</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==2">
-							<view>{{item.amount.toFixed(2) }}</view>
-							<view>提现金额</view>
+					</view>
+				</block>
+				<block v-for="(item,index) in yushouList" :key="index" v-else>
+					<view class="list-item dis a-c j-s" @tap="yushouInfo(index)">
+						<view class="content-box">
+							<view class="des-box">
+								<view class="tit">订单号：{{item.id }}</view>
+								<view class="time">签单时间：{{ item.signingTime }}</view>
+								<view class="time">车牌号：{{ item.licenseno }}</view>
+							</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==3">
-							<view>-{{item.amount.toFixed(2) }}</view>
-							<view>提现金额</view>
+						<view class="money dis f-c a-c j-s">
+							<view
+								style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
+								预收</view>
+							<view v-if="item.willAmount">{{item.willAmount }}</view>
+							<view v-else>0.00</view>
 						</view>
 					</view>
 				</block>
 			</view>
 		</z-paging>
+		<u-popup v-model="statusShow" mode="bottom" height="500">
+			<view class="term dis f-c j-s">
+				<view style="padding: 0 16px;">
+					<view class="title dis j-c a-c">
+						<text>状态筛选</text>
+					</view>
+					<text>订单状态</text>
+					<view class="dis  a-c  " style="margin-top: 10px;">
+						<view class="status-data" :class="item.value==active? 'active':''"
+							v-for="(item,index) in statusList" @tap.stop.prevent="statusclick(item)" :key="index">
+							{{item.label}}
+						</view>
+					</view>
+				</view>
+				<view class="operateBtn dis ">
+					<view class="cancel dis a-c j-c" @click="statusShow=false">
+						取消
+					</view>
+					<view class="confirm dis a-c j-c" @click="stausSearch">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<u-picker v-model="timeShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
 	</view>
 </template>
 
@@ -115,136 +149,129 @@
 		components: {
 			ZPagingMixin
 		},
-		computed: {
-			...mapState(['userInfo']),
-			getHeight() {
-				let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(356);
-				return `height: ${height}px`;
-			}
-		},
-		onLoad() {
-			// 搜索年选项Start
-			this.yearArray = [(new Date().getFullYear() - 2), (new Date().getFullYear() - 1), new Date().getFullYear(), ]
-			this.yearIndex = this.yearArray.length - 1;
-			// 搜索年选项End
-
-			// 搜索月选项Start
-			var month = new Date().getMonth() + 1;
-			for (var i = 1; i <= month; i++) {
-				if (i < 10) {
-					this.monthArray.push('0' + i);
-				} else {
-					this.monthArray.push(i);
-				}
-			}
-			this.monthIndex = this.monthArray.length - 1;
-			// 搜索月选项End
-			// 搜索日选项Start
-			var date = new Date().getDate();
-			for (var i = 1; i <= date; i++) {
-				if (i < 10) {
-					this.dateArray.push('0' + i);
-				} else {
-					this.dateArray.push(i);
-				}
-			}
-			this.dateIndex = this.dateArray.length - 1;
-			// 搜索日选项End
-		},
 		data() {
 			return {
+				statusShow: false, //状态筛选
+				timeShow: false, //日期筛选
+				params: {
+					year: true, //年
+					month: true, //月
+					day: false, //日
+				},
+				//状态筛选list
+				statusLabel: "提现中",
+				statusList: [
+					// {
+					// 	label: '全部',
+					// 	value: 0,
+					// 	src: "/static/image/car-insure/state1.png"
+					// },
+					{
+						label: '预收',
+						value: 1,
+						src: "/static/image/car-insure/state2.png"
+					},
+					{
+						label: '提现中',
+						value: 2,
+						src: "/static/image/car-insure/state3.png"
+					},
+					{
+						label: '已提现',
+						value: 3,
+						src: "/static/image/car-insure/state4.png"
+					},
+				],
+
+				/* 时间筛选相关 */
+				pageRequest: { //查询的默认条件
+					Date: "",
+					pageNum: 1,
+					pageSize: 20,
+				},
 				/* 查询区域Start */
-				yearArray: [], //订单的查询年份
-				yearIndex: 0, //订单的年份选择
-				monthArray: [], //订单的查询月份
-				monthIndex: 0, //订单的月份选择
-				dateArray: [], //订单的查询月份
-				dateIndex: 0, //订单的月份选择
 				/* 查询区域End */
-				active: 2,
+				currentPage: 1, //当前页码
+				pageSize: 5, //每页展示条数
+				totalPages: 0, //总页数
+				totalSize: 0, //总条数
 				list: [],
-				"totalAmount": 0, //总计提现
-				"applyAmount": 0, //提现中
-				"payamount": 0, //已到账
-				"documentary": 0, //可提现金额
-
+				loadStatus: 0,
+				"documentary": 0, //可提现手续费金额
+				willDocumentary: 0,
+				withdrawalDocumentary: 0,
+				approvedDocumentary: 0,
+				yushouIds: '',
+				yushouList: [],
+				active: 2,
 			};
 		},
-		async onShow() {
-			await this.getPayAccount();
+		onLoad(params) {
+			this.pageRequest.Date = this.transformTime();
+		},
+		computed: {
+			...mapState(['userInfo']),
+			getHeight() {
+				let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(356);
+				return `height: ${height}px`;
+			}
+		},
+		onShow() {
+			this.getCarAdvanceMoney();
+			this.getOrdersList(1, 20);
 		},
 		methods: {
-			//搜索年发生变化
-			bindPickerYearChange(e) {
-				this.yearIndex = e.target.value;
-				this.monthArray = [];
-				if (this.yearIndex == (this.yearArray.length - 1)) {
-					var month = new Date().getMonth() + 1;
-					for (var i = 1; i <= month; i++) {
-						if (i < 10) {
-							this.monthArray.push('0' + i);
-						} else {
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex = this.monthArray.length - 1;
-				} else {
-					for (var i = 1; i <= 12; i++) {
-						if (i < 10) {
-							this.monthArray.push('0' + i);
-						} else {
-							this.monthArray.push(i);
+			async stausSearch() {
+				switch (this.active) {
+					case 1:
+						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
+							ids: this.yushouIds,
+							timeFiltering: this.pageRequest.Date,
+							amountType: "2",
+						});
+						if (res.code == 200 && res.data) {
+							this.yushouList = res.data.insFeeOrderNewList;
+							this.statusShow = false;
 						}
-					}
-					this.monthIndex = 0;
+						break;
+					case 2:
+					case 3:
+						await this.getOrdersList(1, 20);
+						this.statusShow = false;
+						break;
+					default:
+						break;
 				}
 			},
-			//搜索月发生变化
-			bindPickerMonthChange(e) {
-				this.monthIndex = e.target.value;
+			async startconfirm(e) {
+				this.pageRequest.Date = e.year + '-' + e.month;
+				switch (this.active) {
+					case 1:
+						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
+							ids: this.yushouIds,
+							timeFiltering: this.pageRequest.Date,
+							amountType: "2",
+						});
+						if (res.code == 200 && res.data) {
+							this.yushouList = res.data.insFeeOrderNewList;
+						}
+						break;
+					case 2:
+					case 3:
+						await this.getOrdersList(1, 20);
+						break;
+				}
 			},
-			bindPickerDateChange(e) {
-				this.dateIndex = e.target.value;
+			//状态筛选
+			statusclick(e) {
+				this.active = e.value;
+				this.statusLabel = e.label;
 			},
-
 			async changeTab(tabIndex) {
 				this.active = tabIndex;
 				this.list = [];
 				await this.getOrdersList(1, 20);
 			},
-
-			// 预收账户金额查询 
-			async getPayAccount() {
-				let res = await this.$http.get('/sysUserAccount/getSysUserAmount?userid=' + this.userInfo.sysUser.id);
-				if (res.code == 200) {
-					this.documentary = res.data.documentary;
-				}
-			},
-
-			//获取订单数据Start
-			async getOrdersList(pageNo, pageSize) {
-				var data = {
-					"pageNum": pageNo,
-					"pageSize": pageSize,
-					"amountStatus": '2',
-					"auditingStatus": this.active,
-				};
-				let res = await this.$http.post('/sysAmountAuditing/queryAppPage', data);
-
-				let content = [];
-				if (res.code == 200) {
-					if (res.data.content.length > 0) {
-						content = res.data.content;
-					}
-				}
-				this.$refs.paging.complete(content);
-			},
-			//获取订单数据End
-			navTo(url) {
-				this.navigate({
-					url: url
-				}, "navigateTo", true)
-			},
 			// 去提现
 			async toWithdraw() {
 				let res = await this.$http.get('/userBank/getUserBankList');
@@ -267,19 +294,97 @@
 						}
 					}, "navigateTo", true)
 				}
-
+			},
+			// 预收账户金额查询 
+			async getCarAdvanceMoney() {
+				let res = await this.$http.get('/sysUserAccount/getSysAllAmount');
+				if (res.code == 200 && res.data) {
+					this.documentary = res.data.documentary; //可提现
+					this.willDocumentary = res.data.willDocumentary; //预收
+					this.withdrawalDocumentary = res.data.withdrawalDocumentary; //提现中
+					this.approvedDocumentary = res.data.approvedDocumentary; //已提现
+					this.yushouIds = res.data.ids;
+				} else {
+					this.willDocumentary = 0; //手续费
+					this.withdrawalDocumentary = 0; //非跟单
+					this.approvedDocumentary = 0; //佣金
+				}
 			},
 			toBillInfo(index) {
 				this.navigate({
 					url: '/pages/wallet/billInfo',
 					success: (res) => {
 						res.eventChannel.emit("acceptData", {
-							item: this.list[index]
+							item: this.list[index],
+							active: this.active,
 						})
 					}
 				}, "navigateTo", true)
-			}
+			},
+			yushouInfo(index) {
+				this.navigate({
+					url: '/pages/wallet/billInfo',
+					success: (res) => {
+						res.eventChannel.emit("acceptData", {
+							item: this.yushouList[index],
+							active: this.active,
+						})
+					}
+				}, "navigateTo", true)
+			},
+			//获取订单数据Start
+			async getOrdersList(pageNo, pageSize) {
+				var data = {
+					"pageNum": pageNo,
+					"pageSize": pageSize,
+					"amountStatus": '2',
+					[this.active == 2 ? "withdrawalTime" : "timeFiltering"]: this.pageRequest.Date,
+					"auditingStatus": this.active,
+				};
+				let res = await this.$http.post('/sysAmountAuditing/queryAppPage', data);
+
+				let content = [];
+				if (res.code == 200) {
+					if (res.data.content.length > 0) {
+						content = res.data.content;
+
+					}
+				}
+				this.$refs.paging.complete(content);
+			},
+			//获取订单数据End
+			//当前时间
+			transformTime(day) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = day ? date.getDate() - day : date.getDate();
+				var strMonth = date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth;
+				return datastr;
+			},
+			transformTime1(month) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = date.getDate();
+				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
 
+				var datastr = strYear + "-" + strMonth;
+				console.log(datastr);
+				return datastr;
+			},
 		},
 	};
 </script>
@@ -288,41 +393,139 @@
 	@import '@/style/mixin.scss';
 
 	page {
+		padding: 12px 16px;
 		background-color: #fff;
 	}
 
+	.term {
+
+		height: 100%;
+
+		.title {
+			font-size: 14px;
+			font-weight: bold;
+			color: #232832;
+			padding: 10px 0;
+			border-bottom: 1px solid #f2f2f2;
+		}
+
+		>text {
+			font-size: 13px;
+			font-weight: bold;
+			color: #232832;
+			margin-bottom: 10px;
+		}
+
+		.status-data {
+			padding: 4px 10px;
+			box-sizing: border-box;
+			margin-right: 10px;
+			font-size: 12px;
+			border: 1px solid #eee;
+			cursor: pointer;
+		}
+
+		.operateBtn {
+			font-weight: bold;
+			font-size: 16px;
+
+			.cancel {
+				width: 50%;
+				height: 46px;
+				color: #0052FF;
+				background-color: #EAEAEA;
+			}
+
+			.confirm {
+				width: 50%;
+				height: 46px;
+				color: #fff;
+				background-color: #0052FF;
+			}
+		}
+	}
+
+
+	.active {
+		position: relative;
+		background: rgba(0, 82, 255, 0.1);
+		color: #0052FF;
+		border: 1px solid #0052FF;
+		font-weight: 700;
+	}
+
+	.queryCriteria {
+		width: 100%;
+		height: 32px;
+		background: #FFFBF2;
+		border-radius: 6px;
+		margin-top: 26px;
+		font-size: 14px;
+		color: rgba(51, 51, 51, 0.8);
+
+		text {
+			margin-left: 5px;
+		}
+	}
+
 	.white-box {
-		width: 94%;
-		background: white;
-		border-radius: 10rpx;
-		margin: 20rpx auto 20rpx;
-		box-shadow: 0 6rpx 20rpx #e7e7e7;
+		width: 100%;
+		height: 155px;
+		background: linear-gradient(270deg, #F9D27B 0%, #E5B25F 100%);
+		box-shadow: 0px 10px 20px 0px rgba(224, 179, 106, 0.4);
+		border-radius: 6px;
+		padding: 34rpx 40rpx;
+		position: relative;
+	}
+
+	.palace {
+		color: #fff;
+		margin-top: 8px;
+
+		.palace-grid {
+			font-size: 12px;
+
+			text:last-child {
+				font-size: 14px;
+				font-family: DIN, DIN;
+				font-weight: bold;
+			}
+
+		}
+
 	}
 
 	.white-box .tx {
-		padding-top: 26rpx;
 		overflow: hidden;
 		display: flex;
 		justify-content: space-between;
 		align-content: center;
+		border-bottom: 1px solid #f2f2f2;
 	}
 
 	.white-box .tx .tx-grid {
 		box-sizing: border-box;
 	}
 
-	.white-box .tx .tx-grid:first-child {
-		margin-left: 40rpx;
-	}
 
-	.white-box .tx .tx-grid .tx-grid-comm-sign {
-		display: block;
-		border-radius: 40rpx 0 0 40rpx;
-		font-size: 26rpx;
-		padding: 16rpx 44rpx;
-		background: linear-gradient(to right, rgba($themeColor, 0.8), rgba($themeColor, 0.6));
-		color: #fff;
+
+	.tx-grid-comm-sign {
+		width: 90px;
+		height: 30px;
+		background: rgba(255, 255, 255, 0.6);
+		box-shadow: -1px 4px 4px 0px rgba(204, 149, 57, 0.2);
+		border-radius: 14px 0px 0px 14px;
 		font-weight: bold;
+		position: absolute;
+		right: 0;
+		top: 44px;
+
+		text {
+			font-size: 14px;
+			color: #CC9539;
+			margin-left: 2px;
+		}
+
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text {
@@ -334,70 +537,21 @@
 		overflow: hidden;
 	}
 
-	.white-box .palace .palace-grid .palace-grid-text.active {
-		background-color: rgba($themeColor, 0.6);
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text.active>view {
-		color: #FFFFFF;
-	}
-
 	.white-box .tx .tx-grid .tx-grid-text .title {
 		font-size: 26rpx;
 		font-weight: normal;
-		color: $themeColor;
+		color: #fff;
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text .money {
-		font-size: 60rpx;
-		color: $themeColor;
-		letter-spacing: 2rpx;
-		margin-bottom: 10rpx;
+		font-size: 24px;
+		color: #fff;
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text .money-b {
 		font-size: 28rpx;
 	}
 
-	.white-box .palace {
-		padding-bottom: 20rpx;
-		overflow: hidden;
-		display: flex;
-		justify-content: center;
-	}
-
-	.white-box .palace .palace-grid {
-		flex: 1;
-		position: relative;
-		box-sizing: border-box;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text {
-		display: block;
-		text-align: center;
-		color: #333;
-		font-size: 32rpx;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-name {
-		font-size: 26rpx;
-		font-weight: normal;
-		color: $themeColor;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-data {
-		font-size: 32rpx;
-		color: $themeColor;
-		letter-spacing: 2rpx;
-		margin-bottom: 5rpx;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-data .palace-grid-text-data-b {
-		font-size: 20rpx;
-	}
 
 	.list-view {
 		position: relative;
@@ -410,9 +564,6 @@
 		padding: 30rpx 28rpx;
 		box-sizing: border-box;
 		background: #fff;
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
 		border-bottom: 1rpx solid #eaeef1;
 	}
 
@@ -446,6 +597,10 @@
 		text-overflow: ellipsis;
 	}
 
+	.source {
+		margin: 12rpx 0;
+	}
+
 	.time {
 		color: #888;
 	}
@@ -453,13 +608,49 @@
 	.money {
 		font-size: 38rpx;
 		font-weight: 500;
-		color: $themeColor;
+		color: #333;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		padding-left: 20rpx;
 	}
 
+	.less {
+		color: #4caf50 !important;
+	}
+
+	.tip {
+		margin-top: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		font-size: 24rpx;
+		color: #888;
+	}
+
+	.nothing {
+		position: absolute;
+		top: 320upx;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.nothing>view {
+		line-height: 1;
+	}
+
+	.nothing>view.icon {
+		/* color: #66A3FF; */
+		color: #989898;
+		font-size: 260upx;
+	}
+
+	.nothing>view.text {
+		font-size: 28upx;
+		color: #989898;
+	}
+
+
 	/* 查询区域Start */
 	.queryView {
 		justify-content: space-around;
@@ -476,11 +667,11 @@
 	}
 
 	.queryView>view:nth-child(1) {
-		flex: 4;
+		flex: 3;
 	}
 
 	.queryView>view:nth-child(2) {
-		flex: 3;
+		flex: 4;
 	}
 
 	.queryView>view:nth-child(3) {
@@ -489,7 +680,7 @@
 
 	.queryView>view:nth-child(4) {
 		border-right: 1px solid #FFC38F;
-		flex: 4;
+		flex: 3;
 	}
 
 	/* 查询区域End */

pages/wallet/billDetails3.vue

@@ -1,118 +1,146 @@
 <template>
 	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+
 		<view class="white-box">
 			<view class="tx">
 				<view class="tx-grid">
 					<view class="tx-grid-text">
-						<view class="title">可提现推广费</view>
+						<view class="title">可提现（元）</view>
 						<view class="money">
-							<text>{{ promotion }}</text>
-							<text class="money-b">元</text>
+							<text v-if="promotion">{{ promotion }}</text>
+							<text v-else>0.00</text>
+
 						</view>
 					</view>
 				</view>
-				<view class="tx-grid" @click="toWithdraw"><span class="tx-grid-comm-sign">立即提现</span></view>
+				<view class="tx-grid-comm-sign dis j-c a-c" @click="toWithdraw">
+					<image src="/static/image/bindBank/Frame1.png" mode="" style="width: 18px;height: 18px;"></image>
+					<text>立即提现</text>
+				</view>
 			</view>
-			<view class="palace palace-one">
-				<view class="palace-grid">
-					<view class="palace-grid-text" :class="active==2?'active':''" @tap="changeTab(2)">
-						<view class="palace-grid-text-data">
-							<text>{{ applyAmount }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">提现中</view>
-					</view>
+			<view class="palace  dis a-c j-s">
+				<view class="palace-grid dis f-c">
+					<text class="">预收金额</text>
+					<text v-if="willPromotion">{{ willPromotion }}</text>
+					<text v-else>0.00</text>
 				</view>
-				<view class="palace-grid">
-					<view class="palace-grid-text" :class="active==1?'active':''" @tap="changeTab(1)">
-						<view class="palace-grid-text-data">
-							<text>{{ totalAmount }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">累计提现</view>
-					</view>
+				<view class="palace-grid dis f-c">
+					<text class="">提现中</text>
+					<text v-if="withdrawalPromotion">{{ withdrawalPromotion}}</text>
+					<text v-else>0.00</text>
 				</view>
-				<view class="palace-grid">
-					<view class="palace-grid-text" :class="active==3?'active':''" @tap="changeTab(3)">
-						<view class="palace-grid-text-data">
-							<text>{{ payamount }}</text>
-							<text class="palace-grid-text-data-b">元</text>
-						</view>
-						<view class="palace-grid-text-name">已到账</view>
-					</view>
+				<view class="palace-grid dis f-c">
+					<text class="">已提现</text>
+					<text v-if="approvedPromotion">{{ approvedPromotion }}</text>
+					<text v-else>0.00</text>
 				</view>
 			</view>
 		</view>
-
-		<z-paging auto-show-back-to-top ref="paging" @query="getOrdersList" v-model="list" :default-page-size="20"
+		<z-paging auto-show-back-to-top ref="paging" @query="getOrdersList" :list.sync="list" :default-page-size="20"
 			:mounted-auto-call-reload="true" :style="getHeight">
 			<view class="list-view">
 
 				<!-- 查询区域Start -->
-				<!-- <view class="queryView d-flex">
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerTypeChange" :value="typeIndex" :range="typeArray">
-						    <view class="d-flex a-center">{{typeArray[typeIndex]}} <view class="icon iconfont icon-xiala"></view></view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerYearChange" :value="yearIndex" :range="yearArray">
-						    <view class="d-flex a-center">{{yearArray[yearIndex]}}年 <view class="icon iconfont icon-xiala"></view></view>
-						</picker>
+				<view class="queryCriteria dis j-s a-c ">
+					<view class="dis a-c j-c" style="width: 49%;" @click="statusShow=true">
+						<image src="/static/image/bindBank/time.png" mode="" style="width: 18px;height: 18px;"></image>
+						<text>{{statusLabel}}</text>
 					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerMonthChange" :value="monthIndex" :range="monthArray">
-						    <view class="d-flex a-center">{{monthArray[monthIndex]}}月 <view class="icon iconfont icon-xiala"></view></view>
-						</picker>
+					<view class="" style="width: 1px;height: 90%;background-color: #D4D0D0;"></view>
+					<view class="dis a-c j-c" style="width: 49%;" @click="timeShow=true">
+						<image src="/static/image/bindBank/date.png" mode="" style="width: 18px;height: 18px;"></image>
+						<text>{{pageRequest.Date}}</text>
 					</view>
-					<view class="d-flex a-center j-center">
-						<picker @change="bindPickerDateChange" :value="dateIndex" :range="dateArray">
-						    <view class="d-flex a-center">{{dateArray[dateIndex]}}日 <view class="icon iconfont icon-xiala"></view></view>
-						</picker>
-					</view>
-					<view class="d-flex a-center j-center">
-						<view class="d-flex a-center px-2">合计：0.00</view>
-					</view>
-				</view> -->
+				</view>
 				<!-- 查询区域End -->
-
-				<block v-for="(item,index) in list" :key="index">
-					<view class="list-item">
-						<view class="content-box">
-							<view class="des-box" v-if="active==0">
-								<view class="tit">订单号：{{item.orderno }}</view>
-								<view class="tit">佣金级别：{{item.level}}</view>
-								<view class="tit">佣金比例：{{ item.commissionrate*100 }}%</view>
-								<view class="time">签单时间：{{ item.insuredtime }}</view>
-							</view>
-							<view class="des-box" v-if="active==2" @tap="toBillInfo(index)">
+				<block v-for="(item,index) in list" :key="index" v-if="[2,3].includes(active)">
+					<view class="list-item dis a-c j-s" @tap="toBillInfo(index)">
+						<view class="">
+							<view class="des-box" v-if="active==2">
 								<view class="tit">订单号：{{item.id }}</view>
 								<view class="time">提现时间：{{ item.createTime }}</view>
 							</view>
-							<view class="des-box" v-if="active==3" @tap="toBillInfo(index)">
+							<view class="des-box" v-if="active==3">
 								<view class="tit">订单号：{{item.id }}</view>
 								<view class="time">提现时间：{{ item.createTime }}</view>
-								<view class="time">到账时间：{{ item.paytime }}</view>
+								<view class="time" v-if="item.paytime">到账时间：{{ item.paytime }}</view>
 							</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==0">
-							<view>+{{item.commissionamount}}</view>
-							<view>推广佣金</view>
+						<view class="money dis f-c a-c j-s" v-if="active==1">
+							<view
+								style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
+								预收</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
+						</view>
+						<view class="money dis f-c a-c j-s " v-if="active==2">
+							<view
+								style="padding: 0 10px;border: 1px solid #FF5600;border-radius: 30px;font-size: 12px;color: #FF5600;">
+								提现中</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==2">
-							<view>{{item.amount}}</view>
-							<view>佣金提现中</view>
+						<view class="money dis f-c a-c j-s" v-if="active==3">
+							<view
+								style="padding: 0 10px;border: 1px solid #0052FF;border-radius: 30px;font-size: 12px;color: #0052FF;">
+								已提现
+							</view>
+							<view v-if="item.amount">{{item.amount }}</view>
+							<view v-else>0.00</view>
+						</view>
+					</view>
+				</block>
+				<block v-for="(item,index) in yushouList" :key="index" v-else>
+					<view class="list-item dis a-c j-s" @tap="yushouInfo(index)">
+						<view class="content-box">
+							<view class="des-box">
+								<view class="tit">订单号：{{item.id }}</view>
+								<view class="time">签单时间：{{ item.signingTime }}</view>
+								<view class="time">车牌号：{{ item.licenseno }}</view>
+							</view>
 						</view>
-						<view class="money d-flex a-center j-center flex-column" v-if="active==3">
-							<view>-{{item.amount}}</view>
-							<view>提现成功</view>
+						<view class="money dis f-c a-c j-s">
+							<view
+								style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
+								预收</view>
+							<view v-if="item.willAmount">{{item.willAmount }}</view>
+							<view v-else>0.00</view>
 						</view>
 					</view>
 				</block>
 			</view>
 		</z-paging>
+		<u-popup v-model="statusShow" mode="bottom" height="500">
+			<view class="term dis f-c j-s">
+				<view style="padding: 0 16px;">
+					<view class="title dis j-c a-c">
+						<text>状态筛选</text>
+					</view>
+					<text>订单状态</text>
+					<view class="dis  a-c  " style="margin-top: 10px;">
+						<view class="status-data" :class="item.value==active? 'active':''"
+							v-for="(item,index) in statusList" @tap.stop.prevent="statusclick(item)" :key="index">
+							{{item.label}}
+						</view>
+					</view>
+				</view>
+				<view class="operateBtn dis ">
+					<view class="cancel dis a-c j-c" @click="statusShow=false">
+						取消
+					</view>
+					<view class="confirm dis a-c j-c" @click="stausSearch">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<u-picker v-model="timeShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
 	</view>
 </template>
+
 <script>
 	import {
 		mapState
@@ -122,70 +150,129 @@
 		components: {
 			ZPagingMixin
 		},
-		computed: {
-			...mapState(['userInfo']),
-			getHeight() {
-				let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(356);
-				return `height: ${height}px`;
-			}
-		},
-		onLoad() {
-			// 搜索年选项Start
-			this.yearArray = [(new Date().getFullYear() - 2), (new Date().getFullYear() - 1), new Date().getFullYear(), ]
-			this.yearIndex = this.yearArray.length - 1;
-			// 搜索年选项End
-
-			// 搜索月选项Start
-			var month = new Date().getMonth() + 1;
-			for (var i = 1; i <= month; i++) {
-				if (i < 10) {
-					this.monthArray.push('0' + i);
-				} else {
-					this.monthArray.push(i);
-				}
-			}
-			this.monthIndex = this.monthArray.length - 1;
-			// 搜索月选项End
-			// 搜索日选项Start
-			var date = new Date().getDate();
-			for (var i = 1; i <= date; i++) {
-				if (i < 10) {
-					this.dateArray.push('0' + i);
-				} else {
-					this.dateArray.push(i);
-				}
-			}
-			this.dateIndex = this.dateArray.length - 1;
-			// 搜索日选项End
-		},
 		data() {
 			return {
+				statusShow: false, //状态筛选
+				timeShow: false, //日期筛选
+				params: {
+					year: true, //年
+					month: true, //月
+					day: false, //日
+				},
+				//状态筛选list
+				statusLabel: "提现中",
+				statusList: [
+					// {
+					// 	label: '全部',
+					// 	value: 0,
+					// 	src: "/static/image/car-insure/state1.png"
+					// },
+					{
+						label: '预收',
+						value: 1,
+						src: "/static/image/car-insure/state2.png"
+					},
+					{
+						label: '提现中',
+						value: 2,
+						src: "/static/image/car-insure/state3.png"
+					},
+					{
+						label: '已提现',
+						value: 3,
+						src: "/static/image/car-insure/state4.png"
+					},
+				],
+
+				/* 时间筛选相关 */
+				pageRequest: { //查询的默认条件
+					Date: "",
+					pageNum: 1,
+					pageSize: 20,
+				},
 				/* 查询区域Start */
-				typeIndex: 0, //订单的类型选择
-				typeArray: ['车险', '意外险', '寿险'], //订单的类型
-				yearArray: [], //订单的查询年份
-				yearIndex: 0, //订单的年份选择
-				monthArray: [], //订单的查询月份
-				monthIndex: 0, //订单的月份选择
-				dateArray: [], //订单的查询月份
-				dateIndex: 0, //订单的月份选择
 				/* 查询区域End */
-
-				active: 2,
-
+				currentPage: 1, //当前页码
+				pageSize: 5, //每页展示条数
+				totalPages: 0, //总页数
+				totalSize: 0, //总条数
 				list: [],
-
-				promotion: 0, //预收金额
-				"totalAmount": 0, //总计提现
-				"applyAmount": 0, //提现中
-				"payamount": 0 //已到账
+				loadStatus: 0,
+				"promotion": 0, //可提现手续费金额
+				willPromotion: 0,
+				withdrawalPromotion: 0,
+				approvedPromotion: 0,
+				yushouIds: '',
+				yushouList: [],
+				active: 2,
 			};
 		},
+		onLoad(params) {
+			this.pageRequest.Date = this.transformTime();
+		},
+		computed: {
+			...mapState(['userInfo']),
+			getHeight() {
+				let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(356);
+				return `height: ${height}px`;
+			}
+		},
 		onShow() {
-			this.getCarExtendMoney();
+			this.getCarAdvanceMoney();
 			this.getOrdersList(1, 20);
 		},
 		methods: {
+			async stausSearch() {
+				switch (this.active) {
+					case 1:
+						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
+							ids: this.yushouIds,
+							timeFiltering: this.pageRequest.Date,
+							amountType: "3",
+						});
+						if (res.code == 200 && res.data) {
+							this.yushouList = res.data.insFeeOrderNewList;
+							this.statusShow = false;
+						}
+						break;
+					case 2:
+					case 3:
+						await this.getOrdersList(1, 20);
+						this.statusShow = false;
+						break;
+					default:
+						break;
+				}
+			},
+			async startconfirm(e) {
+				this.pageRequest.Date = e.year + '-' + e.month;
+				switch (this.active) {
+					case 1:
+						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
+							ids: this.yushouIds,
+							timeFiltering: this.pageRequest.Date,
+							amountType: "3",
+						});
+						if (res.code == 200 && res.data) {
+							this.yushouList = res.data.insFeeOrderNewList;
+						}
+						break;
+					case 2:
+					case 3:
+						await this.getOrdersList(1, 20);
+						break;
+				}
+			},
+			//状态筛选
+			statusclick(e) {
+				this.active = e.value;
+				this.statusLabel = e.label;
+			},
+			async changeTab(tabIndex) {
+				this.active = tabIndex;
+				this.list = [];
+				await this.getOrdersList(1, 20);
+			},
 			// 去提现
 			async toWithdraw() {
 				let res = await this.$http.get('/userBank/getUserBankList');
@@ -209,56 +296,43 @@
 					}, "navigateTo", true)
 				}
 			},
-			bindPickerTypeChange(e) {
-				this.typeIndex = e.target.value;
-			},
-			//搜索年发生变化
-			bindPickerYearChange(e) {
-				this.yearIndex = e.target.value;
-				this.monthArray = [];
-				if (this.yearIndex == (this.yearArray.length - 1)) {
-					var month = new Date().getMonth() + 1;
-					for (var i = 1; i <= month; i++) {
-						if (i < 10) {
-							this.monthArray.push('0' + i);
-						} else {
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex = this.monthArray.length - 1;
+			// 预收账户金额查询 
+			async getCarAdvanceMoney() {
+				let res = await this.$http.get('/sysUserAccount/getSysAllAmount');
+				// 请求失败处理
+				if (res.code == 200 && res.data) {
+					this.promotion = res.data.promotion; //可提现
+					this.willPromotion = res.data.willPromotion; //预收
+					this.withdrawalPromotion = res.data.withdrawalPromotion; //提现中
+					this.approvedPromotion = res.data.approvedPromotion; //已提现
+					this.yushouIds = res.data.ids;
 				} else {
-					for (var i = 1; i <= 12; i++) {
-						if (i < 10) {
-							this.monthArray.push('0' + i);
-						} else {
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex = 0;
+					this.willPromotion = 0; //手续费
+					this.withdrawalPromotion = 0; //非跟单
+					this.approvedPromotion = 0; //佣金
 				}
 			},
-			//搜索月发生变化
-			bindPickerMonthChange(e) {
-				this.monthIndex = e.target.value;
-			},
-			bindPickerDateChange(e) {
-				this.dateIndex = e.target.value;
-			},
-
-
-
-
-			async changeTab(tabIndex) {
-				this.active = tabIndex;
-				this.list = [];
-				await this.getOrdersList(1, 20);
+			toBillInfo(index) {
+				this.navigate({
+					url: '/pages/wallet/billInfo',
+					success: (res) => {
+						res.eventChannel.emit("acceptData", {
+							item: this.list[index],
+							active: this.active,
+						})
+					}
+				}, "navigateTo", true)
 			},
-			// 可提现推广费查询 
-			async getCarExtendMoney() {
-				let res = await this.$http.get('/sysUserAccount/getSysUserAmount?userid=' + this.userInfo.sysUser.id);
-				if (res.code == 200) {
-					this.promotion = res.data.promotion;
-				}
+			yushouInfo(index) {
+				this.navigate({
+					url: '/pages/wallet/billInfo',
+					success: (res) => {
+						res.eventChannel.emit("acceptData", {
+							item: this.yushouList[index],
+							active: this.active,
+						})
+					}
+				}, "navigateTo", true)
 			},
 			//获取订单数据Start
 			async getOrdersList(pageNo, pageSize) {
@@ -266,6 +340,7 @@
 					"pageNum": pageNo,
 					"pageSize": pageSize,
 					"amountStatus": '3',
+					[this.active == 2 ? "withdrawalTime" : "timeFiltering"]: this.pageRequest.Date,
 					"auditingStatus": this.active,
 				};
 				let res = await this.$http.post('/sysAmountAuditing/queryAppPage', data);
@@ -274,24 +349,45 @@
 				if (res.code == 200) {
 					if (res.data.content.length > 0) {
 						content = res.data.content;
-						this.applyAmount = content[0].amount
+
 					}
 				}
 				this.$refs.paging.complete(content);
 			},
 			//获取订单数据End
-			toBillInfo(index) {
-				this.navigate({
-					url: '/pages/wallet/billInfo',
-					success: (res) => {
-						res.eventChannel.emit("acceptData", {
-							item: this.list[index]
-						})
-					}
-				}, "navigateTo", true)
-			}
+			//当前时间
+			transformTime(day) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = day ? date.getDate() - day : date.getDate();
+				var strMonth = date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth;
+				return datastr;
+			},
+			transformTime1(month) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = date.getDate();
+				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
 
-		}
+				var datastr = strYear + "-" + strMonth;
+				console.log(datastr);
+				return datastr;
+			},
+		},
 	};
 </script>
 
@@ -299,41 +395,139 @@
 	@import '@/style/mixin.scss';
 
 	page {
+		padding: 12px 16px;
 		background-color: #fff;
 	}
 
+	.term {
+
+		height: 100%;
+
+		.title {
+			font-size: 14px;
+			font-weight: bold;
+			color: #232832;
+			padding: 10px 0;
+			border-bottom: 1px solid #f2f2f2;
+		}
+
+		>text {
+			font-size: 13px;
+			font-weight: bold;
+			color: #232832;
+			margin-bottom: 10px;
+		}
+
+		.status-data {
+			padding: 4px 10px;
+			box-sizing: border-box;
+			margin-right: 10px;
+			font-size: 12px;
+			border: 1px solid #eee;
+			cursor: pointer;
+		}
+
+		.operateBtn {
+			font-weight: bold;
+			font-size: 16px;
+
+			.cancel {
+				width: 50%;
+				height: 46px;
+				color: #0052FF;
+				background-color: #EAEAEA;
+			}
+
+			.confirm {
+				width: 50%;
+				height: 46px;
+				color: #fff;
+				background-color: #0052FF;
+			}
+		}
+	}
+
+
+	.active {
+		position: relative;
+		background: rgba(0, 82, 255, 0.1);
+		color: #0052FF;
+		border: 1px solid #0052FF;
+		font-weight: 700;
+	}
+
+	.queryCriteria {
+		width: 100%;
+		height: 32px;
+		background: #FFFBF2;
+		border-radius: 6px;
+		margin-top: 26px;
+		font-size: 14px;
+		color: rgba(51, 51, 51, 0.8);
+
+		text {
+			margin-left: 5px;
+		}
+	}
+
 	.white-box {
-		width: 94%;
-		background: white;
-		border-radius: 10rpx;
-		margin: 20rpx auto 20rpx;
-		box-shadow: 0 6rpx 20rpx #e7e7e7;
+		width: 100%;
+		height: 155px;
+		background: linear-gradient(270deg, #F9D27B 0%, #E5B25F 100%);
+		box-shadow: 0px 10px 20px 0px rgba(224, 179, 106, 0.4);
+		border-radius: 6px;
+		padding: 34rpx 40rpx;
+		position: relative;
+	}
+
+	.palace {
+		color: #fff;
+		margin-top: 8px;
+
+		.palace-grid {
+			font-size: 12px;
+
+			text:last-child {
+				font-size: 14px;
+				font-family: DIN, DIN;
+				font-weight: bold;
+			}
+
+		}
+
 	}
 
 	.white-box .tx {
-		padding-top: 26rpx;
 		overflow: hidden;
 		display: flex;
 		justify-content: space-between;
 		align-content: center;
+		border-bottom: 1px solid #f2f2f2;
 	}
 
 	.white-box .tx .tx-grid {
 		box-sizing: border-box;
 	}
 
-	.white-box .tx .tx-grid:first-child {
-		margin-left: 40rpx;
-	}
 
-	.white-box .tx .tx-grid .tx-grid-comm-sign {
-		display: block;
-		border-radius: 40rpx 0 0 40rpx;
-		font-size: 26rpx;
-		padding: 16rpx 44rpx;
-		background: linear-gradient(to right, rgba($themeColor, 0.8), rgba($themeColor, 0.6));
-		color: #fff;
+
+	.tx-grid-comm-sign {
+		width: 90px;
+		height: 30px;
+		background: rgba(255, 255, 255, 0.6);
+		box-shadow: -1px 4px 4px 0px rgba(204, 149, 57, 0.2);
+		border-radius: 14px 0px 0px 14px;
 		font-weight: bold;
+		position: absolute;
+		right: 0;
+		top: 44px;
+
+		text {
+			font-size: 14px;
+			color: #CC9539;
+			margin-left: 2px;
+		}
+
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text {
@@ -345,70 +539,21 @@
 		overflow: hidden;
 	}
 
-	.white-box .palace .palace-grid .palace-grid-text.active {
-		background-color: rgba($themeColor, 0.6);
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text.active>view {
-		color: #FFFFFF;
-	}
-
 	.white-box .tx .tx-grid .tx-grid-text .title {
 		font-size: 26rpx;
 		font-weight: normal;
-		color: $themeColor;
+		color: #fff;
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text .money {
-		font-size: 60rpx;
-		color: $themeColor;
-		letter-spacing: 2rpx;
-		margin-bottom: 10rpx;
+		font-size: 24px;
+		color: #fff;
 	}
 
 	.white-box .tx .tx-grid .tx-grid-text .money-b {
 		font-size: 28rpx;
 	}
 
-	.white-box .palace {
-		padding-bottom: 20rpx;
-		overflow: hidden;
-		display: flex;
-		justify-content: center;
-	}
-
-	.white-box .palace .palace-grid {
-		flex: 1;
-		position: relative;
-		box-sizing: border-box;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text {
-		display: block;
-		text-align: center;
-		color: #333;
-		font-size: 32rpx;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-name {
-		font-size: 26rpx;
-		font-weight: normal;
-		color: $themeColor;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-data {
-		font-size: 32rpx;
-		color: $themeColor;
-		letter-spacing: 2rpx;
-		margin-bottom: 5rpx;
-	}
-
-	.white-box .palace .palace-grid .palace-grid-text .palace-grid-text-data .palace-grid-text-data-b {
-		font-size: 20rpx;
-	}
 
 	.list-view {
 		position: relative;
@@ -421,9 +566,6 @@
 		padding: 30rpx 28rpx;
 		box-sizing: border-box;
 		background: #fff;
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
 		border-bottom: 1rpx solid #eaeef1;
 	}
 
@@ -431,11 +573,6 @@
 		left: 0 !important;
 	}
 
-	.content-box {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-	}
 
 	.des-box {
 		min-height: 80rpx;
@@ -457,6 +594,10 @@
 		text-overflow: ellipsis;
 	}
 
+	.source {
+		margin: 12rpx 0;
+	}
+
 	.time {
 		color: #888;
 	}
@@ -464,13 +605,49 @@
 	.money {
 		font-size: 38rpx;
 		font-weight: 500;
-		color: $themeColor;
+		color: #333;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		padding-left: 20rpx;
 	}
 
+	.less {
+		color: #4caf50 !important;
+	}
+
+	.tip {
+		margin-top: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		font-size: 24rpx;
+		color: #888;
+	}
+
+	.nothing {
+		position: absolute;
+		top: 320upx;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.nothing>view {
+		line-height: 1;
+	}
+
+	.nothing>view.icon {
+		/* color: #66A3FF; */
+		color: #989898;
+		font-size: 260upx;
+	}
+
+	.nothing>view.text {
+		font-size: 28upx;
+		color: #989898;
+	}
+
+
 	/* 查询区域Start */
 	.queryView {
 		justify-content: space-around;

pages/wallet/billInfo.vue

@@ -2,31 +2,50 @@
 	<view class="pay-success" v-if="!loading">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="pay-section" :class="'bg-1'">
+		<view class="pay-section bg-1 dis f-c" :style="{background:style.back}">
 			<image class="bg" src="/static/image/wallet/money-bg.png"></image>
+			<text v-if="[2,3].includes(auditingStatus)"
+				style="font-size: 32px;font-weight: 500;font-family: DIN, DIN;">{{orderDetail.amount.toFixed(2)}}</text>
+			<text v-else
+				style="font-size: 32px;font-weight: 500;font-family: DIN, DIN;">{{orderDetail.willAmount.toFixed(2)}}</text>
 			<view class="tips-wrapper">
-				<text class="icon iconfont icon-xwtubiaoku-13"></text>
+				<image :src="style.icon" mode="" style="width: 20px;height: 20px;margin-right: 5px;"></image>
 				<view class="content">
-					<text class="title" v-if="orderDetail.auditingStatus=='2'">提现审核中！</text>
-					<text class="title" v-if="orderDetail.auditingStatus=='3'">提现成功！</text>
-					<!-- 	<view class="tip" v-if="orderDetail.auditingStatus=='2'">请耐心等待</view>
-					<view class="tip" v-if="orderDetail.auditingStatus=='3'">感谢您的使用</view> -->
+					<text class="title" v-if="auditingStatus=='1'">预收金额！</text>
+					<text class="title" v-if="auditingStatus=='2'">后台审核中</text>
+					<text class="title" v-if="auditingStatus=='3'">提现成功</text>
 				</view>
 			</view>
 		</view>
-		<view class="pay-card">
-			<view class="pay-card-money">￥{{ orderDetail.amount.toFixed(2) }}</view>
-			<view class="item"><text class="tit">订单编号：</text>{{ orderDetail.id }}</view>
-			<view class="item"><text class="tit">申请时间：</text>{{ orderDetail.createTime}}</view>
-			<view class="item" v-if="orderDetail.auditingStatus=='3'"><text
-					class="tit">到账时间：</text>{{ orderDetail.paytime }}</view>
-			<view class="item"><text class="tit">提现账户：</text>{{ orderDetail.bankNumber }}</view>
-			<view class="item"><text class="tit">提现银行：</text>{{ orderDetail.bankAccount }}</view>
-			<view class="item" v-if="orderDetail.applytype=='A'"><text class="tit">提现类型：</text>账户余额提现</view>
-			<view class="item" v-if="orderDetail.applytype=='B'"><text class="tit">提现类型：</text>推广佣金提现</view>
+		<view class="pay-card" v-if="[2,3].includes(auditingStatus)">
+			<view class="item dis j-s a-c" v-if='orderDetail.id'><text>交易编号：</text> <text>{{ orderDetail.id }}</text>
+			</view>
+			<view class="item dis j-s a-c" v-if='orderDetail.createTime'><text>申请时间：</text>
+				<text>{{ orderDetail.createTime}}</text>
+			</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.auditingStatus=='3' && orderDetail.paytime">
+				<text>到账时间：</text>{{ orderDetail.paytime }}
+			</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.bankNumber"><text>提现账户：</text>{{ orderDetail.bankNumber }}
+			</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.bankAccount">
+				<text>提现银行：</text>{{ orderDetail.bankAccount }}
+			</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.applytype=='A'"><text>提现类型：</text>账户余额提现</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.applytype=='B'"><text>提现类型：</text>推广佣金提现</view>
+		</view>
+		<view class="pay-card" v-else>
+			<view class="item dis j-s a-c" v-if="orderDetail.id"><text>订单编号：</text> <text>{{ orderDetail.id }}</text>
+			</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.signingTime"><text>签单时间：</text>
+				<text>{{ orderDetail.signingTime}}</text>
+			</view>
+			<view class="item dis j-s a-c" v-if="orderDetail.licenseno"><text>车牌号：</text>{{ orderDetail.licenseno }}
+			</view>
 		</view>
-		<view class="btn-group">
-			<button class="confirm-btn main-bg-color" :class="'bg-1'" @tap="toHome">返回首页</button>
+		<view class="btn-group dis j-c a-c" v-if="style.btncolor">
+			<u-button type="primary" :style="{width:'100%',background:style.btncolor,color:'#fff'}"
+				@click="toHome">返回首页</u-button>
 		</view>
 	</view>
 </template>
@@ -35,8 +54,32 @@
 		data() {
 			return {
 				loading: false,
+				auditingStatus: "",
 				orderId: '',
-				orderDetail: {}
+				orderDetail: {},
+				style: {},
+				StyleSheet: [{
+						id: 1,
+						title: "预收金额",
+						back: 'linear-gradient( 270deg, #46CE24 0%, #229805 100%)',
+						icon: "/static/image/bindBank/yushou.png",
+						btncolor: '#229805',
+					}, {
+						id: 2,
+						title: "后台审核中",
+						back: 'linear-gradient( 270deg, #FFBA53 0%, #FF9900 100%)',
+						icon: "/static/image/bindBank/shenhezhong.png",
+						btncolor: '#FF9900',
+					},
+					{
+						id: 3,
+						title: "提现成功",
+						back: 'linear-gradient( 270deg, #5187FA 0%, #0052FF 100%)',
+						btncolor: '#0052FF',
+						icon: "/static/image/bindBank/tixian.png"
+					},
+
+				]
 			};
 		},
 		onLoad() {
@@ -46,7 +89,9 @@
 				console.log(data);
 				if (!!data) {
 					this.orderDetail = data.item; //车辆信息
-
+					this.auditingStatus = data.active;
+					let obj = this.StyleSheet.find(val => val.id == data.active);
+					this.style = obj;
 				}
 			})
 		},
@@ -68,7 +113,6 @@
 	}
 
 	.bg-1 {
-		background-color: $themeColor;
 		color: #FFFFFF;
 	}
 
@@ -113,11 +157,14 @@
 
 		.pay-card {
 			width: 90%;
-			height: 620upx;
+			height: auto;
 			background-color: #fff;
 			border-radius: 12upx;
 			margin: -80upx 5% 0;
-			box-shadow: 0upx 5upx 25upx rgba(0, 0, 0, 0.05);
+			background: #FFFFFF;
+			box-shadow: 0px 4px 10px 0px #DAE3F4;
+			border-radius: 6px;
+			padding: 0 10px;
 
 			.pay-card-money {
 				text-align: center;
@@ -129,22 +176,25 @@
 			}
 
 			.item {
-				height: 80upx;
-				line-height: 80upx;
-				margin-left: 30upx;
-				color: #303133;
-
-				.tit {
-					color: #909399;
-				}
+				padding: 10px 0;
+				color: #232832;
+				border-bottom: 1px solid #f2f2f2;
 			}
 		}
 
 		.btn-group {
-			padding: 60upx 30upx 0;
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			height: 62px;
+			background: #FFFFFF;
+			box-shadow: 0px -4px 10px 0px rgba(0, 0, 0, 0.05);
+			padding: 16px;
 
 			.confirm-btn {
-				margin-top: 30upx;
+				width: 100%;
+				height: 100%;
+
 			}
 		}
 	}

pages/wallet/bindBank.vue

@@ -1,40 +1,34 @@
 <template>
 	<view>
-		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<!-- 步骤条Start -->
-		<view class="weui-flex bindBank-step d-flex a-center j-center">
-			<view class="weui-flex-item">
-				<view class="bindBank-step-icon bindBank-step-iconCard"></view>
-				<view class="bindBank-step-des">添加银行卡</view>
+		<view class="binding dis f-c a-c ">
+			<view class="title dis f-c a-c ">
+				<text>添加银行卡</text>
+				<text>请填写本人的银行卡信息</text>
 			</view>
+			<view class="formInfo">
+				<u-field v-model="accountno" @blur="validateBankCard" :field-style="{textAlign:'right'}" label="银行卡"
+					placeholder="请输入银行卡卡号">
+				</u-field>
+				<u-field v-model="bankname" :field-style="{textAlign:'right'}" label="选择银行" placeholder="系统自动识别">
+				</u-field>
+			</view>
+			<u-button class="mt-5" type="primary" style="background-color:#0052FF ;font-weight: bold;width: 100%;"
+				@tap="submit">
+				绑定银行卡</u-button>
 		</view>
-		<!-- 步骤条End -->
-
-		<!-- 持卡人信息Start -->
-		<view class="bindBankCard">
-			<view class="bindBank-infor">
-				<view class="header row">请填写本人银行卡信息（储蓄卡）</view>
-				<view class="inputData d-flex">
-					<view class="d-flex a-center">选择银行</view>
-					<view class="d-flex a-center flex-1">
-						<input style="font-size: 28upx;" type="text" disabled v-model="bankname" placeholder="系统自动识别" />
-					</view>
+		<u-popup mode="bottom" v-model="promptShow" width="100%" height="100%" border-radius="14">
+			<view style="padding: 16px;">
+				<view class="prompt dis a-c j-c f-c">
+					<image src="/static/image/bindBank/success.png" mode="" style="width: 50px;height:50px;"></image>
+					<text>绑定成功</text>
 				</view>
-				<view class="inputData d-flex">
-					<view class="d-flex a-center">银行卡卡号</view>
-					<view class="d-flex a-center flex-1">
-						<input type="text" v-model="accountno" @blur="validateBankCard" placeholder="请输入银行卡卡号"
-							style="font-size: 28upx;" />
-					</view>
+				<view class="dis j-end a-c" style="width: 100%;">
+					<text class="back" @click="GoBack">完成</text>
 				</view>
 			</view>
-		</view>
-		<!-- 持卡人信息End -->
-
-		<button class="user-set-btn d-flex a-center j-center main-bg-color" :class="{'main-bf-hover-color':disabled}"
-			type="primary" @tap="submit" :disabled="disabled" style="margin: 40upx  30upx;">绑定银行卡</button>
 
+		</u-popup>
 	</view>
 </template>
 
@@ -47,6 +41,7 @@
 	export default {
 		data() {
 			return {
+				promptShow: false,
 				bankname: "", //银行名称
 				accountno: "", //银行卡账号
 				disabled: true,
@@ -80,6 +75,7 @@
 				that.bankname = "";
 				await bankBin.getBankBin(this.accountno)
 					.then((data) => {
+						console.log(data);
 						that.bankname = data.bankName;
 						that.validateBankCardStatus = true;
 						return true;
@@ -93,6 +89,13 @@
 					})
 			},
 			async submit() {
+				if (!this.bankname || !this.accountno) {
+					return uni.showToast({
+						title: '信息不完整',
+						duration: 2000,
+						icon: "none"
+					});
+				}
 				var params = {
 					"bankNumber": this.accountno,
 					"bankAccount": this.bankname,
@@ -100,16 +103,18 @@
 				}
 				let res = await this.$http.post('/userBank/insertByBankNumber', params);
 				if (res.code == '200') {
+					this.promptShow = true;
+				} else {
 					uni.showToast({
-						title: '添加成功',
+						title: res.msg,
 						duration: 2000,
-						icon: "success"
+						icon: "none"
 					});
-					setTimeout(() => {
-						return uni.navigateBack();
-					}, 2000);
 				}
 
+			},
+			GoBack() {
+				return uni.navigateBack();
 			}
 
 
@@ -122,77 +127,53 @@
 	@import '@/style/mixin.scss';
 
 	page {
-		background-color: #F5F5F5;
+		background-color: #F8FAFE;
 	}
 
-	.bindBank-step {
-		padding: 72upx 0 78upx;
-		background: rgba($themeColor, 0.8);
-		text-align: center;
-	}
+	.prompt {
+		padding: 16px;
+		position: absolute;
+		top: 30%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+
+		text {
+			font-size: 22px;
+			color: #333333;
+			font-weight: bold;
+			margin-top: 15px;
+		}
 
-	.bindBank-step>view {
-		position: relative;
-		width: 50%;
+		.back {
+			font-size: 14px;
+			color: #333333;
+		}
 	}
 
-	.bindBank-step-icon {
-		width: 76upx;
-		height: 76upx;
-		line-height: 76upx;
-		position: relative;
-		z-index: 3;
-		display: inline-block;
-		overflow: hidden;
-	}
+	.binding {
+		padding: 16px;
 
-	.bindBank-step-des {
-		font-size: 24upx;
-		color: #fff;
-	}
+		.title {
+			font-size: 14px;
+			color: #333333;
 
-	.bindBank-step-iconCard {
-		background: url('/static/image/bindBank/icon-card.png') no-repeat 0 0;
-		background-size: 100%;
-	}
+			text:first-child {
+				font-size: 20px;
+				font-weight: bold;
+			}
+		}
 
-	.bindBank-step-iconEnd {
-		background: url('/static/image/bindBank/icon-Password.png') no-repeat 0 0;
-		background-size: 100%;
-	}
+		.formInfo {
+			margin-top: 18px;
+			width: 100%;
+			height: 88px;
+			background: #FFFFFF;
+			box-shadow: 0px 4px 10px 0px #DAE3F4;
+			border-radius: 6px;
 
-	/* 银行卡信息Start */
-	.bindBankCard {
-		background-color: #f0eff5;
-		margin-top: -40upx;
-		border-radius: 40upx 40upx 0upx 0upx;
-		overflow: hidden;
-		font-size: 28upx;
-	}
 
-	.bindBankCard .row {
-		padding: 0upx 30upx;
-		box-sizing: border-box;
-	}
+		}
 
-	.bindBankCard .inputData {
-		padding: 10upx 15upx;
-		color: #333;
-		background-color: #fff;
-		height: 80upx;
-	}
 
-	.bindBank-infor>.header {
-		height: 90upx;
-		line-height: 90upx;
 	}
-
-	.bindBankCard .inputData>view:nth-of-type(1) {
-		padding: 20upx 0;
-		width: 210upx;
-		flex-shrink: 1;
-		font-size: 30upx;
-	}
-
-	/* 银行卡信息End */
 </style>

pages/wallet/wallet.vue

@@ -3,85 +3,96 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 银行卡信息Start -->
-		<view class="wallet-head">
-			<view class="bank-det d-flex flex-column">
-				<view class="d-flex">
-					<image class="bank-icon flex-shrink" src="/static/image/wallet/bankcard.png" mode="widthFix">
-					</image>
-					<view class="bank-name d-flex flex-1">
-						<p>{{bankname}}</p>
-						<p style="font-size: 24upx;line-height: 40upx;">储蓄卡</p>
-					</view>
-					<view class="changebank" @tap="changeBank">卡包</view>
+		<view class="wallet-head dis f-c j-end">
+			<view class="dis a-start" style="position: absolute;top:13%;left: 9.5%;">
+				<image src="/static/image/my/avatar1.png" mode=""></image>
+				<!-- <text style="font-size: 14px;">admin</text> -->
+			</view>
+			<view class="dis a-c j-s mt-2">
+				<text style="font-size: 15px;color: #333333;font-weight: bold;">我的资产</text>
+				<u-tag @click="changeBank" text="卡包" mode="dark"
+					style="background: linear-gradient( 270deg, #0052FF 0%, #6899FF 100%);" />
+			</view>
+			<view class="dis a-c j-s mt-2 amount">
+				<view class="dis f-c a-c" @click="toBillDetails(1)">
+					<text>手续金额</text>
+					<text v-if="MoneyData.handlingFee" class="sum" style="color: #0052FF;">￥ <text
+							style="font-size: 14px;">{{MoneyData.handlingFee.toFixed(2)}}</text> </text>
+					<text v-else class="sum" style="color: #0052FF;">￥ <text style="font-size: 14px;">0.00</text>
+					</text>
+				</view>
+				<view class="dis f-c a-c" @click="toBillDetails(2)">
+					<text>跟单金额</text>
+					<text v-if="MoneyData.documentary" class="sum" style="color: #FF5600;">￥ <text
+							style="font-size: 14px;">{{MoneyData.documentary.toFixed(2)}}</text> </text>
+					<text v-else class="sum" style="color: #FF5600;">￥ <text style="font-size: 14px;">0.00</text>
+					</text>
 				</view>
-				<view class="bank-num d-flex">
-					<!-- <span>*****</span>
-					<span>*****</span>
-					<span>*****</span>
-					0179 -->
-					<span class="d-flex a-center j-center">{{accountno}}</span>
+				<view class="dis f-c a-c" @click="toBillDetails(3)">
+					<text>推广金额</text>
+					<text v-if="MoneyData.promotion" class="sum" style="color: #229805;">￥ <text
+							style="font-size: 14px;">{{MoneyData.promotion.toFixed(2)}}</text> </text>
+					<text v-else class="sum" style="color: #229805;">￥ <text style="font-size: 14px;">0.00</text>
+					</text>
 				</view>
 			</view>
 		</view>
-		<!-- 银行卡信息End -->
-
-		<!-- 钱包金额Start -->
-		<view class="wallet-money d-flex">
-			<view class="d-flex flex-1 flex-column" @tap="toBillDetails(1)">
-				<view class="d-flex a-center j-center">预收账户</view>
-				<view class="d-flex a-center j-center">¥{{advanceMoney}}</view>
+		<view class="walletData dis a-c j-s f-wrap">
+			<view class="fee-sector ">
+				<text>手续金额预收</text>
+				<text v-if="MoneyData.willHalding">￥ <text style="font-size: 13px;">{{MoneyData.willHalding}}</text>
+				</text>
+				<text v-else>￥ <text style="font-size: 13px;">0.00</text> </text>
 			</view>
-			<view class="d-flex flex-1 flex-column" @tap="toBillDetails(2)">
-				<view class="d-flex a-center j-center">可提现现金</view>
-				<view class="d-flex a-center j-center">¥{{withdrawal}}</view>
+			<view class="copyTrade-sector ">
+				<text>跟单金额预收</text>
+				<text v-if="MoneyData.willDocumentary">￥<text
+						style="font-size: 13px;">{{MoneyData.willDocumentary}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-			<view class="d-flex flex-1 flex-column" @tap="toBillDetails(3)">
-				<view class="d-flex a-center j-center">推广费</view>
-				<view class="d-flex a-center j-center">¥{{extendMoney}}</view>
+			<view class="promotion-sector ">
+				<text>推广金额预收</text>
+				<text v-if="MoneyData.willPromotion">￥<text
+						style="font-size: 13px;">{{MoneyData.willPromotion}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-		</view>
-		<!-- 钱包金额End -->
-
-		<!-- 钱包数据Start -->
-		<view class="wallet-data">
-			<view class="bg1">
-				<view>{{monthCost}}</view>
-				<hr>
-				<view>本月累计推广费（元）</view>
+			<view class="fee-sector ">
+				<text>手续金额提现中</text>
+				<text v-if="MoneyData.withdrawalHalding">￥<text
+						style="font-size: 13px;">{{MoneyData.withdrawalHalding}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-			<view class="bg2">
-				<view>{{yearCost}}</view>
-				<hr>
-				<view>今年累计推广费（元）</view>
+			<view class="copyTrade-sector ">
+				<text>跟单金额提现中</text>
+				<text v-if="MoneyData.withdrawalDocumentary">￥<text
+						style="font-size: 13px;">{{MoneyData.withdrawalDocumentary}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-			<view class="bg3">
-				<view>{{monthPremium}}</view>
-				<hr>
-				<view>本月推广订单保费（元）</view>
+			<view class="promotion-sector ">
+				<text>推广金额提现中</text>
+				<text v-if="MoneyData.withdrawalPromotion">￥<text
+						style="font-size: 13px;">{{MoneyData.withdrawalPromotion}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-			<view class="bg4">
-				<view>{{yearPremium}}</view>
-				<hr>
-				<view>今年推广订单保费（元）</view>
+			<view class="fee-sector">
+				<text>手续金额已提现</text>
+				<text v-if="MoneyData.approvedHalding">￥<text
+						style="font-size: 13px;">{{MoneyData.approvedHalding}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-			<view class="bg5">
-				<view>{{monthExNumber}}</view>
-				<hr>
-				<view>本月累计推广人数</view>
+			<view class="copyTrade-sector">
+				<text>跟单金额已提现</text>
+				<text v-if="MoneyData.approvedDocumentary">￥<text
+						style="font-size: 13px;">{{MoneyData.approvedDocumentary}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
-			<view class="bg6">
-				<view>{{historyNumber}}</view>
-				<hr>
-				<view>历史累计推广人数</view>
+			<view class="promotion-sector">
+				<text>推广金额已提现</text>
+				<text v-if="MoneyData.approvedPromotion">￥<text
+						style="font-size: 13px;">{{MoneyData.approvedPromotion}}</text></text>
+				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
 			</view>
 		</view>
-		<!-- 钱包数据End -->
-		<view style="height: 100upx;"></view>
-
-		<view class="wallet-btn d-flex">
-			<view @tap="toSpread" class="d-flex a-center j-center flex-1">推广</view>
-			<view @tap="toWithdraw" class="d-flex a-center j-center flex-1">提现</view>
-		</view>
 	</view>
 </template>
 
@@ -92,18 +103,7 @@
 	export default {
 		data() {
 			return {
-				bankname: '',
-				accountno: '',
-				advanceMoney: '0', // 预收账户金额
-				withdrawal: '0', //可提现金额
-				extendMoney: '0', //推广费
-
-				monthCost: '0',
-				yearCost: '0',
-				monthPremium: '0',
-				yearPremium: '0',
-				monthExNumber: '0',
-				historyNumber: '0'
+				MoneyData: {},
 
 			}
 		},
@@ -111,61 +111,18 @@
 			...mapState(['userInfo'])
 		},
 		async onShow() {
-			await this.getAdvanceMoney(); //预收金额
-			await this.getPayAccount(); //可提现余额
-			await this.getExtendMoney(); //推广费
-
-			await this.getQuerywallet(); //查询推广
+			await this.getAdvanceMoney(); //金额
 		},
-		// onLoad() {
-		// 	this.bankname=this.userInfo.esmUserInternal.bankname;
-		// 	this.accountno = this.formatBankNo({"value":this.userInfo.esmUserInternal.accountno});
-		// },
-		onShow() {
-			this.bankname = this.userInfo.esmUserInternal.bankname;
-			this.accountno = this.formatBankNo({
-				"value": this.userInfo.esmUserInternal.accountno
-			});
+		async onLoad() {
+			await this.getAdvanceMoney(); //手续费金额
 		},
+		onShow() {},
 		methods: {
-
 			// 预收账户金额查询
 			async getAdvanceMoney() {
-				let res = await this.$http.get('/insPayApply/advanceAccount?userid=' + this.userInfo.sysUser.id, {}, {
-					load: false
-				});
-				this.advanceMoney = res.data;
+				let res = await this.$http.get('/sysUserAccount/getSysAllAmount');
+				this.MoneyData = res.data;
 			},
-
-			// 可提现余额查询
-			async getPayAccount() {
-				let res = await this.$http.get('/insPayApply/payAccount?userid=' + this.userInfo.sysUser.id, {}, {
-					load: false
-				});
-				this.withdrawal = res.data.accountBalance;
-			},
-
-			//推广费
-			async getExtendMoney() {
-				let res = await this.$http.get('/insPayApply/extendAccount?userid=' + this.userInfo.sysUser.id, {}, {
-					load: false
-				});
-				this.extendMoney = res.data.accountBalance;
-			},
-
-			//推广费
-			async getQuerywallet() {
-				let res = await this.$http.get('/insPayApply/querywallet?userid=' + this.userInfo.sysUser.id, {}, {
-					load: false
-				});
-				this.monthCost = res.data.monthCost; //本月累计推广费
-				this.yearCost = res.data.yearCost; //今年累计推广费
-				this.monthPremium = res.data.monthPremium; //本月推广订单保费
-				this.yearPremium = res.data.yearPremium; //今年推广订单保费
-				this.monthExNumber = res.data.monthExNumber; //本月累计推广人数
-				this.historyNumber = res.data.historyNumber; //历史累计推广人数
-			},
-
 			// 去账单明细
 			toBillDetails(type) {
 				this.navigate({
@@ -236,194 +193,102 @@
 
 	/* 银行卡信息Start */
 	.wallet-head {
-		position: relative;
 		width: 100%;
-		height: 264upx;
-		background: url('/static/image/wallet/imgbg.jpg') no-repeat 50%;
+		height: 165px;
+		// background-color: #0052FF;
+		background-image: url("/static/image/my/1.png");
 		background-size: 100% 100%;
-	}
-
-	.wallet-head .bank-det {
-		position: absolute;
-		color: #FFFFFF;
-		left: 5%;
-		top: 32upx;
-		width: 90%;
-		height: 232upx;
-	}
-
-	.wallet-head .bank-det .bank-icon {
-		margin-left: 5.5%;
-		margin-top: 48upx;
-		height: 70upx;
-		width: 70upx;
-		vertical-align: top;
-	}
-
-	.wallet-head .bank-det .bank-name {
-		display: inline-block;
-		vertical-align: top;
-		padding: 46upx 0 0 20upx;
-		font-size: 36upx;
-		line-height: 45upx;
-	}
-
-	.wallet-head .bank-det .changebank {
-		float: right;
-		display: inline-block;
-		vertical-align: top;
-		width: 110upx;
-		padding-top: 0;
-		margin-top: 48upx;
-		margin-right: 6%;
-		height: 50upx;
-		line-height: 50upx;
-		border: 1px solid #fff;
-		border-radius: 30upx;
-		text-align: center;
-		font-size: 30upx;
-	}
-
-	.wallet-head .bank-det .bank-num {
-		/* width: 86%; */
-		width: 100%;
-		display: inline-block;
-		vertical-align: top;
-		padding-top: 20upx;
-		font-size: 36upx;
-		text-align: right;
-		line-height: 40upx;
-	}
-
-	.wallet-head .bank-det .bank-num span {
-		vertical-align: middle;
-		/* margin-right: 10%; */
-		opacity: .5;
-		font-size: 42upx;
-		line-height: 50upx;
-	}
-
-	/* 银行卡信息End */
+		padding: 22px 34px;
+		position: relative;
 
-	/* 钱包金额Start */
-	.wallet-money {
-		width: 100%;
-		height: 130upx;
-		background: #343740;
-		color: #fff;
-	}
+		image {
+			width: 31px;
+			height: 31px;
+		}
 
-	.wallet-money>view>view:nth-of-type(1) {
-		font-size: 24upx;
-		opacity: 0.4;
-		margin-top: 27upx;
-		line-height: 30upx;
-	}
+		.amount {
+			>view {
+				font-size: 12px;
+				color: #333333;
+			}
 
-	.wallet-money>view>view:nth-of-type(2) {
-		font-size: 28upx;
-		margin-top: 10upx;
-		line-height: 40upx;
+			.sum {
+				font-size: 20rpx;
+				font-weight: bold;
+				font-family: DIN, DIN;
+			}
+		}
 	}
 
-	/* 钱包金额End */
-
-	/* 钱包数据Start */
-	.wallet-data {
+	.walletData {
 		width: 100%;
 		height: auto;
-		padding: 2upx 0 100upx;
-		background: #fefefe;
-	}
-
-	.wallet-data>view {
-		display: inline-block;
-		vertical-align: top;
-		width: 330upx;
-		height: 160upx;
-		padding-left: 50upx;
-		box-sizing: border-box;
-		margin: 30upx 0 0 30upx;
-		border-radius: 5upx;
-		box-shadow: 3upx 8upx 30upx #efeff4, -3upx 8upx 30upx #efeff4;
-		background: #fff;
-	}
-
-	.wallet-data .bg1 {
-		background: url('/static/image/wallet/bg1.png') no-repeat 50%;
-		background-size: 100% 100%;
-	}
-
-	.wallet-data .bg2 {
-		background: url('/static/image/wallet/bg2.png') no-repeat 50%;
-		background-size: 100% 100%;
-	}
-
-	.wallet-data .bg3 {
-		background: url('/static/image/wallet/bg3.png') no-repeat 50%;
-		background-size: 100% 100%;
-	}
-
-	.wallet-data .bg4 {
-		background: url('/static/image/wallet/bg4.png') no-repeat 50%;
-		background-size: 100% 100%;
-	}
-
-	.wallet-data .bg5 {
-		background: url('/static/image/wallet/bg5.png') no-repeat 50%;
-		background-size: 100% 100%;
-	}
-
-	.wallet-data .bg6 {
-		background: url('/static/image/wallet/bg6.png') no-repeat 50%;
-		background-size: 100% 100%;
-	}
-
-	.wallet-data>view>view:nth-of-type(1) {
-		padding-top: 20upx;
-		line-height: 60upx;
-		font-size: 32upx;
-		color: #333;
-	}
-
-	.wallet-data>view hr {
-		width: 35upx;
-	}
+		padding: 0 16px;
+
+		.fee-sector,
+		.copyTrade-sector,
+		.promotion-sector {
+			position: relative;
+			width: 32%;
+			height: 56px;
+			background: #FFFFFF;
+			box-shadow: 0px 4px 10px 0px #DAE3F4;
+			border-radius: 4px;
+			margin-bottom: 12px;
+			padding-left: 12px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+			text:first-child {
+				font-size: 12px;
+				color: rgba(51, 51, 51, 0.8);
+			}
 
-	.wallet-data>view>view:nth-last-of-type(1) {
-		font-size: 20upx;
-		color: #999;
-		line-height: 54upx;
+			text:last-child {
+				font-family: DIN, DIN;
+				font-size: 20rpx;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
 	}
 
-	/* 钱包数据End */
+	.fee-sector::before {
 
-	.wallet-btn {
-		width: 100%;
-		position: fixed;
-		bottom: 0;
-		height: 100upx;
-		line-height: 100upx;
-	}
-
-	.wallet-btn>view {
-		font-size: 36upx;
-		flex-shrink: 1;
+		content: "";
+		display: block;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 6%;
 		height: 100%;
-		font-weight: bold;
-		box-sizing: border-box;
-		width: 100%;
+		background-color: #0052FF;
+		border-radius: 4px 0 0 4px;
+		/* 按需设置颜色 */
 	}
 
-	.wallet-btn>view:nth-of-type(1) {
-		color: $themeColor;
-		background: #fff;
-		border-top: 1px solid #d4d4d4;
+	.copyTrade-sector::before {
+		content: "";
+		display: block;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 6%;
+		height: 100%;
+		background-color: #FF5600;
+		border-radius: 4px 0 0 4px;
 	}
 
-	.wallet-btn>view:nth-of-type(2) {
-		color: #fff;
-		background: $themeColor;
-		border-top: 1px solid $themeColor;
+	.promotion-sector::before {
+		content: "";
+		display: block;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 6%;
+		height: 100%;
+		background-color: #229805;
+		border-radius: 4px 0 0 4px;
 	}
 </style>

pages/wallet/withdraw.vue

@@ -3,21 +3,21 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view class="withdraw-head dis f-c" @click="bankCardOption">
-			<view class="dis a-c j-s">
-				<view class="withdraw-head-to">到账银行卡</view>
-				<view class="dis a-c" style="font-weight: bold;font-size: 12px;">
-					<view class="bankLogo">
-						<image src="/static/icon/bjdcar.png" mode="" style="width: 100%;height: 100%;"></image>
+			<text class="withdraw-head-to mb-2">到账银行卡</text>
+			<view class="dis a-start j-s">
+				<view class="dis j-s a-start">
+					<image class="bankLogo" :src="bankCardInfo.logo" mode=""></image>
+					<view class="dis a-start f-c bankName" v-if="bankCardInfo.bankAccount && bankCardInfo.bankNumber">
+						<text>{{bankCardInfo.bankAccount}}（****{{bankCardInfo.bankNumber.slice(-4)}}）</text>
+						<text>注：仅支持整数，72小时内到账</text>
 					</view>
-					<text
-						v-if="bankCardInfo.bankAccount && bankCardInfo.bankNumber">{{bankCardInfo.bankAccount.slice(-4)}}（{{ bankCardInfo.bankNumber.slice(-4)}}）</text>
 				</view>
 				<u-icon name="arrow-right" color="#999" size="30"></u-icon>
 			</view>
-			<text style="color: #999;background-color: #F7F7F7;font-size: 12px;">注：仅支持整数，72小时内到账</text>
+
 		</view>
 		<view class="withdraw-body">
-			<text>提现金额</text>
+			<text style="font-size: 15px;color: #333;">提现金额</text>
 			<view class="input-money">
 				<text class="rmb">￥</text>
 				<input disabled v-model.number="extract" type="text" @focus.prevent="stopKeyborad" class="t-input" />
@@ -34,42 +34,64 @@
 					<text class="info-money-all" @click="getAll">全部提现</text>
 				</view>
 			</view>
-			<view :class="'tx' + (is_post ? '-active' : '')"><button @click="handleShowModel">提现</button></view>
-		</view>
+			<view class="dis j-s" :class="['keyboard', keyboradShow ? '' : 'active', isIphoneX ? 'isIphone' : '']">
+				<view class="dis  a-s j-s f-wrap" style="width: 80%;">
+					<block v-for="(item, index) in 9" :key="index">
+						<view class="keyboard-item" @tap="keyboradKey(index + 1)">{{ index + 1 }}</view>
+					</block>
+					<view class="keyboard-item" style="width: 66%;" @tap="keyboradKey(0)"><text>0</text></view>
+					<view class="keyboard-item ">.</view>
+				</view>
+				<view class="dis f-c j-s" style="margin-left: 8px;width: 20%;">
+					<view class="keyboard-item " @tap="keyboradDel()" style="width: 100%;">
+						<image src="/static/image/bindBank/Frame.png" mode="aspectFill" :lazy-load="true"
+							style="width: 26px;height: 26px;">
+						</image>
+					</view>
+					<u-button class="Withdrawal" type="primary" :disabled="!is_post"
+						@click="handleShowModel">提现</u-button>
+				</view>
 
-		<view :class="['keyboard', keyboradShow ? '' : 'active', isIphoneX ? 'isIphone' : '']">
-			<block v-for="(item, index) in 9" :key="index">
-				<view class="keyboard-item" @tap="keyboradKey(index + 1)">{{ index + 1 }}</view>
-			</block>
-			<view class="keyboard-item hide"></view>
-			<view class="keyboard-item" @tap="keyboradKey(0)"><text>0</text></view>
-			<view class="keyboard-item delte" @tap="keyboradDel()">
-				<image class="img" src="/static/common/del.png" mode="aspectFill" :lazy-load="true"></image>
 			</view>
+			<!-- <view :class="'tx' + (is_post ? '-active' : '')"><button @click="handleShowModel">提现</button></view> -->
 		</view>
-		<u-popup v-model="bankCardListShow" mode="bottom" height="700" border-radius="20">
-			<view class="bankCardPopup">
+		<u-popup v-model="bankCardListShow" mode="bottom" height="660" border-radius="20">
+			<view class="bankCardPopup dis f-c j-s a-c">
 				<view class="title dis f-c a-c">
 					<text>选择到账银行卡</text>
 					<text>请留意各银行到账时间</text>
 				</view>
-				<scroll-view scroll-y="true" style="height: 480rpx;">
-					<view class="PopupSet dis j-s" v-for="(bankitem,bankindex) in bankCardList" :key="bankitem.id"
-						@click="bankCardPopupClick(bankitem)">
-						<view class="setLeft">
-							<image src="../../static/icon/bjdcar.png" mode=""></image>
-						</view>
-						<view class="setRight dis j-s a-c">
-							<view class="dis f-c">
-								<text v-if="bankitem.bankAccount && bankitem.bankNumber">
-									{{bankitem.bankAccount.slice(-4)}} 储蓄卡（{{bankitem.bankNumber.slice(-4)}}）</text>
-								<text>72小时到账</text>
+				<scroll-view scroll-y="true" class="" style="height:auto;background-color: #fff;border-radius: 6px;
+		position: relative;">
+					<view class="PopupSet">
+						<view class=" dis j-s" v-for="(bankitem,bankindex) in bankCardList" :key="bankitem.id"
+							@click="bankCardPopupClick(bankitem)">
+							<view class="setLeft">
+								<image :src="bankitem.logo" mode="" style="width: 100%;height: 100%;"></image>
+							</view>
+							<view class="setRight dis j-s a-c">
+								<view class="dis f-c">
+									<text v-if="bankitem.bankAccount && bankitem.bankNumber">
+										{{bankitem.bankAccount.slice(-4)}} 储蓄卡（{{bankitem.bankNumber.slice(-4)}}）</text>
+									<text>72小时到账</text>
+								</view>
+								<u-icon v-if="bankCardInfo.id==bankitem.id" name="checkbox-mark" color="#0052FF"
+									size="50"></u-icon>
 							</view>
-							<u-icon v-if="bankCardInfo.id==bankitem.id" name="checkbox-mark" color="#02c25d"
-								size="50"></u-icon>
 						</view>
+
 					</view>
+
 				</scroll-view>
+				<view class="bankAdd dis j-s a-c" @click="bank">
+					<view class="dis a-c">
+						<image src="/static/image/bindBank/add.png" mode=""
+							style="width: 20px;height: 20px;margin-right: 20px;">
+						</image>
+						<text>添加银行卡提现</text>
+					</view>
+					<u-icon name="arrow-right" color="#999" size="30"></u-icon>
+				</view>
 			</view>
 		</u-popup>
 	</view>
@@ -89,8 +111,65 @@
 		},
 		data() {
 			return {
+				bankList: [{
+						bankName: "中国邮政储蓄银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(79, 136, 69, 0.7) 0%, #4f8845 100%)"
+					},
+					{
+						bankName: "中国工商银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(177, 0, 13, 0.7) 0%, #b1000d 100%)"
+					},
+					{
+						bankName: "中国农业银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(86,152, 130, 0.7) 0%, #569882 100%)"
+					},
+					{
+						bankName: "中国银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(157, 32, 40, 0.7) 0%, #9d2028 100%)"
+					},
+					{
+						bankName: "中国建设银行",
+						logo: "/static/image/bankLogo/jianshe.png",
+						background: "linear-gradient(90deg, rgba(6, 89, 159, 0.7) 0%, #06569F 100%)"
+					},
+					{
+						bankName: "招商银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(197, 0, 25, 0.7) 0%, #c50019 100%)"
+					},
+					{
+						bankName: "中国民生银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(84,149, 92, 0.7) 0%, #54955c 100%)"
+					},
+					{
+						bankName: "中国光大银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(93, 30, 131, 0.7) 0%, #5d1e83 100%)"
+					},
+					{
+						bankName: "中信银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(184, 0,22, 0.7) 0%, #b80016 100%)"
+					},
+					{
+						bankName: "华夏银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(216, 12, 24, 0.7) 0%, #d80c18 100%)"
+					},
+					{
+						bankName: "中国交通银行",
+						logo: "/static/image/bankLogo/youzheng.png",
+						background: "linear-gradient(90deg, rgba(33, 58, 120, 0.7) 0%, #213a78 100%)"
+					},
+
+				],
 				lowest: 0, //最低提现金额
-				amount: 0, //可提现余额
+				amount: 500, //可提现余额
 				extract: '', //选择的提现金额
 				amountStatus: "", //提现类型
 				is_out: false,
@@ -119,6 +198,11 @@
 			this.getbankCard();
 		},
 		methods: {
+			bank() {
+				this.navigate({
+					url: "/pages/wallet/bindBank"
+				}, "navigateTo", true);
+			},
 			bankCardPopupClick(info) {
 				this.bankCardInfo = info;
 				this.bankCardListShow = false;
@@ -128,9 +212,21 @@
 			},
 			async getbankCard() {
 				let res = await this.$http.get('/userBank/getUserBankList');
+				this.bankList.map(val => {
+					res.data.map(ele => {
+						if (val.bankName == ele.bankAccount) {
+							ele.logo = val.logo;
+							return ele;
+						}
+					})
+				})
+				let bankinfo = res.data.find(val => val.isDefault == 1)
+				if (bankinfo) {
+					this.bankCardInfo = bankinfo;
+				} else {
+					this.bankCardInfo = res.data[0]
+				}
 				this.bankCardList = res.data;
-				this.bankCardInfo = this.bankCardList.find(val => val.isDefault == 1)
-				console.log(this.bankCardInfo);
 			},
 			loadData() {
 				this.lowest = 50;
@@ -235,23 +331,37 @@
 	};
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	page {
-		background-color: #ededed;
+		background-color: #F8FAFE;
+	}
+
+	/deep/ .uni-scroll-view-content {
+		background-color: #F8FAFE;
 	}
 
 	.bankCardPopup {
-		padding: 10px 30px;
+		padding: 10px 16px;
+		background-color: #F8FAFE;
+
+		.bankAdd {
+			background-color: #fff;
+			font-size: 15px;
+			width: 100%;
+			color: #333;
+			padding: 15px 8px;
+
+		}
 
 		.title {
 			color: #000;
 			font-weight: bold;
-			border-bottom: 1px solid #f2f2f2;
 			padding-bottom: 10px;
+			font-size: 15px;
 
 			text:last-child {
 				font-size: 12px;
-				color: #999;
+				color: rgba(51, 51, 51, 0.8);
 				font-weight: 400;
 			}
 		}
@@ -262,17 +372,16 @@
 		}
 
 		.PopupSet {
-			padding-top: 15px;
+			width: 100%;
+			height: auto;
+			background: #FFFFFF;
+			border-radius: 6px;
+			padding: 18rpx 16rpx;
 
 			.setLeft {
-				width: 25px;
-				height: 25px;
-				background-color: #fff;
-				border-radius: 50%;
-				padding: 4px;
-				box-sizing: border-box;
+				width: 35px;
+				height: 30px;
 				margin-right: 5px;
-				box-shadow: 0px 1px 4px #c3c3c3;
 				margin-right: 20px;
 				margin-top: 2px;
 
@@ -284,27 +393,28 @@
 
 			.setRight {
 				width: 100%;
-				padding: 0 2px 15px 0;
 				border-bottom: 1px solid #f2f2f2;
+				padding-bottom: 10px;
 
 				text {
 					font-size: 12px;
-					color: #999;
+					color: rgba(51, 51, 51, 0.6);
 				}
 
 				text:first-child {
 					font-size: 15px;
-					color: #000;
+					color: #333333;
 					font-weight: bold;
 				}
 			}
 
+
+
 		}
 
 	}
 
 	.withdraw {
-		padding: 20px;
 		background-color: #ededed;
 		position: absolute;
 		width: 100%;
@@ -313,13 +423,18 @@
 	}
 
 	.withdraw-head {
-		background-color: #f7f7f7;
-		display: flex;
-		align-content: center;
-		padding: 30px;
+		background-color: #F8FAFE;
+		padding: 16px;
 		border-top-left-radius: 10px;
 		border-top-right-radius: 10px;
 		font-size: 14px;
+
+		.withdraw-head-to {
+			font-size: 16px;
+			font-weight: bold;
+			color: #333333;
+
+		}
 	}
 
 	.withdraw-head-way {
@@ -348,11 +463,13 @@
 
 	.withdraw-body {
 		background-color: #fff;
-		padding: 20px 30px;
+		padding: 12px 16px;
 		font-size: 28upx;
+		box-shadow: 0px 4px 10px 0px #DAE3F4;
 		border-top-left-radius: 10px;
 		border-top-right-radius: 10px;
 		margin-top: -20px;
+		height: calc(100vh - 170px);
 	}
 
 	.withdraw-body .input-money {
@@ -363,8 +480,7 @@
 	}
 
 	.withdraw-body .input-money .rmb {
-		font-size: 2em;
-		top: 10px;
+		font-size: 2.6em;
 		position: relative;
 	}
 
@@ -384,11 +500,12 @@
 	}
 
 	.withdraw-body .info-money-num {
-		color: #b2b2b2;
+		color: rgba(51, 51, 51, 0.6);
+		font-size: 13px;
 	}
 
 	.withdraw-body .info-money-all {
-		color: #576b95;
+		color: #2D4D89;
 	}
 
 	.withdraw-body .tx button {
@@ -403,36 +520,49 @@
 	}
 
 	.withdraw .keyboard {
+		height: 210px;
+		width: 100%;
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		width: 100%;
-		background: #ebebeb;
-		display: flex;
-		justify-content: center;
+		background: #F7F7F7;
 		z-index: 2;
-		flex-wrap: wrap;
+		padding: 23rpx 16rpx 0rpx 16rpx;
 		transition: all 0.2s ease-in 0.2s;
 	}
 
-	.withdraw .active {
-		bottom: -400rpx;
+	.Withdrawal {
+		width: 100%;
+		height: 141px;
+		background: #0052FF;
+		border-radius: 4px;
+		text-align: center;
+		line-height: 286rpx;
+		color: #fff;
+		font-size: 20px;
+		font-weight: 500;
+		margin-bottom: 8px;
 	}
 
 	.withdraw .keyboard-item {
 		box-sizing: border-box;
-		width: 250rpx;
+		width: 32.33%;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		background: #fff;
+		background: #ffffff;
 		font-size: 40rpx;
 		color: #333;
-		height: 99rpx;
-		border: 1rpx solid #ebebeb;
+		height: 84rpx;
 		border-top: none;
 		border-left: none;
+		border-radius: 4px;
+	}
+
+	.keyboard-item:active {
+		background-color: #e6e5ea;
 	}
 
 	.withdraw .hide {
@@ -467,18 +597,26 @@
 	}
 
 	.bankLogo {
-		width: 20px;
-		height: 20px;
-		background-color: #fff;
-		border-radius: 50%;
-		padding: 4px;
-		box-sizing: border-box;
-		margin-right: 5px;
+		width: 25px;
+		height: 25px;
+		margin-right: 8px;
+	}
 
-		image {
-			width: 100%;
-			height: 100%;
+	.bankName {
+		text:first-child {
+			margin-bottom: 10px;
+			line-height: 1;
+			font-weight: bold;
+			font-size: 16px;
+		}
+
+		text:last-child {
+			margin-bottom: 20px;
+			font-size: 12px;
+			color: #999;
 		}
+
+
 	}
 
 	.popup-content .withdrawBody {