231321321

androidPrivacy.json

@@ -1,3 +1,3 @@
 {
-    "prompt" : "none"
+    "prompt" : "template"
 }

config/baseUrl.js

@@ -3,12 +3,12 @@ let h5BaseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://192.168.0.103:8080"; //屈晨
+	baseUrl = "http://192.168.0.103:8080"; //屈晨
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {

pages.json

@@ -1015,6 +1015,17 @@
 
 			}
 		},
+		{
+			"path": "pages/orders1/priceComparison",
+			"style": {
+				"navigationBarTitleText": "报价单",
+				"navigationBarBackgroundColor": "#CDEFF4",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+
+			}
+		},
+
 		{
 			"path": "pages/orders1/orders",
 			"style": {

pages/carInsure2/quote.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="getHeight" class="page">
+	<view class="page">
 		<!-- 头部 -->
 		<view class="car-header dis a-c">
 			<image src="/static/image/car-insure/Group.png" mode="" style="width: 40px;height: 40px;"></image>
@@ -94,10 +94,6 @@
 			<view class="quoteCompany mt-3">
 				<view class="header dis a-c">
 					<view class="title  d-flex">保险公司</view>
-					<view class="Discount dis a-c " style="margin-left: 10px;">
-						<image src="/static/image/car-insure/youhui.png" mode=""></image>
-						<text style="margin-left: 3px;">优惠金额</text>
-					</view>
 					<!-- 	<view class="">
 						<u-checkbox v-model="Selectchecked" @change="SelectAll($event)"
 							active-color="rgb(250, 53, 52)">全选</u-checkbox>
@@ -110,9 +106,10 @@
 								<view class="companyIcon dis j-s a-c"
 									@tap="checkboxChange(totalitem.id,totalitem.cnName, totalindex)">
 									<view class="dis a-c">
-										<!-- <u-checkbox
-											@change="event=>checkboxChange(event,totalitem.id,totalitem.cnName, totalindex)"
-											v-model="totalitem.checked" active-color="rgb(250, 53, 52)"></u-checkbox> -->
+										<u-checkbox @change="priceComparisonChange(totalindex,totalitem)"
+											v-if="totalitem.isComparableshowHide" v-model="totalitem.isComparableShow"
+											active-color="#23C1CB"
+											:disabled='totalitem.isComparableDisabled'></u-checkbox>
 										<image :src="totalitem.logo"></image>
 										<view class="companyName">{{totalitem.namesimple}}</view>
 									</view>
@@ -121,10 +118,8 @@
 									<!-- 价格 -->
 									<view class="dis a-c" v-if="totalitem.quoteCode==200">
 										<view class="dis a-c" style="margin-right: 10px;">
-											<image src="/static/image/car-insure/youhui.png" mode=""
-												style="width: 16px;height: 16px;margin-right: 0;"></image>
 											<text style="color: #FF4D4D;font-size: 12px;"
-												v-if="totalitem.result.sumExportFee">￥{{totalitem.result.sumExportFee}}</text>
+												v-if="totalitem.result.sumExportFee">优惠金额￥{{totalitem.result.sumExportFee}}</text>
 										</view>
 										<text class="sum">￥{{totalitem.result.sumPermium}}</text>
 									</view>
@@ -891,9 +886,27 @@
 				<text>将跳转至保险配置页面添加或修改商业险</text>
 			</view>
 		</u-modal>
+		<u-modal v-model="priceComparisonShow" title="比价提醒"
+			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
+			:show-cancel-button="false"
+			:confirm-style="{background:'#E6EEFF',color:'#0052FF',height:'40px',lineHeight:'40px'}"
+			@confirm="priceComparisonShow=false">
+			<view class="slot-content dis j-c a-c  ">
+				<view class="p-2">
+					<text>可选择有报价结果的公司进行比价 最少选择两家，最多可选择三家</text>
+				</view>
+
+			</view>
+		</u-modal>
 		<view class="footer-btn dis a-c j-s">
-			<u-button type="primary" style="background:#ff9000;width: 20%;" @tap="tempSave">暂存</u-button>
-			<u-button type="primary" style="background:#0052FF; width: 75%;" @tap="toNext">保费计算</u-button>
+			<u-button type="primary" style="background:#FF5600;width: 20%;" @tap="tempSave">暂存</u-button>
+			<u-button type="primary" style="background:#C9C9C9;width: 20%;" @click="priceComparison"
+				v-if="comparableQuantity<2 && priceCtitle=='比价'">比价</u-button>
+			<u-button type="primary" style="background:#24C1CB;width: 20%;" @click="priceComparison1"
+				v-if="comparableQuantity>=2 && priceCtitle=='比价'">比价</u-button>
+			<u-button type="primary" style="background:#24C1CB;width: 20%;" @click="priceComparison2"
+				v-if="priceCtitle=='去比价'">去比价</u-button>
+			<u-button type="primary" style="background:#0052FF; width: 50%;" @tap="toNext">保费计算</u-button>
 		</view>
 	</view>
 </template>
@@ -907,6 +920,9 @@
 	} from '@/plugins/utils';
 	import wybPopup from '@/components/common/wyb-popup/wyb-popup.vue'
 	import lsLoading from '@/components/common/ls-loading/ls-loading.vue';
+	import {
+		sub
+	} from "zrender/lib/core/vector";
 	export default {
 		components: {
 			wybPopup,
@@ -914,10 +930,6 @@
 		},
 		computed: {
 			...mapState(['userInfo', 'quotationType']),
-			getHeight() {
-				let height = uni.getSystemInfoSync().windowHeight;
-				return `minHeight: ${height}px;`;
-			}
 		},
 		// 监听导航栏的按钮
 		onNavigationBarButtonTap(e) {
@@ -929,6 +941,10 @@
 		},
 		data() {
 			return {
+				priceComparisonShow: false,
+				comparableQuantity: 0, //报价成功总数
+				selectedCount: 0, //比价勾选数量
+				priceCtitle: "比价",
 				shadowStyle: {
 					backgroundImage: "none",
 					paddingTop: "0",
@@ -1587,6 +1603,13 @@
 				subOrderId: '',
 			}
 		},
+		watch: {
+			comparableQuantity: {
+				handler(val) {
+					console.log(val);
+				},
+			},
+		},
 		async onLoad(params) {
 			if (params.orderno) {
 				let res = await this.$http.post('/insurance/order/revise', {
@@ -1751,7 +1774,32 @@
 			uni.setStorageSync('historyInfo', res);
 			uni.removeStorageSync("companyId")
 		},
+
 		methods: {
+			priceComparison() {
+				this.priceComparisonShow = true;
+			},
+			priceComparison1() {
+				this.totalCompanyList.map(ele => {
+					if (ele.quoteCode == 200) {
+						ele.isComparableshowHide = true;
+					}
+					return ele;
+				})
+			},
+			priceComparison2() {
+				let subOrderNoslist = [];
+				this.totalCompanyList.map(ele => {
+					if (ele.isComparableShow) {
+						subOrderNoslist.push(ele.result.companyId);
+					}
+					return ele;
+				})
+				uni.navigateTo({
+					url: `/pages/orders1/priceComparison?subOrderNoslist=${JSON.stringify(subOrderNoslist)}`
+				})
+
+			},
 			async coordinateValue() {
 				let location = uni.getStorageSync('location');
 				let params = {
@@ -1968,6 +2016,24 @@
 					})
 				})
 			},
+			priceComparisonChange(index, item) {
+				event.stopPropagation(); // 阻止事件冒泡
+				this.priceCtitle = "去比价";
+				if (!item.isComparableDisabled) {
+					item.isComparableShow = !item.isComparableShow;
+					if (item.isComparableShow) {
+						this.selectedCount++;
+					} else {
+						this.selectedCount--;
+					}
+					this.updateCheckboxStates();
+				}
+			},
+			updateCheckboxStates() {
+				this.totalCompanyList.forEach(item => {
+					item.isComparableDisabled = this.selectedCount >= 3 && !item.isComparableShow;
+				});
+			},
 			/**
 			 * 选择保险公司方法
 			 * @param {String} event  change选中事件
@@ -2395,6 +2461,9 @@
 					ele["syAdjustRate"] = "";
 					ele["selectShow"] = false;
 					ele['underwritingDescription'] = "";
+					ele['isComparableShow'] = false;
+					ele['isComparableshowHide'] = false;
+					ele['isComparableDisabled'] = false;
 				})
 				if (this.insAreaCompanyEditingDtos.length > 0) {
 					commpanykad.data.forEach((val, index) => {
@@ -2429,6 +2498,12 @@
 					return element.checked === false;
 				});
 				if (!allAreFalse) {
+					this.priceCtitle = '比价'
+					this.totalCompanyList.map((ele) => {
+						ele.isComparableShow = false;
+						ele.isComparableshowHide = false;
+						return ele;
+					})
 					this.OrderStageProcessing();
 				} else {
 					uni.showToast({
@@ -2498,7 +2573,14 @@
 			//动态函数
 			async ToolClickFun(MethodName, Parameter, companyId) {
 				await this[`${MethodName}`](Parameter, companyId)
-
+				let filteredObjects = [];
+				this.totalCompanyList.map(ele => {
+					if (ele.quoteCode == 200) {
+						filteredObjects.push(ele.result.companyId)
+					}
+					return ele;
+				})
+				this.comparableQuantity = filteredObjects.length;
 			},
 			//永安报价
 			async yongan(num, id) {

pages/login/mimi.vue

@@ -3,10 +3,10 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view class="u-f-ajc" style="font-size: 16px;font-weight: bold">掌柜科技平台隐私政策</view>
-		<view style="text-align: left;margin-top: 15rpx;">更新日期: 2021年07月01日</view>
-		<view style="text-align: left;margin-bottom: 15rpx;">生效日期: 2021年07月01日</view>
+		<view style="text-align: left;margin-top: 15rpx;">更新日期: 2024年06月24日</view>
+		<view style="text-align: left;margin-bottom: 15rpx;">生效日期: 2024年06月24日</view>
 		<view style="text-align: left;text-indent: 2rem;"> 掌柜科技移动设备客户端(掌柜科技APP)网络运营平台以下简称“掌柜科技平台)
-			由山西掌柜鼎科技有公司(以下简称”我们”或“掌柜科技”。注册地址:山西综改示范区太原阳曲园区五龙口街168号鑫创大厦404室，）运营本政策适用掌柜科技平台所提供的保险信息服务、养车服务、网上购物服务、车圈动态服务，以及其他增值服多(以下统称“我们的产品和/或服务")，包括各类保险产品息服务及洗车美容、维修保养、违章查询、充值服务、代驾、
+			由山西掌柜鼎科技有公司(以下简称”我们”或“掌柜科技”。注册地址:山西转型综合改革示范区科技创新城化章北街1号山西数据流量生态园4号楼4层4408-176，）运营本政策适用掌柜科技平台所提供的保险信息服务、养车服务、网上购物服务、车圈动态服务，以及其他增值服多(以下统称“我们的产品和/或服务")，包括各类保险产品息服务及洗车美容、维修保养、违章查询、充值服务、代驾、
 			预约停车、一键救援、U驾服务、选座观影、车损测算及我们在掌柜科技平台页面所展示的相关产品和/或服务。
 		</view>
 		<view style="text-align: left;text-indent: 2rem;font-weight: bold;text-decoration: underline;">
@@ -274,12 +274,13 @@
 		<view style="text-align: left;text-indent: 2rem;">订单信息--您可以在手机APP中“我的我的订单”访问您的订单信息。</view>
 		<view style="text-align: left;text-indent: 2rem;"> 车辆信息--您可以在APP中“爱车*******”访问您的车辆信息。</view>
 		<view style="text-align: left;text-indent: 2rem;">
-			如果您无法通过上述路径访问这些个人信息，您可以发送电子邮件至*********,我们将在15天内回复您的访问请求。对于您在使用我们的产品与/或服务过程中产生的其他个人信息，您需要访问的,我们会根据下述”(六)响应您的上述请求"的规定响应您的请求。
+			如果您无法通过上述路径访问这些个人信息，您可以发送电子邮件至690068578@qq.com,我们将在15天内回复您的访问请求。对于您在使用我们的产品与/或服务过程中产生的其他个人信息，您需要访问的,我们会根据下述”(六)响应您的上述请求"的规定响应您的请求。
 		</view>
 		<view style="text-align: left;text-indent: 2rem;font-weight: bold;">(二)更正您的个人信息</view>
 		<view style="text-align: left;text-indent: 2rem;">当您发现我们处理的关于您的个人信息有错误时，您有权要求我们做出更正。您可以通过前述" (一)
 			访问您的个人资料”中罗列的方式更正您的个人信息。</view>
-		<view style="text-align: left;text-indent: 2rem;">如果您无法通过上述路径更正这些个人信息，您可以发送电子邮件至*********.我们将在15天内回复您的更正请求。
+		<view style="text-align: left;text-indent: 2rem;">
+			如果您无法通过上述路径更正这些个人信息，您可以发送电子邮件至690068578@qq.com.我们将在15天内回复您的更正请求。
 		</view>
 		<view style="text-align: left;text-indent: 2rem;font-weight: bold;">(三)删除您的个人信息</view>
 		<view style="text-align: left;text-indent: 2rem;">在以下情形中，您可以向我们提出删除个人信息的请求</view>
@@ -302,12 +303,13 @@
 		<view style="text-align: left;text-indent: 2rem;font-weight: bold;">(五)您如何注销账户</view>
 		<view style="text-align: left;text-indent: 2rem;">
 			您随时可注销此前注册的账户，您可以通过掌柜科技平台的“设置"“账号与安全".”账号注销"功能注销您在掌柜科技平台的账户。若注销存在疑问，您可发送电子邮件至
-			*********,我们会在15个工作日内联系您处理。在您注销账户之后，我们将停止为您提供产品或服务。并依据您的要求，删除您的个人信息，法律法规另有规定或本协议、账号注销协议另有约定的除外。</view>
+			690068578@qq.com,我们会在15个工作日内联系您处理。在您注销账户之后，我们将停止为您提供产品或服务。并依据您的要求，删除您的个人信息，法律法规另有规定或本协议、账号注销协议另有约定的除外。
+		</view>
 		<view style="text-align: left;text-indent: 2rem;font-weight: bold;">(六)响应您的上述请求</view>
 		<view style="text-align: left;text-indent: 2rem;">
-			如果您无法通过上述方式访问、更正、删除您的个人信息，或您需要访问您在使用我们的产品与/或服务过程中产生的其他个人信息，或者您认为掌柜科技平台存在违法违规行为，您均可发送电子邮件至**********或通过本协议中列明的其他方式与我们联系。为保障安全，我们可能需要您提供书面请求，或提供您的身份证明文件，然后再处理您的请求。
+			如果您无法通过上述方式访问、更正、删除您的个人信息，或您需要访问您在使用我们的产品与/或服务过程中产生的其他个人信息，或者您认为掌柜科技平台存在违法违规行为，您均可发送电子邮件至690068578@qq.com或通过本协议中列明的其他方式与我们联系。为保障安全，我们可能需要您提供书面请求，或提供您的身份证明文件，然后再处理您的请求。
 		</view>
-		<view style="text-align: left;text-indent: 2rem;">我们将在十五天内做出答复。如您不满意，可以发送电子邮件至********进行投诉。</view>
+		<view style="text-align: left;text-indent: 2rem;">我们将在十五天内做出答复。如您不满意，可以发送电子邮件至690068578@qq.com进行投诉。</view>
 		<view style="text-align: left;text-indent: 2rem;">
 			对于您合理的请求，我们原则上不收取费用，但对多次重复、超出合理限度的请求，我们将视情收取一-定成本费用。对于那些无端重复、需要过多技术手段开发新系统或从根本上改变现行惯例的、给他人合法权益带来风险或者非常不切实际的请求，我们可能会予以拒绝。
 		</view>
@@ -351,10 +353,10 @@
 		<view style="text-align: left;text-indent: 2rem;">6)个人信息安全影响评估报告表明存在高风险时。</view>
 		<view style="text-align: left;text-indent: 2rem;">我们还会将本政策的旧版本存档，供您查阅。</view>
 		<view style="text-align: left;text-indent: 2rem;">
-			如果您对本隐私政策有任何疑问或任何相关的投诉、意见，请发送电子邮件至**********，我们的个人信息保护专职部门(或个人信息保护专员)会在十五天内回复您。</view>
+			如果您对本隐私政策有任何疑问或任何相关的投诉、意见，请发送电子邮件至690068578@qq.com，我们的个人信息保护专职部门(或个人信息保护专员)会在十五天内回复您。</view>
 		<view style="text-align: left;text-indent: 2rem;">
 			如果您对我们的回复不满意，特别是我们的个人信息处理行为损害了您的合法权益，您还可以向网信办、消费者保护协会等监管部门进行投诉或举报，投诉方式如下:</view>
-		<view style="text-align: left;text-indent: 2rem;">国家网信办举报中心: *******</view>
+		<view style="text-align: left;text-indent: 2rem;">国家网信办举报中心: 12377</view>
 		<view style="text-align: left;text-indent: 2rem;">消费者投诉举报电话: 12315</view>
 
 		<view style="font-size: 16px; text-align: left;text-indent: 2rem; font-weight: bold;">九、如何联系我们</view>

pages/orders1/priceComparison.vue

@@ -0,0 +1,715 @@
+<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>
+			<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>
+					<text style="font-weight: bold;margin-left: 6px; font-size: 16px;">比价报价单</text>
+				</view>
+				<view
+					style="background-color: #fff;border-radius:0 0  6px 6px ; box-shadow: 0px 4px 10px 0px rgba(123,160,239,0.2);"
+					class="dis a-c j-c p-2 ">
+					<view style="font-size: 15px;font-weight: bold;" class="dis j-s a-c ">
+						<text style="color: #232832;">订单编号：{{insOrderVo.orderNo}}</text>
+					</view>
+				</view>
+			</view>
+			<view style="padding:0 16px;position: relative;">
+				<view class="information">
+					<text class="title">车辆信息</text>
+					<view class="dis j-s a-c">
+						<text>车牌号：</text>
+						<text>{{insOrderVo.licenseNo}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>品牌型号：</text>
+						<text>{{ insOrderVo.brandName}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>发动机号：</text>
+						<text>{{ insOrderVo.engineNo}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>座位数：</text>
+						<text>{{ insOrderVo.seatCount}}</text>
+					</view>
+				</view>
+				<view class="information">
+					<text class="title">人员信息</text>
+					<view class="dis j-s a-c">
+						<text>车主姓名：</text>
+						<text>{{ insOrderVo.carOwnerName}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>车主身份证号：</text>
+						<text>{{ insOrderVo.ownerIdentifyNumber}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>投保人姓名：</text>
+						<text>{{ insOrderVo.applyName}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>投保人身份证号：</text>
+						<text>{{ insOrderVo.applyIdentifyNumber}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>被保人姓名：</text>
+						<text>{{ insOrderVo.insuredName}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>被保人身份证号：</text>
+						<text>{{ insOrderVo.insuredNumber}}</text>
+					</view>
+				</view>
+				<view class="information">
+					<text class="title">保费信息</text>
+					<view class="dis j-start a-c">
+						<text>交强起保日期：</text>
+						<text>{{ insOrderVo.jqstartDate}}</text>
+					</view>
+					<view class="dis j-start a-c">
+						<text>交强终保日期：</text>
+						<text>{{ insOrderVo.jqendDate}}</text>
+					</view>
+					<view class="dis j-start a-c">
+						<text>商业起保日期：</text>
+						<text>{{ insOrderVo.systartDate}}</text>
+					</view>
+					<view class="dis j-start a-c">
+						<text>商业终保日期：</text>
+						<text>{{ insOrderVo.syendDate}}</text>
+					</view>
+				</view>
+				<view class="information1" v-for="(item,index) in subOrderVos" :key="index">
+					<view class="title dis a-c j-s">
+						<text>{{item.companyName}}</text>
+						<text>总保费￥{{item.sumpremium}}</text>
+					</view>
+					<view class="dis f-c" v-if="item.jqpremium">
+						<view class="dis a-c j-s" style="margin-bottom: 5px;">
+							<text>交强险：</text>
+							<text>{{item.jqpremium}}</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;">
+								<text style="color: rgba(35,40,50,0.8)">险别/名称</text>
+								<text style="color: rgba(35,40,50,0.8)">保额</text>
+							</view>
+							<view class="dis j-s a-c" v-for="(jqInsuranceitem,jqInsuranceindex) in item.jqInsuranceType"
+								:key="jqInsuranceindex" style="margin-top: 6px;">
+								<text>{{jqInsuranceitem.name}}</text>
+								<text>{{jqInsuranceitem.amount}}</text>
+							</view>
+						</view>
+					</view>
+					<view class="dis j-s a-c" v-if="item.taxaMount">
+						<text>车船税：</text>
+						<text>{{ item.taxaMount}}</text>
+					</view>
+					<view class="dis f-c" v-if="item.sypremium">
+						<view class="dis a-c j-s ">
+							<text>商业险：</text>
+							<text>{{ item.sypremium}}</text>
+						</view>
+						<view class=" dis j-s f-c p-2"
+							style="border: none;background-color: #F9F9F9;border-radius: 10px;">
+							<view class="dis j-s a-c" style="border-bottom: 1px solid #f2f2f2;">
+								<view class="dis j-start" style="width: 50%;">
+									<text style="color: rgba(35,40,50,0.8)">险别/名称</text>
+								</view>
+								<view class="dis j-c" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保额</text>
+								</view>
+								<view class="dis j-end" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保费(元)</text>
+								</view>
+							</view>
+							<view class="coverage-sum dis j-s" v-for="(kindinfoitem,kindinfoindex) in item.kindinfo"
+								:key="kindinfoindex" style="margin-top: 6px;">
+								<view style="width: 50%;" class="dis a-c j-start">
+									<text>{{kindinfoitem.kindName}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c"
+									v-if="['D4', 'SY_FJ_YBW2'].includes(kindinfoitem.kindCode)">
+									<text>{{kindinfoitem.unitAmount}}/座*{{insOrderVo.seatCount-1}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c"
+									v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(kindinfoitem.kindCode)">
+									<text>{{kindinfoitem.deductibleRate}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c"
+									v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(kindinfoitem.kindCode)">
+									<text>{{kindinfoitem.serviceTimes}}/次</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c" v-else>
+									<text>{{kindinfoitem.amount}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-end">
+									<text>￥{{kindinfoitem.coveragePremium}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="dis f-c" v-if="item.jypremium">
+						<view class="dis a-c j-s">
+							<text>附加险：意外险</text>
+							<text>{{ item.jypremium}}</text>
+						</view>
+						<view class=" dis j-s f-c p-2" v-if="item.accidentInfo.length>0"
+							style="border: none;background-color: #F9F9F9;border-radius: 10px;">
+							<view class="dis j-s a-c" style="border-bottom: 1px solid #f2f2f2;">
+								<view class="dis j-start" style="width: 50%;">
+									<text style="color: rgba(35,40,50,0.8)">险别/名称</text>
+								</view>
+								<view class="dis j-c" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保额</text>
+								</view>
+								<view class="dis j-end" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保费(元)</text>
+								</view>
+							</view>
+							<view class="coverage-sum dis j-s"
+								v-for="(accidentInfoitem,accidentInfoindex) in item.accidentInfo"
+								:key="accidentInfoindex" style="margin-top: 6px;">
+								<view style="width: 50%;" class="dis a-c j-start">
+									<text>{{accidentInfoitem.name}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c">
+									<text>{{accidentInfoitem.amount}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c">
+									<text>{{accidentInfoitem.premium}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+				<view class="information2">
+					<view class="dis j-s a-c" v-for="(item,index) in parityPriceVo" :key="index">
+						<view class="dis j-c a-c p-1" v-for="(items,indexs) in item" :key="indexs">{{items}}</view>
+					</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>
+					<text>{{companyName}}， 报价最低！</text>
+				</view>
+			</view>
+		</view>
+		<view class="fixed-bottom">
+			<u-button type="primary" style="background-color:#23C1CB;" @tap="sendPayCode">发送微信</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		pathToBase64,
+		base64ToPath
+	} from '@/common/pdf.js'
+	export default {
+		data() {
+			return {
+				texts: [],
+				payImg: "",
+				posterUrl: "",
+				show: false,
+				insOrderVo: {},
+				subOrderVos: [],
+				parityPriceVo: [],
+				companyName: "",
+			}
+		},
+		computed: {
+			...mapState(["userLoginId"])
+
+		},
+		async onLoad(options) {
+			let item = JSON.parse(options.subOrderNoslist);
+			let params = {
+				subOrderNos: item,
+			}
+			let res = await this.$http.post('/insurance/order/getInquiryDetalsBySubOrderNos', params);
+			if (res.code == '200') {
+				res.data.subOrderVos.map(val => {
+					val.kindinfo.map((ele, index) => {
+						switch (ele.kindCode) {
+							case "A":
+								if (ele.amount == 1) {
+									ele.amount = "投保"
+								} else {
+									ele.amount = ele.amount
+								}
+								break;
+							case "D4":
+							case "SY_FJ_YBW2":
+								ele.unitAmount = this.toChinesNum(ele.unitAmount);
+								break;
+							case "MJ1":
+							case "MJ2":
+							case "MJ3":
+							case "MJ4":
+								ele.deductibleRate = ele.deductibleRate + "%";
+								break;
+							default:
+								ele.amount = this.toChinesNum(ele.amount);
+						}
+						return ele;
+					});
+				})
+				this.companyName = res.data.companyName;
+				this.insOrderVo = res.data.insOrderVo;
+				this.subOrderVos = res.data.subOrderVos;
+				this.parityPriceVo = res.data.parityPriceVo;
+
+			}
+
+		},
+		methods: {
+			//页面返回按钮
+			back() {
+				uni.navigateBack({
+					delta: 1, // 返回的页面数，如果是1表示返回上一页
+					success: function() {}
+				});
+			},
+			//分享图片到微信
+			sendPayCode() {
+				if (this.payImg) {
+					uni.share({
+						provider: "weixin",
+						scene: "WXSceneSession",
+						type: 2,
+						imageUrl: this.payImg
+					})
+				}
+			},
+			toChinesNum(num) {
+				let overWan = Math.floor(num / 10000);
+				let result = overWan + "万";
+				return result;
+			},
+			//页面截图转路径
+			receiveRenderData(val) {
+				this.posterUrl = val.replace(/[\r\n]/g, ''); // 去除base64位中的空格
+				const imageStr = this.posterUrl;
+				// 将base64转化为临时地址
+				base64ToPath(imageStr).then(path => {
+					this.payImg = path
+				}).catch(error => {});
+			},
+			showLoading() {
+				uni.showLoading({
+					title: '正在生成图片'
+				});
+			},
+
+			hideLoading() {
+				uni.hideLoading();
+			},
+		},
+	}
+</script>
+<script module="canvasImage" lang="renderjs">
+	import html2canvas from 'html2canvas'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			setTimeout(() => {
+				this.canvasImage.generateImage()
+			}, 1000);
+			// #endif
+
+
+		},
+		methods: {
+			// #ifdef APP-PLUS
+			generateImage() {
+				setTimeout(() => {
+					this.$ownerInstance.callMethod('showLoading')
+					const dom = document.getElementById('panelcanvas') // 需要生成图片内容的 dom 节点
+					html2canvas(dom, {
+						width: dom.clientWidth, //dom 原始宽度
+						height: dom.clientHeight,
+						scrollY: 0, // html2canvas默认绘制视图内的页面，需要把scrollY，scrollX设置为0
+						scrollX: 0,
+						useCORS: true, //支持跨域
+						// allowTaint: false,
+						scale: 3, // 设置生成图片的像素比例，默认是1，如果生成的图片模糊的话可以开启该配置项
+					}).then((canvas) => {
+						// 生成成功
+						this.$ownerInstance.callMethod('hideLoading')
+						this.$ownerInstance.callMethod('receiveRenderData', canvas.toDataURL('image/png'))
+					}).catch(err => {
+						// 生成失败 弹出提示弹窗
+						this.$ownerInstance.callMethod('_errAlert', `【生成图片失败，请重试】${err}`)
+					})
+				}, 300)
+			}
+			// #endif
+		},
+	}
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.page {
+		background-color: #F8FEFE;
+		padding-bottom: 100px;
+		box-sizing: border-box;
+	}
+
+	.massage {
+		width: 100%;
+		height: 41px;
+		background: linear-gradient(90deg, #FFDCCD 0%, #FFF1EE 100%);
+		border-radius: 0px 0px 6px 6px;
+		padding: 10px;
+
+		text {
+			font-size: 15px;
+			font-weight: bold;
+			color: #FF5600;
+			margin-left: 10px;
+		}
+	}
+
+	.fixed-bottom {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 62px;
+		background-color: #FFFFFF;
+		padding: 16px;
+		box-shadow: 0px -4px 10px 0px #DAE3F4;
+		border-radius: 0px 0px 0px 0px;
+	}
+
+	.content {
+		width: 100%;
+		height: auto;
+		padding: 16px 16px 0;
+		position: relative;
+
+		.price {
+			width: 100%;
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 6px 6px 0px 0px;
+		}
+	}
+
+	.information {
+		width: 100%;
+		height: auto;
+		background-color: #fff;
+		box-shadow: 0px 4px 10px 0px rgba(35, 193, 203, 0.2);
+		border-radius: 6px;
+		margin-top: 10px;
+		padding: 10px 10px 0;
+
+
+		>view {
+			padding: 10px 0;
+			border-bottom: 1px solid #f2f2f2;
+
+			text {
+				font-size: 14px;
+				color: #232832;
+			}
+
+		}
+
+		.title {
+			font-size: 15px;
+			color: #232832;
+			font-weight: bold;
+		}
+
+		:last-child {
+			border: none;
+		}
+	}
+
+	.information1 {
+		width: 100%;
+		height: auto;
+		background-color: #fff;
+		box-shadow: 0px 4px 10px 0px rgba(35, 193, 203, 0.2);
+		border-radius: 6px;
+		margin-top: 10px;
+
+		>view {
+			padding: 10px;
+			border-bottom: 1px solid #f2f2f2;
+
+			text {
+				font-size: 14px;
+				color: #232832;
+			}
+		}
+
+		>view:first-child {
+			border: none;
+			background-color: #DCF5F6;
+			border-radius: 6px 6px 0 0;
+
+			text:nth-child(1) {
+				font-weight: bold;
+				color: #232832;
+				font-size: 14px;
+			}
+
+			text:nth-child(2) {
+				font-weight: bold;
+				color: #088F98;
+				font-size: 14px;
+			}
+		}
+
+
+
+		:last-child {
+			border: none;
+		}
+	}
+
+	.information2 {
+		width: 100%;
+		height: auto;
+		background-color: #fff;
+		box-shadow: 0px 4px 10px 0px rgba(35, 193, 203, 0.2);
+		border-radius: 6px;
+		margin-top: 10px;
+
+		>view {
+			view {
+				width: 25%;
+				font-size: 14px;
+				color: #232832;
+			}
+
+		}
+
+		>view:first-child {
+			border: none;
+			background-color: #DCF5F6;
+			border-radius: 6px 6px 0 0;
+			font-weight: bold;
+		}
+
+		.title {
+			font-size: 15px;
+			color: #232832;
+			font-weight: bold;
+		}
+
+		:last-child {
+			border: none;
+		}
+	}
+
+	.Basic-information {
+		background-color: white;
+		width: 100%;
+		height: auto;
+
+		.basic-logo {
+			padding: 10px 16px;
+			border-bottom: 1px solid #f2f2f2;
+
+			image {
+				width: 50px;
+				height: 50px;
+				margin-right: 20px;
+			}
+
+			text {
+				font-size: 12px;
+			}
+
+			text:first-child {
+				font-weight: bold;
+				font-size: 18px;
+			}
+		}
+
+		.basic-data {
+			padding: 16px;
+
+			.arrange {
+				margin: 4px 0;
+				font-size: 14px;
+
+				text:first-child {
+					font-weight: bold;
+					margin-right: 5px;
+				}
+
+				text:last-child {
+					color: #606266;
+				}
+
+				&::before {
+					content: "·";
+					color: #606266;
+					margin-right: 10px;
+					font-weight: bold;
+				}
+
+			}
+		}
+
+		.bjdCarSum {
+			padding: 10px 16px;
+			border-bottom: 1px solid #f2f2f2;
+			font-weight: bold;
+			font-size: 14px;
+		}
+
+		.coverage {
+			padding: 10px 16px;
+
+			.coverage-title {
+				width: 100%;
+
+				view:first-child {
+					border-top-left-radius: 8px;
+				}
+
+				view:last-child {
+					border-top-right-radius: 8px;
+				}
+
+				view:nth-child(2) {
+					border-left: none;
+					border-right: none;
+				}
+
+				view {
+					width: 33.33%;
+					text-align: center;
+					background: #ff8f63;
+					color: #fff;
+					padding: 6px 16px;
+					border: 1px solid #fff;
+					font-size: 12px;
+					box-sizing: border-box;
+				}
+
+			}
+
+			.coverage-sum {
+				width: 100%;
+
+				view {
+					font-size: 12px;
+					padding: 6px 16px;
+				}
+			}
+		}
+	}
+
+	.Circle {
+		position: relative;
+
+		&::before {
+			display: block;
+			content: "";
+			position: absolute;
+			width: 10px;
+			height: 10px;
+			background: #92b5fe;
+			top: -5px;
+			left: -15px;
+			border-radius: 50%;
+		}
+
+		&::after {
+			content: "";
+			position: absolute;
+			width: 10px;
+			height: 10px;
+			background: #92b5fe;
+			top: -5px;
+			right: -15px;
+			border-radius: 50%;
+		}
+
+	}
+
+	.footer-button {
+		z-index: 9999;
+		margin-top: 20px;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		background: white;
+		padding: 10px 20px;
+
+		button {
+			width: 70%;
+			cursor: pointer;
+		}
+	}
+
+	.tip {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10upx;
+		font-size: 32upx;
+		font-weight: bold;
+		margin: 0 auto;
+		padding: 20px;
+		box-sizing: border-box;
+		position: fixed;
+		bottom: 0;
+	}
+
+	/* 底部的样式Start */
+	.infoBottom {
+		height: 140upx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: #ea552d;
+		border-top: 1upx solid #ea552d;
+		z-index: 99;
+		margin-top: 100px;
+	}
+
+	.infoBottom>button {
+		// font-size: 30upx;
+		background: #fff;
+		color: #333;
+		flex: 1;
+		margin: 0upx 30px;
+		font-weight: bold;
+	}
+
+	/* 底部的样式End */
+	.watermark {
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		font-size: 24px;
+		color: rgba(0, 0, 0, 0.3);
+		pointer-events: none;
+		z-index: 9999;
+	}
+</style>

pages/orders1/quotation.vue

@@ -1,108 +1,176 @@
 <template>
-	<view style="height: 100vh;">
+	<view style="height: 100vh;position: relative;">
 		<view class="page" id="panelcanvas">
+			<image src="../../static/image/car-insure/baojiadan.png" mode=""
+				style="width: 100%;height: 450px;position: absolute;"></image>
 			<view class="content">
 				<view class="price dis a-c j-c">
-					<image :src=" logoimg" mode="" style="width: 20px;height: 20px;">
+					<image :src="logoimg" mode="" style="width: 20px;height: 20px;">
 					</image>
 					<text style="font-weight: bold;margin-left: 6px; font-size: 16px;">{{dataInfo.inscompany}}报价单</text>
 				</view>
-				<view style="background-color: #fff;border-radius:0 0  6px 6px ;" class="dis f-c p-2 ">
-					<view class="" style="border-bottom: 1px dashed  #EFEFEF;padding-bottom: 10px;">
-						<view style="font-size: 16px;font-weight: bold;" class="dis j-s a-c ">
-							<text style="color: #232832;">{{dataInfo.licenseno}}</text>
-							<text style="color: #FF5600;">￥{{dataInfo.sumpremium}}</text>
-						</view>
-						<text
-							style="color: rgba(51,51,51,0.8);font-size: 14px;font-weight: bold;letter-spacing:2px;">{{carinfo.modelcname}}</text>
-					</view>
-					<view class="dis  Circle" style="padding-top: 10px;">
-						<view style="width: 49%;font-weight: bold;border-right: 1px dashed #EFEFEF;"
-							v-if="dataInfo.jqstartdate" class="dis f-c a-start ">
-							<text style="font-size: 14px;">{{ dataInfo.jqstartdate }}</text>
-							<text style="font-size: 12px;color: rgba(51,51,51,0.8);">交强险起保日期</text>
-						</view>
-						<view style="width: 49%;font-weight: bold;" class="dis f-c a-end" v-if="dataInfo.systartdate">
-							<text style="font-size: 14px;">{{ dataInfo.systartdate }}</text>
-							<text style="font-size: 12px;color: rgba(51,51,51,0.8);">商业险起保日期</text>
-						</view>
+				<view
+					style="background-color: #fff;border-radius:0 0  6px 6px ; box-shadow: 0px 4px 10px 0px rgba(123,160,239,0.2);"
+					class="dis a-c j-c p-2 ">
+					<view style="font-size: 15px;font-weight: bold;" class="dis j-s a-c ">
+						<text style="color: #232832;">订单编号：{{dataInfo.orderno}}</text>
 					</view>
 				</view>
 			</view>
-			<view style="padding:0 16px;margin-top: -20px;">
+			<view style="padding:0 16px;position: relative;">
 				<view class="information">
+					<text class="title">车辆信息</text>
 					<view class="dis j-s a-c">
-						<text>订单号：</text>
+						<text>车牌号：</text>
 						<text>{{dataInfo.orderno}}</text>
 					</view>
+					<view class="dis j-s a-c">
+						<text>品牌型号：</text>
+						<text>{{dataInfo.orderno}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>发动机号：</text>
+						<text>{{carinfo.engineNo}}</text>
+					</view>
+					<view class="dis j-s a-c">
+						<text>座位数：</text>
+						<text>{{carinfo.seatCount}}</text>
+					</view>
+				</view>
+				<view class="information">
+					<text class="title">人员信息</text>
 					<view class="dis j-s a-c">
 						<text>车主姓名：</text>
 						<text>{{ownerinfo.name}}</text>
 					</view>
 					<view class="dis j-s a-c">
-						<text>投保人姓名：</text>
-						<text>{{applyinfo.name}}</text>
+						<text>车主身份证号：</text>
+						<text>{{ownerinfo.identifyNumber}}</text>
 					</view>
 					<view class="dis j-s a-c">
-						<text>被保人姓名：</text>
-						<text>{{insureinfo.name}}</text>
+						<text>投保人姓名：</text>
+						<text>{{applyinfo.name}}</text>
 					</view>
 					<view class="dis j-s a-c">
-						<text>发动机号：</text>
-						<text>{{carinfo.engineNo}}</text>
+						<text>投保人身份证号：</text>
+						<text>{{ownerinfo.identifyNumber}}</text>
 					</view>
 					<view class="dis j-s a-c">
-						<text>车架号：</text>
-						<text>{{carinfo.vinNo}}</text>
+						<text>被保人姓名：</text>
+						<text>{{insureinfo.name}}</text>
 					</view>
 					<view class="dis j-s a-c">
-						<text>座位数：</text>
-						<text>{{carinfo.seatCount}}</text>
+						<text>被保人身份证号：</text>
+						<text>{{ownerinfo.identifyNumber}}</text>
 					</view>
-					<view class="dis j-s a-c" v-if="dataInfo.jqpremium">
-						<text>交强险</text>
-						<text>￥{{dataInfo.jqpremium}}</text>
+				</view>
+				<view class="information">
+					<text class="title">保费信息</text>
+					<view class="dis j-s f-c" v-if="dataInfo.jqpremium">
+						<view class="dis j-s a-c">
+							<text>交强险：</text>
+							<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>
+						</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;">
+								<text style="color: rgba(35,40,50,0.8)">险别/名称</text>
+								<text style="color: rgba(35,40,50,0.8)">保额</text>
+							</view>
+							<view class="dis j-s a-c" v-for="(item,index) in dataInfo.jqInsuranceType" :key="index"
+								style="margin-top: 6px;">
+								<text>{{item.name}}</text>
+								<text>{{item.amount}}</text>
+							</view>
+						</view>
 					</view>
 					<view class="dis j-s a-c">
-						<text>车船税</text>
-						<text v-if="dataInfo.taxamount">￥{{dataInfo.taxamount}}</text>
+						<text>车船税：</text>
+						<text>{{ownerinfo.identifyNumber}}</text>
 					</view>
-					<view class="dis j-s a-c" v-if="dataInfo.jypremium">
-						<text>驾意险</text>
-						<text>￥{{dataInfo.jypremium}}</text>
-					</view>
-					<view class="dis  f-c " v-if="dataInfo.sypremium">
+					<view class="dis  f-c j-s " v-if="dataInfo.sypremium">
 						<view class="dis j-s a-c">
 							<text>商业险</text>
 							<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>
+						</view>
 						<view class=" dis j-s f-c p-2"
 							style="border: none;background-color: #F9F9F9;border-radius: 10px;">
-							<view class="coverage-sum dis j-s" v-for="(item,index) in dataInfo.kindinfo" :key="index">
-								<view style="width: 33.33%;" class="dis a-c j-start">
+							<view class="dis j-s a-c" style="border-bottom: 1px solid #f2f2f2;">
+								<view class="dis j-start" style="width: 50%;">
+									<text style="color: rgba(35,40,50,0.8)">险别/名称</text>
+								</view>
+								<view class="dis j-c" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保额</text>
+								</view>
+								<view class="dis j-end" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保费(元)</text>
+								</view>
+							</view>
+							<view class="coverage-sum dis j-s" v-for="(item,index) in dataInfo.kindinfo" :key="index"
+								style="margin-top: 6px;">
+								<view style="width: 50%;" class="dis a-c j-start">
 									<text>{{item.kindName}}</text>
 								</view>
-								<view style="width: 33.33%;" class="dis a-c j-c"
+								<view style="width: 25%;" class="dis a-c j-c"
 									v-if="['D4', 'SY_FJ_YBW2'].includes(item.kindCode)">
 									<text>{{item.unitAmount}}/座*{{dataInfo.carinfo.seatCount-1}}</text>
 								</view>
-								<view style="width: 33.33%;" class="dis a-c j-c"
+								<view style="width: 25%;" class="dis a-c j-c"
 									v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(item.kindCode)">
 									<text>{{item.deductibleRate}}</text>
 								</view>
-								<view style="width: 33.33%;" class="dis a-c j-c"
+								<view style="width: 25%;" class="dis a-c j-c"
 									v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(item.kindCode)">
 									<text>{{item.serviceTimes}}/次</text>
 								</view>
-								<view style="width: 33.33%;" class="dis a-c j-c" v-else>
+								<view style="width: 25%;" class="dis a-c j-c" v-else>
 									<text>{{item.amount}}</text>
 								</view>
-								<view style="width: 33.33%;" class="dis a-c j-end">
+								<view style="width: 25%;" class="dis a-c j-end">
 									<text>￥{{item.coveragePremium}}</text>
 								</view>
 							</view>
 						</view>
 					</view>
+					<view class="dis  f-c j-s " v-if="dataInfo.jypremium">
+						<view class="dis j-s a-c">
+							<text>附加险：意外险</text>
+							<text>￥{{dataInfo.jypremium}}</text>
+						</view>
+						<view class=" dis j-s f-c p-2" v-if="dataInfo.accidentInfo.length>0"
+							style="border: none;background-color: #F9F9F9;border-radius: 10px;">
+							<view class="dis j-s a-c" style="border-bottom: 1px solid #f2f2f2;">
+								<view class="dis j-start" style="width: 50%;">
+									<text style="color: rgba(35,40,50,0.8)">险别/名称</text>
+								</view>
+								<view class="dis j-c" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保额</text>
+								</view>
+								<view class="dis j-end" style="width: 25%;">
+									<text style="color: rgba(35,40,50,0.8)">保费(元)</text>
+								</view>
+							</view>
+							<view class="coverage-sum dis j-s" v-for="(item,index) in dataInfo.accidentInfo"
+								:key="index" style="margin-top: 6px;">
+								<view style="width: 50%;" class="dis a-c j-start">
+									<text>{{item.name}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c">
+									<text>{{item.amount}}</text>
+								</view>
+								<view style="width: 25%;" class="dis a-c j-c">
+									<text>{{item.premium}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
 					<view class="dis j-s a-c">
 						<text>应缴金额：</text>
 						<text style="color: #0052FF;font-weight: bold;">￥{{dataInfo.sumpremium}}</text>
@@ -400,9 +468,9 @@
 
 	.content {
 		width: 100%;
-		height: 214px;
-		background: linear-gradient(180deg, #0052FF 0%, #F8FAFE 100%);
-		padding: 10px 16px 150px 16px;
+		height: auto;
+		padding: 16px 16px 0;
+		position: relative;
 
 		.price {
 			width: 100%;
@@ -419,7 +487,8 @@
 		box-shadow: 0px 4px 10px 0px #DAE3F4;
 		border-radius: 6px;
 		margin-top: 10px;
-		padding: 0 10px;
+		padding: 10px 10px 0;
+
 
 		>view {
 			padding: 10px 0;
@@ -432,6 +501,12 @@
 
 		}
 
+		.title {
+			font-size: 15px;
+			color: #232832;
+			font-weight: bold;
+		}
+
 		:last-child {
 			border: none;
 		}
@@ -532,13 +607,11 @@
 				width: 100%;
 
 				view {
-					width: 33.33%;
 					font-size: 12px;
 					padding: 6px 16px;
 				}
 			}
 		}
-
 	}
 
 	.Circle {

pages/wallet/preReceivedDetails.vue

@@ -69,7 +69,7 @@
 		</view>
 
 		<view class="" style="padding-top: 52px;">
-			<view class="yshoudata" v-for="(item,index) in dataList" :key="index" @click="details(item.subOrderNo)">
+			<view class="yshoudata" v-for="(item,index) in dataList" :key="index" @click="details(item)">
 				<view class=" dis f-c content">
 					<view class="dis a-c j-s">
 						<view class="dis a-c" v-if="item.transactionType==1">
@@ -207,11 +207,24 @@
 					this[type + 'List'] = res.data.ddList;
 				}
 			},
-			details(id) {
-				this.navigate({
-						url: "/pages/wallet/billInfo1?companyId=" + id,
-					},
-					"navigateTo", true);
+			details(item) {
+				switch (item.transactionType) {
+					case '1':
+						this.navigate({
+								url: "/pages/wallet/billInfo1?companyId=" + item.subOrderNo,
+							},
+							"navigateTo", true);
+						break;
+					case '2':
+						this.navigate({
+								url: "/pages/wallet/billInfo?type=" + item.transactionType + '&id=' + item.id +
+									'&subOrderNo=' + item.subOrderNo + '&amount=' + item.amount,
+							},
+							"navigateTo", true);
+						break;
+					default:
+				}
+
 			},
 			async queryList() {
 				let res = await this.$http.post('/sysUserAccount/findMyCollectInAdvanceByUserId', this.pageRequest);

style/zcm-main.css

@@ -228,12 +228,6 @@ body {
 	text-align: right;
 }
 
-.row {
-	box-sizing: border-box !important;
-	display: flex !important;
-	flex-direction: row;
-	flex-wrap: wrap;
-}
 
 [class*='col-'],
 [class*='span-'],