登录

config/api.js

@@ -64,22 +64,18 @@ $http.dataFactory = async function(res) {
 			return Promise.resolve(httpData);
 			// return Promise.resolve(httpData.data);
 		} else if (httpData.code == "401") {
-			store.commit("emptyUserInfo");
-			// #ifdef MP-WEIXIN
-			// onLogin();
-			// #endif
-			var content = '登录已失效,需要您登录喔~';
 			if (loginPopupNum <= 0) {
 				loginPopupNum++;
 				uni.showModal({
 					title: '温馨提示',
-					content: content,
+					content: '登录已失效,需要您登录喔~',
 					confirmText: "去登录",
 					cancelText: "再逛会",
 					showCancel: false,
 					success: function(res) {
 						loginPopupNum--;
 						if (res.confirm) {
+							store.commit("emptyUserInfo");
 							uni.navigateTo({
 								url: "/pages/login/login"
 							});

config/login.js

@@ -20,52 +20,48 @@ async function login(options = {}) {
 	if (res.code != '200') {
 		return Promise.resolve(res);
 	} else {
-		if (options.data.account) {
-			uni.setStorageSync('username', options.data.account);
-			uni.setStorageSync('password', options.data.password);
-			let loginStatus = await getLoginUserInfo(res.data, options.data.account);
+		if (options.data.userName) {
+			uni.setStorageSync('username', options.data.userName);
+			uni.setStorageSync('password', options.data.passWord);
+			let loginStatus = await getLoginUserInfo(res.data.token, options.data.userName);
 			if (loginStatus) {
-				// 跳转到首页
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
-				setTimeout(() => {
-					uni.showToast({
-						title: '登录成功',
-						icon: 'none'
-					});
-				}, 500);
-			}
-		} else if (options.data.mobile) {
-			let loginStatus = await getLoginUserInfo(res.data, '');
-			if (loginStatus) {
-				// 跳转到首页
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
-				setTimeout(() => {
-					uni.showToast({
-						title: '登录成功',
-						icon: 'none'
-					});
-				}, 500);
+				if (res.data.isFirst) {
+					uni.navigateTo({
+						url: '/pages/login/forgotPassword'
+					})
+				} else {
+					// 跳转到首页
+					uni.switchTab({
+						url: "/pages/index/index"
+					})
+					setTimeout(() => {
+						uni.showToast({
+							title: '登录成功',
+							icon: 'none'
+						});
+					}, 500);
+				}
 
 			}
-		} else {
-			uni.setStorageSync('username', res.data.userId);
-			let loginStatus = await getLoginUserInfo(res.data.token, res.data.userId);
+		} else if (options.data.smsCode) {
+			let loginStatus = await getLoginUserInfo(res.data.token, '');
 			if (loginStatus) {
-				// 跳转到首页
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
-				setTimeout(() => {
-					uni.showToast({
-						title: '登录成功',
-						icon: 'none'
-					});
-				}, 500);
-
+				if (res.data.isFirst) {
+					uni.navigateTo({
+						url: '/pages/login/forgotPassword'
+					})
+				} else {
+					// 跳转到首页
+					uni.switchTab({
+						url: "/pages/index/index"
+					})
+					setTimeout(() => {
+						uni.showToast({
+							title: '登录成功',
+							icon: 'none'
+						});
+					}, 500);
+				}
 			}
 		}
 

pages/index/index.vue

@@ -52,7 +52,7 @@
 						</view>
 						<view class="licenslist dis mt-3">
 							<view class="item dis a-c j-c" v-for="(items,index) in historicalVehicle" :key="index"
-								@click="licensePlateQuery(items)">
+								@click="licensePlateQuery(items.licenseNo)">
 								<text>{{items.licenseNo}}</text>
 							</view>
 						</view>
@@ -64,7 +64,7 @@
 			</uni-tab>
 		</view>
 		<view class="swiper">
-			<u-swiper :list="bannerList" indicator height="180rpx" radius="10"></u-swiper>
+			<u-swiper :list="bannerList" indicator height="180rpx" radius="10" imgMode="heightFix"></u-swiper>
 		</view>
 		<!-- 车牌地区选择 -->
 		<uni-Popup :show="licenseShow" bgColor="#F8F8F8" @close='licenseclose'>
@@ -110,6 +110,10 @@
 	</view>
 </template>
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
 	import store from '@/store';
 	export default {
 		data() {
@@ -235,10 +239,12 @@
 			}
 		},
 		methods: {
+			...mapMutations(['activelicenseNo']),
 			//车牌号查询相关历史订单
 			licensePlateQuery(item) {
-				uni.navigateTo({
-					url: '/pages/quote/quoteInfo?info=' + JSON.stringify(params)
+				this.activelicenseNo(item);
+				uni.switchTab({
+					url: '/pages/orders/orders',
 				})
 			},
 			//获取轮播图

pages/login/forgotPassword.vue

@@ -8,22 +8,22 @@
 		<view class="info">
 			<u--form labelPosition="left" :model="info" ref="ownerForm" labelWidth="60" errorType="message"
 				:labelStyle="{fontWeight:'bold',color:'#333'}">
-				<u-form-item label="手机号" prop="name" borderBottom class="mb-3">
-					<u--input v-model="info.name" border="none" clearable placeholder="请输入手机号" maxlength="11"
+				<u-form-item label="手机号" borderBottom>
+					<u--input v-model="info.mobile" border="none" clearable placeholder="请输入手机号" maxlength="11"
 						placeholderStyle="color:#999"></u--input>
 				</u-form-item>
-				<u-form-item label="验证码" prop="mobile" borderBottom class="mb-3">
-					<u--input v-model="info.mobile" border="none" clearable placeholder="请输入图形验证码" maxlength="6"
+				<u-form-item label="验证码" borderBottom>
+					<u--input v-model="info.smsCode" border="none" clearable placeholder="请输入手机验证码" maxlength="6"
 						placeholderStyle="color:#999">
 						<template slot="suffix">
 							<u-code ref="uCode2" @change="codeChange2" keep-running start-text="发送验证码"
 								style="color: #F9E000;"></u-code>
-							<text @tap="getCode2" :text="tips2" class="u-page__code-text">{{tips2}}</text>
+							<view @tap="getCode2" :text="tips2" class="u-page__code-text">{{tips2}}</view>
 						</template>
 					</u--input>
 				</u-form-item>
-				<u-form-item label="密码" prop="identifyNumber" borderBottom>
-					<u--input v-model="info.identifyNumber" border="none" clearable placeholder="请输入密码"
+				<u-form-item label="新密码" borderBottom>
+					<u--input v-model="info.password" border="none" clearable placeholder="请输入密码"
 						placeholderStyle="color:#999" :password="isHidePassword">
 						<template slot="suffix">
 							<image class="icon-img"
@@ -50,28 +50,60 @@
 				isHidePassword: true, //是否隐藏密码
 				tips2: '',
 				info: {
-
+					mobile: "",
+					password: "",
+					smsCode: "",
 				}
 			}
 		},
 		onLoad() {
-
+			const value = uni.getStorageSync('username');
+			this.info.mobile = value;
 		},
 		onShow() {},
 		methods: {
 			//修改密码
-			confirm() {
-				//重置密码逻辑
-				uni.navigateTo({
-					url: '/pages/login/login'
-				})
+			async confirm() {
+				if (!this.info.mobile) {
+					return uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					});
+				}
+				if (!this.info.smsCode) {
+					return uni.showToast({
+						title: '验证码不能为空',
+						icon: 'none'
+					});
+				}
+				if (!this.info.password) {
+					return uni.showToast({
+						title: '新密码不能为空',
+						icon: 'none'
+					});
+				}
+				let res = await this.$http.post('/auth/forgotPassword', this.info);
+				if (res.code == '200') {
+					uni.showToast({
+						title: '密码修改成功',
+						icon: 'none'
+					});
+					uni.switchTab({
+						url: "/pages/index/index"
+					})
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					});
+				}
 			},
 			codeChange2(text) {
 				this.tips2 = text;
 			},
 			getCode2() {
 				if (this.$refs.uCode2.canGetCode) {
-					// 模拟向后端请求验证码
+					this.smsCode(); // 向后端请求验证码
 					uni.showLoading({
 						title: '正在获取验证码'
 					})
@@ -91,7 +123,7 @@
 
 			},
 			async smsCode() {
-				// let res = await this.$http.get('/send/sendSmsCode?mobile=' + this.model.mobile);
+				let res = await this.$http.get('/auth/sendSmsCode?mobile=' + this.info.mobile);
 			},
 		}
 	}
@@ -197,6 +229,17 @@
 	}
 
 	.u-page__code-text {
-		color: #F9E000;
+		padding: 4rpx 18rpx;
+		background: rgba(253, 233, 53, 0.2);
+		border-radius: 6rpx 6rpx 6rpx 6rpx;
+		border: 1rpx solid #FDE935;
+		color: #333333;
+		font-size: 26rpx;
+	}
+
+	::v-deep {
+		.u-form-item__body {
+			padding: 34rpx 0;
+		}
 	}
 </style>

pages/login/login.vue

@@ -8,12 +8,12 @@
 		<view class="info">
 			<u--form labelPosition="left" :model="info" ref="ownerForm" labelWidth="60" errorType="message"
 				:labelStyle="{fontWeight:'bold',color:'#333'}">
-				<u-form-item label="手机号" prop="name" borderBottom class="mb-3">
-					<u--input v-model="info.name" border="none" clearable placeholder="请输入手机号" maxlength="11"
+				<u-form-item label="手机号" borderBottom>
+					<u--input v-model="info.userName" border="none" clearable placeholder="请输入手机号" maxlength="11"
 						placeholderStyle="color:#999"></u--input>
 				</u-form-item>
-				<u-form-item label="密码" prop="identifyNumber" borderBottom class="mb-3" v-show="!codeLoginShow">
-					<u--input v-model="info.identifyNumber" border="none" clearable placeholder="请输入密码"
+				<u-form-item label="密码" borderBottom v-show="!codeLoginShow">
+					<u--input v-model="info.passWord" border="none" clearable placeholder="请输入密码"
 						placeholderStyle="color:#999" :password="isHidePassword">
 						<template slot="suffix">
 							<image class="icon-img"
@@ -22,8 +22,8 @@
 						</template>
 					</u--input>
 				</u-form-item>
-				<u-form-item label="验证码" prop="mobile" borderBottom v-show="!codeLoginShow">
-					<u--input v-model="info.mobile" border="none" clearable placeholder="请输入图形验证码" maxlength="5"
+				<u-form-item label="验证码" borderBottom v-show="!codeLoginShow">
+					<u--input v-model="info.captcha" border="none" clearable placeholder="请输入图形验证码" maxlength="5"
 						placeholderStyle="color:#999">
 						<template slot="suffix">
 							<image :src="imgcodesrc" mode="" @tap="refreshCaptcha" style="width: 146rpx;height: 52rpx;">
@@ -36,10 +36,10 @@
 				</view>
 			</u--form>
 			<view class="performLogin">
-				<view class="buttom dis a-c j-c " v-if="!codeLoginShow">
+				<view class="buttom dis a-c j-c " v-if="!codeLoginShow" @click="submit">
 					<text>登录</text>
 				</view>
-				<view class="buttom dis a-c j-c " v-else @click="modalshow=true">
+				<view class="buttom dis a-c j-c " v-else @click="nextStep">
 					<text>下一步</text>
 				</view>
 				<view class="dis a-c j-s arigon mt-2">
@@ -50,7 +50,7 @@
 		</view>
 
 		<view class="footer dis a-c j-c">
-			<u-checkbox-group v-model="checkboxValue1" placement="row" @change="checkboxChange" iconPlacement="left"
+			<u-checkbox-group v-model="checkbox" placement="row" @change="checkboxChange" iconPlacement="left"
 				size="14">
 				<u-checkbox v-for="(item, index) in checkboxList1" :key="index" :name="item" shape="circle"
 					activeColor="#FDE935" iconColor='#333' iconSize="10">
@@ -66,8 +66,8 @@
 			mode="center" width="90%">
 			<template #content>
 				<view class="codemodal">
-					<u--input v-model="info.mobile" border="none" clearable placeholder="请输入图形验证码" maxlength="5"
-						placeholderStyle="color:#999">
+					<u--input v-model="info.captcha" border="bottom" clearable placeholder="请输入图形验证码" maxlength="5"
+						placeholderStyle="color:#999" style="padding: 34rpx 0;box-sizing: border-box;">
 						<template slot="suffix">
 							<image :src="imgcodesrc" mode="" @tap="refreshCaptcha" style="width: 146rpx;height: 52rpx;">
 							</image>
@@ -82,16 +82,6 @@
 				</view>
 			</template>
 		</uni-Popup>
-		<u--form labelPosition="left" :model="model" ref="uForm">
-			<u-form-item label="账号" borderBottom>
-				<u--input v-model="model.mobile" border="none"></u--input>
-			</u-form-item>
-			<u-form-item label="短信验证码" borderBottom>
-				<u--input v-model="model.smsCode" border="none"></u--input>
-			</u-form-item>
-		</u--form>
-		<u-button type="primary" text="获取验证码" @click="smsCode"></u-button>
-		<u-button type="primary" text="登录" @click="submit"></u-button>
 	</div>
 </template>
 
@@ -103,17 +93,17 @@
 				codeLoginShow: false, //登录方式切换
 				captchaId: "", //验证码id
 				imgcodesrc: "", //图形验证码
-				checkboxValue1: [],
+				checkbox: [],
 				// 基本案列数据
-				checkboxList1: ['苹果'],
-				model: {
-					mobile: "17503456524",
-					smsCode: "391615",
-				},
+				checkboxList1: ['选中'],
 				isHidePassword: true, //是否隐藏密码
 				info: {
-
-				}
+					userName: "13503573960", //账号
+					passWord: "Aa159357", //密码
+					system: "APP", //系统code
+					captcha: "", //验证码
+					captchaId: "", //验证码id
+				},
 			}
 		},
 		onLoad() {
@@ -123,14 +113,19 @@
 			this.refreshCaptcha(); //获取图形验证码
 		},
 		methods: {
+			nextStep() {
+				this.refreshCaptcha(); //获取图形验证码
+				this.modalshow = true
+			},
 			confirm() {
 				uni.navigateTo({
-					url: '/pages/login/smsCode?model=' + this.model.mobile,
+					url: '/pages/login/smsCode?info=' + JSON.stringify(this.info),
 				})
 			},
 			//弹窗关闭事件
 			deptclose() {
 				this.modalshow = false;
+
 			},
 			//忘记密码
 			forgotPassword() {
@@ -148,17 +143,40 @@
 				let randnum = Math.floor(Math.random() * (1000000 - 1 + 1)) + 1
 				this.imgcodesrc = this.$base.baseUrl + "/auth/captchaById?t=" + new Date().getTime() +
 					'&captchaId=' + randnum;
-				this.captchaId = randnum;
+				this.info.captchaId = randnum;
 			},
 			checkboxChange(n) {
-				console.log('change', n);
+				this.checkbox = n;
 			},
 
-			async smsCode() {},
 			submit() {
+				if (!this.info.userName) {
+					return uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					});
+				}
+				if (!this.info.passWord) {
+					return uni.showToast({
+						title: '请输入密码',
+						icon: 'none'
+					});
+				}
+				if (!this.info.captcha) {
+					return uni.showToast({
+						title: '请输入验证码',
+						icon: 'none'
+					});
+				}
+				if (this.checkbox.length == 0) {
+					return uni.showToast({
+						title: '请阅读后勾选并同意《用户协议》及《隐私政策》',
+						icon: 'none'
+					});
+				}
 				this.$login({
-					url: "/appAuth/smsCodeLogin",
-					data: this.model,
+					url: "/auth/login",
+					data: this.info,
 				}).then(res => {
 					if (res) {
 						return uni.showToast({
@@ -168,9 +186,7 @@
 					}
 					return;
 				})
-				// uni.switchTab({
-				// 	url: "/pages/index/index"
-				// })
+
 			},
 		}
 	}
@@ -269,4 +285,10 @@
 			color: #1f1f1f;
 		}
 	}
+
+	::v-deep {
+		.u-form-item__body {
+			padding: 34rpx 0;
+		}
+	}
 </style>

pages/login/smsCode.vue

@@ -3,15 +3,15 @@
 		<view class="backimage">
 			<image class="back" src="/static/image/login/back.png" mode=""></image>
 			<image class="title-img" src="/static/image/login/code.png" mode=""></image>
-			<text class="title">验证码已发送至：+86 152 0101 2212</text>
+			<text class="title">验证码已发送至：+86 {{this.info.userName}}</text>
 		</view>
 		<view class="info">
-			<u--input v-model="info.mobile" border="none" clearable maxlength="6" placeholderStyle="color:#999"
-				:focus="true" @focus="focus">
+			<u--input v-model="info.smsCode" border="bottom" clearable maxlength="6" placeholderStyle="color:#999"
+				style="padding: 34rpx 0;box-sizing: border-box;" :focus="true">
 				<template slot="suffix">
 					<u-code ref="uCode2" @change="codeChange2" keep-running start-text="发送验证码"
 						style="color: #F9E000;"></u-code>
-					<text @tap="getCode2" :text="tips2" class="u-page__code-text">{{tips2}}</text>
+					<view @tap="getCode2" :text="tips2" class="u-page__code-text">{{tips2}}</view>
 				</template>
 			</u--input>
 		</view>
@@ -25,18 +25,52 @@
 				isHidePassword: true, //是否隐藏密码
 				tips2: '',
 				info: {
-
+					userName: "", //账号
+					system: "APP", //系统code
+					captcha: "", //验证码
+					captchaId: "", //验证码id
+					smsCode: "", //手机验证码
 				}
 			}
 		},
 
-		onLoad() {},
+		onLoad(options) {
+			let info = JSON.parse(options.info);
+			this.info.userName = info.userName;
+			this.info.captcha = info.captcha;
+			this.info.captchaId = info.captchaId;
+		},
+		watch: {
+			"info.smsCode": {
+				handler(val) {
+					if (val.length == 6) {
+						console.log(this.info);
+						uni.showLoading({
+							title: '请求登录'
+						})
+						setTimeout(() => {
+							uni.hideLoading();
+							this.$login({
+								url: "/auth/login",
+								data: this.info,
+							}).then(res => {
+								if (res) {
+									return uni.showToast({
+										title: res.msg,
+										icon: 'none'
+									});
+								}
+								return;
+							})
+						}, 1000);
+
+					}
+				},
+				deep: true
+			},
+		},
 		onShow() {},
 		methods: {
-			focus() {
-				// let res = await this.$http.get('/send/sendSmsCode?mobile=' + this.model.mobile);
-				this.getCode2();
-			},
 			//修改密码
 			confirm() {
 				//重置密码逻辑
@@ -49,6 +83,7 @@
 			},
 			getCode2() {
 				if (this.$refs.uCode2.canGetCode) {
+					this.smsCode();
 					// 模拟向后端请求验证码
 					uni.showLoading({
 						title: '正在获取验证码'
@@ -63,14 +98,11 @@
 				} else {
 					uni.$u.toast('倒计时结束后再发送');
 				}
-			},
-			//发送短信验证码
-			sendCode() {
-
 			},
 			async smsCode() {
-				// let res = await this.$http.get('/send/sendSmsCode?mobile=' + this.model.mobile);
+				let res = await this.$http.get('/auth/sendSmsCode?mobile=' + this.info.userName);
 			},
+
 		}
 	}
 </script>
@@ -175,6 +207,11 @@
 	}
 
 	.u-page__code-text {
-		color: #F9E000;
+		padding: 4rpx 18rpx;
+		background: rgba(253, 233, 53, 0.2);
+		border-radius: 6rpx 6rpx 6rpx 6rpx;
+		border: 1rpx solid #FDE935;
+		color: #333333;
+		font-size: 26rpx;
 	}
 </style>

pages/orders/orders.vue

@@ -249,7 +249,8 @@
 				statusList: [{
 						label: '全部',
 						value: " ",
-					}, {
+					},
+					{
 						label: '待核保',
 						value: 1,
 						btnColor: "#229805",
@@ -411,7 +412,7 @@
 			}, 1000)
 		},
 		computed: {
-			...mapState(['userInfo', 'typeIndex'])
+			...mapState(['userInfo', 'licenseNo'])
 		},
 
 		// 页面滚动触发
@@ -423,6 +424,10 @@
 			}
 		},
 		onShow() {
+			console.log(this.licenseNo);
+			if (this.licenseNo) {
+				this.pageRequest.licenseNo = this.licenseNo;
+			}
 			const arr = uni.getStorageSync('historyInfo');
 			if (arr) {
 				uni.removeStorageSync('historyInfo');
@@ -437,12 +442,12 @@
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
-		async onLoad() {
+		onLoad() {
 			this.getOrdersList(1, 20)
 			this.getDicType("insurance_type"); //车船税类型
 		},
 		methods: {
-			...mapMutations(['setOrderType', 'setOrderStage']),
+			...mapMutations(['setOrderStage']),
 			phone(phone) {
 				// 获取宿主上下文  
 				var main = plus.android.runtimeMainActivity();

pages/quote/checkOption.vue

@@ -30,7 +30,7 @@
 						</view>
 						<view class="tr dis a-c j-c">
 							<text class="td special">交通事故强制责任险</text>
-							<text class="td">{{item.result.jqPremium?'￥'+item.result.jqPremium:'-'}}</text>
+							<text class="td">{{item.costs.jqPremium?'￥'+item.costs.jqPremium:'-'}}</text>
 						</view>
 					</view>
 				</view>
@@ -49,13 +49,13 @@
 							size="mini" @click="syterms">商业条款</u-button>
 					</view>
 					<text style="margin-left: 10px;">{{systartDate}}-{{syendDate}} </text>
-					<view class="table " v-if="item.insurancePlanInfo.kinds.length>0">
+					<view class="table " v-if="item.kindInfoVo.length>0">
 						<view class="header dis a-c j-s">
 							<text class="th special">险种</text>
 							<text class="th">保额</text>
 							<text class="th">保费(元)</text>
 						</view>
-						<view class="tr dis a-c j-c" v-for="(item,index) in item.insurancePlanInfo.kinds" :key="index">
+						<view class="tr dis a-c j-c" v-for="(item,index) in item.kindInfoVo" :key="index">
 							<view class="td special dis a-c  ">
 								<view class="circle dis a-c j-c"></view>
 								<text class="ml-2">{{item.kindName}}</text>
@@ -74,13 +74,13 @@
 					</view>
 				</view>
 				<view class="Plancontent dis  f-c " style="padding: 0;"
-					v-if=" item.insurancePlanInfo.drivings && item.insurancePlanInfo.drivings.length>0 ">
+					v-if=" item.accidentalDrivings && item.accidentalDrivings.length>0 ">
 					<image src="../../static/image/car-insure/ywrisk.png" mode="" style="height: 22px;width: 88px;"
 						class="mb-1"></image>
-					<view class="policyInfo" v-for="(drivingsitem,risksindex) in item.insurancePlanInfo.drivings"
+					<view class="policyInfo" v-for="(drivingsitem,risksindex) in item.accidentalDrivings"
 						:key="risksindex">
 						<text class="tagHeader dis a-c mb-2">
-							<text>{{drivingsitem.alias}}
+							<text>{{drivingsitem.riskName}}
 								<view class="tag"></view>
 							</text>
 						</text>

pages/quote/chooseOption.vue

@@ -1520,7 +1520,6 @@
 			},
 			//字典信息回显处理
 			dictionaryConfirm(value, name, showName) {
-				console.log(value);
 				this.vehicleAndVesselTaxForm[name] = value.value[0].dictValue;
 				this.model[name] = value.value[0].dictTag;
 				this[showName] = false;
@@ -1530,7 +1529,6 @@
 			},
 			async queryPlan(params) {
 				let res = await this.$http.get('/scheme/getSchemeResult', params);
-				// let res1 = await this.$http.post('/plt/scheme/getCompanyOptionalSchemeInfo', params);
 				if (res.code == '200') {
 					if (res.data.optionalScheme) {
 						this.planDataExpansion.genericPlanList = [...res.data.schemes, res.data.optionalScheme];
@@ -1551,8 +1549,6 @@
 				let nowPage = pages[pages.length - 1]; //当前页页面实例
 				let prevPage = pages[pages.length - 2]; //上一页页面实例
 				let prevPage1 = pages[pages.length - 3]; //上一页页面实例
-				console.log(prevPage.route);
-				console.log(prevPage1.route);
 				this.quotableCompanyList.map(val => {
 					if (val.id == this.planDataExpansion.id) {
 						val.insurancePlanInfo = this.planDataExpansion.genericPlanInfo;

pages/quote/premiumCalc.vue

@@ -140,7 +140,7 @@
 										</view>
 									</view>
 									<view class="dis a-c" v-if="totalitem.quoteCode=='200'">
-										<text class="sum">总保费：￥{{totalitem.result.sumPermium}}</text>
+										<text class="sum">总保费：￥{{totalitem.result.costs.sumPremium}}</text>
 										<view class="dis a-c" style="margin-left: 10px;"
 											v-if="totalitem.result.feeDisplay">
 											<text style="color: #FF4D4D;font-size: 12px;"
@@ -150,15 +150,15 @@
 									<ls-loading v-if="totalitem.quoteCode ==1" text="掌柜正在为您报价，请稍等......"
 										:animation="animation" fontSize="22" />
 									<text v-if="totalitem.quoteCode=='3'" class="quoteFailed"
-										@tap.stop.prevent="ErrorMsg(totalitem.msg,totalitem.nameSimple)">报价失败，查看原因</text>
+										@tap.stop.prevent="ErrorMsg(errorMessage,totalitem.nameSimple)">报价失败，查看原因</text>
 								</view>
 								<view class=" dis j-end a-c mt-2 f-wrap">
 									<view class="ml-2 mb-1 "
-										v-if="totalitem.nameSimple=='诚泰财险' && totalitem.result.companyId"
+										v-if="totalitem.nameSimple=='诚泰财险' && totalitem.result.ordersNo"
 										style="border: 1px solid #06A8DC;border-radius: 2px;padding:1px 6px;color:#06A8DC;font-size: 24rpx;"
 										@click="CTadjustmentCoefficient(totalindex)">调整系数</view>
 									<view class="ml-2 mb-1 "
-										v-if="totalitem.nameSimple=='紫金财险' && totalitem.result.companyId"
+										v-if="totalitem.nameSimple=='紫金财险' && totalitem.result.ordersNo"
 										style="border: 1px solid #06A8DC;border-radius: 2px;padding:1px 6px;color:#06A8DC;font-size: 24rpx;"
 										@click="ZJadjustmentCoefficient(totalindex)">调整系数</view>
 									<view class="ml-2 mb-1"
@@ -166,13 +166,13 @@
 										style="border: 1px solid #06A8DC;border-radius: 2px;padding:1px 6px;color:#06A8DC;font-size: 24rpx;"
 										@click="specialAgreementSelection(totalitem.id)">调整特约</view>
 									<view class="ml-2 mb-1"
-										v-if="totalitem.nameSimple=='紫金财险' && totalitem.result.orderstatus"
+										v-if="totalitem.nameSimple=='紫金财险' && totalitem.result.ordersNo"
 										style="border: 1px solid #06A8DC;border-radius: 2px;padding:1px 6px;color:#06A8DC;font-size: 24rpx;"
-										@click="zijinspecialAgreementSelection(totalitem.result.companyId)">调整特约</view>
+										@click="zijinspecialAgreementSelection(totalitem.result.ordersNo)">调整特约</view>
 									<view class="ml-2 mb-1"
-										v-if="totalitem.nameSimple=='华泰财险' && totalitem.result.orderstatus"
+										v-if="totalitem.nameSimple=='华泰财险' && totalitem.result.ordersNo"
 										style="border: 1px solid #06A8DC;border-radius: 2px;padding:1px 6px;color:#06A8DC;font-size: 24rpx;"
-										@click="huataispecialAgreementSelection(totalitem.result.companyId)">调整特约</view>
+										@click="huataispecialAgreementSelection(totalitem.result.ordersNo)">调整特约</view>
 									<view class="ml-2 mb-1"
 										style="border: 1px solid #FF5600;border-radius: 2px;padding:1px 6px;color:#FF5600;font-size: 24rpx;"
 										@click="SchemeSelection(totalitem)">
@@ -180,7 +180,7 @@
 									</view>
 									<view class="ml-2 mb-1" v-if="totalitem.insurancePlanInfo"
 										style="border: 1px solid #0052FF;border-radius: 2px;padding:1px 6px;color:#0052FF;font-size: 24rpx;"
-										@click="checkSelection(totalitem)">查看方案</view>
+										@click="checkSelection">查看方案</view>
 									<view class="ml-2 mb-1" v-if="totalitem.insurancePlanInfo"
 										style="background:#FF4D4D;color: #fff;border: 1px solid #FF4D4D;border-radius: 2px;padding:1px 6px;font-size: 24rpx;"
 										@click="individualQuote(totalitem)">单独报价</view>
@@ -193,12 +193,13 @@
 									</view>
 									<view class="dis a-c  f-wrap price">
 										<text
-											v-if="totalitem.result.ciPremium">交强险：￥{{totalitem.result.ciPremium}}</text>
+											v-if="totalitem.result.costs.ciPremium">交强险：￥{{totalitem.result.costs.ciPremium}}</text>
 										<text
-											v-if="totalitem.result.biPremium">商业险：￥{{totalitem.result.biPremium}}</text>
-										<text v-if="totalitem.result.vvTax">车船税：￥{{totalitem.result.vvTax}}</text>
+											v-if="totalitem.result.costs.biPremium">商业险：￥{{totalitem.result.costs.biPremium}}</text>
 										<text
-											v-if="totalitem.result.niPremium">驾意险：￥{{totalitem.result.niPremium}}</text>
+											v-if="totalitem.result.costs.vvTax">车船税：￥{{totalitem.result.costs.vvTax}}</text>
+										<text
+											v-if="totalitem.result.costs.niPremium">驾意险：￥{{totalitem.result.costs.niPremium}}</text>
 									</view>
 									<view class="dis a-c  f-wrap price" style="font-size: 20rpx;color: #FF4D4D;"
 										v-if="totalitem.result.feeDisplay">
@@ -215,17 +216,17 @@
 									<view class="dis a-c j-s ">
 										<view class="dis f-c time">
 											<text
-												v-if="totalitem.result.ciStartDate">交强起保时间：{{totalitem.result.ciStartDate}}
+												v-if="totalitem.result.ciRiskInfoVo.startDate">交强起保时间：{{totalitem.result.ciRiskInfoVo.startDate}}
 
 											</text>
 											<text
-												v-if="totalitem.result.ciEndDate">交强终保时间：{{totalitem.result.ciEndDate}}
+												v-if="totalitem.result.ciRiskInfoVo.endDate">交强终保时间：{{totalitem.result.ciRiskInfoVo.endDate}}
 											</text>
 											<text
-												v-if="totalitem.result.biStartDate">商业起保时间：{{totalitem.result.biStartDate}}
+												v-if="totalitem.result.biRiskInfoVo.startDate">商业起保时间：{{totalitem.result.biRiskInfoVo.startDate}}
 											</text>
 											<text
-												v-if="totalitem.result.biEndDate">商业终保时间：{{totalitem.result.biEndDate}}
+												v-if="totalitem.result.biRiskInfoVo.endDate">商业终保时间：{{totalitem.result.biRiskInfoVo.endDate}}
 											</text>
 										</view>
 										<image src="/static/image/car-insure/Group30.png" mode=""
@@ -233,31 +234,31 @@
 										</image>
 									</view>
 									<view class="dis a-c  f-wrap time">
-										<text v-if="totalitem.nameSimple == '永诚财险'">光博分：{{ totalitem.result.ilogPreUdwMess ?
-										totalitem.result.ilogPreUdwMess : '无' }}</text>
-										<text v-else>评分：{{ totalitem.result.ilogPreUdwMess ?
-										totalitem.result.ilogPreUdwMess : '无' }}</text>
-										<text v-if="totalitem.result.jqScore">交强类型评分：{{ totalitem.result.jqScore ?
-										totalitem.result.jqScore : '无' }}</text>
-										<text v-if="totalitem.result.syScore">商业类型评分：{{ totalitem.result.syScore ?
-										totalitem.result.syScore : '无' }}</text>
-										<text v-if="totalitem.result.lossRation">总赔付率：{{ totalitem.result.lossRation ?
-										totalitem.result.lossRation : '无' }}</text>
-										<text v-if="totalitem.result.jqLossRation">交强赔付率：{{ totalitem.result.jqLossRation ?
-										totalitem.result.jqLossRation : '无' }}</text>
-										<text v-if="totalitem.result.syLossRation">商业赔付率：{{ totalitem.result.syLossRation ?
-										totalitem.result.syLossRation : '无' }}</text>
+										<text v-if="totalitem.nameSimple == '永诚财险'">光博分：{{ totalitem.result.scoreVo.score ?
+										totalitem.result.scoreVo.score : '无' }}</text>
+										<text v-else>评分：{{ totalitem.result.scoreVo.score?
+										totalitem.result.scoreVo.score : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.jqScore">交强类型评分：{{ totalitem.result.scoreVo.jqScore ?
+										totalitem.result.scoreVo.jqScore : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.syScore">商业类型评分：{{ totalitem.result.scoreVo.syScore ?
+										totalitem.result.scoreVo.syScore : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.lossRation">总赔付率：{{ totalitem.result.scoreVo.lossRation ?
+										totalitem.result.scoreVo.lossRation : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.jqLossRation">交强赔付率：{{ totalitem.result.scoreVo.jqLossRation ?
+										totalitem.result.scoreVo.jqLossRation : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.syLossRation">商业赔付率：{{ totalitem.result.scoreVo.syLossRation ?
+										totalitem.result.scoreVo.syLossRation : '无' }}</text>
 										<text
-											v-if="totalitem.nameSimple == '紫金财险'">鼎然-车辆风险评分：{{totalitem.result.ubiPredictedInfoScore ?
-										totalitem.result.ubiPredictedInfoScore : '无'}}</text>
-										<text v-if="totalitem.result.jqRenewal">交强续保：{{ totalitem.result.jqRenewal ?
-										totalitem.result.jqRenewal : '无' }}</text>
-										<text v-if="totalitem.result.syRenewal">商业续保：{{ totalitem.result.syRenewal ?
-										totalitem.result.syRenewal : '无' }}</text>
-										<text v-if="totalitem.result.jqClaims">交强出险次数：{{ totalitem.result.jqClaims ?
-										totalitem.result.jqClaims : '无' }}</text>
-										<text v-if="totalitem.result.syClaims">商业出险次数：{{ totalitem.result.syClaims ?
-										totalitem.result.syClaims : '无' }}</text>
+											v-if="totalitem.nameSimple == '紫金财险'">鼎然-车辆风险评分：{{totalitem.result.scoreVo.ubiPredictedInfoScore ?
+										totalitem.result.scoreVo.ubiPredictedInfoScore : '无'}}</text>
+										<text v-if="totalitem.result.scoreVo.jqRenewal">交强续保：{{ totalitem.result.scoreVo.jqRenewal ?
+										totalitem.result.scoreVo.jqRenewal : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.syRenewal">商业续保：{{ totalitem.result.scoreVo.syRenewal ?
+										totalitem.result.scoreVo.syRenewal : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.jqClaims">交强出险次数：{{ totalitem.result.scoreVo.jqClaims ?
+										totalitem.result.scoreVo.jqClaims : '无' }}</text>
+										<text v-if="totalitem.result.scoreVo.syClaims">商业出险次数：{{ totalitem.result.scoreVo.syClaims ?
+										totalitem.result.scoreVo.syClaims : '无' }}</text>
 									</view>
 									<template v-if="totalitem.result.iszdj !=null && totalitem.result.iszdj!=''">
 										<text v-if="totalitem.result.iszdj==0" style="color: red;">假单交</text>
@@ -278,20 +279,19 @@
 											<u-button class="ml-2" type="error" size="mini"
 												:custom-style="{borderRadius:'2px'}"
 												style="background: linear-gradient( 90deg, #10D8D8 0%, #00CBE6 100%);"
-												@click="resubmitImage(totalitem.result.companyId)">补传影像</u-button>
+												@click="resubmitImage(totalitem.result.ordersNo)">补传影像</u-button>
 											<u-button class="ml-2" type="error" size="mini"
 												:custom-style="{borderRadius:'2px'}"
 												style="background: linear-gradient( 90deg, #FF4D4D 0%, #FF784D 100%);"
-												@click="bjdpreview(totalitem.result.companyId)">报价单</u-button>
+												@click="bjdpreview(totalitem.result.ordersNo)">报价单</u-button>
 											<u-button class="ml-2" type="primary" size="mini"
 												:custom-style="{borderRadius:'2px'}"
 												style="background: linear-gradient( 90deg, #FF9415 0%, #FFB525 100%);"
-												@click="querydetial(totalitem.result.companyId,totalitem.cnName)">查看详情</u-button>
+												@click="querydetial(totalitem.result.ordersNo,totalitem.cnName)">查看详情</u-button>
 											<u-button class="ml-2" type="primary" size="mini"
-												v-if="totalitem.result.orderstatus==0"
-												:custom-style="{borderRadius:'2px'}"
+												v-if="order.orderStatus==1" :custom-style="{borderRadius:'2px'}"
 												style="background: linear-gradient( 90deg, #0052FF 0%, #0D8BFF 100%);"
-												@click="submitUnderwriting(totalitem.result.companyId,totalitem.result.apiType ,totalitem.nameSimple)">提交核保</u-button>
+												@click="submitUnderwriting(totalitem.result.ordersNo,totalitem.result.apiType ,totalitem.nameSimple)">提交核保</u-button>
 										</view>
 									</view>
 								</view>
@@ -1378,6 +1378,9 @@
 				systartvalue: Number(new Date()), //证件起期
 				syendvalue: Number(new Date()), //证件起期
 				transferDatevalue: Number(new Date()), //证件起期
+				order: {},
+				costs: {}, //价格
+				accidentalDrivings: {}, //驾意险
 				imagelist: [{
 						name: '车辆/人员信息'
 					},
@@ -1474,7 +1477,7 @@
 				priceComparisonShow: false, //比价弹窗
 				comparableQuantity: 0, //报价成功总数
 				selectedCount: 0, //比价勾选数量
-				riskList: [], //险种大类
+				kindInfoVo: [], //险种大类
 				ciRiskInfoVo: {
 					amount: 0,
 					endDate: '',
@@ -1498,7 +1501,7 @@
 					taxPaidAreaCode: "",
 				},
 				//车船税form
-				vehicleAndVesselTaxForm: {
+				vehicleAndVesselTaxVo: {
 					taxRelifFlag: "1", //类型
 					identifyNumber: "", //纳税人识别号
 					taxpayerIdentifier: "01", //纳税人证件类型
@@ -1680,24 +1683,28 @@
 				this.productId = res.data.order.productsCode; //险种id
 				this.productName = res.data.order.productsName; //险种name
 				this.quotableCompanyList = JSON.parse(JSON.stringify(res.data.insCompanyVo));
-				this.commpanyList();
+				this.order = res.data.order;
+				this.costs = res.data.costs; //价格
+				this.errorMessage = res.data.errorMessage; //报价失败原因
+				this.accidentalDrivings = res.data.accidentalDrivings; //驾意险
 				this.carInfo = res.data.carInfoVo; //车辆信息
 				this.ownerInfo = res.data.ownersInfo; //车主信息
 				this.policyHolderInfo = res.data.policyHolderInfo; //投保人信息
 				this.insuredPersonInfo = res.data.insuredPersonInfo; //被保人信息
-				this.riskList = res.data.kindInfoVo; //险种大类
-				this.ciRiskInfoVo = res.data.ciRiskInfoVo;
-				this.biRiskInfoVo = res.data.biRiskInfoVo;
-				this.vehicleAndVesselTaxForm = res.data.vehicleAndVesselTax; //车船税信息
+				this.kindInfoVo = res.data.kindInfoVo; //险种大类
+				this.ciRiskInfoVo = res.data.ciRiskInfoVo; //交强险
+				this.biRiskInfoVo = res.data.biRiskInfoVo; //商业险
+				this.vehicleAndVesselTaxVo = res.data.vehicleAndVesselTaxVo; //车船税信息
 				this.orderno = res.data.order.ordersNo;
 				this.quoteno = res.data.order.quoteNo;
+				await this.commpanyList();
 				this.imageEcho(this.quoteno) // 影像获取完毕
 				if (this.ciRiskInfoVo) {
 					if (this.isDateBeforeToday(this.ciRiskInfoVo.startDate)) {
 						this.jqstartDate = this.nextday();
 						this.jqendDate = this.oneYearPast(this.jqstartDate)
-						this.riskList[i].startDate = this.nextday()
-						this.riskList[i].endDate = this.oneYearPast(this.jqstartDate)
+						this.ciRiskInfoVo.startDate = this.nextday()
+						this.ciRiskInfoVo.endDate = this.oneYearPast(this.jqstartDate)
 					} else {
 						this.jqstartDate = this.ciRiskInfoVo.startDate;
 						this.jqendDate = this.ciRiskInfoVo.endDate;
@@ -1707,8 +1714,8 @@
 					if (this.isDateBeforeToday(this.biRiskInfoVo.startDate)) {
 						this.systartDate = this.nextday();
 						this.syendDate = this.oneYearPast(this.systartDate)
-						this.riskList[i].startDate = this.nextday()
-						this.riskList[i].endDate = this.oneYearPast(this.systartDate)
+						this.biRiskInfoVo.startDate = this.nextday()
+						this.biRiskInfoVo.endDate = this.oneYearPast(this.systartDate)
 					} else {
 						this.systartDate = this.biRiskInfoVo.startDate;
 						this.syendDate = this.biRiskInfoVo.endDate;
@@ -1726,8 +1733,8 @@
 					this.carInfo = data.carInfo; //车辆信息
 					this.ownerInfo = data.ownerInfo; //车主信息
 					this.policyHolderInfo = data.policyHolderInfo; //投保人信息
-					this.vehicleAndVesselTaxForm.identifyNumber = this.policyHolderInfo.identifyNumber;
-					this.vehicleAndVesselTaxForm.taxpayerName = this.policyHolderInfo.name;
+					this.vehicleAndVesselTaxVo.identifyNumber = this.policyHolderInfo.identifyNumber;
+					this.vehicleAndVesselTaxVo.taxpayerName = this.policyHolderInfo.name;
 					this.insuredPersonInfo = data.insuredPersonInfo; //被保人信息
 					this.carInfoPositiveList = data.carInfoPositiveList; //车辆
 					this.ownerInfoPositiveList = data.ownerInfoPositiveList; //车主
@@ -2274,16 +2281,6 @@
 					})
 					this.riskTypeEchoProcessing(this.productId); //更新险种大类日期
 					let param = {
-						// quoteno: this.quoteno ? this.quoteno : "",
-						// orderNo: this.orderno ? this.orderno : "",
-						// riskList: this.riskList,
-						// carInfo: this.carInfo,
-						// insuredPersonInfo: this.insuredPersonInfo,
-						// ownerInfo: this.ownerInfo,
-						// policyHolderInfo: this.policyHolderInfo,
-						// vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-						// productId: this.productId,
-						// orderSource: "1",
 						licenseNo: this.carInfo.licenseNo,
 						vinNo: this.carInfo.vinNo,
 						engineNo: this.carInfo.engineNo,
@@ -2331,12 +2328,12 @@
 					userId: this.userInfo.sysUser.id,
 					quoteno: this.quoteno ? this.quoteno : "",
 					orderNo: this.orderno ? this.orderno : "",
-					riskList: this.riskList,
+					kindInfoVost: thikindInfoVost,
 					carInfo: this.carInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
 					ownerInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
-					vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTax: this.vehicleAndVesselTaxVo,
 					productId: this.productId,
 					orderSource: "1",
 				};
@@ -2371,16 +2368,6 @@
 					this.riskTypeEchoProcessing(this.productId); //更新险种大类日期
 
 					let param = {
-						// quoteno: this.quoteno ? this.quoteno : "",
-						// orderNo: this.orderno ? this.orderno : "",
-						// riskList: this.riskList,
-						// carInfo: this.carInfo,
-						// insuredPersonInfo: this.insuredPersonInfo,
-						// ownerInfo: this.ownerInfo,
-						// policyHolderInfo: this.policyHolderInfo,
-						// vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-						// productId: this.productId,
-						// orderSource: "1",
 						licenseNo: this.carInfo.licenseNo,
 						vinNo: this.carInfo.vinNo,
 						engineNo: this.carInfo.engineNo,
@@ -2447,7 +2434,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -2456,7 +2443,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -2516,7 +2503,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -2525,7 +2512,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -2585,7 +2572,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -2594,7 +2581,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -2654,7 +2641,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -2663,7 +2650,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -2723,7 +2710,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -2732,7 +2719,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -2790,7 +2777,7 @@
 					orderNo: this.orderno,
 					companyId: id,
 					kinds: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					risks: this.riskList,
+					risks: thikindInfoVost,
 					agreementId: this.quotableCompanyList[num].agreement[0].id,
 					coefficient: this.quotableCompanyList[num].coefficient,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
@@ -2842,15 +2829,27 @@
 				let isTaxSource = this.quotableCompanyList[num].isTaxSource;
 				let ccidenttype = this.quotableCompanyList[num].cnName;
 				let params = {
-					accidentalDrivingVo: this.quotableCompanyList[num].insurancePlanInfo.drivingList[0] ? this
-						.quotableCompanyList[num].insurancePlanInfo.drivingList[0] : {},
-					orderNo: this.orderno,
-					companyId: id,
-					kinds: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					risks: this.riskList,
-					agreementId: this.quotableCompanyList[num].agreement[0].id,
+					order: {
+						insuranceCompanyCode: id,
+						quoteNo: this.quoteno,
+						productsCode: this.productId,
+					},
+					accidentalDrivings: this.quotableCompanyList[num].insurancePlanInfo.drivings[0] ? [this
+						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
+					] : [],
+					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
+					// risks: thikindInfoVost,
+					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
+						.ciRiskInfoVo : null, //交强大类
+					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
+						.biRiskInfoVo : null, //商业大类
+					carInfoVo: this.carInfo,
+					ownersInfo: this.ownerInfo,
+					policyHolderInfo: this.policyHolderInfo,
+					insuredPersonInfo: this.insuredPersonInfo,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
-					guoRenSpecialAgreementVo: this.guoRenSpecialAgreementVo,
+					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
 				};
 				try {
@@ -2908,7 +2907,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -2917,7 +2916,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -3014,7 +3013,7 @@
 						.quotableCompanyList[num].insurancePlanInfo.drivings[0]
 					] : [],
 					kindInfoVo: this.quotableCompanyList[num].insurancePlanInfo.kinds,
-					// risks: this.riskList,
+					// risks: thikindInfoVost,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null, //交强大类
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -3023,7 +3022,7 @@
 					ownersInfo: this.ownerInfo,
 					policyHolderInfo: this.policyHolderInfo,
 					insuredPersonInfo: this.insuredPersonInfo,
-					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxForm,
+					vehicleAndVesselTaxVo: this.vehicleAndVesselTaxVo,
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					// agreementId: this.quotableCompanyList[num].agreement[0].id,
 					systemType: '2'
@@ -3247,14 +3246,14 @@
 			},
 			//使用此时间
 			syncData(item) {
-				this.jqstartDate = item.startDateJq ? item
-					.startDateJq : this.jqstartDate
-				this.jqendDate = item.endDateJq ? item
-					.endDateJq : this.endDateJq
-				this.systartDate = item.startDateSy ? item
-					.startDateSy : this.systartDate
-				this.syendDate = item.endDateSy ? item
-					.endDateSy : this.syendDate
+				this.jqstartDate = item.ciStartDate ? item
+					.ciStartDate : this.jqstartDate
+				this.jqendDate = item.ciEndDate ? item
+					.ciEndDate : this.jqendDate
+				this.systartDate = item.biStartDate ? item
+					.biStartDate : this.systartDate
+				this.syendDate = item.biEndDate ? item
+					.biEndDate : this.syendDate
 				uni.showToast({
 					title: '时间已替换',
 					icon: 'none',
@@ -3263,14 +3262,14 @@
 			},
 			//车船税类型选择
 			taxRelifFlagConfirm(val, name) {
-				this.vehicleAndVesselTaxForm[name] = val[0].value;
+				this.vehicleAndVesselTaxVo[name] = val[0].value;
 				this.model[name] = val[0].label;
 			},
 			taxDocumentDateconfirm(e) {
-				this.vehicleAndVesselTaxForm.taxDocumentDate = e.year + '-' + e.month + '-' + e.day;
+				this.vehicleAndVesselTaxVo.taxDocumentDate = e.year + '-' + e.month + '-' + e.day;
 			},
 			taxPaidAreaCodeconfirm(e) {
-				this.vehicleAndVesselTaxForm.taxPaidAreaCode = e.province.value;
+				this.vehicleAndVesselTaxVo.taxPaidAreaCode = e.province.value;
 				this.model.taxPaidAreaCode = e.province.label;
 			},
 			//数据字典
@@ -3368,12 +3367,16 @@
 				}
 			},
 			//查看方案
-			checkSelection(item) {
+			checkSelection() {
 				uni.navigateTo({
 					url: '/pages/quote/checkOption',
 					success: (res) => {
 						res.eventChannel.emit("acceptData", {
-							item: item,
+							item: {
+								costs: this.costs, //价格
+								kindInfoVo: this.kindInfoVo, //商业险险别
+								accidentalDrivings: this.accidentalDrivings, //驾意险
+							},
 							seatNum: this.carInfo.seatCount,
 							jqstartDate: this.jqstartDate,
 							jqendDate: this.jqendDate,
@@ -3395,10 +3398,6 @@
 							params: {
 								companyId: item.id,
 								productId: this.productId,
-								// seatNum: this.carInfo.seatCount,
-								// vehicleType: this.carInfo.carKindCode,
-								// energyTypeCode: this.carInfo.energyTypeCode,
-								// carNatureCode: this.carInfo.carNatureCode,
 							},
 							nameSimple: item.nameSimple,
 							cnName: item.cnName,
@@ -3413,45 +3412,6 @@
 						})
 					}
 				}, "navigateTo", true);
-				// let params = {
-				// 	companyId: item.id,
-				// 	productId: this.productId,
-				// 	seatNum: this.carInfo.seatCount,
-				// 	vehicleType: this.carInfo.carKindCode,
-				// 	energyTypeCode: this.carInfo.energyTypeCode,
-				// 	carNatureCode: this.carInfo.carNatureCode,
-				// };
-				// let res = await this.$http.post('/plt/scheme/getCompanySchemeInfo', params);
-				// let res1 = await this.$http.post('/plt/scheme/getCompanyOptionalSchemeInfo', params);
-				// let typelist = [];
-				// this.planDataExpansion.id = item.id;
-				// this.planDataExpansion.nameSimple = item.nameSimple;
-				// this.planDataExpansion.cnName = item.cnName;
-				// if (res.code == '200' && res.data.length > 0) {
-				// 	this.planDataExpansion.genericPlanList = [...res.data];
-				// 	this.planDataExpansion.genericPlanInfo = res.data[0];
-				// 	this.SelectedPlanId = res.data[0].schemeId;
-				// } else {
-				// 	this.planDataExpansion.genericPlanList = [];
-				// 	this.planDataExpansion.genericPlanInfo = {};
-				// 	this.SelectedPlanId = "";
-				// }
-				// if (res1.code == '200') {
-				// 	this.planDataExpansion.genericPlanList = [...res.data, res1.data];
-				// 	res1.data.drivingTypeList.map(val => {
-				// 		if (val.children) {
-				// 			val.children.map(ele => {
-				// 				typelist.push(ele)
-				// 				return ele
-				// 			})
-				// 		}
-				// 	})
-				// } else {
-				// 	this.planDataExpansion.genericPlanList = [...res.data];
-				// }
-				// this.accidentInsuranceCategoryList = typelist;
-				// this.genericPlanPopup = true;
-
 			},
 			//即使投保时处理时间
 			datelyClick(value, name, startDate, endDate, obj) {
@@ -3491,25 +3451,21 @@
 					ele['isComparableshowHide'] = false;
 					ele['isComparableDisabled'] = false;
 					ele['insurancePlanInfo'] = null;
-					if (ele.editingDto) {
-						if (ele.editingDto.sumPermium) {
-							ele.result = ele.editingDto;
+					if (this.order && this.order.orderStatus) {
+						if (this.costs.sumPremium) {
 							ele.insurancePlanInfo = {};
-							ele.insurancePlanInfo.drivingList = ele.editingDto.drivingList;
-							ele.insurancePlanInfo.kinds = ele.editingDto.kindList;
 							ele.quoteCode = 200;
-							list.push(1);
 						} else {
-							ele.msg = ele.editingDto.quoteErrMsg;
+							ele.msg = this.errorMessage;
 							ele.insurancePlanInfo = {};
-							ele.insurancePlanInfo.drivingList = ele.editingDto.drivingList;
-							ele.insurancePlanInfo.kinds = ele.editingDto.kindList;
 							ele.quoteCode = 3;
 						}
 
 					}
 					return ele;
 				})
+				console.log(this.quotableCompanyList);
+				console.log(this.costs);
 				this.comparableQuantity = list.length;
 
 			},

pages/quote/queryVehicleModel.vue

@@ -47,7 +47,6 @@
 				this.keyword = options.frameNo;
 				this.getCarModel(options.frameNo);
 			} else if (options.modelName) {
-				let res = await this.$http.get('/order/carModel/vinSearch?frameNo=' + options.modelName);
 				this.getBrandModel(options.modelName);
 			}
 		},
@@ -95,7 +94,7 @@
 			//品牌型号查询
 			async getBrandModel(cctype, marketYear) {
 				let cctypeName = cctype.replace(/[^u4e00-u9fa5|,]+/ig, ''); //去掉中文
-				let res = await this.$http.post('/order/zhongMeiApi/modelsQuery', {
+				let res = await this.$http.post('/order/carModel/modelsQuery', {
 					modelName: cctypeName,
 					marketYear: marketYear
 				});

pages/quote/quoteDetail.vue

@@ -216,7 +216,7 @@
 					name: '影像资料'
 				}],
 				current: 0,
-				orderStatus: '5',
+				orderStatus: '',
 				statusList: [{
 						label: '订单已提交',
 						value: 0,
@@ -301,7 +301,7 @@
 					this.id = data.id;
 					let res = await this.$http.get('/supplementOrder/getOrderDetail?ordersNo=' + data.id);
 					if (res.code == 200) {
-						// this.orderStatus = res.data.order.orderStatus;
+						this.orderStatus = res.data.order.orderStatus;
 						this.companyName = res.data.order.companyName;
 						this.ordersNo = res.data.order.ordersNo;
 						this.quoteNo = res.data.order.quoteNo;

pages/quote/selectInsuranceCompany.vue

@@ -201,6 +201,10 @@
 						name: "诚泰财险",
 						icon: "/static/image/insuranceCompany/chengtai.png"
 					},
+					{
+						name: "阳光财险",
+						icon: "/static/image/insuranceCompany/yangguang.png"
+					},
 				]
 			}
 		},

store/modules/order.js

@@ -1,14 +1,15 @@
 export const state = {
-	typeIndex: 0,
+	licenseNo: null,
 	stageIndex: null,
 };
 export const mutations = {
-	setOrderType(state, data) {
-		state.typeIndex = data;
+	activelicenseNo(state, data) {
+		state.licenseNo = data;
 	},
 	setOrderStage(state, data) {
 		state.stageIndex = data;
-	}
+	},
+
 };
 export const actions = {