@dongkboy 2 лет назад
Родитель
Сommit
008dffd251

+ 2 - 2
components/modules/orders/carOrders.vue

@@ -160,7 +160,7 @@
 				</view>
 			</template>
 
-			<!-- 已核保待缴费 -->
+			<!-- 待缴费 -->
 			<template v-if="order.orderstatus == '5'">
 				<view class="orderItemPane  animated fadeIn fast">
 					<view class="paneTitle d-flex a-center j-sb">
@@ -178,7 +178,7 @@
 						</view>
 						<view class="line d-flex a-center j-sb">
 							<view>报价时间: {{order.createtime}}</view>
-							<view class="sign">已核保待缴费</view>
+							<view class="sign">待缴费</view>
 						</view>
 						<view class="companyList">
 							<view style="d-flex j-sb">

+ 6 - 3
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.6.3",
-	"versionCode": 263,
+	"versionName": "2.6.9",
+	"versionCode": 269,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -76,7 +76,10 @@
 				"targetSdkVersion": 30
 			},
 			"sdkConfigs": {
-				"ad": {},
+				"ad": {
+					"ks": {},
+					"sigmob": {}
+				},
 				"payment": {
 					"weixin": {
 						"__platform__": ["android"],

+ 1 - 1
pages/carInsure/Information.vue

@@ -1344,7 +1344,7 @@
 						.policyHolderInfo,
 						'email') && this.isEveryPropertyFilled(this.insuredPersonInfo, 'email')) {
 					this.navigate({
-						url: '/pages/carInsure/insureItems',
+						url: '/pages/carInsure/companyQuotable',
 						success: (res) => {
 							res.eventChannel.emit(
 								"acceptData", {

+ 118 - 190
pages/carInsure/premiumCalc.vue

@@ -135,9 +135,10 @@
 										:animation="animation" fontSize="22" />
 									<!-- 价格 -->
 									<view class="dis a-c" v-if="totalitem.quoteCode=='200'">
-										<view class="dis a-c" style="margin-right: 10px;">
+										<view class="dis a-c" style="margin-right: 10px;"
+											v-if="totalitem.result.feeDisplay">
 											<text style="color: #FF4D4D;font-size: 12px;"
-												v-if="totalitem.result.sumExportFee">优惠金额¥{{totalitem.result.sumExportFee}}</text>
+												v-if="totalitem.result.sumExportFee">{{totalitem.result.feeView?'掌柜科技币':'优惠金额¥'}}{{totalitem.result.sumExportFee}}</text>
 										</view>
 										<text class="sum">¥{{totalitem.result.sumPermium}}</text>
 									</view>
@@ -161,8 +162,9 @@
 										<text
 											v-if="totalitem.result.jyPremium">驾意险:¥{{totalitem.result.jyPremium}}</text>
 									</view>
-									<view class="dis a-c  f-wrap price" style="font-size: 20rpx;color: #FF4D4D;">
-										<text>优惠金额:【
+									<view class="dis a-c  f-wrap price" style="font-size: 20rpx;color: #FF4D4D;"
+										v-if="totalitem.result.feeDisplay">
+										<text>{{totalitem.result.feeView?'掌柜科技币:【':'优惠金额:【'}}
 											<text
 												v-if="totalitem.result.jqPremium">交强险:{{totalitem.result.jqExportFee?totalitem.result.jqExportFee:'无'}}</text>
 											<text
@@ -222,6 +224,10 @@
 										<text v-if="totalitem.result.syClaims">商业出险次数:{{ totalitem.result.syClaims ?
 										totalitem.result.syClaims : '无' }}</text>
 									</view>
+									<template v-if="totalitem.result.iszdj !=null && totalitem.result.iszdj!=''">
+										<text v-if="totalitem.result.iszdj==0" style="color: red;">假单交</text>
+										<text v-if="totalitem.result.iszdj==1" style="color: red;">真单交</text>
+									</template>
 									<view class="dis a-c j-end lastyear">
 										<view class=" left  dis j-c a-c" v-if="totalitem.lastYearMsg"
 											@click="YearMsg(totalitem.lastYearMsg,totalitem.namesimple)">
@@ -306,8 +312,7 @@
 												v-for="(drivingsitem,risksindex) in totalitem.insurancePlanInfo.drivingList"
 												:key="risksindex">
 												<view class="dis f-c ">
-													<text>{{drivingsitem.parentName}}</text>
-													<text>{{drivingsitem.projectName}}</text>
+													<text>{{drivingsitem.alias}}</text>
 												</view>
 												<view class="Accident mt-2"
 													v-if="drivingsitem.insDrivingIntentionInsuranceSon && drivingsitem.insDrivingIntentionInsuranceSon.length>0">
@@ -337,12 +342,12 @@
 									</view>
 								</view>
 								<view class=" dis j-s a-c">
-									<u-button type="primary" size="mini"
+									<button type="primary" size="mini"
 										style="background:#E6EEFF;color:#0052FF; width: 45%;"
-										@click="SchemeSelection(totalitem)">方案选择</u-button>
-									<u-button type="primary" size="mini"
+										@tap="SchemeSelection(totalitem)">方案选择</button>
+									<button type="primary" size="mini"
 										style="background:#FFEFE6;color: #FF5600; width: 45%;"
-										@tap="individualQuote(totalitem)">单独报价</u-button>
+										@tap="individualQuote(totalitem)">单独报价</button>
 								</view>
 								<view class="dis f-c mt-2" v-if="totalitem.namesimple=='国任财险'">
 									<view class="dis a-c j-s">
@@ -421,13 +426,8 @@
 				<image src="/static/image/car-insure/SchemeSelection.png" mode="" style="width: 100%;height: 40px;">
 				</image>
 				<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
-					<view class="Plancontent dis  j-s a-c ">
-						<text class="title mb-1">险种</text>
-						<text style="font-size: 14px;color: #FF5600;margin-right: 20px;">{{productName}}</text>
-
-					</view>
 					<view class="Plancontent dis  f-c ">
-						<text class="title mb-1">方案选择</text>
+						<text class="title ">方案选择</text>
 						<view class="dis  a-c f-wrap  modelformcss">
 							<view class="status-data" :class="item.schemeId==SelectedPlanId? 'active':''"
 								style="margin:4px 10px;" v-for="(item,index) in planDataExpansion.genericPlanList"
@@ -436,6 +436,11 @@
 							</view>
 						</view>
 					</view>
+					<view class="Plancontent dis  j-s a-c ">
+						<text class="title ">已选险种</text>
+						<text style="font-size: 14px;color: #FF5600;margin-right: 20px;">{{productName}}</text>
+					</view>
+
 					<view class="">
 						<view class="Plancontent dis  f-c " v-if="planDataExpansion.genericPlanInfo.isJq=='1'">
 							<text class="title mb-1">交强险</text>
@@ -623,11 +628,7 @@
 										<text>{{anshengaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="anshengPopupshow=true">
-										<text>{{anshengaccidentalDrivingVo.parentName}}</text>
-										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
-									</view>
-									<view class="dis a-c j-s" @click="anshengPopupshow1=true">
-										<text>{{anshengaccidentalDrivingVo.projectName}}</text>
+										<text>{{anshengaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -666,11 +667,7 @@
 										<text>{{guoRenaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="guoRenPopupshow=true">
-										<text>{{guoRenaccidentalDrivingVo.parentName}}</text>
-										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
-									</view>
-									<view class="dis a-c j-s" @click="guoRenPopupshow1=true">
-										<text>{{guoRenaccidentalDrivingVo.projectName}}</text>
+										<text>{{guoRenaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -710,11 +707,7 @@
 										<text>{{dajiaaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="dajiaPopupshow=true">
-										<text>{{dajiaaccidentalDrivingVo.parentName}}</text>
-										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
-									</view>
-									<view class="dis a-c j-s" @click="dajiaPopupshow1=true">
-										<text>{{dajiaaccidentalDrivingVo.projectName}}</text>
+										<text>{{dajiaaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -752,7 +745,7 @@
 										style="color: #FF5600;font-size: 14px;">意外险选择</text>
 									<view class="" v-for="(item,index) in zijinaccidentalDrivingVo" :key="index">
 										<view class=" accident-ins dis a-c j-s">
-											<text>{{item.projectName}}</text>
+											<text>{{item.alias}}</text>
 										</view>
 										<view class=" dis j-s a-c">
 											<view class="">
@@ -791,7 +784,7 @@
 										<text>{{zhonganaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="zhonganPopupshow=true">
-										<text>{{zhonganaccidentalDrivingVo.projectName}}</text>
+										<text>{{zhonganaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -830,7 +823,7 @@
 										<text>{{yongchengaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="yongchengPopupshow=true">
-										<text>{{yongchengaccidentalDrivingVo.projectName}}</text>
+										<text>{{yongchengaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -868,8 +861,8 @@
 									<view class="header">
 										<text>{{hengbangaccidentalDrivingVo.typeName}}</text>
 									</view>
-									<view class="dis a-c j-s" @click="zhonganPopupshow=true">
-										<text>{{hengbangaccidentalDrivingVo.projectName}}</text>
+									<view class="dis a-c j-s" @click="hengbangPopupshow=true">
+										<text>{{hengbangaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -908,7 +901,7 @@
 										<text>{{zhongmeiaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="zhongmeiPopupshow=true">
-										<text>{{zhongmeiaccidentalDrivingVo.projectName}}</text>
+										<text>{{zhongmeiaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -947,7 +940,7 @@
 										<text>{{taikangaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="taikangPopupshow=true">
-										<text>{{taikangaccidentalDrivingVo.projectName}}</text>
+										<text>{{taikangaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -986,7 +979,7 @@
 										<text>{{bohaiaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="bohaiPopupshow=true">
-										<text>{{bohaiaccidentalDrivingVo.projectName}}</text>
+										<text>{{bohaiaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -1025,7 +1018,7 @@
 										<text>{{taipingaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="taipingPopupshow=true">
-										<text>{{taipingaccidentalDrivingVo.projectName}}</text>
+										<text>{{taipingaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -1064,7 +1057,7 @@
 										<text>{{huanongaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="huanongPopupshow=true">
-										<text>{{huanongaccidentalDrivingVo.projectName}}</text>
+										<text>{{huanongaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -1103,7 +1096,7 @@
 										<text>{{renshouaccidentalDrivingVo.typeName}}</text>
 									</view>
 									<view class="dis a-c j-s" @click="renshouPopupshow=true">
-										<text>{{renshouaccidentalDrivingVo.projectName}}</text>
+										<text>{{renshouaccidentalDrivingVo.alias}}</text>
 										<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 									</view>
 									<view>
@@ -1139,11 +1132,12 @@
 					</view>
 				</scroll-view>
 				<view class="PlanPopup-btn dis a-c j-c">
-					<u-button shape="circle" size="medium" style="margin-right:50px;"
-						@click="genericPlanPopup=false">取消</u-button>
-					<u-button type="primary" shape="circle" size="medium"
-						style="background: linear-gradient( 90deg, #0052FF 0%, #0D8BFF 100%);"
-						@click="confirmPlan(planDataExpansion.cnName)">确定方案</u-button>
+					<button size="mini" type="default"
+						style="margin-right:50px;border: 1px solid #C9C9C9;border-radius: 50px;width: 100px;"
+						@click="genericPlanPopup=false">取消</button>
+					<button type="primary" size="mini"
+						style="background: linear-gradient( 90deg, #0052FF 0%, #0D8BFF 100%);border-radius: 50px;width: 100px;"
+						@click="confirmPlan(planDataExpansion.cnName)">确定方案</button>
 				</view>
 			</view>
 		</u-popup>
@@ -1182,23 +1176,9 @@
 			:scroll-height="{height: '300px'}" :show-confirm-button="false" mask-close-able>
 			<view class="slot-content p-2">
 				<u-radio-group size="30" wrap>
-					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="ASprogrammeradioChange"
-						shape="square" v-for="(item, index) in anshengprogrammeData" :key="index"
-						:name="item.projectCode">
-						{{item.projectCode}}{{item.projectName}}
-					</u-radio>
-				</u-radio-group>
-			</view>
-		</u-modal>
-		<u-modal v-model="anshengPopupshow1" 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 p-2">
-				<u-radio-group size="30" wrap>
-					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="ASInsuranceradioChange"
-						shape="square" v-for="(item, index) in anshengInsuranceData" :key="index"
-						:name="item.projectCode">
-						{{item.projectCode}}{{item.projectName}}
+					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="ASradioChange" shape="square"
+						v-for="(item, index) in anshengInsuranceData" :key="index" :name="item.projectCode">
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1212,7 +1192,7 @@
 					<u-radio style="margin: 4px 0; align-items: flex-start;" label-size="30" shape="square"
 						@change="RSradioChange" v-for="(item, index) in renshouInsuranceData" :key="index"
 						:name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1225,7 +1205,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;" label-size="30" @change="ZMradioChange" shape="square"
 						v-for="(item, index) in zhongmeiInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1238,7 +1218,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="HBradioChange" shape="square"
 						v-for="(item, index) in hengbangInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1251,7 +1231,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="ZAradioChange" shape="square"
 						v-for="(item, index) in zhonganInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1264,7 +1244,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="HNradioChange" shape="square"
 						v-for="(item, index) in huanongInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1277,7 +1257,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="TkradioChange" shape="square"
 						v-for="(item, index) in taikangInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1289,7 +1269,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="YCradioChange" shape="square"
 						v-for="(item, index) in yongchengInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1302,7 +1282,7 @@
 				<u-radio-group size="30" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="TPradioChange" shape="square"
 						v-for="(item, index) in taipingInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1315,7 +1295,7 @@
 				<u-radio-group size="30" style="" wrap>
 					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="BHradioChange" shape="square"
 						v-for="(item, index) in bohaiInsuranceData" :key="index" :name="item.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1343,7 +1323,7 @@
 					<u-checkbox-group @change="ZJcheckboxGroupChange">
 						<u-checkbox style="margin: 8px 0;flex: auto;" active-color="#FF4D4D" label-size="28"
 							v-model="item.checked" v-for="(item, index) in zijinInsuranceData" :key="index"
-							:name="item.projectCode">{{item.projectName}}</u-checkbox>
+							:name="item.projectCode">{{item.alias}}</u-checkbox>
 					</u-checkbox-group>
 				</scroll-view>
 				<view class="operateBtn dis ">
@@ -1382,54 +1362,27 @@
 				</view>
 			</view>
 		</u-popup>
-		<!-- 国任驾意险弹框 -->
+
 		<u-modal v-model="guoRenPopupshow" 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 p-2">
 				<u-radio-group size="30" wrap>
-					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="GRprogrammeradioChange"
-						shape="square" v-for="(item, index) in guoRenprogrammeData" :key="index"
-						:name="item.projectCode">
-						{{item.projectName}}
-					</u-radio>
-				</u-radio-group>
-			</view>
-		</u-modal>
-		<u-modal v-model="guoRenPopupshow1" 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 p-2">
-				<u-radio-group size="30" wrap>
-					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="GRInsuranceradioChange"
-						shape="square" v-for="(item, index) in guoRenInsuranceData" :key="index"
-						:name="item.projectCode">
-						{{item.projectName}}
+					<u-radio style="margin: 4px 0;flex: auto;" label-size="30" @change="GRradioChange" shape="square"
+						v-for="(item, index) in guoRenInsuranceData" :key="index" :name="item.projectCode">
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
 		</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 p-2">
-				<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 p-2">
 				<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.projectCode">
-						{{item.projectName}}
+						{{item.alias}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1629,20 +1582,14 @@
 				accidentCategoryId: "",
 				/* 安盛 */
 				anshengPopupshow: false,
-				anshengPopupshow1: false,
-				anshengprogrammeData: [],
 				anshengInsuranceData: [],
 				anshengaccidentalDrivingVo: {},
 				/* 国任 */
 				guoRenPopupshow: false,
-				guoRenPopupshow1: false,
-				guoRenprogrammeData: [],
 				guoRenInsuranceData: [],
 				guoRenaccidentalDrivingVo: {},
 				/* 大家 */
 				dajiaPopupshow: false,
-				dajiaPopupshow1: false,
-				dajiaprogrammeData: [],
 				dajiaInsuranceData: [],
 				dajiaaccidentalDrivingVo: {},
 				/* 永诚 */
@@ -1849,69 +1796,20 @@
 				uni.navigateBack(1)
 			},
 			//-------------驾意险处理开始
-			//安盛一级选择
-			ASprogrammeradioChange(id) {
-				let info = this.anshengprogrammeData.find((val => val.projectCode == id))
-				this.anshengPopupshow = false;
-				this.anshengaccidentalDrivingVo.parentCode = info.projectCode;
-				this.anshengaccidentalDrivingVo.parentName = info.projectName;
-				if (info.insDrivingIntentionInsurances) {
-					this.anshengInsuranceData = info.insDrivingIntentionInsurances;
-					this.anshengaccidentalDrivingVo.projectCode = info.insDrivingIntentionInsurances[0].projectCode;
-					this.anshengaccidentalDrivingVo.projectName = info.insDrivingIntentionInsurances[0].projectName;
-				} else {
-					this.anshengInsuranceData = []
-				}
-			},
-			//安盛二级选择
-			ASInsuranceradioChange(id) {
-				let info = this.anshengInsuranceData.find((val => val.projectCode == id))
-				this.anshengaccidentalDrivingVo.projectCode = info.projectCode;
-				this.anshengaccidentalDrivingVo.projectName = info.projectName;
-				this.anshengPopupshow1 = false;
-			},
-			//国任一级选择
-			async GRprogrammeradioChange(id) {
-				let info = this.guoRenprogrammeData.find((val => val.projectCode == id))
-				this.guoRenPopupshow = false;
-				this.guoRenaccidentalDrivingVo.parentCode = info.projectCode;
-				this.guoRenaccidentalDrivingVo.parentName = info.projectName;
-				if (info.insDrivingIntentionInsurances) {
-					this.guoRenInsuranceData = info.insDrivingIntentionInsurances;
-					this.guoRenaccidentalDrivingVo.projectCode = info.insDrivingIntentionInsurances[0].projectCode;
-					this.guoRenaccidentalDrivingVo.projectName = info.insDrivingIntentionInsurances[0].projectName;
-				} else {
-					this.guoRenInsuranceData = []
-				}
 
+
+			//国任
+			GRradioChange(id) {
+				let obj = this.guoRenInsuranceData.find((val => val.projectCode == id))
+				Object.assign(this.guoRenaccidentalDrivingVo, obj);
+				this.guoRenPopupshow = false;
 			},
-			//国任二级选择
-			GRInsuranceradioChange(id) {
-				let info = this.guoRenInsuranceData.find((val => val.projectCode == id))
-				this.guoRenaccidentalDrivingVo.projectCode = info.projectCode;
-				this.guoRenaccidentalDrivingVo.projectName = info.projectName;
-				this.guoRenPopupshow1 = false;
-			},
-			//大家一级选择
-			DJprogrammeradioChange(id) {
-				let info = this.dajiaprogrammeData.find((val => val.projectCode == id))
-				this.dajiaPopupshow = false;
-				this.dajiaaccidentalDrivingVo.parentCode = info.projectCode;
-				this.dajiaaccidentalDrivingVo.parentName = info.projectName;
-				if (info.insDrivingIntentionInsurances) {
-					this.dajiaInsuranceData = info.insDrivingIntentionInsurances;
-					this.dajiaaccidentalDrivingVo.projectCode = info.insDrivingIntentionInsurances[0].projectCode;
-					this.dajiaaccidentalDrivingVo.projectName = info.insDrivingIntentionInsurances[0].projectName;
-				} else {
-					this.dajiaInsuranceData = []
-				}
-			},
-			//大家二级
+
+			//大家
 			DJradioChange(id) {
-				let info = this.dajiaInsuranceData.find((val => val.projectCode == id))
-				this.dajiaaccidentalDrivingVo.projectCode = info.projectCode;
-				this.dajiaaccidentalDrivingVo.projectName = info.projectName;
-				this.dajiaPopupshow1 = false;
+				let obj = this.dajiaInsuranceData.find((val => val.projectCode == id))
+				Object.assign(this.dajiaaccidentalDrivingVo, obj);
+				this.dajiaPopupshow = false;
 			},
 			//紫金意外险
 			ZJcheckboxGroupChange(detail) {
@@ -1921,6 +1819,12 @@
 					this.zijinaccidentalDrivingVo.push(list)
 				})
 			},
+			//安盛
+			ASradioChange(id) {
+				let obj = this.anshengInsuranceData.find((val => val.projectCode == id))
+				Object.assign(this.anshengaccidentalDrivingVo, obj);
+				this.anshengPopupshow = false;
+			},
 			//太平
 			TPradioChange(id) {
 				let obj = this.taipingInsuranceData.find(val => val.projectCode == id)
@@ -2011,6 +1915,26 @@
 			},
 			jqterms() {
 				let file = 'https://sxzgkj.baoxianzhanggui.com/web-api/upload/specification/commercialInsurance.pdf';
+				//#ifdef APP-PLUS
+				uni.showLoading({
+					title: '正在打开'
+				});
+				let dtask = plus.downloader.createDownload(file, {
+					filename: "_downloads/" + '交强条款.pdf'
+				}, function(d, status) {
+					if (status == 200) {
+						uni.hideLoading()
+						//下载成功,d.filename是文件在保存在本地的相对路径,使用下面的API可转为平台绝对路径
+						let fileSaveUrl = plus.io.convertLocalFileSystemURL(d.filename);
+						plus.runtime.openFile(d.filename); //选择软件打开文件
+					} else {
+						uni.hideLoading()
+						//下载失败
+						plus.downloader.clear(); //清除下载任务
+					}
+				})
+				dtask.start();
+				//#endif
 				//#ifdef H5
 				var win = window.open();
 				win.document.write(
@@ -2024,6 +1948,26 @@
 			},
 			syterms() {
 				let file = 'https://sxzgkj.baoxianzhanggui.com/web-api/upload/specification/compulsoryInsurance.pdf';
+				//#ifdef APP-PLUS
+				uni.showLoading({
+					title: '正在打开'
+				});
+				let dtask = plus.downloader.createDownload(file, {
+					filename: "_downloads/" + '商业条款.pdf'
+				}, function(d, status) {
+					if (status == 200) {
+						uni.hideLoading()
+						//下载成功,d.filename是文件在保存在本地的相对路径,使用下面的API可转为平台绝对路径
+						let fileSaveUrl = plus.io.convertLocalFileSystemURL(d.filename);
+						plus.runtime.openFile(d.filename); //选择软件打开文件
+					} else {
+						uni.hideLoading()
+						//下载失败
+						plus.downloader.clear(); //清除下载任务
+					}
+				})
+				dtask.start();
+				//#endif
 				//#ifdef H5
 				var win = window.open();
 				win.document.write(
@@ -2990,28 +2934,12 @@
 			async accidentCategoryclick(item, items, index) {
 				this.accidentInsuranceCategoryList[index].checked = !this.accidentInsuranceCategoryList[index].checked;
 				if (this.accidentInsuranceCategoryList[index].checked) {
-					let params = {
-						companyId: items.id,
-						type: item.code,
-						productId: this.productId,
-						vehicleType: this.carInfo.cimodelclass,
-						energyType: this.carInfo.energyType,
-						carnature: this.carInfo.carnature,
-					}
-					let res = await this.$http.post('/plt/scheme/getDriving', params)
+					let res = await this.$http.get('/plt/scheme/optionalSchemeDriving?schemeId=' + this
+						.SelectedPlanId + '&seatNum=' + this.carInfo.seatCount)
 					switch (items.namesimple) {
 						case '安盛天平':
 						case '国任财险':
 						case '大家财险':
-							this[items.cnName + 'programmeData'] = res.data;
-							this[items.cnName + 'InsuranceData'] = res.data[0].insDrivingIntentionInsurances; //意外险list
-							this[items.cnName + 'accidentalDrivingVo'] = {
-								typeName: item.typeName,
-								...res.data[0].insDrivingIntentionInsurances[0],
-							};
-							this[items.cnName + 'accidentalDrivingVo'].parentCode = res.data[0].projectCode;
-							this[items.cnName + 'accidentalDrivingVo'].parentName = res.data[0].projectName;
-							break;
 						case '永诚财险':
 						case '恒邦财险':
 						case '诚泰财险':

+ 4 - 0
pages/carInsure/quote.vue

@@ -700,6 +700,10 @@
 										<text v-if="totalitem.result.syClaims">商业出险次数:{{ totalitem.result.syClaims ?
 										totalitem.result.syClaims : '无' }}</text>
 									</view>
+									<template v-if="totalitem.result.iszdj !=null && totalitem.result.iszdj!=''">
+										<text v-if="totalitem.result.iszdj==0" style="color: red;">假单交</text>
+										<text v-if="totalitem.result.iszdj==1" style="color: red;">真单交</text>
+									</template>
 									<view class="dis a-c j-end lastyear">
 										<view class=" left dis j-c a-c" v-if="totalitem.lastYearMsg"
 											@click="YearMsg(totalitem.lastYearMsg,totalitem.namesimple)">

+ 13 - 5
pages/carInsure/quoteDetail.vue

@@ -427,7 +427,7 @@
 								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>
+										<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>
@@ -456,7 +456,7 @@
 			</view>
 			<view class="car">
 				<view class="header d-flex a-center j-sb" @tap="showextendInfo = !showextendInfo">
-					<view class="title">保费因素</view>
+					<view class="title">车辆评分</view>
 					<view class="adjustPlan d-flex">
 						<view class="icon iconfont "
 							:class="{ 'icon-up-yixuanzhong': showextendInfo, 'icon-down-weixuanzhong': !showextendInfo }"
@@ -785,17 +785,25 @@
 					</view>
 				</view>
 				<view class="body" v-if="showApplyno">
+					<view class="row d-flex a-center j-sb" v-if="orderInfo.jqapplyno">
+						<view>交强险投保单号:</view>
+						<view>{{orderInfo.jqapplyno}}</view>
+					</view>
 					<view class="row d-flex a-center j-sb" v-if="orderInfo.jqpolicyno">
 						<view>交强险保单号:</view>
 						<view>{{orderInfo.jqpolicyno}}</view>
 					</view>
+					<view class="row d-flex a-center j-sb" v-if="orderInfo.syapplyno">
+						<view>商业险投保单号:</view>
+						<view>{{orderInfo.syapplyno}}</view>
+					</view>
 					<view class="row d-flex a-center j-sb" v-if="orderInfo.sypolicyno">
 						<view>商业险保单号:</view>
 						<view>{{orderInfo.sypolicyno}}</view>
 					</view>
 					<view class="row dis f-c">
 						<view class=" dis a-c j-s" v-for="(policyListitem,policyListindex) in policyList"
-							:key="policyListindex">
+							:key="policyListindex+'保单'">
 							<view class="left">{{policyListitem.fileTitle}}:{{carInfo.licenseNo}}
 							</view>
 							<view class="right ">
@@ -804,7 +812,7 @@
 							</view>
 						</view>
 						<view class="content" v-for="(policyListitem1,policyListindex1) in policyList1"
-							:key="policyListindex1">
+							:key="policyListindex1+'标志'">
 							<view class=" dis a-c j-s">
 								<view class="left">{{policyListitem1.fileTitle}}:{{carInfo.licenseNo}}
 								</view>
@@ -1270,7 +1278,7 @@
 				showPolicybzFile: false, //展示电子保单
 				policyList: [], //电子保单文件
 				policyList1: [], //电子标志文件
-				showCarImageInfo: true, //显示车辆影像
+				showCarImageInfo: false, //显示车辆影像
 				carImageListId: [],
 				ownerImageListId: [],
 				policyImageListId: [],

+ 26 - 19
pages/chat/chat.vue

@@ -25,7 +25,7 @@
 						<view class="dis j-c a-c mt-1 mb-3 ">
 							<text class="initTime">{{x.initTime}}</text>
 						</view>
-						<view class="flex" style="max-width: 550rpx;">
+						<view class="flex" style="max-width: 650rpx;">
 							<view class=" chatBox  dis j-s a-c" style="">
 								<image v-if="i==0" src="/static/img/customerService1.png" mode=""
 									style="width: 47px;height: 50px;position: absolute;left: 0;bottom: 0;">
@@ -51,7 +51,7 @@
 					</view>
 				</view>
 				<!-- 防止消息底部被遮 -->
-				<view style="height: 120rpx;">
+				<view style="height: 100px;">
 
 				</view>
 			</view>
@@ -241,24 +241,16 @@
 					setTimeout(() => {
 						// 取消loading
 						this.msgLoad = false
-						this.msgList.push({
+						const newMessage = {
 							my: false,
-							msg: res.data.message,
+							msg: '',
 							initTime: res.data.date
-						})
-						// this.msgList.push({
-						// 	my: false,
-						// 	msg: "单消息模板",
-						// 	type: -1
-						// })
-						// this.msgList.push({
-						// 	my: false,
-						// 	msg: "根据您的问题,已为您匹配了下列问题(多个答案模板)",
-						// 	type: 2,
-						// 	questionList: ["如何注销用户", "我想了解业务流程", "手机号如何更换"]
-						// })
-						this.msgGo()
-					}, 1000)
+						};
+						this.msgList.push(newMessage);
+						this.msgGo();
+						// 使用typeWriter效果逐个字符显示
+						this.typeWriter(res.data.message, newMessage);
+					}, 400)
 				}
 
 			},
@@ -287,7 +279,22 @@
 				animation.translateY(x).step()
 
 				this.animationData = animation.export()
-			}
+			},
+			typeWriter(text, messageObj) {
+				let index = 0;
+				const speed = 20;
+				const addCharacter = () => {
+					if (index < text.length) {
+						messageObj.msg += text.charAt(index);
+						index++;
+						setTimeout(addCharacter, speed);
+					} else {
+						this.msgGo();
+					}
+				};
+				addCharacter();
+			},
+
 		}
 	}
 </script>

+ 148 - 81
pages/orders/orders.vue

@@ -13,61 +13,66 @@
 					<image src="/static/image/car-insure/dropdown.png" mode="" @tap="searchPopup"></image>
 				</view>
 				<view :class="['dropdown-content', { 'show': showDropdown }]" @tap="searchPopup">
-					<view :class="['dropdown-content1','dis','f-c','j-s', { 'show1': showDropdown }]" @tap.stop.prevent>
-						<view style="padding: 0 16px; box-sizing: border-box;">
-							<view class="term">
-								<text>订单状态</text>
-								<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
-									<view class="status-data" :class="item.value===pageRequest.orderStatus? 'active':''"
-										v-for="(item,index) in statusList" @tap.stop.prevent="statusclick(index)"
-										:key="index">
-										{{item.label}}
+					<view :class="['dropdown-content1','dis','f-c','j-s','', { 'scolcentent': showDropdown }]"
+						@tap.stop.prevent>
+						<scroll-view scroll-y="true" class="scolcentent ">
+							<view style="padding: 0px 20px;">
+								<view class="term">
+									<text>订单状态</text>
+									<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
+										<view class="status-data"
+											:class="item.value===pageRequest.orderStatus? 'active':''"
+											v-for="(item,index) in statusList"
+											@tap.stop.prevent="statusclick(item.value)" :key="index">
+											{{item.label}}
+										</view>
 									</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 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>
-							<view class="term">
-								<text>保险公司</text>
-								<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
-									<view class="status-data" :class="item.id==pageRequest.companyId? 'active':''"
-										v-for="(item,index) in esmInsCompanyList" @tap="companystatusclick(item.id)"
-										:key="index">
-										{{item.namesimple}}
+								<view class="term">
+									<text>保险公司</text>
+									<view class="dis  a-c f-wrap j-start" style="margin-top: 10px;">
+										<view class="status-data" :class="item.id==pageRequest.companyId? 'active':''"
+											v-for="(item,index) in esmInsCompanyList" @tap="companystatusclick(item.id)"
+											:key="index">
+											{{item.namesimple}}
+										</view>
 									</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.value==timespecifications? 'active':''"
-										v-for="(item,index) in dateList" @tap="dateclick(index)" :key="index">
-										{{item.label}}
-									</view>
-									<view class="dis a-c">
-										<view class="status-data" :class="startShow? 'active' :''"
-											@tap="startShowmethod()">
-											<text v-if="pageRequest.startDate!=''">{{pageRequest.startDate}}</text>
-											<text v-else>{{transformTime()}}</text>
+								<view class="term">
+									<text>订单日期</text>
+									<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
+										<view class="status-data" :class="item.value==timespecifications? 'active':''"
+											v-for="(item,index) in dateList" @tap="dateclick(index)" :key="index">
+											{{item.label}}
 										</view>
-										<text style="margin: 0 8px;font-size: 12px;">至</text>
-										<view class="status-data" :class="endShow? 'active' :''" @tap="endShowmethod()">
-											<text v-if="pageRequest.endDate!=''">{{pageRequest.endDate}}</text>
-											<text v-else>{{transformTime()}}</text>
+										<view class="dis a-c">
+											<view class="status-data" :class="startShow? 'active' :''"
+												@tap="startShowmethod()">
+												<text v-if="pageRequest.startDate!=''">{{pageRequest.startDate}}</text>
+												<text v-else>{{transformTime()}}</text>
+											</view>
+											<text style="margin: 0 8px;font-size: 12px;">至</text>
+											<view class="status-data" :class="endShow? 'active' :''"
+												@tap="endShowmethod()">
+												<text v-if="pageRequest.endDate!=''">{{pageRequest.endDate}}</text>
+												<text v-else>{{transformTime()}}</text>
+											</view>
 										</view>
 									</view>
 								</view>
 							</view>
-						</view>
+						</scroll-view>
 						<view class="operateBtn dis ">
 							<view class="cancel dis a-c j-c" @click="showDropdown=false">
 								取消
@@ -81,7 +86,7 @@
 			</view>
 		</view>
 		<view style="padding: 110px 16px 50px 16px;">
-			<view class=" orderItemPane" v-for="(item,index) in pageResult" :key="index" @click="querydetail(item)">
+			<view class=" orderItemPane" v-for="(item,index) in pageResult" :key="index">
 				<view class="orderItemPane-upper dis j-s a-c ">
 					<view v-for="(statusitem, statusindex) in statusList" :key="statusindex" class="dis a-c"
 						style="font-weight: bold;" v-if="item.orderstatus == statusitem.value">
@@ -98,20 +103,30 @@
 							<u-icon name="arrow-right" size="14px"
 								style="margin-left: 5px;color: #C7C6CA;"></u-icon></text>
 						</view>
-
 						<text>订单号:{{item.orderno}}</text>
-						<text>业务员:{{item.username}}({{item.userid}})</text>
-						<text>投保人:{{item.insuredname}}</text>
+						<text>投保人:{{item.applyinfo.name}}</text>
 						<text>投保险种:{{item.product}}</text>
 						<text v-if="item.orderstatus=='3'">承保公司:{{item.insCompany}}</text>
 
 					</view>
 				</view>
-				<view class="orderItemPane-below dis a-c  j-end ">
-					<u-button v-if="item.orderstatus!='3'" type="primary" size="mini" :hair-line="false"
-						:custom-style="{fontSize:'15px'}" :plain="true" @click="quotehistory(item)">报价历史</u-button>
-					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'15px'}" type="warning" size="mini"
-						:hair-line="false" :plain="true" @click="CloseEdit(item.orderno)">编辑</u-button>
+				<view class="orderItemPane-below dis a-c  j-s ">
+					<!-- <u-button v-if="item.orderstatus!='3'" type="primary" size="mini" :hair-line="false"
+						:custom-style="{fontSize:'12px'}" :plain="true" @click="quotehistory(item)">报价历史</u-button> -->
+					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
+						type="warning" size="mini" :hair-line="false" :plain="true"
+						@click="CloseEdit(item.orderno)">进行中</u-button>
+					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
+						type="warning" size="mini" :hair-line="false" :plain="true"
+						@click="quotehistory(item,'1')">核保中</u-button>
+					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
+						type="warning" size="mini" :hair-line="false" :plain="true"
+						@click="quotehistory(item,'2')">待缴费</u-button>
+					<u-button :custom-style="{fontSize:'12px'}" shape="circle" type="warning" size="mini"
+						:hair-line="false" :plain="true" @click="quotehistory(item,'3')">已承保</u-button>
+					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
+						type="warning" size="mini" :hair-line="false" :plain="true"
+						@click="quotehistory(item,'4')">核保退回</u-button>
 				</view>
 			</view>
 			<u-loadmore v-if="pageResult.length!=0" :status="status" />
@@ -194,7 +209,10 @@
 				/* 搜索框配置 */
 				//状态筛选list
 				statusList: [{
-						label: '报价完成',
+						label: '全部',
+						value: " ",
+					}, {
+						label: '进行中',
 						value: 0,
 						color: "#229805",
 						src: "/static/image/car-insure/state1.png"
@@ -206,7 +224,7 @@
 						src: "/static/image/car-insure/state2.png"
 					},
 					{
-						label: '已核保待缴费',
+						label: '待缴费',
 						value: 2,
 						color: "#FF0F00",
 						src: "/static/image/car-insure/state3.png"
@@ -230,21 +248,45 @@
 						value: 0,
 					},
 					{
-						label: '一周内',
+						label: '近1天',
 						value: 1,
 					},
 					{
-						label: '一个月内',
+						label: '近2天',
 						value: 2,
 					},
 					{
-						label: '三个月内',
+						label: '近3天',
 						value: 3,
 					},
 					{
-						label: '六个月内',
+						label: '近4天',
 						value: 4,
 					},
+					{
+						label: '近5天',
+						value: 5,
+					},
+					{
+						label: '近6天',
+						value: 6,
+					},
+					{
+						label: '近7天',
+						value: 7,
+					},
+					{
+						label: '一个月内',
+						value: '一个月内',
+					},
+					{
+						label: '三个月内',
+						value: '三个月内',
+					},
+					{
+						label: '六个月内',
+						value: '六个月内',
+					},
 
 				],
 				typeArray: [{
@@ -260,6 +302,7 @@
 						value: 2,
 					}
 				], //订单的类型
+				vehiclePlateList: [], //车牌
 				toTopFlag: false, //显示回到顶部按钮
 				queryLicenseNo: "",
 				queryFrameNo: "",
@@ -355,7 +398,10 @@
 			async getDicType(type) {
 				let res = await this.$http.get('/sysDict/dictDetails/' + type);
 				if (res.code == 200) {
-					this[type + 'options'] = res.data.ddList;
+					this[type + 'options'] = [{
+						dictTag: "全部",
+						dictValue: " ",
+					}, ...res.data.ddList];
 				}
 			},
 			async esmInsCompany() {
@@ -383,7 +429,7 @@
 			},
 			//状态筛选
 			statusclick(e) {
-
+				console.log(e);
 				if (e === this.pageRequest.orderStatus) {
 					this.pageRequest.orderStatus = ''
 				} else {
@@ -426,26 +472,40 @@
 					case 0:
 						this.pageRequest.startDate = "";
 						this.pageRequest.endDate = "";
+
 						break;
 					case 1:
-						this.pageRequest.startDate = this.transformTime(7);
+					case 2:
+					case 3:
+					case 4:
+					case 5:
+					case 6:
+					case 7:
+						this.pageRequest.startDate = this.transformTime(e);
 						this.pageRequest.endDate = this.transformTime();
 						break;
-					case 2:
+					case '一个月内':
 						this.pageRequest.startDate = this.transformTime1(1);
 						this.pageRequest.endDate = this.transformTime();
 						break;
-					case 3:
+					case '三个月内':
 						this.pageRequest.startDate = this.transformTime1(3);
 						this.pageRequest.endDate = this.transformTime();
 						break;
-					case 4:
+					case '六个月内':
 						this.pageRequest.startDate = this.transformTime1(6);
 						this.pageRequest.endDate = this.transformTime();
 						break;
 					default:
 				}
 				this.timespecifications = e;
+				this.vehiclePlateform(this.pageRequest.startDate, this.pageRequest.endDate);
+			},
+			async vehiclePlateform(start, end) {
+				let res = await this.$http.post('/insurance/order/queryLicenseInOrder', {
+					startDate: start,
+					endDate: end,
+				});
 			},
 			startconfirm(e) {
 				this.pageRequest.startDate = e.year + '-' + e.month + '-' + e.day;
@@ -465,24 +525,25 @@
 				// return /^陆丰[0-9A-Z]{4}临$/.test(str.trim())
 			},
 			//查看子订单
-			async querydetail(val) {
-				let params = {
-					orderno: val.orderno,
-					insuredname: val.insuredname,
-					licenseno: val.licenseno,
-					modelcname: val.carinfo.modelcname,
-				}
-				uni.navigateTo({
-					url: `/pages/orders/subOrders?orderno=${JSON.stringify(params)}`
-				})
-			},
+			// async querydetail(val) {
+			// 	let params = {
+			// 		orderno: val.orderno,
+			// 		insuredname: val.insuredname,
+			// 		licenseno: val.licenseno,
+			// 		modelcname: val.carinfo.modelcname,
+			// 	}
+			// 	uni.navigateTo({
+			// 		url: `/pages/orders/subOrders?orderno=${JSON.stringify(params)}`
+			// 	})
+			// },
 			//报价历史
-			quotehistory(val) {
+			quotehistory(val, Status) {
 				let params = {
 					orderno: val.orderno,
 					insuredname: val.insuredname,
 					licenseno: val.licenseno,
 					modelcname: val.carinfo.modelcname,
+					orderStatus: Status,
 				}
 				uni.navigateTo({
 					url: `/pages/orders/quoteHistory?orderno=${JSON.stringify(params)}`
@@ -492,7 +553,7 @@
 			//编辑
 			CloseEdit(val) {
 				uni.navigateTo({
-					url: "/pages/carInsure/quote?orderno=" + val
+					url: "/pages/carInsure/premiumCalc?orderno=" + val
 				})
 				// this.navigate({
 				// 	url: '/pages/carInsure1/quote1',
@@ -646,6 +707,7 @@
 		}
 	}
 
+
 	.dropdown-content1 {
 		background-color: #fff;
 		height: 0px;
@@ -659,8 +721,10 @@
 		/* 下拉菜单内容的最大高度 */
 	}
 
-	.show1 {
-		height: auto;
+	.scolcentent {
+		height: 450px;
+		margin-bottom: 10px;
+		overflow-y: auto;
 		/* 下拉菜单遮罩最大高度 */
 	}
 
@@ -677,6 +741,8 @@
 
 	}
 
+
+
 	.search-condition {
 		padding: 0 16px;
 
@@ -779,9 +845,10 @@
 
 	.orderItemPane-below {
 		height: auto;
+		margin-top: 5px;
 
 		&>button {
-			margin-left: 10px;
+			// margin-left: 10px;
 		}
 	}
 

+ 4 - 4
pages/orders/paymentCode.vue

@@ -25,28 +25,28 @@
 						<view class="dis f-wrap" style=" padding: 10px 0; border-bottom: 1px dashed #EFEFEF;"
 							v-if="jqStartDate">
 							<view style="width: 50%;border-right: 1px dashed #EFEFEF;" class="dis f-c a-start ">
+								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">交强险起保日期</text>
 								<text
 									style="font-size: 15px;font-weight: bold;letter-spacing:1px;">{{ jqStartDate }}</text>
-								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">交强险起保日期</text>
 							</view>
 							<view style="width: 50%;" class="dis f-c a-end">
+								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">交强险终保日期</text>
 								<text
 									style="font-size: 15px;font-weight: bold;letter-spacing:1px;">{{ jqEndDate }}</text>
-								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">交强险终保日期</text>
 							</view>
 
 						</view>
 						<view class="dis f-wrap" style=" padding: 10px 0; border-bottom: 1px dashed #EFEFEF;"
 							v-if="syStartDate">
 							<view style="width: 50%;border-right: 1px dashed #EFEFEF;" class="dis f-c a-start ">
+								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">商业险起保日期</text>
 								<text
 									style="font-size: 15px;font-weight: bold;letter-spacing:1px;">{{ syStartDate }}</text>
-								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">商业险起保日期</text>
 							</view>
 							<view style="width: 50%;" class="dis f-c a-end">
+								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">商业险终保日期</text>
 								<text
 									style="font-size: 15px;font-weight: bold;letter-spacing:1px;">{{ sysEndDate }}</text>
-								<text style="font-size: 14px;color: rgba(51,51,51,0.8);">商业险终保日期</text>
 							</view>
 						</view>
 						<view class="information">

+ 111 - 19
pages/orders/quoteHistory.vue

@@ -29,15 +29,11 @@
 						<view>车船税:¥{{item.taxamount}}</view>
 						<view v-if="item.jypremium">驾意险:¥{{item.jypremium}}</view>
 					</view>
-					<view v-if="item.auditopinion" class="dis f-c" style="font-size: 12px;">
-						<text>审核意见</text>
-						<text>{{item.auditopinion}}</text>
-					</view>
 				</view>
 				<view class="orders-below dis f-c">
 					<view class="dis a-c j-end">
 						<u-button
-							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险','诚泰财险'].includes(item.inscompany)"
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="queryStatus(item.id,item)">查询缴费状态</u-button>
 						<u-button v-if="item.orderstatus==2" size="mini" type="error" :custom-style="{fontSize:'14px'}"
@@ -48,15 +44,25 @@
 						<u-button v-if="item.orderstatus==2" size="mini" type="primary"
 							:custom-style="{fontSize:'14px'}" :plain="true"
 							@click="revokeCode(item.id)">撤销二维码</u-button>
+
+						<u-button v-if="item.orderstatus==1" size="mini" type="default"
+							:custom-style="{fontSize:'14px'}" :plain="true"
+							@click="terminateOrder(item.id)">关闭订单</u-button>
+						<u-button v-if="item.orderstatus==1" size="mini" type="default"
+							:custom-style="{fontSize:'14px'}" :plain="true"
+							@click="revokeUnderwriting(item.id)">取消核保</u-button>
 					</view>
 					<view class="dis a-c j-end" style="margin-top: 5px;">
 						<u-button v-if="(item.orderstatus==4 || item.orderstatus==1) && item.inscompany=='华泰财险'"
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="huataiunderwriting(item)">更新订单</u-button>
 						<u-button
-							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险','诚泰财险'].includes(item.inscompany)"
 							size="mini" type="error" :plain="true" :custom-style="{fontSize:'14px'}"
 							@click="underwriting(item.id,item.inscompany)">更新订单</u-button>
+						<u-button v-if="item.orderstatus==4" size="mini" type="primary"
+							:custom-style="{fontSize:'14px',background:'#ffaa00'}"
+							@click="approvalReason(item.id)">核保原因</u-button>
 						<u-button size="mini" type="primary" :custom-style="{fontSize:'14px',background:'#FF5600'}"
 							@click="bjdpreview(item.id)">报价单</u-button>
 						<u-button size="mini" type="primary" :custom-style="{fontSize:'14px'}"
@@ -79,9 +85,26 @@
 			</view>
 		</view>
 		<o-empty v-if="sublist.length==0" />
-		<!-- <u-popup v-model="trajectoryShow" mode="center" border-radius="8" width="80%">
-			<u-steps mode="number" :list="numList" :current="2" direction="column" style="padding: 20px;"></u-steps>
-		</u-popup> -->
+		<u-modal v-model="approvalReasonShow" 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="approvalReasonShow=false" confirm-text="关闭">
+			<view class="slot-content dis  a-c  p-2">
+				<scroll-view :scroll-top="scrollTop" scroll-y="true" class="discountInfoscroll">
+					<rich-text :nodes="approvalReasonContent"></rich-text>
+				</scroll-view>
+			</view>
+		</u-modal>
+		<u-modal v-model="revokeQrCodeShow" 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="revokeQrCodeconfirm" confirm-text="确定">
+			<view class="slot-content dis  a-c j-c  p-2">
+				确认撤销二维码?
+			</view>
+		</u-modal>
 	</view>
 </template>
 <script>
@@ -93,6 +116,10 @@
 	export default {
 		data() {
 			return {
+				revokeQrCodeShow: false,
+				scrollTop: 0,
+				approvalReasonShow: false, //核保意见
+				approvalReasonContent: "",
 				show: true,
 				modeClass: 'fade',
 				// trajectoryShow: false,
@@ -104,23 +131,24 @@
 				orderno: "",
 				insuredname: "",
 				licenseno: "",
+				orderStatus: "",
 				sublist: [],
 				numList: [{
-						name: '报价完成'
+						name: '进行中'
 					}, {
 						name: '待核保'
 					},
 					{
 						name: '核保退回'
 					}, {
-						name: '已核保待缴费'
+						name: '待缴费'
 					}, {
 						name: '已承保'
 					},
 
 				],
 				statusList: [{
-						label: '报价完成',
+						label: '进行中',
 						value: 0,
 						color: "#229805",
 						src: "/static/image/car-insure/state1.png"
@@ -132,7 +160,7 @@
 						src: "/static/image/car-insure/state2.png"
 					},
 					{
-						label: '已核保待缴费',
+						label: '待缴费',
 						value: 2,
 						color: "#FF0F00",
 						src: "/static/image/car-insure/state3.png"
@@ -150,21 +178,80 @@
 						src: "/static/image/car-insure/state5.png"
 					}
 				],
+				id: "",
 			}
 		},
 		computed: {
 			...mapState(['userInfo', 'quotationType']),
 		},
 		onLoad(params) {
-
 			let item = JSON.parse(params.orderno);
 			this.orderno = item.orderno;
 			this.modelcname = item.modelcname;
 			this.insuredname = item.insuredname;
 			this.licenseno = item.licenseno;
-			this.querylist();
+			this.orderStatus = item.orderStatus,
+				this.querylist();
+			if (this.orderStatus == '1') {
+				uni.setNavigationBarTitle({
+					title: "待核保任务"
+				})
+			} else if (this.orderStatus == '2') {
+				uni.setNavigationBarTitle({
+					title: "待缴费任务"
+				})
+			} else if (this.orderStatus == '3') {
+				uni.setNavigationBarTitle({
+					title: "已承保任务"
+				})
+			} else if (this.orderStatus == '4') {
+				uni.setNavigationBarTitle({
+					title: "核保退回任务"
+				})
+			}
 		},
 		methods: {
+			async terminateOrder(id) {
+				let res = await this.$http.get('/subOrder/close/' + id)
+				if (res.code == '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+						duration: 1000
+					});
+					this.querylist();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
+			async revokeUnderwriting(id) {
+				let res = await this.$http.get('/subOrder/cancelUnderwriting/' + id)
+				if (res.code == '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+						duration: 1000
+					});
+					this.querylist();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
+			async approvalReason(id) {
+				let res = await this.$http.get('/insurance/underwriting/cause/' + id)
+				if (res.code = 200) {
+					this.approvalReasonShow = true;
+					this.approvalReasonContent = res.msg.replace(/\n/g, '<br>');
+				}
+			},
 			handle(type) {
 				this.show = !this.show
 				this.modeClass = type
@@ -172,7 +259,7 @@
 			async querylist() {
 				let params = {
 					orderNo: this.orderno,
-					orderStatus: ""
+					orderStatus: this.orderStatus,
 				}
 				let res = await this.$http.post('/insurance/order/queryQuoteHistory', params)
 				this.sublist = res.data;
@@ -236,8 +323,13 @@
 				}
 			},
 			//撤销二维码
-			async revokeCode(id) {
-				let res = await this.$http.post('/order/qrCode/destructionQrCode?areaCompanyId=' + id)
+			revokeCode(id) {
+				this.id = id;
+				this.revokeQrCodeShow = true;
+
+			},
+			async revokeQrCodeconfirm() {
+				let res = await this.$http.post('/order/qrCode/destructionQrCode?areaCompanyId=' + this.id)
 				if (res.code == '200') {
 					uni.showToast({
 						title: res.msg,
@@ -371,7 +463,7 @@
 						break;
 					default:
 						let pythonres = await this.$http.post('/insurance/crawler/auditStatusQuery', {
-							subOrderNo: id
+							companyId: id
 						});
 						if (pythonres.code == '200') {
 							uni.showToast({

+ 6 - 7
pages/orders/subOrders.vue

@@ -38,7 +38,7 @@
 				<view class="orders-below dis f-c">
 					<view class="dis a-c j-end">
 						<u-button
-							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险','诚泰财险'].includes(item.inscompany)"
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="queryStatus(item.id,item)">查询缴费状态</u-button>
 						<u-button v-if="item.orderstatus==2" size="mini" type="error" :custom-style="{fontSize:'14px'}"
@@ -55,7 +55,7 @@
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="huataiunderwriting(item)">更新订单</u-button>
 						<u-button
-							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险','诚泰财险'].includes(item.inscompany)"
 							size="mini" type="error" :plain="true" :custom-style="{fontSize:'14px'}"
 							@click="underwriting(item.id,item.inscompany)">更新订单</u-button>
 						<u-button type="error" size="mini" :custom-style="{fontSize:'14px'}"
@@ -135,21 +135,21 @@
 				licenseno: "",
 				sublist: [],
 				numList: [{
-						name: '报价完成'
+						name: '进行中'
 					}, {
 						name: '待核保'
 					},
 					{
 						name: '核保退回'
 					}, {
-						name: '已核保待缴费'
+						name: '待缴费'
 					}, {
 						name: '已承保'
 					},
 
 				],
 				statusList: [{
-						label: '报价完成',
+						label: '进行中',
 						value: 0,
 						color: "#229805",
 						src: "/static/image/car-insure/state1.png"
@@ -161,7 +161,7 @@
 						src: "/static/image/car-insure/state2.png"
 					},
 					{
-						label: '已核保待缴费',
+						label: '待缴费',
 						value: 2,
 						color: "#FF0F00",
 						src: "/static/image/car-insure/state3.png"
@@ -185,7 +185,6 @@
 			...mapState(['userInfo', 'quotationType']),
 		},
 		onLoad(params) {
-
 			let item = JSON.parse(params.orderno);
 			this.orderno = item.orderno;
 			this.modelcname = item.modelcname;

+ 1 - 1
pages/tools/policy/policy.vue

@@ -175,7 +175,7 @@
 						src: "/static/image/car-insure/state2.png"
 					},
 					{
-						label: '已核保待缴费',
+						label: '待缴费',
 						value: 2,
 						color: "#FF0F00",
 						src: "/static/image/car-insure/state3.png"

+ 2 - 2
pages/tools/policy/subOrders.vue

@@ -114,7 +114,7 @@
 					{
 						name: '核保退回'
 					}, {
-						name: '已核保待缴费'
+						name: '待缴费'
 					}, {
 						name: '已承保'
 					},
@@ -133,7 +133,7 @@
 						src: "/static/image/car-insure/state2.png"
 					},
 					{
-						label: '已核保待缴费',
+						label: '待缴费',
 						value: 2,
 						color: "#FF0F00",
 						src: "/static/image/car-insure/state3.png"