@dongkboy преди 1 година
родител
ревизия
f23791c85c

+ 288 - 296
components/common/previewImage/previewImage.vue

@@ -1,37 +1,16 @@
 <template>
-	<view class="previewImage" :style="{ 'background-color': 'rgba(0,0,0,' + opacity + ')' }" v-if="show" @tap="close" @touchmove.stop.prevent>
+	<view class="previewImage" :style="{ 'background-color': 'rgba(0,0,0,' + opacity + ')' }" v-if="show" @tap="close"
+		@touchmove.stop.prevent>
 		<swiper class="swiper" :current="index" @change="swiperChange" :disable-touch="swiper" :circular="circular">
 			<swiper-item v-for="(img, i) in imgs" :key="'swiper-item-'+i" :id="'swiper-item-'+i">
 				<movable-area class="marea" scale-area>
-					<movable-view
-						:id="'movable-view-'+i"
-						:key="'movable-view-'+i"
-						class="mview"
-						direction="all"
-						:out-of-bounds="false"
-						:inertia="true"
-						damping="90"
-						friction="2"
-						scale="true"
-						scale-min="1"
-						scale-max="4"
-						:scale-value="scale"
-						@scale="onScale"
-						@change="movableChange"
-					>
-						<image
-							:id="'image-'+i"
-							:key="'movable-view'+i"
-							class="image"
-							:src="img"
-							:style="{ transform: 'rotateZ(' + deg + 'deg)' }"
-							:data-index="i"
-							:data-src="img"
-							mode="widthFix"
-							@touchmove="handletouchmove"
-							@touchstart="handletouchstart"
-							@touchend="handletouchend"
-						/>
+					<movable-view :id="'movable-view-'+i" :key="'movable-view-'+i" class="mview" direction="all"
+						:out-of-bounds="false" :inertia="true" damping="90" friction="2" scale="true" scale-min="1"
+						scale-max="4" :scale-value="scale" @scale="onScale" @change="movableChange">
+						<image :id="'image-'+i" :key="'movable-view'+i" class="image" :src="img.url"
+							:style="{ transform: 'rotateZ(' + deg + 'deg)' }" :data-index="i" :data-src="img.url"
+							mode="widthFix" @touchmove="handletouchmove" @touchstart="handletouchstart"
+							@touchend="handletouchend" />
 					</movable-view>
 				</movable-area>
 			</swiper-item>
@@ -41,308 +20,321 @@
 		</view>
 		<view class="save" v-if="saveBtn" @click.stop.prevent="save"><text class="text">保存</text></view>
 		<view class="rotate" v-if="rotateBtn" @click.stop.prevent="rotate"><text class="text">旋转</text></view>
-		<view class="desc" v-if="descs.length > 0 && descs.length == imgs.length && descs[index].length > 0">{{ descs[index] }}</view>
+		<view class="desc" v-if="descs.length > 0 && descs.length == imgs.length && descs[index].length > 0">
+			{{ descs[index] }}
+		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	name: 'ksj-previewImage', //插件名称
-	props: {
-		imgs: {
-			//图片列表
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			}
-		},
-		descs: {
-			//描述列表
-			type: Array,
-			required: false,
-			default: () => {
-				return [];
+	export default {
+		name: 'ksj-previewImage', //插件名称
+		props: {
+			imgs: {
+				//图片列表
+				type: Array,
+				required: true,
+				default: () => {
+					return [];
+				}
+			},
+			descs: {
+				//描述列表
+				type: Array,
+				required: false,
+				default: () => {
+					return [];
+				}
+			},
+			//透明度,0到1之间。
+			opacity: {
+				type: Number,
+				default: 0.8
+			},
+			//保存按键
+			saveBtn: {
+				type: Boolean,
+				default: false
+			},
+			//旋转按键
+			rotateBtn: {
+				type: Boolean,
+				default: true
+			},
+			//循环预览
+			circular: {
+				type: Boolean,
+				default: false
 			}
 		},
-		//透明度,0到1之间。
-		opacity: {
-			type: Number,
-			default: 0.8
-		},
-		//保存按键
-		saveBtn: {
-			type: Boolean,
-			default: false
-		},
-		//旋转按键
-		rotateBtn: {
-			type: Boolean,
-			default: true
-		},
-		//循环预览
-		circular:{
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			swiper:false,//是否禁用
-			show: false, //显示状态
-			index: 0, //当前页
-			deg: 0, //旋转角度
-			time: 0, //定时器
-			interval: 1000, //长按事件
-			scale: 1 ,//缩放比例
-			
-		};
-	},
-	methods: {
-		//比例变化
-		onScale(e) {
-			
+		data() {
+			return {
+				swiper: false, //是否禁用
+				show: false, //显示状态
+				index: 0, //当前页
+				deg: 0, //旋转角度
+				time: 0, //定时器
+				interval: 1000, //长按事件
+				scale: 1, //缩放比例
+
+			};
 		},
+		methods: {
+			//比例变化
+			onScale(e) {
 
-		//长按事件相关内容---------开始-------------------
-		//接触开始
-		handletouchstart(e) {
-			var tchs = e.touches.length;
-			if (tchs != 1) {
+			},
+
+			//长按事件相关内容---------开始-------------------
+			//接触开始
+			handletouchstart(e) {
+				var tchs = e.touches.length;
+				if (tchs != 1) {
+					return false;
+				}
+				this.time = setTimeout(() => {
+					this.onLongPress(e);
+				}, this.interval);
 				return false;
-			}
-			this.time = setTimeout(() => {
-				this.onLongPress(e);
-			}, this.interval);
-			return false;
-		},
-		//清除定时器
-		handletouchend() {
-			clearTimeout(this.time);
-			if (this.time != 0) {
-				//处理点击时间
-			}
-			return false;
-		},
-		//清除定时器
-		handletouchmove() {
-			clearTimeout(this.time);
-			this.time = 0;
-		},
-		// 处理长按事件
-		onLongPress(e) {
-			var src = e.currentTarget.dataset.src;
-			var index = e.currentTarget.dataset.index;
-			var data = { src: src, index: index };
-			this.$emit('longPress', data);
-		},
-		//长按事件相关内容---------结束-------------------
+			},
+			//清除定时器
+			handletouchend() {
+				clearTimeout(this.time);
+				if (this.time != 0) {
+					//处理点击时间
+				}
+				return false;
+			},
+			//清除定时器
+			handletouchmove() {
+				clearTimeout(this.time);
+				this.time = 0;
+			},
+			// 处理长按事件
+			onLongPress(e) {
+				var src = e.currentTarget.dataset.src;
+				var index = e.currentTarget.dataset.index;
+				var data = {
+					src: src,
+					index: index
+				};
+				this.$emit('longPress', data);
+			},
+			//长按事件相关内容---------结束-------------------
 
-		//图片改变
-		swiperChange(e) {
-			this.index = e.target.current; //更新当前图片index
-			
-			this.$nextTick(function() {
-				this.scale = 1;
-			})
-			
-			//this.deg = 0; //旋转角度
-			//this.swiper=true;
-		},
-		
-		//移动变化
-		movableChange(e) {
-			//console.log(e);
-			/* if(this.old.scale <= 1){
-				this.swiper=false;
-			}else if(e.detail.x===0){
-				this.swiper=false;
-			} */
-		},
-		
+			//图片改变
+			swiperChange(e) {
+				this.index = e.target.current; //更新当前图片index
 
-		//保存
-		save(e) {
-			var src = this.imgs[this.index];
-			console.log(src)
-			console.log(this.imgs)
-			console.log(this.index)
-			this.downloadImg(src);
-		},
+				this.$nextTick(function() {
+					this.scale = 1;
+				})
 
-		//下载并保存文件
-		downloadImg(src) {
-			//下载图片文件
-			uni.showLoading({
-				title: '保存中'
-			});
-			uni.saveImageToPhotosAlbum({
-				filePath: src,
-				success: (res) => {
-					uni.hideLoading();
-					uni.showToast({
-						title: '已保存至相册',
-						duration: 1000
-					});
-				},fail: function(err) {
-					console.log(err)
-					uni.hideLoading();
-					uni.showToast({
-						title: '图片下载失败',
-						icon: 'none',
-						duration: 1000
-					});
-				}
-			});
-		},
+				//this.deg = 0; //旋转角度
+				//this.swiper=true;
+			},
+
+			//移动变化
+			movableChange(e) {
+				/* if(this.old.scale <= 1){
+					this.swiper=false;
+				}else if(e.detail.x===0){
+					this.swiper=false;
+				} */
+			},
 
-		//旋转
-		rotate(e) {
-			this.deg = this.deg == 270 ? 0 : this.deg + 90;
-		},
-		//打开
-		open(e) {
-			console.log(e)
-			if (e === null || e === '') {
-				console.log('kxj-previewImage:打开参数无效');
-				return;
-			}
 
-			if (!isNaN(e)) {
-				if(e>=this.imgs.length){
-					console.log('kxj-previewImage:打开参数无效');
-				}else{
-					this.index = e;
+			//保存
+			save(e) {
+				var src = this.imgs[this.index];
+				this.downloadImg(src);
+			},
+
+			//下载并保存文件
+			downloadImg(src) {
+				//下载图片文件
+				uni.showLoading({
+					title: '保存中'
+				});
+				uni.saveImageToPhotosAlbum({
+					filePath: src,
+					success: (res) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: '已保存至相册',
+							duration: 1000
+						});
+					},
+					fail: function(err) {
+						uni.hideLoading();
+						uni.showToast({
+							title: '图片下载失败',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				});
+			},
+
+			//旋转
+			rotate(e) {
+				this.deg = this.deg == 270 ? 0 : this.deg + 90;
+			},
+			//打开
+			open(e) {
+				if (e === null || e === '') {
+					// console.log('kxj-previewImage:打开参数无效');
+					return;
 				}
-			} else {
-				var index = this.imgs.indexOf(e);
-				if(index===-1){
-					this.imgs = [e];
-					this.index = 0;
-					console.log('kxj-previewImage:未在图片地址数组中找到传入的图片,已为你自动打开单张预览模式')
-				}else{
-					this.index = this.imgs.indexOf(e);
+
+				if (!isNaN(e)) {
+					if (e >= this.imgs.length) {
+						// console.log('kxj-previewImage:打开参数无效');
+					} else {
+						this.index = e;
+					}
+				} else {
+					var index = this.imgs.indexOf(e);
+					if (index === -1) {
+						this.imgs = [e];
+						this.index = 0;
+						// console.log('kxj-previewImage:未在图片地址数组中找到传入的图片,已为你自动打开单张预览模式')
+					} else {
+						this.index = this.imgs.indexOf(e);
+					}
 				}
+				// console.log('kxj-previewImage:当前预览图片序号' + this.index);
+				this.show = true;
+			},
+			//关闭
+			close(e) {
+				this.show = false;
+				this.index = 0; //当前页
+				this.deg = 0; //旋转角度
+				this.time = 0; //定时器
+				this.interval = 1000; //长按事件
+				this.scale = 1; //缩放比例
 			}
-			console.log('kxj-previewImage:当前预览图片序号'+this.index);
-			this.show = true;
-		},
-		//关闭
-		close(e) {
-			this.show = false;
-			this.index = 0; //当前页
-			this.deg = 0; //旋转角度
-			this.time = 0; //定时器
-			this.interval = 1000; //长按事件
-			this.scale = 1; //缩放比例
 		}
-	}
-};
+	};
 </script>
 
 <!--使用scss,只在本组件生效-->
 <style lang="scss" scoped>
-.previewImage {
-	z-index: 999;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background-color: #000000;
-	user-select: none;
-	.swiper {
+	.previewImage {
+		z-index: 999;
+		position: fixed;
+		top: 0;
+		left: 0;
 		width: 100%;
 		height: 100%;
-		.marea {
-			height: 100%;
+		background-color: #000000;
+		user-select: none;
+
+		.swiper {
 			width: 100%;
-			position: fixed;
-			overflow: hidden;
-			.mview {
-				display: flex;
-				align-items: center;
-				justify-content: center;
+			height: 100%;
+
+			.marea {
+				height: 100%;
 				width: 100%;
-				height: auto;
-				min-height: 100%;
-				.image {
+				position: fixed;
+				overflow: hidden;
+
+				.mview {
+					display: flex;
+					align-items: center;
+					justify-content: center;
 					width: 100%;
+					height: auto;
+					min-height: 100%;
+
+					.image {
+						width: 100%;
+					}
 				}
 			}
 		}
-	}
 
-	.page {
-		position: absolute;
-		width: 100%;
-		bottom: 20rpx;
-		text-align: center;
-		.text {
-			color: #fff;
-			font-size: 26rpx;
-			background-color: rgba(0, 0, 0, 0.5);
-			padding: 3rpx 16rpx;
-			border-radius: 20rpx;
-			user-select: none;
+		.page {
+			position: absolute;
+			width: 100%;
+			bottom: 20rpx;
+			text-align: center;
+
+			.text {
+				color: #fff;
+				font-size: 26rpx;
+				background-color: rgba(0, 0, 0, 0.5);
+				padding: 3rpx 16rpx;
+				border-radius: 20rpx;
+				user-select: none;
+			}
 		}
-	}
-	.save {
-		position: absolute;
-		left: 10rpx;
-		width: 120rpx;
-		height: 56rpx;
-		bottom: 10rpx;
-		text-align: center;
-		padding: 10rpx;
-		.text {
-			background-color: rgba(0, 0, 0, 0.5);
-			color: #fff;
-			font-size: 30rpx;
-			border-radius: 20rpx;
-			border: 1rpx solid #f1f1f1;
-			padding: 6rpx 22rpx;
-			user-select: none;
+
+		.save {
+			position: absolute;
+			left: 10rpx;
+			width: 120rpx;
+			height: 56rpx;
+			bottom: 10rpx;
+			text-align: center;
+			padding: 10rpx;
+
+			.text {
+				background-color: rgba(0, 0, 0, 0.5);
+				color: #fff;
+				font-size: 30rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid #f1f1f1;
+				padding: 6rpx 22rpx;
+				user-select: none;
+			}
+
+			.text:active {
+				background-color: rgba(100, 100, 100, 0.5);
+			}
 		}
-		.text:active {
-			background-color: rgba(100, 100, 100, 0.5);
+
+		.rotate {
+			position: absolute;
+			right: 0;
+			left: 0;
+			height: 56rpx;
+			bottom: 200rpx;
+			text-align: center;
+			padding: 10rpx;
+			margin: auto;
+
+			.text {
+				background-color: rgba(0, 0, 0, 0.5);
+				color: #fff;
+				font-size: 30rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid #f1f1f1;
+				padding: 6rpx 22rpx;
+				user-select: none;
+			}
+
+			.text:active {
+				background-color: rgba(100, 100, 100, 0.5);
+			}
 		}
-	}
-	.rotate {
-		position: absolute;
-		right: 10rpx;
-		width: 120rpx;
-		height: 56rpx;
-		bottom: 10rpx;
-		text-align: center;
-		padding: 10rpx;
-		.text {
+
+		.desc {
+			position: absolute;
+			top: 0;
+			width: 100%;
+			padding: 5rpx 10rpx;
+			text-align: center;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
 			background-color: rgba(0, 0, 0, 0.5);
 			color: #fff;
-			font-size: 30rpx;
-			border-radius: 20rpx;
-			border: 1rpx solid #f1f1f1;
-			padding: 6rpx 22rpx;
+			font-size: 28rpx;
+			letter-spacing: 3rpx;
 			user-select: none;
 		}
-		.text:active {
-			background-color: rgba(100, 100, 100, 0.5);
-		}
-	}
-	.desc {
-		position: absolute;
-		top: 0;
-		width: 100%;
-		padding: 5rpx 10rpx;
-		text-align: center;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		background-color: rgba(0, 0, 0, 0.5);
-		color: #fff;
-		font-size: 28rpx;
-		letter-spacing: 3rpx;
-		user-select: none;
 	}
-}
-</style>
+</style>

+ 4 - 3
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "1.0.158",
-	"versionCode": 158,
+	"versionName": "1.0.161",
+	"versionCode": 161,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -33,7 +33,8 @@
 			"Push": {},
 			"SQLite": {
 				"description": "iBeacon"
-			}
+			},
+			"Camera": {}
 		},
 		"distribute": {
 			"android": {

+ 111 - 90
pages/carInsure1/carInfo1.vue

@@ -754,6 +754,7 @@
 				carback: {},
 				userfront: {},
 				userback: {},
+				token: "",
 			}
 		},
 		async onLoad(options) {
@@ -776,7 +777,10 @@
 						this.ownerInfo = JSON.parse(JSON.stringify(data.ownerInfo));
 						this.policyHolderInfo = JSON.parse(JSON.stringify(data.policyHolderInfo));
 						this.insuredPersonInfo = JSON.parse(JSON.stringify(data.insuredPersonInfo));
-
+						this.carInfoRmation = data.carInfoRmation; //车辆
+						this.ownerInfoRmation = data.ownerInfoRmation; //车主
+						this.policyHolderInfoRmation = data.policyHolderInfoRmation; //投保
+						this.insuredPersonInfoRmation = data.insuredPersonInfoRmation; //被保人
 						this.riskList = data.riskList; //险种大类
 						this.kindList = data.kindList; //商业险险别
 						this.licenseNo = this.carInfo.licenseNo;
@@ -785,7 +789,8 @@
 						this.tbrAndOwner = false; //被保人同投保人
 					}
 				})
-			}
+			};
+			this.token = store.state.token
 		},
 		// 监听导航栏的按钮
 		onNavigationBarButtonTap(e) {
@@ -824,13 +829,14 @@
 						let filelist = await this.choosepars(type + 'Rmation') //储存影像id
 						console.log(filelist)
 						uni.uploadFile({
-							url: `${this.$base.baseUrl}/order/identify/drivingPermit`,
+							url: this.$base.baseUrl + '/order/identify/drivingPermit',
 							filePath: filelist[0],
 							name: "image1",
 							header: {
-								Authorization: store.state.token,
+								Authorization: this.token,
 							},
 							success: (uploadFileRes) => {
+								console.log(filelist)
 								let data = JSON.parse(uploadFileRes.data).data;
 								let rdate = '';
 								if (!!data.carInfo.registerDate) {
@@ -858,28 +864,33 @@
 									brandName: data.carInfo.backOcrID, //品牌型号
 
 								}
-								uni.uploadFile({
-									url: `${this.$base.baseUrl}/order/identify/drivingPermit`,
-									filePath: filelist[1],
-									name: "image2",
-									header: {
-										Authorization: store.state.token,
-									},
-									success: (uploadFileRes) => {
-										let data1 = JSON.parse(uploadFileRes.data).data;
-										this.carback = {
-											vehicleweight: data1.carInfo.grossMass, //总质量
-											completeKerbMass: data1.carInfo
-												.unladenMass, //整备质量
-											seatCount: data1.carInfo
-												.approvedPassengersCapacity, //核定载客数
+								if (filelist.length > 1) {
+									uni.uploadFile({
+										url: this.$base.baseUrl + '/order/identify/drivingPermit',
+										filePath: filelist[1],
+										name: "image2",
+										header: {
+											Authorization: this.token,
+										},
+										success: (uploadFileRes) => {
+											let data1 = JSON.parse(uploadFileRes.data).data;
+											this.carback = {
+												vehicleweight: data1.carInfo
+													.grossMass, //总质量
+												completeKerbMass: data1.carInfo
+													.unladenMass, //整备质量
+												seatCount: data1.carInfo
+													.approvedPassengersCapacity, //核定载客数
+											}
+
 										}
-										this.checkInfo = Object.assign(this.carfront, this
-											.carback)
-										this.lodingshow = false;
-										this.checkInfoShow = true;
-									}
-								});
+									});
+								}
+								this.checkInfo = Object.assign(this.carfront, this
+									.carback)
+								this.lodingshow = false;
+								this.checkInfoShow = true;
+
 							}
 						});
 						break;
@@ -888,11 +899,11 @@
 					case "insuredPersonInfo":
 						let ownerInfolist = await this.choosepars(type + 'Rmation') //储存影像id
 						uni.uploadFile({
-							url: `${this.$base.baseUrl}/order/identify/idCard`,
+							url: this.$base.baseUrl + '/order/identify/idCard',
 							filePath: ownerInfolist[0],
 							name: "image1",
 							header: {
-								Authorization: store.state.token,
+								Authorization: this.token,
 							},
 							success: (uploadFileRes) => {
 								let data = JSON.parse(uploadFileRes.data).data;
@@ -903,83 +914,93 @@
 									addr: data.customerInfo.addr,
 
 								}
-								uni.uploadFile({
-									url: `${this.$base.baseUrl}/order/identify/idCard`,
-									filePath: ownerInfolist[1],
-									name: "image2",
-									header: {
-										Authorization: store.state.token,
-									},
-									success: (uploadFileRes) => {
-										let data1 = JSON.parse(uploadFileRes.data).data;
-										let identifyValidDate = '';
-										if (!!data1.customerInfo.identifyValidDate) {
-											identifyValidDate = data1.customerInfo
-												.identifyValidDate.substr(0, 4) +
-												'-' + data1.customerInfo
-												.identifyValidDate.substr(4, 2) + '-' + data1
-												.customerInfo
-												.identifyValidDate
-												.substr(6,
-													2)
-										}
-										let identifyValidEndDate = '';
-										if (!!data1.customerInfo.identifyValidEndDate) {
-											identifyValidEndDate = data1.customerInfo
-												.identifyValidEndDate.substr(0,
-													4) + '-' + data1.customerInfo
-												.identifyValidEndDate.substr(4, 2) + '-' +
-												data1
-												.customerInfo
-												.identifyValidEndDate.substr(6, 2)
-										}
-										this.userback = {
-											identifyValidDate: identifyValidDate, //起期
-											identifyValidEndDate: identifyValidEndDate, //止期
+								if (ownerInfolist.length > 1) {
+									uni.uploadFile({
+										url: this.$base.baseUrl + '/order/identify/idCard',
+										filePath: ownerInfolist[1],
+										name: "image2",
+										header: {
+											Authorization: this.token,
+										},
+										success: (uploadFileRes) => {
+											let data1 = JSON.parse(uploadFileRes.data).data;
+											let identifyValidDate = '';
+											if (!!data1.customerInfo.identifyValidDate) {
+												identifyValidDate = data1.customerInfo
+													.identifyValidDate.substr(0, 4) +
+													'-' + data1.customerInfo
+													.identifyValidDate.substr(4, 2) + '-' +
+													data1
+													.customerInfo
+													.identifyValidDate
+													.substr(6,
+														2)
+											}
+											let identifyValidEndDate = '';
+											if (!!data1.customerInfo.identifyValidEndDate) {
+												identifyValidEndDate = data1.customerInfo
+													.identifyValidEndDate.substr(0,
+														4) + '-' + data1.customerInfo
+													.identifyValidEndDate.substr(4, 2) + '-' +
+													data1
+													.customerInfo
+													.identifyValidEndDate.substr(6, 2)
+											}
+											this.userback = {
+												identifyValidDate: identifyValidDate, //起期
+												identifyValidEndDate: identifyValidEndDate, //止期
+											}
+
 										}
-										this.checkInfo = Object.assign(this.userfront, this
-											.userback)
-										this.lodingshow = false;
-										this.checkInfoShow = true;
-									}
-								});
+									});
+								}
+
+								this.checkInfo = Object.assign(this.userfront, this
+									.userback)
+								this.lodingshow = false;
+								this.checkInfoShow = true;
 
 							}
 						});
 						break;
 					default:
 				}
-
 			},
 			//自定义影像上传识别
 			async choosepars(imageName) {
-
 				let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
 					count: 2,
 					sizeType: ['compressed']
 				});
-				this.lodingshow = true;
-				// 上传
-				this.checkImage = chooseImageRes.tempFilePaths;
-				this[imageName] = [];
-				chooseImageRes.tempFilePaths.map((ele, index) => {
-					uni.uploadFile({
-						url: `${this.$base.baseUrl}/ins/taskImage/uploadFile`,
-						filePath: ele,
-						name: "multipartFile",
-						formData: {
-							'type': 'image',
-						},
-						header: {
-							Authorization: store.state.token,
-						},
-						success: (imgRes) => {
-							let id = JSON.parse(imgRes.data).data.id;
-							this[imageName].push(id)
-						}
-					});
-				})
-				return chooseImageRes.tempFilePaths;
+				if (chooseImageErr) {
+					this.lodingshow = false;
+					return;
+				} else {
+					this.lodingshow = true;
+					// 上传
+					this.checkImage = chooseImageRes.tempFilePaths;
+					this[imageName] = [];
+					chooseImageRes.tempFilePaths.map((ele, index) => {
+						uni.uploadFile({
+							url: this.$base.baseUrl + '/ins/taskImage/uploadFile',
+							filePath: ele,
+							name: "multipartFile",
+							formData: {
+								'type': 'image',
+							},
+							header: {
+								Authorization: this.token,
+							},
+							success: (imgRes) => {
+								let id = JSON.parse(imgRes.data).data.id;
+								console.log(id)
+								this[imageName].push(id)
+							}
+						});
+					})
+					return chooseImageRes.tempFilePaths;
+				}
+
 			},
 
 			// 取消验证信息

+ 14 - 1
pages/carInsure1/quote1.vue

@@ -613,6 +613,10 @@
 				this.insuredPersonInfo = data.insuredPersonInfo; //被保人信息
 				this.riskList = data.riskList; //险种大类
 				this.kindList = data.kindList; //商业险险别
+				this.carInfoRmation = data.carInfoRmation; //车辆
+				this.ownerInfoRmation = data.ownerInfoRmation; //车主
+				this.policyHolderInfoRmation = data.policyHolderInfoRmation; //投保
+				this.insuredPersonInfoRmation = data.insuredPersonInfoRmation; //被保人
 				this.orderno = data.orderno;
 				this.quoteno = data.quoteno;
 				if (this.riskList.length > 0) {
@@ -1043,7 +1047,12 @@
 							policyHolderInfo: this.policyHolderInfo,
 							insuredPersonInfo: this.insuredPersonInfo,
 							riskList: this.riskList,
-							kindList: this.kindList
+							kindList: this.kindList,
+							carInfoRmation: this.carInfoRmation, //车辆
+							ownerInfoRmation: this.ownerInfoRmation, //车主
+							policyHolderInfoRmation: this.policyHolderInfoRmation, //投保
+							insuredPersonInfoRmation: this.insuredPersonInfoRmation, //被保人
+
 						})
 					}
 				}, "navigateTo", true);
@@ -1060,6 +1069,10 @@
 							insuredPersonInfo: this.insuredPersonInfo,
 							riskList: this.riskList,
 							kindList: this.kindList,
+							carInfoRmation: this.carInfoRmation, //车辆
+							ownerInfoRmation: this.ownerInfoRmation, //车主
+							policyHolderInfoRmation: this.policyHolderInfoRmation, //投保
+							insuredPersonInfoRmation: this.insuredPersonInfoRmation, //被保人
 							vehicleModel: this.vehicleModel,
 						})
 					}

+ 0 - 1
pages/carInsure1/quoteDetail1.vue

@@ -1166,7 +1166,6 @@
 
 			//影像预览
 			previewImage(e, type) {
-				this.previewImgs = [];
 				this.previewImgs = this[type + 'ImageList'];
 				var current = e.currentTarget.dataset.src;
 				this.$refs.previewImage.open(current); // 传入当前选中的图片地址或序号

+ 170 - 252
pages/carInsure1/underwriting1.vue

@@ -154,7 +154,7 @@
 								</view>
 							</block>
 							<view class="uni-uploader__input-box" style="box-sizing: border-box;">
-								<view class="uni-uploader__input" @tap="chooseImage('car')"></view>
+								<view class="uni-uploader__input" @tap="chooseImage('C01','car')"></view>
 							</view>
 						</view>
 					</view>
@@ -183,7 +183,7 @@
 								</view>
 							</block>
 							<view class="uni-uploader__input-box" style="box-sizing: border-box;">
-								<view class="uni-uploader__input" @tap="chooseImage('owner')"></view>
+								<view class="uni-uploader__input" @tap="chooseImage('C02','owner')"></view>
 							</view>
 						</view>
 					</view>
@@ -212,7 +212,7 @@
 								</view>
 							</block>
 							<view class="uni-uploader__input-box" style="box-sizing: border-box;">
-								<view class="uni-uploader__input" @tap="chooseImage('policy')"></view>
+								<view class="uni-uploader__input" @tap="chooseImage('C03','policy')"></view>
 							</view>
 						</view>
 					</view>
@@ -240,7 +240,7 @@
 								</view>
 							</block>
 							<view class="uni-uploader__input-box" style="box-sizing: border-box;">
-								<view class="uni-uploader__input" @tap="chooseImage('insured')"></view>
+								<view class="uni-uploader__input" @tap="chooseImage('C04','insured')"></view>
 							</view>
 						</view>
 					</view>
@@ -267,7 +267,7 @@
 								</view>
 							</block>
 							<view class="uni-uploader__input-box" style="box-sizing: border-box;">
-								<view class="uni-uploader__input" @tap="chooseImage('carCheck')"></view>
+								<view class="uni-uploader__input" @tap="chooseImage('C05','carCheck')"></view>
 							</view>
 						</view>
 					</view>
@@ -353,10 +353,7 @@
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations
-	} from "vuex"
+	import store from '@/store';
 	import previewImage from '@/components/common/previewImage/previewImage.vue'; //引用插件
 	// import wPicker from "@/components/w-picker/w-picker.vue";
 	import {
@@ -364,13 +361,13 @@
 		base64ToPath
 	} from '@/common/image-tools-base64.js';
 	import * as imageConversion from 'image-conversion'
+
 	export default {
 		components: {
 			// wPicker,
 			previewImage
 		},
 		computed: {
-			...mapState(['userInfo']),
 			getHeight() {
 				let height = uni.getSystemInfoSync().windowHeight;
 				return `minHeight: ${height}px;`;
@@ -431,18 +428,25 @@
 				showAppoint: false, //展示特约
 				showCarImageInfo: false, //显示车辆影像
 				carImageList: [],
+				carImageListId: [],
 				showOwnerImageInfo: false, //显示车主影像
 				ownerImageList: [],
+				ownerImageListId: [],
 				showPolicyImageInfo: false, //显示投保人影像
 				policyImageList: [],
+				policyImageListId: [],
 				showInsuredImageInfo: false, //显示被保人影像
 				insuredImageList: [],
+				insuredImageListId: [],
 				showCarCheckImageInfo: false, //显示验车照影像
 				carCheckImageList: [],
+				carCheckImageListId: [],
 				existenceimg: 0,
+				token: "",
 			}
 		},
 		async onLoad(params) {
+			this.token = store.state.token
 			if (!!params.companyId) {
 				this.companyId = params.companyId;
 				let param = {
@@ -477,7 +481,6 @@
 			}
 		},
 		methods: {
-			...mapMutations(['setOrdertype', 'setOrderStage']),
 			//影像查询
 			async imageEcho(quotenos) {
 				let imgres = await this.$http.get('/ins/taskImage/findByQuoteNo?quoteNo=' + quotenos);
@@ -485,10 +488,28 @@
 					Object.keys(imgres.data).forEach((keys) => {
 						imgres.data[keys].forEach((ele) => {
 							ele.url = this.$base.baseUrl + ele.url;
+							switch (keys) {
+								case "C01":
+									this.carImageListId.push(ele.imageId);
+									break;
+								case "C02":
+									this.ownerImageListId.push(ele.imageId);
+									break;
+								case "C03":
+									this.policyImageListId.push(ele.imageId);
+									break;
+								case "C04":
+									this.insuredImageListId.push(ele.imageId);
+									break;
+								case "C05":
+									this.carCheckImageListId.push(ele.imageId);
+									break;
+								default:
+									break;
+							}
 							return ele;
 						});
-					});
-					console.log(imgres.data)
+					})
 					this.carImageList = imgres.data.C01;
 					this.ownerImageList = imgres.data.C02;
 					this.policyImageList = imgres.data.C03;
@@ -525,159 +546,39 @@
 					this.agree = false;
 				}
 			},
-			//保存影像
-			async getTaskImg(type, typeName) {
-				let res = await this.$http.get('/insTaskImage/findById?imgtype=' + type + '&taskid=' + this.orderno);
-				if (res.data.imgList.length > 0) {
-					this.existenceimg = 1;
-				} else {
-					this.existenceimg = 0;
-				}
-				this[typeName] = res.data.imgList;
-			},
-			async chooseImage(type) {
-				if (this[type + 'ImageList'].length === 9) {
-					let isContinue = await this.isFullImg(type);
-					console.log("是否继续?", isContinue);
-					if (!isContinue) {
-						return;
-					}
-				}
-				uni.chooseImage({
-					count: 9 - this[type + 'ImageList'].length,
-					success: (res) => {
-						for (let i = 0; i < res.tempFilePaths.length; i++) {
-							if (this.name == '永安财险') {
-								if (Math.round(res.tempFiles[i].size / 1024) > 800) {
-									uni.showModal({
-										showCancel: false,
-										title: "图片过大,请重新上传"
-									})
-								} else if ((Math.round(res.tempFiles[i].size / 1024) < 800) && (Math
-										.round(res
-											.tempFiles[i].size / 1024) > 100)) {
-									//#ifdef APP-PLUS
-									let kb = Math.round((100 / Math.round(res.tempFiles[i].size /
-											1024)) *
-										100);
-									uni.compressImage({
-										src: res.tempFilePaths[i],
-										quality: kb,
-										success: res => {
-											pathToBase64(res.tempFilePath)
-												.then(base64 => {
-													this[type + 'ImageList'] = this[
-														type +
-														'ImageList'].concat(base64)
-												})
-										}
-									})
-									//#endif
-									//#ifdef H5
-									const isJpgOrPng = res.tempFiles[i].type === "image/jpeg";
-									if (!isJpgOrPng) {
-										uni.showModal({
-											showCancel: false,
-											title: "上传图片只能是 JPG 格式!"
-										})
-										return false;
-									}
-									return new Promise((resolve) => {
-										// 压缩到400KB,这里的400就是要压缩的大小,可自定义
-										imageConversion.imageConversion(res.tempFiles[i],
-												90)
-											.then((res) => {
-												let file = window.URL.createObjectURL(
-													res) //blob转临时路径
-												pathToBase64(file)
-													.then(base64 => {
-														this[type + 'ImageList'] =
-															this[type +
-																'ImageList']
-															.imageConversionconcat(
-																base64)
-													})
-												resolve(res);
-											});
-									});
-									//#endif
-								}
-							} else {
-								//#ifdef APP-PLUS
-								uni.compressImage({
-									src: res.tempFilePaths[i],
-									quality: 95,
-									success: res => {
-										pathToBase64(res.tempFilePath)
-											.then(base64 => {
-												this[type + 'ImageList'] = this[type +
-													'ImageList'].concat(base64)
-											})
-									}
-								})
-								//#endif
-								//#ifdef H5
-								const isJpgOrPng = res.tempFiles[i].type === "image/jpeg";
-								if (!isJpgOrPng) {
-									uni.showModal({
-										showCancel: false,
-										title: "上传图片只能是 JPG 格式!"
-									})
-									return false;
-								}
-								return new Promise((resolve) => {
-									// 压缩到400KB,这里的400就是要压缩的大小,可自定义
-									imageConversion.compressAccurately(res.tempFiles[i], 90)
-										.then((res) => {
-											let file = window.URL.createObjectURL(
-												res) //blob转临时路径
-											pathToBase64(file)
-												.then(base64 => {
-													this[type + 'ImageList'] = this[
-														type +
-														'ImageList'].concat(base64)
-												})
-											resolve(res);
-										});
-								});
-								//#endif
-							}
-						}
-					},
-					fail: (err) => {
-						console.log("上传失败!!");
-					},
 
-				})
-			},
-			isFullImg(type) {
-				return new Promise((res) => {
-					uni.showModal({
-						content: "已经有9张图片了,是否清空现有图片?",
-						success: (e) => {
-							if (e.confirm) {
-								this[type + 'ImageList'] = [];
-								// this[type+'PreviewImageList']=[];
-								setTimeout(() => {
-									res(true);
-								}, 500);
-							} else {
-								res(false)
-							}
+			async chooseImage(typename, type) {
+				let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
+					count: 2,
+					sizeType: ['compressed']
+				});
+				chooseImageRes.tempFilePaths.map((ele, index) => {
+					uni.uploadFile({
+						url: this.$base.baseUrl + '/ins/taskImage/uploadFile',
+						filePath: ele,
+						name: "multipartFile",
+						formData: {
+							'type': 'image',
+						},
+						header: {
+							Authorization: this.token,
 						},
-						fail: () => {
-							res(false)
+						success: async (imgRes) => {
+							let id = JSON.parse(imgRes.data).data.id;
+							this[type + 'ImageListId'].push(id)
+							let imgres = await this.$http.post('/ins/taskImage/uploadImages', {
+								imageIdList: this[type + 'ImageListId'],
+								imageType: typename,
+								quoteNo: this.quoteno
+							});
+							if (imgres.code == '200') {
+								this.imageEcho(this.quoteno)
+							}
 						}
-					})
+					});
 				})
 			},
 			previewImage(e, type) {
-				// var current = e.target.dataset.src
-				// uni.previewImage({
-				// 	current: current,
-				// 	urls: this[type+'PreviewImageList']
-				// })
-				this.previewImgs = [];
 				this.previewImgs = this[type + 'ImageList'];
 				var current = e.currentTarget.dataset.src;
 				this.$refs.previewImage.open(current); // 传入当前选中的图片地址或序号
@@ -685,7 +586,6 @@
 			//删除图片
 			delCheckImage(type, index) {
 				this[type + 'ImageList'].splice(index, 1);
-				// this[type+'PreviewImageList'].splice(index,1)
 			},
 			// 上传影像并提交核保
 			async submitAudit() {
@@ -703,15 +603,17 @@
 						if (res.confirm) {
 							switch (this.name) {
 								case "永安财险":
-									let yaimage = await this.$http.post('/order/yongAn/submitImage', {
-										companyId: this.companyId
-									});
-									if (yaimage.code == '200') {
-										let yaaudit = await this.$http.post('/order/yongAn/audit', {
-											companyId: this.companyId,
-											jqappoint: "",
-											syappoint: ""
+									let yaimage = await this.$http.post(
+										'/order/yongAn/submitImage', {
+											companyId: this.companyId
 										});
+									if (yaimage.code == '200') {
+										let yaaudit = await this.$http.post(
+											'/order/yongAn/audit', {
+												companyId: this.companyId,
+												jqappoint: "",
+												syappoint: ""
+											});
 										if (yaaudit.code == '200') {
 											uni.showModal({
 												content: '订单自核成功',
@@ -721,40 +623,44 @@
 													if (res1.confirm) {
 														uni.navigateTo({
 															url: "/pages/carInsure1/payCode1?companyId=" +
-																this.companyId
+																this
+																.companyId
 														})
 													} else {
 														this.navigate({
-															url: "/pages/index/index"
-														}, "switchTab", true);
+																url: "/pages/index/index"
+															}, "switchTab",
+															true);
 													}
 												}
 											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + result.msg + ')',
+												confirmText: '继续核保',
+												success: async (res2) => {}
+											});
 										}
 									} else {
 										uni.showModal({
-											content: '自核不通过(' + result.msg + ')',
-											confirmText: '继续选择',
-											success: async (res2) => {
-												if (res2.confirm) {
-													this.navigate({
-														url: "/pages/orders/orders"
-													}, "switchTab", true);
-												}
-											}
+											content: '影像上传失败(' + result.msg + ')',
+											confirmText: '继续提交',
+											success: async (res2) => {}
 										});
 									}
 									break;
 								case "中煤财险":
-									let zmimage = await this.$http.post('/order/zhongMeiApi/submitImage', {
-										companyId: this.companyId
-									});
-									if (zmimage.code == '200') {
-										let zmaudit = await this.$http.post('/order/zhongMeiApi/audit', {
-											companyId: this.companyId,
-											jqappoint: "",
-											syappoint: ""
+									let zmimage = await this.$http.post(
+										'/order/zhongMeiApi/submitImage', {
+											companyId: this.companyId
 										});
+									if (zmimage.code == '200') {
+										let zmaudit = await this.$http.post(
+											'/order/zhongMeiApi/audit', {
+												companyId: this.companyId,
+												jqappoint: "",
+												syappoint: ""
+											});
 										if (zmaudit.code == '200') {
 											uni.showModal({
 												content: '订单自核成功',
@@ -764,38 +670,42 @@
 													if (res1.confirm) {
 														uni.navigateTo({
 															url: "/pages/carInsure1/payCode1?companyId=" +
-																this.companyId
+																this
+																.companyId
 														})
 													} else {
 														this.navigate({
-															url: "/pages/index/index"
-														}, "switchTab", true);
+																url: "/pages/index/index"
+															}, "switchTab",
+															true);
 													}
 												}
 											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + result.msg + ')',
+												confirmText: '继续核保',
+												success: async (res2) => {}
+											});
 										}
 									} else {
 										uni.showModal({
-											content: '自核不通过(' + result.msg + ')',
-											confirmText: '继续选择',
-											success: async (res2) => {
-												if (res2.confirm) {
-													this.navigate({
-														url: "/pages/orders/orders"
-													}, "switchTab", true);
-												}
-											}
+											content: '影像上传失败(' + result.msg + ')',
+											confirmText: '继续提交',
+											success: async (res2) => {}
 										});
 									}
 									break;
 								case "永诚财险":
-									let ycimage = await this.$http.post('/api/yongCheng/UploadImage', {
-										companyId: this.companyId
-									});
-									if (ycimage.code == '200') {
-										let ycaudit = await this.$http.post('/api/yongCheng/audit', {
-											companyId: this.companyId,
+									let ycimage = await this.$http.post(
+										'/api/yongCheng/UploadImage', {
+											companyId: this.companyId
 										});
+									if (ycimage.code == '200') {
+										let ycaudit = await this.$http.post(
+											'/api/yongCheng/audit', {
+												companyId: this.companyId,
+											});
 										if (ycaudit.code == '200') {
 											uni.showModal({
 												content: '订单自核成功',
@@ -805,38 +715,42 @@
 													if (res1.confirm) {
 														uni.navigateTo({
 															url: "/pages/carInsure1/payCode1?companyId=" +
-																this.companyId
+																this
+																.companyId
 														})
 													} else {
 														this.navigate({
-															url: "/pages/index/index"
-														}, "switchTab", true);
+																url: "/pages/index/index"
+															}, "switchTab",
+															true);
 													}
 												}
 											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + result.msg + ')',
+												confirmText: '继续核保',
+												success: async (res2) => {}
+											});
 										}
 									} else {
 										uni.showModal({
-											content: '自核不通过(' + result.msg + ')',
-											confirmText: '继续选择',
-											success: async (res2) => {
-												if (res2.confirm) {
-													this.navigate({
-														url: "/pages/orders/orders"
-													}, "switchTab", true);
-												}
-											}
+											content: '影像上传失败(' + result.msg + ')',
+											confirmText: '继续提交',
+											success: async (res2) => {}
 										});
 									}
 									break;
 								case "紫金财险":
-									let zjimage = await this.$http.post('/order/zijin/submitImage', {
-										companyId: this.companyId
-									});
-									if (zjimage.code == '200') {
-										let zjaudit = await this.$http.post('/order/zijin/audit', {
-											companyId: this.companyId,
+									let zjimage = await this.$http.post(
+										'/order/zijin/submitImage', {
+											companyId: this.companyId
 										});
+									if (zjimage.code == '200') {
+										let zjaudit = await this.$http.post(
+											'/order/zijin/audit', {
+												companyId: this.companyId,
+											});
 										if (zjaudit.code == '200') {
 											uni.showModal({
 												content: '订单自核成功',
@@ -846,27 +760,29 @@
 													if (res1.confirm) {
 														uni.navigateTo({
 															url: "/pages/carInsure1/payCode1?companyId=" +
-																this.companyId
+																this
+																.companyId
 														})
 													} else {
 														this.navigate({
-															url: "/pages/index/index"
-														}, "switchTab", true);
+																url: "/pages/index/index"
+															}, "switchTab",
+															true);
 													}
 												}
 											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + result.msg + ')',
+												confirmText: '继续核保',
+												success: async (res2) => {}
+											});
 										}
 									} else {
 										uni.showModal({
-											content: '自核不通过(' + result.msg + ')',
-											confirmText: '继续选择',
-											success: async (res2) => {
-												if (res2.confirm) {
-													this.navigate({
-														url: "/pages/orders/orders"
-													}, "switchTab", true);
-												}
-											}
+											content: '影像上传失败(' + result.msg + ')',
+											confirmText: '继续提交',
+											success: async (res2) => {}
 										});
 									}
 									break;
@@ -880,9 +796,9 @@
 										});
 									if (pythonimage.code == '200') {
 										let pythonaudit = await this.$http.post(
-										'/insurance/crawler/audit', {
-											subOrderNo: this.companyId,
-										});
+											'/insurance/crawler/audit', {
+												subOrderNo: this.companyId,
+											});
 										if (pythonaudit.code == '200') {
 											uni.showModal({
 												content: '订单自核成功',
@@ -892,27 +808,29 @@
 													if (res1.confirm) {
 														uni.navigateTo({
 															url: "/pages/carInsure1/payCode1?companyId=" +
-																this.companyId
+																this
+																.companyId
 														})
 													} else {
 														this.navigate({
-															url: "/pages/index/index"
-														}, "switchTab", true);
+																url: "/pages/index/index"
+															}, "switchTab",
+															true);
 													}
 												}
 											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + result.msg + ')',
+												confirmText: '继续核保',
+												success: async (res2) => {}
+											});
 										}
 									} else {
 										uni.showModal({
-											content: '自核不通过(' + result.msg + ')',
-											confirmText: '继续选择',
-											success: async (res2) => {
-												if (res2.confirm) {
-													this.navigate({
-														url: "/pages/orders/orders"
-													}, "switchTab", true);
-												}
-											}
+											content: '影像上传失败(' + result.msg + ')',
+											confirmText: '继续提交',
+											success: async (res2) => {}
 										});
 									}
 									break;

+ 15 - 15
pages/index/index.vue

@@ -4,12 +4,12 @@
 			:show="show" :type="type" :list="list" :moreIcon="moreIcon" :volumeIcon="volumeIcon" :duration="duration"
 			bgColor="" padding="8rpx 24rpx" :isCircular="isCircular"
 			style="position: absolute;top: 12%;z-index: 9;width: 100%;"></u-notice-bar> -->
-			
+
 		<!-- 更新组件 force 是否强制更新   tabbar:页面是否有原生tabbar组件-->
 		<app-update ref="app_update" :tabbar="false"></app-update>
 		<!-- 状态栏 -->
 		<view class="status" :style="{position:headerPosition,backgroundColor:bgColor}"></view>
-		
+
 		<!-- 漂浮头部 -->
 		<view class="header" :style="{position:headerPosition,backgroundColor:bgColor}">
 			<view class="scan">
@@ -20,7 +20,8 @@
 				<input disabled placeholder="车险" @tap="toSearch()" />
 			</view>
 			<view class="menu">
-				<image mode="aspectFill" :src="avatar" 	@click='isShow?navigate({url:"/pages/realname/realname"},"navigateTo",true):""'></image>
+				<image mode="aspectFill" :src="avatar"
+					@click='isShow?navigate({url:"/pages/realname/realname"},"navigateTo",true):""'></image>
 			</view>
 		</view>
 		<!-- 公共组件-每个页面必须引入 -->
@@ -28,13 +29,8 @@
 		<!-- 占位 -->
 		<view class="place" :style="{backgroundColor:'#fff'}"></view>
 		<!-- 实名认证提示 -->
-		<u-notice-bar
-		:list="list" 
-		v-show="isShow"
-		 type="error"
-		 padding="8rpx 24rpx"
-		  @click='navigate({url:"/pages/realname/realname"},"navigateTo",true)'
-		></u-notice-bar>
+		<u-notice-bar :list="list" v-show="isShow" type="error" padding="8rpx 24rpx"
+			@click='navigate({url:"/pages/realname/realname"},"navigateTo",true)'></u-notice-bar>
 		<!-- 轮播图 -->
 		<swiper-image :resdata="swiperList" @changeEvent="swiperChange"></swiper-image>
 
@@ -327,7 +323,7 @@
 		},
 		async onLoad() {
 			// uni.startPullDownRefresh(); 
-			this.isShow=this.userInfo.sysUser.status=='2'?true:false
+			this.isShow = this.userInfo.sysUser.status == '2' ? true : false
 			let res = await this.$http.get('/apps/getApplicationStatus?jobNumber=' + this.userInfo.sysUser.id);
 			if (res.code == 200) {
 				if (res.data == '0') {
@@ -352,11 +348,13 @@
 			store.commit('setUserModules', {
 				title: 'userInfo',
 				data: {
-					sysUser:{...userInfoRes.data}
+					sysUser: {
+						...userInfoRes.data
+					}
 				}
 			})
 			if (userInfoRes.data.status == 2) {
-				this.isShow = true; 
+				this.isShow = true;
 			} else {
 				this.isShow = false;
 			}
@@ -401,8 +399,10 @@
 		// 	}
 		// },
 		methods: {
-			nameClick(){
-				this.navigate({url:"/pages/realname/realname"},"navigateTo",true)
+			nameClick() {
+				this.navigate({
+					url: "/pages/realname/realname"
+				}, "navigateTo", true)
 			},
 			async chooseImage() {
 				var _this = this;

+ 694 - 425
pages/my/my.vue

@@ -2,12 +2,13 @@
 	<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>
+				<p class="animate">掌柜爆款百万医疗!众安尊享e生2020版,最高300万一般医疗保障,100种重疾+121种罕见病医疗最高600万保障,四大增值服务,一年低至136元起!点击了解>>
+				</p>
 			</view>
 			<view class="icon iconfont icon-cuo d-flex a-center j-center" @tap="controlProdetIntro"></view>
 		</view>
@@ -23,13 +24,17 @@
 		<!-- 我的订单Start -->
 		<scroll-view scroll-x class="my-orders">
 			<view :style="'width: calc(((690upx)/4)*'+orderTypeList.length+')'">
-				<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder" style="width: 100%;height:100%">
-					<uni-grid-item style="width: calc((690upx)/4)" class="d-flex a-center j-center"  v-for="(item ,index) in orderTypeList" :index="index" :key="index">
-						<view style="width: calc((690upx)/4)" class="grid-item-box d-flex a-center j-center flex-column">
+				<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder"
+					style="width: 100%;height:100%">
+					<uni-grid-item style="width: calc((690upx)/4)" class="d-flex a-center j-center"
+						v-for="(item ,index) in orderTypeList" :index="index" :key="index">
+						<view style="width: calc((690upx)/4)"
+							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" />
+								<uni-badge :text="(item.badge>99)?'99+':item.badge" :type="item.type" size="small"
+									:inverted="false" />
 							</view>
 						</view>
 					</uni-grid-item>
@@ -37,17 +42,18 @@
 			</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 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">
 			<view class="header d-flex a-center j-sb">
@@ -70,7 +76,7 @@
 			</view>
 		</view>
 		<!-- 我的钱包End -->
-		
+
 		<!-- 我的工具Start -->
 		<view class="my-tools">
 			<view class="header d-flex a-center j-sb">
@@ -80,10 +86,14 @@
 				<!-- 因为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" >
+						<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" ></view>
+									<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor">
+									</view>
 									<text class="text">{{item.text}}</text>
 								</view>
 							</uni-grid-item>
@@ -93,7 +103,7 @@
 			</view>
 		</view>
 		<!-- 我的工具End -->
-		
+
 		<!-- 售后管理Start -->
 		<view class="my-tools">
 			<view class="header d-flex a-center j-sb">
@@ -103,10 +113,14 @@
 				<!-- 因为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">
-						<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)"  v-for="(item ,index) in serviceList" :index="index" :key="item.text" >
+						<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)"
+								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="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor">
+									</view>
 									<text class="text">{{item.text}}</text>
 								</view>
 							</uni-grid-item>
@@ -116,7 +130,7 @@
 			</view>
 		</view>
 		<!-- 售后管理End -->
-		
+
 		<!-- 我的关于Start -->
 		<view class="my-tools">
 			<view class="header d-flex a-center j-sb">
@@ -126,10 +140,14 @@
 				<!-- 因为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">
-						<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" >
+						<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>
+									<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor">
+									</view>
 									<text class="text">{{item.text}}</text>
 								</view>
 							</uni-grid-item>
@@ -139,13 +157,13 @@
 			</view>
 		</view>
 		<!-- 我的关于End -->
-		
+
 		<!-- 菜单Start -->
 		<block v-for="(item,index) in menusList" :key="index">
 			<my-list-item :item="item" :index="index"></my-list-item>
 		</block>
 		<!-- 菜单End -->
-		
+
 		<!-- 头像预览Start -->
 		<z-popup v-model="popupShow" :hideOnBlur="false" type="center" width="600upx" radius="12upx">
 			<view class="popup_title">
@@ -164,171 +182,352 @@
 </template>
 
 <script>
-	import {mapState,mapMutations} from "vuex"
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
 	import zPopup from '@/components/common/z-popup.vue'
-	import { pathToBase64,base64ToPath } from '@/common/image-tools-base64.js';
+	import {
+		pathToBase64,
+		base64ToPath
+	} from '@/common/image-tools-base64.js';
 	import myListItem from "@/components/modules/my/my-list-item.vue";
 	export default {
-		components:{
+		components: {
 			zPopup,
 			myListItem
 		},
 		data() {
 			return {
-				popupShow:false, //头像是否展示
-				mystatusText:"未认证",
-				prodetIntroShow:true,	//显示滚动公告
-				advanceMoney:'0',// 预收账户金额
-				withdrawal:'0',//可提现金额
-				extendMoney:'0',//推广费
-				
+				popupShow: false, //头像是否展示
+				mystatusText: "已认证",
+				prodetIntroShow: true, //显示滚动公告
+				advanceMoney: '0', // 预收账户金额
+				withdrawal: '0', //可提现金额
+				extendMoney: '0', //推广费
+
 				//轮播
-				swiperList:[
-					{sid:0,src:'自定义src0',img:'/static/image/my/ads/ban1.png'}
-				],
-				
-				orderTypeList: [
-					{ icon: 'icon-jixurenwu',orderstatus:0,text: '待继续',badge: '0',type: "primary",orderStage:0,iconColor:'#0696FF'},
-					{ icon: 'icon-hebaozhong',orderstatus:1,text: '核保中',badge: '0',type: "success",orderStage:1,iconColor:'#FFA22A'},
-					{ icon: 'icon-daijiaofei',orderstatus:2,text: '已核保',badge: '0',type: "warning",orderStage:2,iconColor:'#0696FF'},
-					{ icon: 'icon-querenzhifu',orderstatus:5,text: '待缴费',badge: '0',type: "error",orderStage:3,iconColor:'#DD525E'},
-					{ icon: 'icon-querenzhifu',orderstatus:6,text: '已缴费',badge: '0',type: "success",orderStage:4,iconColor:'#FFA22A'},
-					{ icon: 'icon-peisong',orderstatus:7,text: '已承保',badge: '0',type: "error",orderStage:5,iconColor:'#0696FF'},
-					{ icon: 'icon-kehuguanli',orderstatus:3,text: '待修改',badge: '0',type: "warning",orderStage:6,iconColor:'#0696FF'}
+				swiperList: [{
+					sid: 0,
+					src: '自定义src0',
+					img: '/static/image/my/ads/ban1.png'
+				}],
+
+				orderTypeList: [{
+						icon: 'icon-jixurenwu',
+						orderstatus: 0,
+						text: '待继续',
+						badge: '0',
+						type: "primary",
+						orderStage: 0,
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-hebaozhong',
+						orderstatus: 1,
+						text: '核保中',
+						badge: '0',
+						type: "success",
+						orderStage: 1,
+						iconColor: '#FFA22A'
+					},
+					{
+						icon: 'icon-daijiaofei',
+						orderstatus: 2,
+						text: '已核保',
+						badge: '0',
+						type: "warning",
+						orderStage: 2,
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-querenzhifu',
+						orderstatus: 5,
+						text: '待缴费',
+						badge: '0',
+						type: "error",
+						orderStage: 3,
+						iconColor: '#DD525E'
+					},
+					{
+						icon: 'icon-querenzhifu',
+						orderstatus: 6,
+						text: '已缴费',
+						badge: '0',
+						type: "success",
+						orderStage: 4,
+						iconColor: '#FFA22A'
+					},
+					{
+						icon: 'icon-peisong',
+						orderstatus: 7,
+						text: '已承保',
+						badge: '0',
+						type: "error",
+						orderStage: 5,
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-kehuguanli',
+						orderstatus: 3,
+						text: '待修改',
+						badge: '0',
+						type: "warning",
+						orderStage: 6,
+						iconColor: '#0696FF'
+					}
 				],
-				toolsList: [
-					{ icon: 'icon-shandian',text: '闪电增员',url:'/pages/tools/addStaff/addStaff',iconColor:'#0696FF'},
-					{ icon: 'icon-tuanduiguanli',text: '团队管理',url:'/pages/tools/team/team',iconColor:'#FFA22A'},
-					{ icon: 'icon-kehuguanli',text: '客户管理',url:'/pages/tools/customer/customer',iconColor:'#0696FF'},
-					{ icon: 'icon-yejiguanli',text: '业绩管理',url:'/pages/tools/achievement/achievement',iconColor:'#0696FF'},
-					{ icon: 'icon-20xiaoshifuwurexian',text: '报案服务',url:'/pages/tools/insuranceClaims/insuranceClaims',iconColor:'#DD525E'},
-					{ icon: 'icon-qianbao',text: '钱包',url:'/pages/wallet/wallet',iconColor:'#FFA22A'},
-					{ icon: 'icon-baodan',text: '保单',url:'/pages/tools/policy',iconColor:'#0696FF'},
-					{ icon: 'icon-jisuanqi',text: '计算器',url:'/pages/tools/calculator/calculator',iconColor:'#0696FF'},
-					{ icon: 'icon-xiaomishu',text: '掌柜秘书',url:'/pages/tools/messageReminder/messageReminder',iconColor:'#DD525E'},
-					{ icon: 'icon-xiaomishu',text: '海报管理',url:'/pages/tools/poster/poster',iconColor:'#0696FF'},
-					{ icon: 'icon-xiaomishu',text: '优惠劵',url:'/pages/tools/coupon/coupon',iconColor:'#0696FF'}
+				toolsList: [{
+						icon: 'icon-shandian',
+						text: '闪电增员',
+						url: '/pages/tools/addStaff/addStaff',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-tuanduiguanli',
+						text: '团队管理',
+						url: '/pages/tools/team/team',
+						iconColor: '#FFA22A'
+					},
+					{
+						icon: 'icon-kehuguanli',
+						text: '客户管理',
+						url: '/pages/tools/customer/customer',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-yejiguanli',
+						text: '业绩管理',
+						url: '/pages/tools/achievement/achievement',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-20xiaoshifuwurexian',
+						text: '报案服务',
+						url: '/pages/tools/insuranceClaims/insuranceClaims',
+						iconColor: '#DD525E'
+					},
+					{
+						icon: 'icon-qianbao',
+						text: '钱包',
+						url: '/pages/wallet/wallet',
+						iconColor: '#FFA22A'
+					},
+					{
+						icon: 'icon-baodan',
+						text: '保单',
+						url: '/pages/tools/policy',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-jisuanqi',
+						text: '计算器',
+						url: '/pages/tools/calculator/calculator',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-xiaomishu',
+						text: '掌柜秘书',
+						url: '/pages/tools/messageReminder/messageReminder',
+						iconColor: '#DD525E'
+					},
+					{
+						icon: 'icon-xiaomishu',
+						text: '海报管理',
+						url: '/pages/tools/poster/poster',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-xiaomishu',
+						text: '优惠劵',
+						url: '/pages/tools/coupon/coupon',
+						iconColor: '#0696FF'
+					}
 				],
-				aboutList: [
-					{ icon: 'icon-yejiguanli',text: '常见问题',url:'/pages/set/question',iconColor:'#0696FF'},
+				aboutList: [{
+						icon: 'icon-yejiguanli',
+						text: '常见问题',
+						url: '/pages/set/question',
+						iconColor: '#0696FF'
+					},
 					// { icon: 'icon-baodan',text: '意见反馈',url:'/pages/set/suggest',iconColor:'#DD525E'},
-					{ icon: 'icon-baodan',text: '意见反馈',url:'',iconColor:'#DD525E'},
-					{ icon: 'icon-yongjinguanli',text: '联系客服',tel:'4006333016',iconColor:'#FFA22A'},
-					{ icon: 'icon-qianbao',text: '关于我们',url:'/pages/set/about',iconColor:'#0696FF'}
+					{
+						icon: 'icon-baodan',
+						text: '意见反馈',
+						url: '',
+						iconColor: '#DD525E'
+					},
+					{
+						icon: 'icon-yongjinguanli',
+						text: '联系客服',
+						tel: '4006333016',
+						iconColor: '#FFA22A'
+					},
+					{
+						icon: 'icon-qianbao',
+						text: '关于我们',
+						url: '/pages/set/about',
+						iconColor: '#0696FF'
+					}
 				],
-				serviceList:[
-					{ icon: 'icon-yejiguanli',text: '发票申请',popup:'请加微信15513511113,联系客服操作',iconColor:'#0696FF'},
-					{ icon: 'icon-yongjinguanli',text: '保单批改',popup:'请加微信15513511113,联系客服操作',iconColor:'#FFA22A'},
-					{ icon: 'icon-qianbao',text: '申请退保',popup:'请加微信15513511113,联系客服操作',iconColor:'#0696FF'},
-					{ icon: 'icon-qianbao',text: '自助理赔',popup:'请加微信15513511113,联系客服操作',iconColor:'#0696FF'}
+				serviceList: [{
+						icon: 'icon-yejiguanli',
+						text: '发票申请',
+						popup: '请加微信15513511113,联系客服操作',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-yongjinguanli',
+						text: '保单批改',
+						popup: '请加微信15513511113,联系客服操作',
+						iconColor: '#FFA22A'
+					},
+					{
+						icon: 'icon-qianbao',
+						text: '申请退保',
+						popup: '请加微信15513511113,联系客服操作',
+						iconColor: '#0696FF'
+					},
+					{
+						icon: 'icon-qianbao',
+						text: '自助理赔',
+						popup: '请加微信15513511113,联系客服操作',
+						iconColor: '#0696FF'
+					}
 				],
-				menusList:[
-					{ icon:"shangcheng",name:"掌柜商场",clicktype:"nothing",url:"",auth:true },
-					{ icon:"chexiandingdan",name:"车险之家",clicktype:"navigateTo",url:"/pages/carInsure/entry",auth:true }
+				menusList: [{
+						icon: "shangcheng",
+						name: "掌柜商场",
+						clicktype: "nothing",
+						url: "",
+						auth: true
+					},
+					{
+						icon: "chexiandingdan",
+						name: "车险之家",
+						clicktype: "navigateTo",
+						url: "/pages/carInsure/entry",
+						auth: true
+					}
 				]
 			}
 		},
 		onNavigationBarButtonTap(e) {
-			if(e.index == 0){
+			if (e.index == 0) {
 				uni.navigateTo({
-					url:"/pages/set/set"
+					url: "/pages/set/set"
 				})
 			}
 		},
-		computed:{
-			...mapState(['avatar','userStatus',"userInfo","userCheckInfo"]),
-			toolsListLength(){
-				return Math.ceil(this.toolsList.length/8);
+		computed: {
+			...mapState(['avatar', 'userInfo', "userCheckInfo"]),
+
+			toolsListLength() {
+				return Math.ceil(this.toolsList.length / 8);
 			},
-			aboutListLength(){
-				return Math.ceil(this.aboutList.length/4);
+			aboutListLength() {
+				return Math.ceil(this.aboutList.length / 4);
 			},
-			serviceListLength(){
-				return Math.ceil(this.serviceList.length/4);
+			serviceListLength() {
+				return Math.ceil(this.serviceList.length / 4);
 			}
 		},
-		
-		async onload() {
-			if(this.userStatus == '1'){
-				this.mystatusText="未认证";
-			}else if(this.userStatus == '5'){
-				this.mystatusText="已认证";
-			}else{
-				this.mystatusText="认证中";
+		onShow() {
+			if (this.userInfo.sysUser.status == '1') {
+				this.mystatusText = "已认证";
+			} else if (this.userStatus == '2') {
+				this.mystatusText = "未认证";
 			}
-			
-			await this.getAdvanceMoney();//预收金额
-			await this.getPayAccount();//可提现余额
-			await this.getExtendMoney();//推广费
-			await this.getOrderNum();//获取订单数量
-			
+		},
+		async onload() {
+			await this.getAdvanceMoney(); //预收金
+			await this.getPayAccount(); //可提现余额
+			await this.getExtendMoney(); //推广费
+			await this.getOrderNum(); //获取订单数量
 		},
 		methods: {
-			...mapMutations(['setUserModules','setOrderType','setOrderStage']),
+			...mapMutations(['setUserModules', 'setOrderType', 'setOrderStage']),
 			//获得订单数量
-			async getOrderNum(){
+			async getOrderNum() {
 				console.log(this.userInfo)
-				var data= {
-					"columnFilters":{
-						"orderstatus":{"name":"orderstatus","value":""},
-						"userid":{"name":"userid","value":this.userInfo.sysUser.id},
-						"quotestatus":{"name":"quotestatus","value":'1'}
+				var data = {
+					"columnFilters": {
+						"orderstatus": {
+							"name": "orderstatus",
+							"value": ""
+						},
+						"userid": {
+							"name": "userid",
+							// "value": this.userInfo.sysUser.id
+						},
+						"quotestatus": {
+							"name": "quotestatus",
+							"value": '1'
+						}
 					},
-					"pageNum":1,
-					"pageSize":1
+					"pageNum": 1,
+					"pageSize": 1
 				};
-				for(let i=0;i<this.orderTypeList.length;i++){
+				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});
+					let res = await this.$http.post('/insOrder/findPage', data, {
+						load: false
+					});
 					// 请求失败处理
-					if (res.code == 200){
+					if (res.code == 200) {
 						this.orderTypeList[i].badge = res.data.totalSize;
-					}else{
-						this.orderTypeList[i].badge ='0';
+					} else {
+						this.orderTypeList[i].badge = '0';
 					}
 				}
 			},
-			
+
 			// 预收账户金额查询
 			async getAdvanceMoney() {
-				let res = await this.$http.get('/insPayApply/advanceAccount?userid=' + this.userInfo.sysUser.id,{},{load:false});
+				let res = await this.$http.get('/insPayApply/advanceAccount?userid=', {}, {
+					load: false
+				});
 				// 请求失败处理
-				if (res.code == 200){
+				if (res.code == 200) {
 					this.advanceMoney = res.data;
-				}else{
-					this.advanceMoney ='0';
+				} else {
+					this.advanceMoney = '0';
 				}
 			},
-			
+
 			// 可提现余额查询
 			async getPayAccount() {
-				let res = await this.$http.get('/insPayApply/payAccount?userid=' + this.userInfo.sysUser.id,{},{load:false});
+				let res = await this.$http.get('/insPayApply/payAccount?userid=', {}, {
+					load: false
+				});
 				// 请求失败处理
-				if (res.code == 200){
+				if (res.code == 200) {
 					this.withdrawal = res.data.accountBalance;
-				}else{
-					this.withdrawal ='0';
+				} else {
+					this.withdrawal = '0';
 				}
 			},
-			
+
 			//推广费
 			async getExtendMoney() {
-				let res = await this.$http.get('/insPayApply/extendAccount?userid=' + this.userInfo.sysUser.id,{},{load:false});
+				let res = await this.$http.get('/insPayApply/extendAccount?userid=', {}, {
+					load: false
+				});
 				// 请求失败处理
-				if (res.code == 200){
+				if (res.code == 200) {
 					this.extendMoney = res.data.accountBalance;
-				}else{
-					this.extendMoney ='0';
+				} else {
+					this.extendMoney = '0';
 				}
 			},
-			
+
 			// 广告滚动
-			controlProdetIntro(){
+			controlProdetIntro() {
 				this.prodetIntroShow = !this.prodetIntroShow;
 			},
-		
+
 			//保存头像
-			saveAvatar(){
+			saveAvatar() {
 				var that = this;
 				uni.saveImageToPhotosAlbum({ //保存图片
 					filePath: that.avatar,
@@ -339,17 +538,20 @@
 					}
 				})
 			},
-			
+
 			//修改头像
-			async changeAvatar(){
-				let [err,chooseImageRes] =await uni.chooseImage({
-					count:1,
-					sizeType:['compressed']
+			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" });
+					return uni.showToast({
+						title: '上传图片大小不能超过 2MB!',
+						icon: "none"
+					});
 				}
 				// 上传
 				pathToBase64(chooseImageRes.tempFilePaths[0])
@@ -357,334 +559,401 @@
 						var paramImg = {
 							"imgList": [base64],
 							"imgtype": "avatar",
-							"taskid": this.userInfo.sysUser.id
+							"taskid": "",
 						}
-						let res =await this.$http.post('/insTaskImage/save',paramImg);
-						if(res.code == 200){
-							this.setUserModules({title:'avatar',data:base64})
-							uni.showToast({ title: '更换头像成功!',icon:'none',duration:2000 });
-						}else{
-							uni.showToast({ title: '更换头像失败!',icon:'none',duration:2000 });
+						let res = await this.$http.post('/insTaskImage/save', paramImg);
+						if (res.code == 200) {
+							this.setUserModules({
+								title: 'avatar',
+								data: base64
+							})
+							uni.showToast({
+								title: '更换头像成功!',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: '更换头像失败!',
+								icon: 'none',
+								duration: 2000
+							});
 						}
 					})
 			},
-			
+
 			//去工具页面
-			toTools(e,listName){
-				if(!!this[listName][e.detail.index].url && (this[listName][e.detail.index].url =='/pages/wallet/wallet')){
-					if((!!this.userInfo.esmUserInternal) && (!!this.userInfo.esmUserInternal.accountno)){
+			toTools(e, listName) {
+				if (!!this[listName][e.detail.index].url && (this[listName][e.detail.index].url ==
+						'/pages/wallet/wallet')) {
+					if ((!!this.userInfo.esmUserInternal) && (!!this.userInfo.esmUserInternal.accountno)) {
 						this.navigate({
-							url:this[listName][e.detail.index].url
-						},"navigateTo",true)
-					}else{
+							url: this[listName][e.detail.index].url
+						}, "navigateTo", true)
+					} else {
 						this.navigate({
-							url:'/pages/wallet/bindBank',
-							complete:() => {
+							url: '/pages/wallet/bindBank',
+							complete: () => {
 								setTimeout(() => {
-									uni.showToast({ title: '请先绑定银行卡',duration:3000,icon:"none"});
+									uni.showToast({
+										title: '请先绑定银行卡',
+										duration: 3000,
+										icon: "none"
+									});
 								}, 500);
-								
+
 							}
-						},"navigateTo",true)
+						}, "navigateTo", true)
 					}
-				}else if(this[listName][e.detail.index].url){
-					this.navigate({url:this[listName][e.detail.index].url},"navigateTo",true)
-				}else if(this[listName][e.detail.index].tel){
+				} else if (this[listName][e.detail.index].url) {
+					this.navigate({
+						url: this[listName][e.detail.index].url
+					}, "navigateTo", true)
+				} else if (this[listName][e.detail.index].tel) {
 					uni.makePhoneCall({
 						phoneNumber: this[listName][e.detail.index].tel,
 					})
-				}else if(this[listName][e.detail.index].popup){
+				} else if (this[listName][e.detail.index].popup) {
 					uni.showModal({
-						showCancel:false,
-					    content: this[listName][e.detail.index].popup,
+						showCancel: false,
+						content: this[listName][e.detail.index].popup,
 					});
-				}else{
+				} else {
 					uni.showToast({
-						title:this[listName][e.detail.index].text+'更新中...',
+						title: this[listName][e.detail.index].text + '更新中...',
 						icon: 'none'
 					})
 				}
-				
+
 			},
-			
+
 			// 去账单明细
-			toBillDetails(type){
-				this.navigate({url:"/pages/wallet/billDetails"+type},"navigateTo",true)
+			toBillDetails(type) {
+				this.navigate({
+					url: "/pages/wallet/billDetails" + type
+				}, "navigateTo", true)
 			},
 			// 去账单明细
-			toWallet(type){
-				this.navigate({url:"/pages/wallet/wallet"},"navigateTo",true)
+			toWallet(type) {
+				this.navigate({
+					url: "/pages/wallet/wallet"
+				}, "navigateTo", true)
 			},
 			//跳转个人信息页面
-			openDetail(){
-				this.navigate({url:"/pages/user/userInfo"},"navigateTo",false)
+			openDetail() {
+				this.navigate({
+					url: "/pages/user/userInfo"
+				}, "navigateTo", false)
 			},
 			//跳转订单页面
 			openOrder(e) {
 				let index = e.detail.index;
 				this.setOrderType(0);
 				this.setOrderStage(this.orderTypeList[index].orderStage);
-				this.navigate({url:"/pages/orders/orders"},"switchTab",true)
+				this.navigate({
+					url: "/pages/orders/orders"
+				}, "switchTab", true)
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-@import '@/style/mixin.scss';
-page{
-	background-color: #FEFEFE;
-}
-/* 产品介绍Start */
-.prodet-intro{
-	width: 100%;
-	height: 70upx;
-	background-color: #333;
-	color: #3ae;
-	white-space: nowrap;
-	border-top: 1upx solid #666;
-	border-bottom: 1upx solid #666;
-	box-sizing: border-box;
-}
-.prodet-intro>view:nth-of-type(1){
-	width: 60upx;
-	height: 100%;
-	flex-shrink: 1;
-	padding-left: 20upx;
-	font-size: 36upx;
-}
-.prodet-intro>view:nth-of-type(2){
-	overflow: hidden;
-	line-height: 70upx;
-	font-size: 24upx;
-}
-.prodet-intro>view:nth-of-type(3){
-	width: 60upx;
-	padding-right: 20upx;
-	flex-shrink: 1;
-	height: 100%;
-	font-size: 36upx;
-}
-.animate {
-	padding-left: 40rpx;
-	display: inline-block;
-	white-space: nowrap;
-	animation: 20s wordsLoop linear infinite normal;
-}
-@keyframes wordsLoop {
-	0% {
-		transform: translateX(750rpx);
-		-webkit-transform: translateX(750rpx);
-	}
-	100% {
-		transform: translateX(-100%);
-		-webkit-transform: translateX(-100%);
-	}
-}
-/* 产品介绍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 */
-
-/* 我的订单Start */
-.my-orders,.wallet-body{
-	position: relative;
-	width: 690upx;
-	height: 180upx;
-	margin: -80upx 30upx 0upx;
-	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;
-}
-.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;
-}
-.wallet-body>view{
-	flex-shrink: 1;
-}
-.wallet-body>view>view{
-	line-height: 65upx;
-}
-.wallet-body>view>view:nth-of-type(1){
-	font-size: 24upx;
-}
-.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;
-}
-.grid-item-box .text{
-	font-size: 24upx;
-	color: #666666;
-}
-.grid-dot {
-	position: absolute;
-	top: 20upx;
-	right: 25upx;
-	background-color: none;
-}
-.swiper {
-	width: 100%;
-}
-
-.swiper-view .keep-out {
-	width: 100%;
-	height: 30upx;
-	border-radius: 100% 100% 0 0;
-	margin-top: -15upx;
-	position: absolute;
-}
-.swiper-view .swiper {
-	overflow: hidden;
-	padding: 30upx 20upx 0;
-	box-sizing: border-box;
-	width: 100%;
-	height: 200upx;
-}
-.swiper-view .swiper image {
-	width: 100%;
-	height: 200upx;
-}	
-	
-</style>
+	@import '@/style/mixin.scss';
+
+	page {
+		background-color: #FEFEFE;
+	}
+
+	/* 产品介绍Start */
+	.prodet-intro {
+		width: 100%;
+		height: 70upx;
+		background-color: #333;
+		color: #3ae;
+		white-space: nowrap;
+		border-top: 1upx solid #666;
+		border-bottom: 1upx solid #666;
+		box-sizing: border-box;
+	}
+
+	.prodet-intro>view:nth-of-type(1) {
+		width: 60upx;
+		height: 100%;
+		flex-shrink: 1;
+		padding-left: 20upx;
+		font-size: 36upx;
+	}
+
+	.prodet-intro>view:nth-of-type(2) {
+		overflow: hidden;
+		line-height: 70upx;
+		font-size: 24upx;
+	}
+
+	.prodet-intro>view:nth-of-type(3) {
+		width: 60upx;
+		padding-right: 20upx;
+		flex-shrink: 1;
+		height: 100%;
+		font-size: 36upx;
+	}
+
+	.animate {
+		padding-left: 40rpx;
+		display: inline-block;
+		white-space: nowrap;
+		animation: 20s wordsLoop linear infinite normal;
+	}
+
+	@keyframes wordsLoop {
+		0% {
+			transform: translateX(750rpx);
+			-webkit-transform: translateX(750rpx);
+		}
+
+		100% {
+			transform: translateX(-100%);
+			-webkit-transform: translateX(-100%);
+		}
+	}
 
+	/* 产品介绍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 */
+
+	/* 我的订单Start */
+	.my-orders,
+	.wallet-body {
+		position: relative;
+		width: 690upx;
+		height: 180upx;
+		margin: -80upx 30upx 0upx;
+		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;
+	}
+
+	.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;
+	}
+
+	.wallet-body>view {
+		flex-shrink: 1;
+	}
+
+	.wallet-body>view>view {
+		line-height: 65upx;
+	}
+
+	.wallet-body>view>view:nth-of-type(1) {
+		font-size: 24upx;
+	}
+
+	.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;
+	}
+
+	.grid-item-box .text {
+		font-size: 24upx;
+		color: #666666;
+	}
+
+	.grid-dot {
+		position: absolute;
+		top: 20upx;
+		right: 25upx;
+		background-color: none;
+	}
+
+	.swiper {
+		width: 100%;
+	}
+
+	.swiper-view .keep-out {
+		width: 100%;
+		height: 30upx;
+		border-radius: 100% 100% 0 0;
+		margin-top: -15upx;
+		position: absolute;
+	}
+
+	.swiper-view .swiper {
+		overflow: hidden;
+		padding: 30upx 20upx 0;
+		box-sizing: border-box;
+		width: 100%;
+		height: 200upx;
+	}
+
+	.swiper-view .swiper image {
+		width: 100%;
+		height: 200upx;
+	}
+</style>

+ 8 - 2
pages/register/registerSuccess.vue

@@ -63,7 +63,7 @@
 		},
 		methods: {
 			// 判断是不是微信
-			weixinTip(ele) {
+			async weixinTip(ele) {
 				var ua = navigator.userAgent;
 				var isWeixin = !!/MicroMessenger/i.test(ua);
 				if (isWeixin) {
@@ -77,7 +77,13 @@
 							data: this.id
 						})
 					}
-					window.open('http://baoxianzhanggui.com:8080/app/android/zgcx.apk');
+					var data = {
+						appid: "__UNI__D4FE29A"
+					}
+					let res = await this.$http.get('/sysVersion/queryMaxNum', data);
+					if (res.code == '200') {
+						window.open(res.data.path);
+					}
 				}
 			},
 			downloadApp(typeId) {