7/22日提交

components/yzhua006-update/app-update.vue

@@ -354,7 +354,7 @@
 			.title {
 				font-size: 32rpx;
 				font-weight: bold;
-				color: #6526f3;
+				color: #3a63f6;
 			}
 
 			.title-sub {
@@ -374,7 +374,7 @@
 				height: 80rpx;
 				line-height: 80rpx;
 				border-radius: 100px;
-				background-color: #6526f3;
+				background-color: #3a63f6;
 				margin-top: 20rpx;
 			}
 		}

config/baseUrl.js

@@ -48,7 +48,67 @@ const courtConfig = {
 		// #endif
 	}
 };
-
+const insCompanyList = [{
+		name: "中煤财险",
+		icon: "/static/insuranceicon/zhongmei.png"
+	}, //华农
+	{
+		name: "恒邦财险",
+		icon: "/static/insuranceicon/hengbang.png"
+	},
+	{
+		name: "安盛天平",
+		icon: "/static/insuranceicon/ansheng.png"
+	},
+	{
+		name: "中国人寿",
+		icon: "/static/insuranceicon/renshou.png"
+	},
+	{
+		name: "众安财险",
+		icon: "/static/insuranceicon/zhongan.png"
+	},
+	{
+		name: "永诚财险",
+		icon: "/static/insuranceicon/yongcheng.png"
+	},
+	{
+		name: "永安财险",
+		icon: "/static/insuranceicon/yongan.png"
+	},
+	{
+		name: "紫金财险",
+		icon: "/static/insuranceicon/zijin.png"
+	},
+	{
+		name: "国任财险",
+		icon: "/static/insuranceicon/guoren.png"
+	},
+	{
+		name: "华泰财险",
+		icon: "/static/insuranceicon/huatai.png"
+	},
+	{
+		name: "大家财险",
+		icon: "/static/insuranceicon/dajia.png"
+	},
+	{
+		name: "太平财险",
+		icon: "/static/insuranceicon/taiping.png"
+	},
+	{
+		name: "华农财险",
+		icon: "/static/insuranceicon/huanong.png"
+	},
+	{
+		name: "渤海财险",
+		icon: "/static/insuranceicon/bohai.png"
+	},
+	{
+		name: "泰康财险",
+		icon: "/static/insuranceicon/taikang.png"
+	},
+];
 //手机号验证正则表达式
 const phoneRegular = /^1[3456789]\d{9}$/;
 //邮箱验证正则表达式
@@ -59,5 +119,6 @@ const passwordRegular = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,15}$/;
 export default Object.assign({
 	phoneRegular,
 	mailRegular,
-	passwordRegular
+	passwordRegular,
+	insCompanyList
 }, courtConfig);

config/login.js

@@ -227,12 +227,12 @@ async function getLoginUserInfo(token, userId) {
 		title: 'sources',
 		data: Institutionalsources.data
 	})
-	let baojiadan = await $http.get('/sys/quotation/getThemeByUserId?userId=' + userId, {
+	let id = userId ? userId : userInfoRes.data.id;
+	let baojiadan = await $http.get('/sys/quotation/getThemeByUserId?userId=' + id, {
 		header: {
 			Authorization: Author,
 		}
 	});
-	console.log(baojiadan);
 	store.commit('setUserModules', {
 		title: 'quotationType',
 		data: {

manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.3.0",
-	"versionCode": 230,
+	"versionName": "2.4.4",
+	"versionCode": 244,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -71,7 +71,8 @@
 				],
 				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
 				"minSdkVersion": 21,
-				"schemes": "zgcxapp"
+				"schemes": "zgcxapp",
+				"targetSdkVersion": 30
 			},
 			"sdkConfigs": {
 				"ad": {},

pages.json

@@ -2,9 +2,7 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [
-
-		{
+	"pages": [{
 			"path": "pages/login/login", //登录页	
 			"style": {
 				"enablePullDownRefresh": false, //是否开启下拉刷新功能
@@ -53,6 +51,17 @@
 				}
 			}
 		},
+		{
+			"path": "pages/ad/ad",
+			"style": {
+				"navigationStyle": "custom", // 取消本页面的导航栏
+				"app-plus": {
+					"titleNView": false,
+					"scrollIndicator": "none", //隐藏滚动条
+					"bounce": "none" //关闭反弹效果
+				}
+			}
+		},
 		{
 			"path": "pages/register/registerSuccess",
 			"style": {
@@ -943,7 +952,12 @@
 			"path": "pages/register/orderissuer",
 			"style": {
 				"navigationBarTitleText": "出单员注册",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false,
+					"scrollIndicator": "none", //隐藏滚动条
+					"bounce": "none" //关闭反弹效果
+				}
 			}
 		},
 
@@ -1069,6 +1083,16 @@
 			}
 
 		},
+		{
+			"path": "pages/orders1/quotation1",
+			"style": {
+				"navigationBarTitleText": "报价单",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+
+			}
+		},
 		{
 			"path": "pages/orders1/paymentCode",
 			"style": {

pages/ad/ad.vue

@@ -0,0 +1,116 @@
+<template>
+	<view class="page" :style="{height:windowHeight}">
+		<view class="dis j-s a-c" style="padding: 0 10px;">
+			<view class="maskTool">
+				<text>广告</text>
+				<text>丨</text>
+				<text v-if="countdownTime>0">观看{{countdownTime}}秒后获得奖励</text>
+				<text v-else>已获得奖励</text>
+			</view>
+			<view class="maskTool1 dis j-s a-c">
+				<image :src="isMuted?'../../static/img/volume1.png':'../../static/img/volume2.png'" mode=""
+					style="width: 15px;height: 15px;" @click="isMuteds"></image>
+
+				<text>丨</text>
+				<!-- #ifdef APP -->
+				<text @click="showAlert">关闭</text>
+				<!-- #endif -->
+				<text @click="showAlert1">关闭</text>
+			</view>
+		</view>
+		<view class="" :style="{width:'100%',height:'calc(100% - 45px)',position: 'relative'}">
+			<video id="myVideo" src="../../ad.mp4" autoplay controls :style="{width:'100%',height:'100%'}"
+				:controls="true" @play="startCountdown">
+			</video>
+		</view>
+		<u-modal v-model="show" content="暂未获得奖励,是否继续观看视频"></u-modal>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				countdownTime: 30,
+				windowHeight: "",
+				isMuted: true,
+				show: false,
+			}
+		},
+		onShow() {
+			// 确保视频元素存在
+			this.$nextTick(() => {
+				this.video = document.getElementById('myVideo');
+			});
+		},
+		onLoad() {
+			const res = uni.getSystemInfoSync();
+			this.windowHeight = res.windowHeight + 'px';
+		},
+		methods: {
+			isMuteds() {
+				this.isMuted = !this.isMuted;
+				this.video.muted = this.isMuted;
+			},
+			startCountdown() {
+				if (this.intervalId) {
+					clearInterval(this.intervalId);
+				}
+				this.intervalId = setInterval(() => {
+					if (this.countdownTime > 0) {
+						this.countdownTime--;
+					} else {
+						clearInterval(this.intervalId);
+					}
+				}, 1000);
+			},
+			showAlert1() {
+				this.show = true;
+			},
+			showAlert() {
+				// 判断plus对象是否存在
+				if (plus) {
+					// 创建一个提示窗
+					plus.nativeUI.alert('这是一个弹窗', function() {});
+				} else {
+					// 非App环境的处理逻辑
+					alert('这是一个浏览器的弹窗');
+				}
+			}
+		},
+		beforeDestroy() {
+			if (this.intervalId) {
+				clearInterval(this.intervalId);
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #000;
+
+	}
+</style>
+<style lang="scss" scoped>
+	.page {
+		padding-top: 20px;
+		background-color: #000;
+	}
+
+	.maskTool {
+
+		border: 1px solid #999;
+		height: auto;
+		color: #fff;
+		border-radius: 20px;
+		padding: 5px 10px;
+	}
+
+	.maskTool1 {
+		border: 1px solid #999;
+		height: auto;
+		color: #fff;
+		border-radius: 20px;
+		padding: 5px 10px;
+	}
+</style>

pages/carInsure1/payCode1.vue

@@ -101,59 +101,6 @@
 				sysEndDate: "",
 				arr: false,
 				posterUrl: "",
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-				],
 				logoimg: "",
 			}
 		},
@@ -196,7 +143,7 @@
 							size: parseInt(300) //二维码大小  
 						})
 					}
-					this.insCompanyList.map(ele => {
+					this.$base.insCompanyList.map(ele => {
 						if (ele.name == res.data.inscompany) {
 							uni.getImageInfo({
 								src: ele.icon,

pages/carInsure1/payCode2.vue

@@ -99,59 +99,6 @@
 				sysEndDate: "",
 				arr: false,
 				posterUrl: "",
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-				],
 				logoimg: "",
 			}
 		},

pages/carInsure2/insureItems.vue

@@ -974,6 +974,7 @@
 								this.jqendDate = this.riskList[0].endDate;
 								this.BIInsureList.amount = "0";
 								this.BIInsureList.amountDesc = "不投保";
+
 								this.sychecked = false;
 							} else if (this.riskList[0].riskCode == '0510') {
 								this.CIInsureList.amount = "0";
@@ -1030,6 +1031,14 @@
 							})
 
 						})
+						if (this.jqstartDate.slice(-8) !== '00:00:00') {
+							this.jqimmediately = "1";
+
+						}
+						if (this.systartDate.slice(-8) !== '00:00:00') {
+							this.syimmediately = "1";
+
+						}
 						var notselected = this.insureList.filter(item1 => !this.kindList.some(item2 => item2
 							.kindCode === item1.kindCode))
 						notselected.map(ele => {

pages/carInsure2/quote.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="page">
+		<public-module></public-module>
 		<!-- 头部 -->
 		<view class="car-header dis a-c">
 			<image src="/static/image/car-insure/Group.png" mode="" style="width: 40px;height: 40px;"></image>
@@ -24,7 +25,7 @@
 						<u-switch v-model="jqchecked" active-color="#0052FF" inactive-color="#eee" size='30'
 							@change="jqImmediate"></u-switch>
 					</view>
-					<view class=" qunimade   dis a-c j-start" @click="jqstartShow = true" v-if="jqstartDate">
+					<view class=" qunimade   dis a-c j-start" @click="jqstartShow = true" v-if="jqchecked">
 						<text>{{jqstartDate}}</text>
 						<text class="mx-2">-</text>
 						<text>{{jqendDate}}</text>
@@ -139,7 +140,7 @@
 											:custom-style="{textAlign:'right'}" v-model="totalitem.agreementName"
 											placeholder="请选择协议" @click="totalitem.selectShow = true"></u-input>
 										<u-select mode="single-column" :list="totalitem.agreement" value-name="id"
-											label-name="agreementName" v-model="totalitem.selectShow"
+											label-name="businessDescription" v-model="totalitem.selectShow"
 											@confirm="val=>selectConfirm(val,totalindex)"></u-select>
 									</u-form-item>
 									<u-form-item label="商业险折扣" v-if="totalitem.namesimple == '中国人寿'" placeholder="请输入数字"
@@ -543,16 +544,22 @@
 												inactive-color="#eee" size='30'
 												@change="accidentChange($event,totalitem.id,totalitem.cnName,totalindex)"></u-switch>
 										</view>
-										<view class="" v-if="dajiaaccidentalDrivingVo.rideRiskCode">
-											<view class=" accident-ins dis a-c j-s" @click="dajiaPopupshow=true">
-												<text>{{dajiaaccidentalDrivingVo.rideRiskName}}</text>
+										<view class=""
+											v-if="dajiaaccidentalDrivingVo.projectCode  && totalitem.jychecked">
+											<view class=" accident-ins dis a-c j-s" @click="dajiaPopupshow=true"
+												v-if="totalitem.apiType=='2'">
+												<text>{{dajiaaccidentalDrivingVo.parentName}}</text>
+												<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
+											</view>
+											<view class=" accident-ins dis a-c j-s" @click="dajiaPopupshow1=true">
+												<text>{{dajiaaccidentalDrivingVo.projectName}}</text>
 												<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 											</view>
 											<view class=" dis j-s a-c">
 												<view class="">
 													<text>保费：</text>
 													<text
-														style="color: #ee7000;">￥{{dajiaaccidentalDrivingVo.price*dajiaaccidentalDrivingVo.quantity}}.00</text>
+														style="color: #ee7000;">￥{{dajiaaccidentalDrivingVo.sumPremium*dajiaaccidentalDrivingVo.quantity}}.00</text>
 												</view>
 												<view class="">
 													<text>份数：</text>
@@ -741,7 +748,7 @@
 					<u-radio style="margin: 4px 0;flex: auto;align-items: flex-start;" label-size="30"
 						@change="HNradioChange" shape="square" v-for="(item, index) in huanongInsuranceData"
 						:key="index" :name="item.projectCode">
-						{{item.projectName}}s
+						{{item.projectName}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -868,13 +875,26 @@
 		</u-modal>
 		<!-- 大家驾意险弹框 -->
 		<u-modal v-model="dajiaPopupshow" title="驾意险"
+			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
+			:scroll-height="{height: '300px'}" :show-confirm-button="false" mask-close-able>
+			<view class="slot-content">
+				<u-radio-group size="30" wrap>
+					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="DJprogrammeradioChange"
+						shape="square" v-for="(item, index) in dajiaprogrammeData" :key="index"
+						:name="item.projectCode">
+						{{item.projectName}}
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</u-modal>
+		<u-modal v-model="dajiaPopupshow1" title="驾意险"
 			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
 			:scroll-height="{height: '300px'}" :show-confirm-button="false" mask-close-able>
 			<view class="slot-content">
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="DJradioChange" shape="square"
-						v-for="(item, index) in dajiaInsuranceData" :key="index" :name="item.id">
-						{{item.productName}}
+						v-for="(item, index) in dajiaInsuranceData" :key="index" :name="item.projectCode">
+						{{item.projectName}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -928,7 +948,7 @@
 			:show-cancel-button="true"
 			:confirm-style="{background:'#0052FF',color:'#fff',height:'40px',lineHeight:'40px'}"
 			:cancel-style="{background:'#E6EEFF',color:'#0052FF',height:'40px',lineHeight:'40px'}"
-			@confirm="Guidedconfirm">
+			@confirm="Guidedconfirm" @cancel="sychecked=false">
 			<view class="slot-content dis j-c a-c font-weight" style="color: #232832;">
 				<text>将跳转至保险配置页面添加或修改商业险</text>
 			</view>
@@ -1046,6 +1066,8 @@
 				guoRenaccidentalDrivingVo: {}, //国任意外险
 				guoRencontributingshow: false, //国任特约
 				dajiaPopupshow: false,
+				dajiaPopupshow1: false,
+				dajiaprogrammeData: [],
 				dajiaInsuranceData: [], //大家意外险list
 				dajiaaccidentalDrivingVo: {}, //大家意外险
 				guoRenSpecialAgreementData: [],
@@ -1735,7 +1757,6 @@
 				const eventChannel = this.getOpenerEventChannel()
 				// 监听acceptData事件，获取上一页面通过eventChannel传送到当前页面的数据
 				eventChannel.on('acceptData', async (data) => {
-					console.log(data);
 					this.carInfo = data.carInfo; //车辆信息
 					this.ownerInfo = data.ownerInfo; //车主信息
 					this.policyHolderInfo = data.policyHolderInfo; //投保人信息
@@ -1792,13 +1813,14 @@
 					}
 				})
 			}
+			this.commpanyList();
 			const storage = uni.getStorageSync('historyInfo');
 			if (storage) {
 				Object.keys(storage).forEach(key => {
 					this[key] = storage[key]
 				})
 			} else {
-				this.commpanyList();
+
 
 			}
 
@@ -1807,7 +1829,21 @@
 			let historyInfo = {
 				quoteno: this.quoteno,
 				orderno: this.orderno,
-				totalCompanyList: this.totalCompanyList,
+				zhongmeiInsuranceData: this.zhongmeiInsuranceData, //中煤意外险list
+				zhongmeiaccidentalDrivingVo: this.zhongmeiaccidentalDrivingVo, //中煤意外险
+				huanongInsuranceData: this.huanongInsuranceData, //华农意外险list
+				huanongaccidentalDrivingVo: this.huanongaccidentalDrivingVo, //华农意外险
+				taikangInsuranceData: this.taikangInsuranceData, //泰康意外险list
+				taikangaccidentalDrivingVo: this.taikangaccidentalDrivingVo, //泰康意外险
+				taipingInsuranceData: this.taipingInsuranceData, //太平意外险list
+				taipingaccidentalDrivingVo: this.taipingaccidentalDrivingVo, //太平意外险
+				guorenprogrammeData: this.guorenprogrammeData,
+				guoRenInsuranceData: this.guoRenInsuranceData, //国任意外险list
+				guoRenaccidentalDrivingVo: this.guoRenaccidentalDrivingVo, //国任意外险
+				dajiaInsuranceData: this.dajiaInsuranceData, //大家意外险list
+				dajiaaccidentalDrivingVo: this.dajiaaccidentalDrivingVo, //大家意外险
+				bohaiInsuranceData: this.bohaiInsuranceData, //渤海意外险list
+				bohaiaccidentalDrivingVo: this.bohaiaccidentalDrivingVo, //渤海意外险
 				zijinInsuranceData: this.zijinInsuranceData, //紫金意外险list
 				zijinaccidentalDrivingVo: this.zijinaccidentalDrivingVo, //紫金意外险
 				anshengprogrammeData: this.anshengprogrammeData,
@@ -1853,13 +1889,13 @@
 
 			},
 			async coordinateValue() {
-				let location = uni.getStorageSync('location');
-				let params = {
-					subOrderNo: this.subOrderId,
-					lng: location.longitude,
-					lat: location.latitude,
-				}
-				let orders = await this.$http.post('/insurance/order/savePosition', params);
+				// let location = uni.getStorageSync('location');
+				// let params = {
+				// 	subOrderNo: this.subOrderId,
+				// 	lng: location.longitude,
+				// 	lat: location.latitude,
+				// }
+				// let orders = await this.$http.post('/insurance/order/savePosition', params);
 			},
 			async tempSave() {
 				let param = {
@@ -1902,6 +1938,8 @@
 			},
 			jqImmediate(value) {
 				if (value) {
+					this.jqstartDate = this.nextday();
+					this.jqendDate = this.oneYearPast(this.jqstartDate)
 					this.riskList.push({
 						amount: 0,
 						endDate: this.jqendDate,
@@ -1910,27 +1948,33 @@
 						riskCode: "0507",
 						startDate: this.jqstartDate,
 					})
+					this.commpanyList();
 				} else {
 					let list = this.riskList.filter(item => item.riskCode !== "0507");
 					this.riskList = list;
+					this.commpanyList();
 				}
 			},
 			syImmediate(value) {
 				if (value) {
 					this.GuidedPopShow = true;
-
 				} else {
 					let list = this.riskList.filter(item => item.riskCode !== "0510");
 					this.riskList = list;
+					this.kindList = [];
+					this.commpanyList();
 				}
 			},
 			immediatelyClick(name) {
 				this.carInfo[name] = !this.carInfo[name];
-				if (this.carInfo[name]) {
-					this.carInfo.transferDate = this.carInfo.issueDate;
-				} else {
-					this.carInfo.transferDate = "";
+				if (name == 'transferFlag') {
+					if (this.carInfo[name]) {
+						this.carInfo.transferDate = this.carInfo.issueDate;
+					} else {
+						this.carInfo.transferDate = "";
+					}
 				}
+
 			},
 			preUnderwriting(list) {
 				this.RSpreUnderwritingList = list;
@@ -2040,10 +2084,60 @@
 
 			},
 			//选择协议
-			selectConfirm(e, index) {
+			async selectConfirm(e, index) {
 				this.totalCompanyList[index].agreementId = e[0].value;
 				this.totalCompanyList[index].agreementName = e[0].label;
 				this.totalCompanyList[index].apiType = e[0].extra;
+				let ruleThirdPartyInsurance = this.kindList.find(val => val.kindCode == 'B'); //获取三者保额
+				switch (this.totalCompanyList[index].namesimple) {
+					case "大家财险":
+						let djcallback = await this.$http.post('/api/drivingInsurance/getDrivingInsuranceRule', {
+							agreementId: this.totalCompanyList[index].agreementId,
+							companyCode: this.totalCompanyList[index].id,
+							ruleSeatNum: Number(this.carInfo.seatCount),
+							ruleThirdPartyInsurance: ruleThirdPartyInsurance ? ruleThirdPartyInsurance
+								.amount : '',
+							ruleUseNature: this.carInfo.carnature,
+							kind: this.kindList,
+							risk: this.riskList,
+						});
+						if (djcallback.code == '200') {
+							let data = djcallback.data;
+							data.map(ele => {
+								ele.quantity = 1;
+								return ele;
+							})
+							if (this.totalCompanyList[index].apiType == '2') {
+								this.dajiaprogrammeData = data;
+								const defaultProject = findDefaultProject(data);
+								if (JSON.stringify(defaultProject.result) !== "{}") {
+									this.totalCompanyList[index].jychecked = true;
+									this.dajiaInsuranceData = defaultProject.list;
+									this.dajiaaccidentalDrivingVo = defaultProject.result;
+								} else {
+									this.dajiaaccidentalDrivingVo = {
+										parentCode: data[0].projectCode, //驾意险商品号
+										parentName: data[0].projectName, //驾意险商品名称
+										...data[0].children[0]
+									}
+									this.dajiaInsuranceData = data[0].children;
+								}
+							} else {
+								this.dajiaInsuranceData = data;
+								const defaultProject = findDefaultProject(data);
+								if (JSON.stringify(defaultProject.result) !== "{}") {
+									this.totalCompanyList[index].jychecked = true;
+									this.dajiaInsuranceData = defaultProject.list;
+									this.dajiaaccidentalDrivingVo = defaultProject.result;
+								} else {
+									this.dajiaInsuranceData = data;
+									this.dajiaaccidentalDrivingVo = data[0];
+								}
+							}
+						}
+						break;
+					default:
+				}
 			},
 			//国任特约
 			async guoRencontributing(id) {
@@ -2069,8 +2163,6 @@
 				})
 			},
 			priceComparisonChange(index, item) {
-				console.log(index, item);
-				this.priceCtitle = "去比价";
 				if (!item.isComparableDisabled) {
 					item.isComparableShow = !item.isComparableShow;
 					if (item.isComparableShow) {
@@ -2095,6 +2187,7 @@
 			 */
 			async checkboxChange(code, name, index) {
 				this.totalCompanyList[index].checked = !this.totalCompanyList[index].checked;
+				// let apiType = this.totalCompanyList[index].apiType;
 				let value = this.totalCompanyList[index].checked;
 				if (value) {
 					let ins = this.totalCompanyList[index].namesimple;
@@ -2106,7 +2199,7 @@
 					this.totalCompanyList[index].agreement = list;
 					this.totalCompanyList[index].agreementId = this.totalCompanyList[index].agreement[0].id;
 					this.totalCompanyList[index].agreementName = this.totalCompanyList[index].agreement[0]
-						.agreementName;
+						.businessDescription;
 					this.totalCompanyList[index].apiType = this.totalCompanyList[index].agreement[0].extra;
 					this.totalCompanyList[index].underwritingDescription = this.totalCompanyList[index].agreement[0]
 						.underwritingDescription;
@@ -2117,6 +2210,7 @@
 								agreementId: this.totalCompanyList[index].agreement[0].id,
 								companyCode: code,
 								ruleSeatNum: Number(this.carInfo.seatCount),
+								seatNum: Number(this.carInfo.seatCount),
 								ruleThirdPartyInsurance: ruleThirdPartyInsurance ? ruleThirdPartyInsurance
 									.amount : '',
 								ruleUseNature: this.carInfo.carnature,
@@ -2240,8 +2334,16 @@
 							}
 							break;
 						case '大家财险':
-							let djcallback = await this.$http.post('/api/dajia/accidentalDrivingList', {
-								agreementId: this.totalCompanyList[index].agreement[0].id
+							let apiType = this.totalCompanyList[index].apiType;
+							let djcallback = await this.$http.post('/api/drivingInsurance/getDrivingInsuranceRule', {
+								agreementId: this.totalCompanyList[index].agreement[0].id,
+								companyCode: code,
+								ruleSeatNum: Number(this.carInfo.seatCount),
+								ruleThirdPartyInsurance: ruleThirdPartyInsurance ? ruleThirdPartyInsurance
+									.amount : '',
+								ruleUseNature: this.carInfo.carnature,
+								kind: this.kindList,
+								risk: this.riskList,
 							});
 							if (djcallback.code == '200') {
 								let data = djcallback.data;
@@ -2249,13 +2351,33 @@
 									ele.quantity = 1;
 									return ele;
 								})
-								this.dajiaInsuranceData = data;
-								this.dajiaaccidentalDrivingVo = {
-									rideRiskCode: data[0].id,
-									rideRiskName: data[0].productName,
-									quantity: data[0].quantity,
-									price: data[0].price,
-								};
+								if (apiType == '2') {
+									this.dajiaprogrammeData = data;
+									const defaultProject = findDefaultProject(data);
+									if (JSON.stringify(defaultProject.result) !== "{}") {
+										this.totalCompanyList[index].jychecked = true;
+										this.dajiaInsuranceData = defaultProject.list;
+										this.dajiaaccidentalDrivingVo = defaultProject.result;
+									} else {
+										this.dajiaaccidentalDrivingVo = {
+											parentCode: data[0].projectCode, //驾意险商品号
+											parentName: data[0].projectName, //驾意险商品名称
+											...data[0].children[0]
+										}
+										this.dajiaInsuranceData = data[0].children;
+									}
+								} else {
+									this.dajiaInsuranceData = data;
+									const defaultProject = findDefaultProject(data);
+									if (JSON.stringify(defaultProject.result) !== "{}") {
+										this.totalCompanyList[index].jychecked = true;
+										this.dajiaInsuranceData = defaultProject.list;
+										this.dajiaaccidentalDrivingVo = defaultProject.result;
+									} else {
+										this.dajiaInsuranceData = data;
+										this.dajiaaccidentalDrivingVo = data[0];
+									}
+								}
 							}
 							break;
 						case '中煤财险':
@@ -2342,7 +2464,7 @@
 									kind: this.kindList,
 									risk: this.riskList,
 								});
-							if (Insurancecallback.code == 200) {
+							if (Insurancecallback.code == 200 && Insurancecallback.data.length !== 0) {
 								let data = Insurancecallback.data;
 								data.map(ele => {
 									ele.quantity = 1;
@@ -2430,16 +2552,26 @@
 				this.huanongaccidentalDrivingVo.accidentType = this.huanongaccidentalDrivingVo.planCode;
 				this.huanongPopupshow = false;
 			},
+			//大家一级选择
+			DJprogrammeradioChange(id) {
+				let info = this.dajiaprogrammeData.find((val => val.projectCode == id))
+				console.log(info);
+				this.dajiaPopupshow = false;
+				this.dajiaaccidentalDrivingVo.parentCode = info.projectCode;
+				this.dajiaaccidentalDrivingVo.parentName = info.projectName;
+				console.log(this.dajiaaccidentalDrivingVo);
+				if (info.children) {
+					this.dajiaInsuranceData = info.children;
+					Object.assign(this.dajiaaccidentalDrivingVo, info.children[0]);
+				} else {
+					this.dajiaInsuranceData = []
+				}
+			},
 			//大家意外险
 			DJradioChange(id) {
-				let info = this.dajiaInsuranceData.find(val => val.id == id)
-				this.dajiaaccidentalDrivingVo = {
-					rideRiskCode: info.id,
-					rideRiskName: info.productName,
-					quantity: info.quantity,
-					price: info.price,
-				};
-				this.dajiaPopupshow = false;
+				let info = this.dajiaInsuranceData.find((val => val.projectCode == id))
+				Object.assign(this.dajiaaccidentalDrivingVo, info);
+				this.dajiaPopupshow1 = false;
 			},
 			TPradioChange(id) {
 				this.taipingaccidentalDrivingVo = this.taipingInsuranceData.find(val => val.projectCode == id)
@@ -2491,8 +2623,10 @@
 			GRInsuranceradioChange(id) {
 				let info = this.guoRenInsuranceData.find((val => val.projectCode == id))
 				Object.assign(this.guoRenaccidentalDrivingVo, info);
+				console.log(this.guoRenaccidentalDrivingVo);
 				this.guorenPopupshow1 = false;
 			},
+			//
 			//紫金意外险
 			ZJcheckboxGroupChange(detail) {
 				this.zijinaccidentalDrivingVo = [];
@@ -2533,29 +2667,38 @@
 					})
 				}
 				// //险种合并集合
-				// const combinedArray = [
-				// 	...this.riskList.map(item => item.riskCode),
-				// 	...this.kindList.map(item => item.kindCode),
-				// ];
-				// commpanykad.data = commpanykad.data.filter(obj => {
-				// 	obj.agreement = obj.agreement.filter(agreementObj => {
-				// 		// 险种配置为空，则过滤掉该协议
-				// 		if (agreementObj.productsCodes == null) {
-				// 			return false;
-				// 		}
-				// 		return agreementObj.productsCodes.some(item => combinedArray.includes(item));
-				// 	});
-
-				// 	return obj.agreement.length > 0; // 返回true保留，返回false移除该保险公司
-				// });
+				const combinedArray = [
+					...this.riskList.map(item => item.riskCode),
+					...this.kindList.map(item => item.kindCode),
+				];
+				commpanykad.data = commpanykad.data.filter(obj => {
+					obj.agreement = obj.agreement.filter(agreementObj => {
+						agreementObj.businessDescription = agreementObj.businessDescription + "（" +
+							agreementObj.jobDescription + "）";
+						// 险种配置为空，则过滤掉该协议
+						if (agreementObj.productsCodes == null) {
+							return true;
+						} else {
+							if (combinedArray.includes('A') && !agreementObj.productsCodes.includes(
+									'A')) {
+								return false;
+							}
+							return agreementObj.productsCodes.some(item => combinedArray.includes(
+								item));
+						}
+					});
+					return obj.agreement.length > 0; // 返回true保留，返回false移除该保险公司
+				});
 				this.totalCompanyList = commpanykad.data;
 			},
 			async toNext() {
+
 				var allAreFalse = this.totalCompanyList.every(function(element) {
 					return element.checked === false;
 				});
 				if (!allAreFalse) {
-					this.priceCtitle = '比价'
+					this.comparableQuantity = 0; //报价成功总数
+					this.selectedCount = 0; //比价勾选数量
 					this.totalCompanyList.map((ele) => {
 						ele.isComparableShow = false;
 						ele.isComparableshowHide = false;
@@ -3058,6 +3201,8 @@
 			},
 			//大家报价
 			async dajia(num, id) {
+				let type = this.totalCompanyList[num].apiType;
+				let api = type == 2 ? "/insurance/crawler/quote" : "/api/dajia/quote";
 				let isTaxSource = this.totalCompanyList[num].isTaxSource;
 				let jychecked = this.totalCompanyList[num].jychecked
 				let params = {
@@ -3073,7 +3218,7 @@
 					agreementId: this.totalCompanyList[num]
 						.agreementId,
 				};
-				let res = await this.$http.post('/api/dajia/quote',
+				let res = await this.$http.post(`${api}`,
 					params);
 				this.totalCompanyList[num].msg = res.msg;
 				if (!!res.msg && res.msg.indexOf("不存在有效协议") >= 0) {
@@ -3283,7 +3428,7 @@
 					case '太平财险':
 					case '华农财险':
 					case '泰康财险':
-						if (!!res.data) {
+						if (res.code == '200') {
 							if (res.data.warnMessageList !=
 								null && res.data
 								.warnMessageList[0] != null &&
@@ -3321,7 +3466,7 @@
 						}
 						break;
 					case '众安财险':
-						if (!!res.data) {
+						if (res.code == '200') {
 							if (res.data.warnMessageList !=
 								null && res.data
 								.warnMessageList[0] != null &&

pages/index/index.vue

@@ -4,6 +4,7 @@
 			: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> -->
+
 		<!-- 状态栏 -->
 		<view class="status" :style="{position:headerPosition,backgroundColor:bgColor}"></view>
 		<!-- 漂浮头部 -->
@@ -22,6 +23,7 @@
 		</view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
+
 		<!-- 占位 -->
 		<view class="place" :style="{backgroundColor:'#fff'}"></view>
 		<!-- 实名认证提示 -->
@@ -31,7 +33,9 @@
 
 		<!-- 轮播图 -->
 		<swiper-image :resdata="swiperList" @changeEvent="swiperChange"></swiper-image>
-
+		<!-- <view class="" @click="arr">
+			321321
+		</view> -->
 		<!-- 分类轮播 -->
 		<index-nav :resdata="categoryList" :row="2"></index-nav>
 		<!-- 推荐商品 -->
@@ -69,6 +73,7 @@
 			</view>
 			<view class="loading-text">{{loadingText}}</view>
 		</view>
+
 	</view>
 </template>
 <script>
@@ -395,6 +400,11 @@
 		// 	}
 		// },
 		methods: {
+			arr() {
+				uni.navigateTo({
+					url: '/pages/ad/ad'
+				})
+			},
 			nameClick() {
 				this.navigate({
 					url: "/pages/realname/realname"

pages/login/login.vue

@@ -7,7 +7,7 @@
 		<!-- 欢迎语 -->
 		<view class="dis j-end a-c">
 			<image src="../../static/image/login/2.png" mode=""
-				style="height: 280px;width: calc(100% - 16px);margin-top: 120px;">
+				style="height: 280px;width: calc(100% - 16px);margin-top: 25%;">
 			</image>
 		</view>
 		<view class="" style="margin-top: -120px;">
@@ -788,7 +788,7 @@
 	/* 第三方登录Start */
 	.third_party_login_box {
 		position: fixed;
-		bottom: 100rpx;
+		bottom: 50rpx;
 		left: 0;
 		right: 0;
 		height: 170rpx;

pages/login/mimi.vue

@@ -219,7 +219,7 @@
 				style="font-weight: bold;text-decoration: underline;">我们目前使用了第三方的SDK，包括高德SDK
 				(获取GPS信息，用于提供附近服务门店服务，会共享您的设备信息、位置信息)、支付宝支付，SDK/微信支付SDK (用于您支付时使用，会共享您的设备信息(可能包括IMEI、IMSI、
 				设备MAC地址、AndroidID、
-				设备型号、网络类型、无线网络列表、无线网络MAC地址、无线网络名称、传感器信息、SIM序列号信息)、位信息、手机号、已安装APP信息、粘贴板)、微信分享SDK/腾讯分享SDK/友盟分享SDK
+				设备型号、网络类型、无线网络列表、无线网络MAC地址、无线网络名称、传感器信息、SIM序列号信息)、位信息、手机号、已安装APP信息、粘贴板、OAID)、微信分享SDK/腾讯分享SDK/友盟分享SDK
 				(用于微信好友、朋友圈、QQ空间、新浪微博及其他社交平台分享，会收集您的您的设备信息(可能包括IMEI、 设备MAC 地址、Android
 				ID、设备型号、无线网络MAC地址、无线网络名称、SIM序列号、手机序列号信息)、位置信息)、Talking Data SDK
 				(用于分析app崩溃情况，会收集您的您的设备信息，可能包括设备型号、崩溃日志、性能日志)、Growing 10 SDK (用于用户行为分析,根据软件情况涉及共享您使用掌柜科技过程中产生的目志数据)、极光SDK

pages/my/my.vue

@@ -302,22 +302,22 @@
 				serviceList: [{
 						image: '/static/image/my/Frame1.png',
 						text: '发票申请',
-						popup: '请加微信15513511113,联系客服操作',
+						popup: '此功能还未开放,有需要请联系客服',
 					},
 					{
 						image: '/static/image/my/Frame2.png',
 						text: '保单批改',
-						popup: '请加微信15513511113,联系客服操作',
+						popup: '此功能还未开放,有需要请联系客服',
 					},
 					{
 						image: '/static/image/my/Frame3.png',
 						text: '申请退保',
-						popup: '请加微信15513511113,联系客服操作',
+						popup: '此功能还未开放,有需要请联系客服',
 					},
 					{
 						image: '/static/image/my/Frame4.png',
 						text: '自助理赔',
-						popup: '请加微信15513511113,联系客服操作',
+						popup: '此功能还未开放,有需要请联系客服',
 					}
 				],
 				menusList: [{

pages/orders/quotation.vue

@@ -147,63 +147,7 @@
 				ownerinfo: {}, //车主信息
 				applyinfo: {}, //投保人信息
 				insureinfo: {}, //被保人信息
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "渤海财险",
-						icon: "../../static/insuranceicon/bohai.png"
-					},
-				],
+
 				logoimg: "",
 			}
 		},
@@ -238,7 +182,7 @@
 				}
 				return ele;
 			});
-			this.insCompanyList.map(ele => {
+			this.$base.insCompanyList.map(ele => {
 				if (ele.name == data.inscompany) {
 					uni.getImageInfo({
 						src: ele.icon,

pages/orders/quotation1.vue

@@ -140,59 +140,7 @@
 				ownerinfo: {}, //车主信息
 				applyinfo: {}, //投保人信息
 				insureinfo: {}, //被保人信息
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-				],
+
 				logoimg: "",
 			}
 		},
@@ -227,7 +175,7 @@
 				}
 				return ele;
 			});
-			this.insCompanyList.map(ele => {
+			this.$base.insCompanyList.map(ele => {
 				if (ele.name == data.inscompany) {
 					uni.getImageInfo({
 						src: ele.icon,

pages/orders1/orders.vue

@@ -25,6 +25,17 @@
 									</view>
 								</view>
 							</view>
+							<view class="term">
+								<text>投保险种</text>
+								<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
+									<view class="status-data"
+										:class="item.dictValue==pageRequest.productid? 'active':''"
+										v-for="(item,index) in productsTypeoptions"
+										@tap="productstatusclick(item.dictValue)" :key="index">
+										{{item.dictTag}}
+									</view>
+								</view>
+							</view>
 							<view class="term">
 								<text>保险公司</text>
 								<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
@@ -132,6 +143,7 @@
 		},
 		data() {
 			return {
+				productsTypeoptions: [],
 				show: true,
 				showDropdown: false,
 				/* 时间筛选相关 */
@@ -154,6 +166,7 @@
 					deptId: "",
 					endDate: "",
 					startDate: "",
+					productid: "",
 					pageNum: 1,
 					pageSize: 20,
 				},
@@ -275,12 +288,19 @@
 			}
 			this.getOrdersList(1, 20)
 			this.esmInsCompany()
+
+		},
+		onPullDownRefresh() {
+			this.getOrdersList(1, 20)
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		async onLoad(e) {
 			this.pageRequest.userId = this.userInfo.sysUser.id;
 			this.pageRequest.deptId = this.userInfo.sysUser.deptId;
 			this.getOrdersList(1, 20)
-
+			this.getDicType("productsType"); //车船税类型
 		},
 		methods: {
 			...mapMutations(['setOrderType', 'setOrderStage']),
@@ -293,6 +313,12 @@
 					this.totalPages = res.data.totalPages;
 				}
 			},
+			async getDicType(type) {
+				let res = await this.$http.get('/sysDict/dictDetails/' + type);
+				if (res.code == 200) {
+					this[type + 'options'] = res.data.ddList;
+				}
+			},
 			async esmInsCompany() {
 				let commpanykad = await this.$http.get('/insurance/order/getAgreementInsCompany');
 				if (commpanykad.code == '200') {
@@ -324,6 +350,10 @@
 			companystatusclick(e) {
 				this.pageRequest.companyId = e;
 			},
+			//投保险种筛选
+			productstatusclick(e) {
+				this.pageRequest.productid = e;
+			},
 			startShowmethod() {
 				this.startShow = true;
 				this.timespecifications = null;
@@ -559,7 +589,7 @@
 	}
 
 	.show1 {
-		height: 430px;
+		height: auto;
 		/* 下拉菜单遮罩最大高度 */
 	}
 

pages/orders1/paymentCode.vue

@@ -58,7 +58,7 @@
 								<text>交强险：</text>
 								<text>￥{{jqpremium}}</text>
 							</view>
-							<view class="dis j-s a-c">
+							<view v-if="taxamount" class="dis j-s a-c">
 								<text>车船税：</text>
 								<text>￥{{taxamount}}</text>
 							</view>
@@ -87,7 +87,8 @@
 			<u-button type="primary" style="background-color:#0052FF;margin-bottom: 10px;"
 				@click="sendPayCode">发送微信</u-button>
 			<!-- #endif -->
-			<u-button type="primary" style="background-color:#EAEAEA ;color: #0052FF;" @click="navOrder">返回订单</u-button>
+			<u-button type="primary" :loading="loading" style="background-color:#EAEAEA ;color: #0052FF;"
+				@click="navOrder">返回订单</u-button>
 		</view>
 	</view>
 </template>
@@ -109,6 +110,7 @@
 		},
 		data() {
 			return {
+				loading: true,
 				texts: [],
 				paycodeimg: "",
 				payImg: "",
@@ -129,63 +131,6 @@
 				sysEndDate: "",
 				arr: false,
 				posterUrl: "",
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "泰康财险",
-						icon: "../../static/insuranceicon/taikang.png"
-					},
-				],
 				logoimg: "",
 			}
 		},
@@ -197,7 +142,6 @@
 			}
 		},
 		async onLoad(data) {
-			console.log(data);
 			this.texts = [this.userLoginId]
 			if (!!data.companyId) {
 				let params = {
@@ -223,7 +167,11 @@
 						let imgBase64 = `data:image/png;base64,${result}`;
 						base64ToPath(imgBase64)
 							.then(path => {
-								this.paycodeimg = path;
+								pathToBase64(path)
+									.then(base64 => {
+										this.paycodeimg = base64;
+									})
+									.catch(error => {});
 							})
 					} else if (this.companyName == '华泰财险') {
 						switch (data.apiType) {
@@ -237,16 +185,33 @@
 								let imgBase64 = `data:image/png;base64,${result}`;
 								base64ToPath(imgBase64)
 									.then(path => {
-										this.paycodeimg = path;
+										pathToBase64(path)
+											.then(base64 => {
+												this.paycodeimg = base64;
+											})
+											.catch(error => {});
 									})
 								break;
 						}
+					} else if (this.companyName == '大家财险') {
+						switch (data.apiType) {
+							case 1:
+							case '1':
+								this.paycodeimg = QR.createQrCodeImg(res.data.qrCodeUrl, {
+									size: parseInt(300) //二维码大小  
+								})
+								break;
+							case 2:
+							case '2':
+								this.paycodeimg = res.data.qrCodeUrl;
+								break;
+						}
 					} else {
 						this.paycodeimg = QR.createQrCodeImg(res.data.qrCodeUrl, {
 							size: parseInt(300) //二维码大小  
 						})
 					}
-					this.insCompanyList.map(ele => {
+					this.$base.insCompanyList.map(ele => {
 						if (ele.name == res.data.inscompany) {
 							uni.getImageInfo({
 								src: ele.icon,
@@ -293,7 +258,6 @@
 			sendPayCode() {
 				// var that = this;
 				// this.canvasPayImage();
-				console.log(this.payImg);
 				if (this.payImg) {
 					uni.share({
 						provider: "weixin",
@@ -360,8 +324,7 @@
 				const imageStr = this.posterUrl;
 				// 将base64转化为临时地址
 				base64ToPath(imageStr).then(path => {
-					console.log(path);
-					this.payImg = path
+					this.payImg = path;
 				}).catch(error => {
 					console.log(error);
 				});
@@ -373,6 +336,7 @@
 			},
 			hideLoading() {
 				uni.hideLoading();
+				this.loading = false;
 			},
 
 		}

pages/orders1/paymentCode1.vue

@@ -60,11 +60,12 @@
 			</view>
 		</view>
 		<!-- #ifdef APP-PLUS -->
-		<u-button type="primary" style="width: 100%;background: #2D4D89;" @click="sendPayCode">发送到微信</u-button>
+		<u-button type="primary" :loading="loading" style="width: 100%;background: #2D4D89;"
+			@click="sendPayCode">发送到微信</u-button>
 		<!-- #endif -->
 		<u-button class="tip" type="default" :hair-line="false"
 			style="color: #2D4D89;background: #EAEDF1;font-weight: bold;border: none;" @click="navOrder">返回订单</u-button>
-		<canvas id="mycanvas" ref="mycanvas" canvas-id="mycanvas" style="width: 1080px;height: 1680px;"></canvas>
+		<!-- <canvas id="mycanvas" ref="mycanvas" canvas-id="mycanvas" style="width: 1080px;height: 1680px;"></canvas> -->
 	</view>
 </template>
 <script>
@@ -80,6 +81,7 @@
 	export default {
 		data() {
 			return {
+				loading: true,
 				paycodeimg: "",
 				payImg: "",
 				endDateTime: "",
@@ -99,63 +101,6 @@
 				sysEndDate: "",
 				arr: false,
 				posterUrl: "",
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "泰康财险",
-						icon: "../../static/insuranceicon/taikang.png"
-					},
-				],
 				logoimg: "",
 			}
 		},
@@ -191,7 +136,11 @@
 						let imgBase64 = `data:image/png;base64,${result}`;
 						base64ToPath(imgBase64)
 							.then(path => {
-								this.paycodeimg = path;
+								pathToBase64(path)
+									.then(base64 => {
+										this.paycodeimg = base64;
+									})
+									.catch(error => {});
 							})
 					} else if (this.companyName == '华泰财险') {
 						switch (data.apiType) {
@@ -205,16 +154,33 @@
 								let imgBase64 = `data:image/png;base64,${result}`;
 								base64ToPath(imgBase64)
 									.then(path => {
-										this.paycodeimg = path;
+										pathToBase64(path)
+											.then(base64 => {
+												this.paycodeimg = base64;
+											})
+											.catch(error => {});
 									})
 								break;
 						}
+					} else if (this.companyName == '大家财险') {
+						switch (data.apiType) {
+							case 1:
+							case '1':
+								this.paycodeimg = QR.createQrCodeImg(res.data.qrCodeUrl, {
+									size: parseInt(300) //二维码大小  
+								})
+								break;
+							case 2:
+							case '2':
+								this.paycodeimg = res.data.qrCodeUrl;
+								break;
+						}
 					} else {
 						this.paycodeimg = QR.createQrCodeImg(res.data.qrCodeUrl, {
 							size: parseInt(300) //二维码大小  
 						})
 					}
-					this.insCompanyList.map(ele => {
+					this.$base.insCompanyList.map(ele => {
 						if (ele.name == res.data.inscompany) {
 							uni.getImageInfo({
 								src: ele.icon,
@@ -318,7 +284,7 @@
 			// },
 			navOrder() {
 				this.navigate({
-					url: "/pages/orders/orders"
+					url: "/pages/orders1/orders"
 				}, "switchTab", true);
 			},
 			//页面截图转路径
@@ -337,6 +303,7 @@
 			},
 			hideLoading() {
 				uni.hideLoading();
+				this.loading = false;
 			},
 
 		}

pages/orders1/priceComparison.vue

@@ -1,11 +1,10 @@
 <template>
 	<view style="height: 100vh;position: relative;">
 		<view class="page" id="panelcanvas">
-			<image src="../../static/image/car-insure/bijiadan.png" mode=""
-				style="width: 100%;height: 450px;position: absolute;"></image>
+			<image :src="bannerImg" mode="" style="width: 100%;height: 450px;position: absolute;"></image>
 			<view class="content">
 				<view class="price dis a-c j-c">
-					<image src="../../static/image/car-insure/bijia.png" mode="" style="width: 20px;height: 20px;">
+					<image :src="iconImg" mode="" style="width: 20px;height: 20px;">
 					</image>
 					<text style="font-weight: bold;margin-left: 6px; font-size: 16px;">比价报价单</text>
 				</view>
@@ -26,7 +25,11 @@
 					</view>
 					<view class="dis j-s a-c">
 						<text>品牌型号：</text>
-						<text>{{ insOrderVo.brandName}}</text>
+						<text>{{ insOrderVo.modelcname}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>车架号：</text>
+						<text>{{ insOrderVo.frameNo}}</text>
 					</view>
 					<view class="dis j-s a-c">
 						<text>发动机号：</text>
@@ -68,19 +71,19 @@
 					<text class="title">保费信息</text>
 					<view class="dis j-start a-c" v-if="insOrderVo.jqstartDate">
 						<text>交强起保日期：</text>
-						<text>{{ insOrderVo.jqstartDate}}</text>
+						<text style="letter-spacing: 1px;">{{ insOrderVo.jqstartDate}}</text>
 					</view>
 					<view class="dis j-start a-c" v-if="insOrderVo.jqendDate">
 						<text>交强终保日期：</text>
-						<text>{{ insOrderVo.jqendDate}}</text>
+						<text style="letter-spacing: 1px;">{{ insOrderVo.jqendDate}}</text>
 					</view>
 					<view class="dis j-start a-c" v-if="insOrderVo.systartDate">
 						<text>商业起保日期：</text>
-						<text>{{ insOrderVo.systartDate}}</text>
+						<text style="letter-spacing: 1px;">{{ insOrderVo.systartDate}}</text>
 					</view>
 					<view class="dis j-start a-c" v-if="insOrderVo.syendDate">
 						<text>商业终保日期：</text>
-						<text>{{ insOrderVo.syendDate}}</text>
+						<text style="letter-spacing: 1px;">{{ insOrderVo.syendDate}}</text>
 					</view>
 				</view>
 				<view class="information1" v-for="(item,index) in subOrderVos" :key="index">
@@ -197,8 +200,7 @@
 					</view>
 				</view>
 				<view class="massage dis a-c j-start">
-					<image src="../../static/image/car-insure/jianyitoubao.png" mode=""
-						style="width: 105px;height: 25px;"></image>
+					<image :src="jianyitoubaoImg" mode="" style="width: 105px;height: 25px;"></image>
 					<text>{{companyName}}， 报价最低！</text>
 				</view>
 			</view>
@@ -229,6 +231,9 @@
 				subOrderVos: [],
 				parityPriceVo: [],
 				companyName: "",
+				bannerImg: "",
+				iconImg: "",
+				jianyitoubaoImg: "",
 			}
 		},
 		computed: {
@@ -241,7 +246,6 @@
 				subOrderNos: item,
 			}
 			let res = await this.$http.post('/insurance/order/getInquiryDetalsBySubOrderNos', params);
-			console.log(res);
 			if (res.code == '200') {
 				res.data.subOrderVos.map(val => {
 					val.kindinfo.map((ele, index) => {
@@ -275,6 +279,39 @@
 				this.parityPriceVo = res.data.parityPriceVo;
 
 			}
+			uni.getImageInfo({
+				src: '../../static/image/car-insure/bijiadan.png',
+				success: image => {
+					pathToBase64(image.path)
+						.then(base64 => {
+							this.bannerImg = base64;
+						})
+						.catch(error => {});
+				},
+				fail: err => {}
+			});
+			uni.getImageInfo({
+				src: '../../static/image/car-insure/bijia.png',
+				success: image => {
+					pathToBase64(image.path)
+						.then(base64 => {
+							this.iconImg = base64;
+						})
+						.catch(error => {});
+				},
+				fail: err => {}
+			});
+			uni.getImageInfo({
+				src: '../../static/image/car-insure/jianyitoubao.png',
+				success: image => {
+					pathToBase64(image.path)
+						.then(base64 => {
+							this.jianyitoubaoImg = base64;
+						})
+						.catch(error => {});
+				},
+				fail: err => {}
+			});
 
 		},
 		methods: {

pages/orders1/quotation.vue

@@ -25,7 +25,7 @@
 					</view>
 					<view class="dis j-s a-c">
 						<text>品牌型号：</text>
-						<text>{{dataInfo.orderno}}</text>
+						<text>{{carinfo.modelcname}}</text>
 					</view>
 					<view class="dis j-s a-c">
 						<text>发动机号：</text>
@@ -71,8 +71,10 @@
 							<text>￥{{dataInfo.jqpremium}}</text>
 						</view>
 						<view class="dis f-c">
-							<text style="color: rgba(35,40,50,0.9);">起保日期：{{dataInfo.jqstartdate}}</text>
-							<text style="color: rgba(35,40,50,0.9);">终保日期：{{dataInfo.jqenddate}}</text>
+							<text
+								style="color: rgba(35,40,50,0.9);letter-spacing: 1px;">起保日期：{{dataInfo.jqstartdate}}</text>
+							<text
+								style="color: rgba(35,40,50,0.9);letter-spacing: 1px;">终保日期：{{dataInfo.jqenddate}}</text>
 						</view>
 						<view class="dis f-c" style="background-color: #F9F9F9;border-radius: 10px;padding: 6px;">
 							<view class="dis j-s a-c" style="border-bottom: 1px solid #f2f2f2;">
@@ -96,8 +98,10 @@
 							<text>￥{{dataInfo.sypremium}}</text>
 						</view>
 						<view class="dis f-c">
-							<text style="color: rgba(35,40,50,0.9);">起保日期：{{dataInfo.systartdate}}</text>
-							<text style="color: rgba(35,40,50,0.9);">终保日期：{{dataInfo.syenddate}}</text>
+							<text
+								style="color: rgba(35,40,50,0.9);letter-spacing: 1px;">起保日期：{{dataInfo.systartdate}}</text>
+							<text
+								style="color: rgba(35,40,50,0.9);letter-spacing: 1px;">终保日期：{{dataInfo.syenddate}}</text>
 						</view>
 						<view class=" dis j-s f-c p-2"
 							style="border: none;background-color: #F9F9F9;border-radius: 10px;">
@@ -179,7 +183,8 @@
 			<kxj-watermark type="fixation" color="#333" :texts="texts" :count="12"></kxj-watermark>
 		</view>
 		<view class="fixed-bottom">
-			<u-button type="primary" style="background-color:#0052FF ;" @tap="sendPayCode">发送微信</u-button>
+			<u-button type="primary" :loading="loading" style="background-color:#0052FF;"
+				@tap="sendPayCode">发送微信</u-button>
 		</view>
 	</view>
 </template>
@@ -200,6 +205,7 @@
 		},
 		data() {
 			return {
+				loading: true,
 				bannerImg: '',
 				texts: [],
 				payImg: "",
@@ -212,67 +218,6 @@
 				ownerinfo: {}, //车主信息
 				applyinfo: {}, //投保人信息
 				insureinfo: {}, //被保人信息
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "渤海财险",
-						icon: "../../static/insuranceicon/bohai.png"
-					},
-					{
-						name: "泰康财险",
-						icon: "../../static/insuranceicon/taikang.png"
-					},
-				],
 				logoimg: "",
 			}
 		},
@@ -312,7 +257,7 @@
 				}
 				return ele;
 			});
-			this.insCompanyList.map(ele => {
+			this.$base.insCompanyList.map(ele => {
 				if (ele.name == data.inscompany) {
 					uni.getImageInfo({
 						src: ele.icon,
@@ -333,17 +278,6 @@
 			this.ownerinfo = data.ownerinfo;
 			this.applyinfo = data.applyinfo;
 			this.insureinfo = data.insureinfo;
-			uni.getImageInfo({
-				src: '../../static/icon/bjdcar.png',
-				success: image => {
-					pathToBase64(image.path)
-						.then(base64 => {
-							this.caricon = base64
-						})
-						.catch(error => {});
-				},
-
-			});
 			uni.getImageInfo({
 				src: '../../static/image/car-insure/baojiadan.png',
 				success: image => {
@@ -402,7 +336,6 @@
 				const imageStr = this.posterUrl;
 				// 将base64转化为临时地址
 				base64ToPath(imageStr).then(path => {
-					console.log(path);
 					this.payImg = path
 				}).catch(error => {
 					console.log(error);
@@ -416,6 +349,7 @@
 
 			hideLoading() {
 				uni.hideLoading();
+				this.loading = false;
 			},
 		},
 	}

pages/orders1/quotation1.vue

@@ -44,11 +44,11 @@
 				</view>
 				<view class="circulate-data dis a-c " v-if="dataInfo.jqstartdate">
 					<text>交强投保时间：</text>
-					<text>{{ dataInfo.jqstartdate }}</text>
+					<text style="letter-spacing: 1px;">{{ dataInfo.jqstartdate }}</text>
 				</view>
 				<view class="circulate-data dis a-c " v-if="dataInfo.systartdate">
 					<text>商业投保时间：</text>
-					<text>{{ dataInfo.systartdate }}</text>
+					<text style="letter-spacing: 1px;">{{ dataInfo.systartdate }}</text>
 				</view>
 				<view class="coverage dis j-s f-c" style="border: none;" v-if="dataInfo.sypremium">
 					<view class="coverage-title dis">
@@ -116,7 +116,8 @@
 			</view>
 		</view>
 		<view class=" dis a-c j-s" style="padding: 16px;">
-			<u-button type="primary" style="width: 100%;background: #2D4D89;" @click="sendPayCode">发送到微信</u-button>
+			<u-button type="primary" :loading="loading" style="width: 100%;background: #2D4D89;"
+				@click="sendPayCode">发送到微信</u-button>
 			<!-- <button type="default" @tap="sendPayCode">发送到微信</button> -->
 		</view>
 	</view>
@@ -130,6 +131,7 @@
 	export default {
 		data() {
 			return {
+				loading: true,
 				payImg: "",
 				posterUrl: "",
 				caricon: "", //carlogo
@@ -140,63 +142,6 @@
 				ownerinfo: {}, //车主信息
 				applyinfo: {}, //投保人信息
 				insureinfo: {}, //被保人信息
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "泰康财险",
-						icon: "../../static/insuranceicon/taikang.png"
-					},
-				],
 				logoimg: "",
 			}
 		},
@@ -231,7 +176,7 @@
 				}
 				return ele;
 			});
-			this.insCompanyList.map(ele => {
+			this.$base.insCompanyList.map(ele => {
 				if (ele.name == data.inscompany) {
 					uni.getImageInfo({
 						src: ele.icon,
@@ -313,6 +258,7 @@
 
 			hideLoading() {
 				uni.hideLoading();
+				this.loading = false;
 			},
 		},
 	}

pages/orders1/quoteHistory.vue

@@ -332,7 +332,9 @@
 						}
 						break;
 					case "大家财险":
-						let djres = await this.$http.post('/api/dajia/verifyPayment', {
+						let djapi = item.apiType == '2' ? '/insurance/crawler/auditStatusQuery' :
+							'/api/dajia/verifyPayment';
+						let djres = await this.$http.post(`${djapi}`, {
 							companyId: id
 						});
 						if (djres.code == '200') {
@@ -345,7 +347,7 @@
 						} else {
 							uni.showToast({
 								title: djres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;
@@ -429,8 +431,10 @@
 						}
 						break;
 					case "大家财险":
-						let djres = await this.$http.post('/api/dajia/verifyPayment', {
-							companyId: id
+						let djapi = item.apiType == '2' ? '/insurance/crawler/verifyPayment' :
+							'/api/dajia/verifyPayment';
+						let djres = await this.$http.post(`${djapi}`, {
+							[item.apiType == 2 ? "subOrderNo" : "companyId"]: id
 						});
 						if (djres.code == '200') {
 							uni.showToast({
@@ -442,7 +446,7 @@
 						} else {
 							uni.showToast({
 								title: djres.msg,
-								icon: 'error',
+								icon: 'none',
 							});
 						}
 						break;

pages/orders1/subOrders.vue

@@ -323,7 +323,9 @@
 						}
 						break;
 					case "大家财险":
-						let djres = await this.$http.post('/api/dajia/verifyPayment', {
+						let djapi = item.apiType == '2' ? '/insurance/crawler/auditStatusQuery' :
+							'/api/dajia/verifyPayment';
+						let djres = await this.$http.post(`${djapi}`, {
 							companyId: id
 						});
 						if (djres.code == '200') {
@@ -419,8 +421,10 @@
 						}
 						break;
 					case "大家财险":
-						let djres = await this.$http.post('/api/dajia/verifyPayment', {
-							companyId: id
+						let djapi = item.apiType == '2' ? '/insurance/crawler/verifyPayment' :
+							'/api/dajia/verifyPayment';
+						let djres = await this.$http.post(`${djapi}`, {
+							[item.apiType == 2 ? "subOrderNo" : "companyId"]: id
 						});
 						if (djres.code == '200') {
 							uni.showToast({
@@ -437,9 +441,9 @@
 						}
 						break;
 					case "华泰财险":
-						let api = item.apiType == '2' ? '/insurance/crawler/verifyPayment' :
+						let htapi = item.apiType == '2' ? '/insurance/crawler/verifyPayment' :
 							'/order/huaTaiApi/paymentEnquiry';
-						let htres = await this.$http.post(`${api}`, {
+						let htres = await this.$http.post(`${htapi}`, {
 							[item.apiType == 2 ? "subOrderNo" : "companyId"]: id
 						});
 						if (htres.code == '200') {

pages/register/orderissuer.vue

@@ -54,9 +54,9 @@
 				:class="{'main-bf-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
 				style="letter-spacing: 20rpx;">注册</button>
 
-			<view class="d-flex a-center j-center my-3">
+			<!-- <view class="d-flex a-center j-center my-3">
 				已有帐号？<view class="main-text-color" @tap="navigate({url:'/pages/login/login'},'reLaunch')">去登录</view>
-			</view>
+			</view> -->
 		</view>
 
 	</view>

pages/register/register.vue

@@ -67,9 +67,9 @@
 					:class="{'bg-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
 					style="letter-spacing: 20rpx;">注册</button>
 
-				<view class="d-flex a-center j-center my-3">
+				<!-- <view class="d-flex a-center j-center my-3">
 					已有帐号？<view class="text-color" @tap="navigate({url:'/pages/login/login'},'reLaunch')">去登录</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 

pages/tools/customer/customer.vue

@@ -92,63 +92,7 @@
 	export default {
 		data() {
 			return {
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "渤海财险",
-						icon: "../../../static/insuranceicon/bohai.png"
-					},
-				],
+
 				show: true,
 				showDropdown: false,
 				/* 时间筛选相关 */
@@ -225,7 +169,7 @@
 				let res = await this.$http.post('/insurance/order/getExpirationInsure', this.pageRequest);
 				if (res.code == '200') {
 					let data = res.data.records;
-					this.insCompanyList.map(val => {
+					this.$base.insCompanyList.map(val => {
 						data.map(ele => {
 							if (ele.insCompany == val.name) {
 								ele.iconImg = val.icon;

pages/tools/customer/custormerDetail.vue

@@ -769,63 +769,7 @@
 				toolPopupshow: false, //底部弹窗
 				agree: false,
 				logoimg: "",
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "渤海财险",
-						icon: "../../static/insuranceicon/bohai.png"
-					},
-				],
+
 				companyId: "", //订单号
 				orderInfo: {},
 				licenseNo: "", //车牌号
@@ -1330,7 +1274,7 @@
 					this.orderInfo = {};
 					Object.assign(this.orderInfo, res.data)
 					this.imageEcho(this.quoteno) // 影像获取完毕
-					this.insCompanyList.map(ele => {
+					this.$base.insCompanyList.map(ele => {
 						if (ele.name == res.data.inscompany) {
 							uni.getImageInfo({
 								src: ele.icon,

pages/wallet/bankCard.vue

@@ -17,11 +17,7 @@
 					</view>
 				</view>
 				<view class="bank dis j-s a-c">
-					<view>{{item.bankNumber.slice(0,4)}}</view>
-					<view>{{item.bankNumber.slice(4,8)}}</view>
-					<view>{{item.bankNumber.slice(8,12)}}</view>
-					<view>{{item.bankNumber.slice(12,16)}}</view>
-					<view>{{item.bankNumber.slice(-3)}}</view>
+					<view v-for="(item,index) in item.bankArray" :key="index">{{item}}</view>
 				</view>
 			</view>
 			<view v-if="current==1 && item.delFlag==0" class="bankClass dis a-start f-c j-s"
@@ -38,19 +34,13 @@
 						</view>
 					</view>
 					<view class="dis ">
-						<image class="tool" src="/static/image/bindBank/xiugai.png" style="margin-right: 12px;" mode=""
-							@click="update(item.id)">
-						</image>
+
 						<image class="tool" src="/static/image/bindBank/del.png" mode="" @click="del(item.id)">
 						</image>
 					</view>
 				</view>
 				<view class="bank dis j-s a-c">
-					<view>{{item.bankNumber.slice(0,4)}}</view>
-					<view>{{item.bankNumber.slice(4,8)}}</view>
-					<view>{{item.bankNumber.slice(8,12)}}</view>
-					<view>{{item.bankNumber.slice(12,16)}}</view>
-					<view>{{item.bankNumber.slice(-3)}}</view>
+					<view v-for="(item,index) in item.bankArray" :key="index">{{item}}</view>
 				</view>
 			</view>
 			<view class="" v-if="current==2" v-for="(item,index) in cardPackList3" :key="index">
@@ -76,11 +66,7 @@
 						</view>
 					</view>
 					<view class="bank dis j-s a-c">
-						<view>{{item.bankNumber.slice(0,4)}}</view>
-						<view>{{item.bankNumber.slice(4,8)}}</view>
-						<view>{{item.bankNumber.slice(8,12)}}</view>
-						<view>{{item.bankNumber.slice(12,16)}}</view>
-						<view>{{item.bankNumber.slice(-3)}}</view>
+						<view v-for="(item,index) in item.bankArray" :key="index">{{item}}</view>
 					</view>
 				</view>
 			</view>
@@ -103,12 +89,12 @@
 						<text>请填写本人的银行卡信息</text>
 					</view>
 					<view class="formInfo">
-						<u-field v-model="form.bankNumber" @blur="validateBankCard" :field-style="{textAlign:'right'}"
-							label="银行卡" placeholder="请输入银行卡卡号">
-						</u-field>
 						<u-field v-model="form.realUserName" :field-style="{textAlign:'right'}" label="本人姓名"
 							placeholder="输入真实姓名">
 						</u-field>
+						<u-field v-model="form.bankNumber" @blur="validateBankCard" :field-style="{textAlign:'right'}"
+							label="银行卡号" placeholder="请输入银行卡卡号">
+						</u-field>
 						<u-field @click="showAction" v-model="form.bankAccount" :field-style="{textAlign:'right'}"
 							label="选择银行" placeholder="点击选择银行">
 						</u-field>
@@ -322,17 +308,34 @@
 		onShow() {
 			this.getcardPack(); //获取卡包
 		},
+		watch: {
+			"form.bankNumber": {
+				handler(val) {
+					if (val) {
+						this.form.bankNumber = val.replace(/\s/g, "");
+					}
+				},
+			},
+		},
 		onLoad() {},
 		methods: {
 			async updateSubmit() {
+				if (!this.form.bankNumber || !this.form.realUserName || !this.form.bankAccount || !this.form
+					.bankAddress) {
+					return uni.showToast({
+						title: '信息不完整',
+						duration: 2000,
+						icon: "none"
+					});
+				}
 				let res = await this.$http.put('/userBank/update', this.form);
 				if (res.code == '200') {
-					this.promptShow = false;
 					uni.showToast({
 						title: res.msg,
 						icon: "none"
 					});
-
+					this.promptShow = false;
+					this.getcardPack();
 				} else {
 					uni.showToast({
 						title: res.msg,
@@ -364,17 +367,6 @@
 						});
 					})
 			},
-			async update(id) {
-				let res = await this.$http.get('/userBank/getByBankId?id=' + id);
-				if (res.code == '200') {
-					this.form.id = res.data.id;
-					this.form.bankNumber = res.data.bankNumber;
-					this.form.realUserName = res.data.realUserName;
-					this.form.bankAccount = res.data.bankAccount;
-					this.form.bankAddress = res.data.bankAddress;
-					this.promptShow = true;
-				}
-			},
 			change(index) {
 				this.current = index;
 			},
@@ -398,6 +390,11 @@
 								background: 'linear-gradient(90deg, rgba(229, 166,0,0.7) 0%, #e5a600 100%)',
 							}
 						}
+						const resultArray = [];
+						for (let i = 0; i < val.bankNumber.length; i += 4) {
+							resultArray.push(val.bankNumber.substring(i, i + 4));
+						}
+						val.bankArray = resultArray;
 						switch (val.auditStatus) {
 							case "0":
 								list1.push(val);

pages/wallet/billInfo.vue

@@ -94,6 +94,11 @@
 						<text>到账银行：</text>
 						<text>{{MoneyData.bankAccount}}</text>
 					</view>
+					<view class="dis j-s a-c" v-if="MoneyData.bankReceipt">
+						<text>银行回单：</text>
+						<image :src="MoneyData.bankReceipt" mode="" style="width: 150px;height: 100px;"
+							@click="closeImage(MoneyData.bankReceipt)"></image>
+					</view>
 				</template>
 				<template v-if="detailsType==4">
 					<view class="dis j-s a-c" v-if="refundData.transactionNumber">
@@ -152,6 +157,8 @@
 					case '3':
 						let res = await this.$http.get('/sysUserAccount/findDetailById?id=' + params.id);
 						this.MoneyData = res.data;
+						this.MoneyData.bankReceipt = this.$base.baseUrl + this.MoneyData.bankReceipt
+						console.log(this.MoneyData.bankReceipt)
 						this.numList = res.data.record;
 						const filteredArray = this.numList.filter(item => item.processingStatusFlag === true).length -
 							1;;
@@ -170,6 +177,11 @@
 		},
 		onShow() {},
 		methods: {
+			closeImage(img) {
+				uni.previewImage({
+					urls: [img],
+				});
+			},
 			// 绑定银行卡界面
 			async changeBank() {
 				let res = await this.$http.post('/userBank/getUserBankList', {

pages/wallet/billInfo1.vue

@@ -850,67 +850,7 @@
 				toolPopupshow: false, //底部弹窗
 				agree: false,
 				logoimg: "",
-				insCompanyList: [{
-						name: "中煤财险",
-						icon: "../../static/insuranceicon/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "../../static/insuranceicon/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "../../static/insuranceicon/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "../../static/insuranceicon/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "../../static/insuranceicon/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "../../static/insuranceicon/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "../../static/insuranceicon/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "../../static/insuranceicon/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "../../static/insuranceicon/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "../../static/insuranceicon/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "../../static/insuranceicon/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "../../static/insuranceicon/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "../../static/insuranceicon/huanong.png"
-					},
-					{
-						name: "渤海财险",
-						icon: "../../static/insuranceicon/bohai.png"
-					},
-					{
-						name: "泰康财险",
-						icon: "../../static/insuranceicon/taikang.png"
-					},
-				],
+
 				companyId: "", //订单号
 				orderInfo: {},
 				licenseNo: "", //车牌号
@@ -1429,7 +1369,7 @@
 					this.orderInfo = {};
 					Object.assign(this.orderInfo, res.data)
 					this.imageEcho(this.quoteno) // 影像获取完毕
-					this.insCompanyList.map(ele => {
+					this.$base.insCompanyList.map(ele => {
 						if (ele.name == res.data.inscompany) {
 							uni.getImageInfo({
 								src: ele.icon,

pages/wallet/bindBank.vue

@@ -7,11 +7,11 @@
 				<text>请填写本人的银行卡信息</text>
 			</view>
 			<view class="formInfo">
+				<u-field v-model="realUserName" :field-style="{textAlign:'right'}" label="本人姓名" placeholder="输入真实姓名">
+				</u-field>
 				<u-field v-model="accountno" @blur="validateBankCard" :field-style="{textAlign:'right'}" label="银行卡"
 					placeholder="请输入银行卡卡号">
 				</u-field>
-				<u-field v-model="realUserName" :field-style="{textAlign:'right'}" label="本人姓名" placeholder="输入真实姓名">
-				</u-field>
 				<u-field @click="showAction" v-model="bankname" :field-style="{textAlign:'right'}" label="选择银行"
 					placeholder="点击选择银行">
 				</u-field>
@@ -153,24 +153,17 @@
 			...mapState(['userInfo'])
 		},
 		watch: {
-			bankname(val) {
-				this.OnBtnChange();
-			},
-			accountno(val) {
-				this.OnBtnChange();
+			"accountno": {
+				handler(val) {
+					if (val) {
+						this.accountno = val.replace(/\s/g, "");
+					}
+				},
 			},
 		},
 		methods: {
 			...mapMutations(['setUserModules']),
 			// 改变按钮状态
-
-			OnBtnChange() {
-				if (this.accountno && this.bankname) {
-					this.disabled = false;
-					return;
-				}
-				this.disabled = true;
-			},
 			confirm(e) {
 				this.bankname = e[0].label;
 			},
@@ -183,7 +176,6 @@
 				that.bankname = "";
 				await bankBin.getBankBin(this.accountno)
 					.then((data) => {
-						console.log(data);
 						that.bankname = data.bankName;
 						that.validateBankCardStatus = true;
 						return true;
@@ -197,7 +189,7 @@
 					})
 			},
 			async submit() {
-				if (!this.bankname || !this.accountno) {
+				if (!this.bankname || !this.accountno || !this.realUserName || !this.bankAddress) {
 					return uni.showToast({
 						title: '信息不完整',
 						duration: 2000,
@@ -210,6 +202,8 @@
 					"bankAccount": this.bankname,
 					"bankAddress": this.bankAddress,
 					"isDefault": 0,
+					"userId": this.userInfo.sysUser.id,
+					"userName": this.userInfo.sysUser.name
 				}
 				let res = await this.$http.post('/userBank/insertByBankNumber', params);
 				if (res.code == '200') {

pages/wallet/transactionDetails.vue

@@ -89,11 +89,23 @@
 							<image src="/static/image/wallet/shouxu.png" mode="">
 							</image>
 							<text style="margin-left: 5px;font-size: 14px;color: #333;">车险</text>
+							<image v-if="item.checkStatus==1" src="/static/image/wallet/zidong.png" mode=""
+								style="margin-left: 20px;width: 20px;height: 20px;">
+							</image>
+							<image v-else src="/static/image/wallet/rengong.png" mode=""
+								style="margin-left: 20px;width: 20px;height: 20px;">
+							</image>
 						</view>
 						<view class="dis a-c" v-if="item.transactionType==2">
 							<image src="/static/image/wallet/tuiguang.png" mode="">
 							</image>
 							<text style="margin-left: 5px;font-size: 14px;color: #333;">推广</text>
+							<image v-if="item.checkStatus==1" src="/static/image/wallet/zidong.png" mode=""
+								style="margin-left: 20px;width: 20px;height: 20px;">
+							</image>
+							<image v-else src="/static/image/wallet/rengong.png" mode=""
+								style="margin-left: 20px;width: 20px;height: 20px;">
+							</image>
 						</view>
 						<view class="dis a-c" v-if="item.transactionType==3">
 							<image src="/static/image/wallet/tixian.png" mode="">
@@ -103,6 +115,7 @@
 								v-if="item.auditingStatus!='驳回'">{{item.auditingStatus}}</text>
 							<text style="margin-left: 5px;font-size: 24rpx;color: #FF5600;"
 								v-if="item.auditingStatus=='驳回'">{{item.auditingStatus}}</text>
+
 						</view>
 						<view class="dis a-c" v-if="item.transactionType==4">
 							<image src="/static/image/wallet/tuikuan.png" mode="">

pages/wallet/withdraw.vue

@@ -269,7 +269,7 @@
 			},
 			//全部提现
 			getAll() {
-				this.extract = parseInt(this.amount);
+				this.extract = this.amount;
 				this.checkMoney();
 			},
 			//提现