5/14提交

components/common/commonFormItem/ApplicantInfoForm.vue

@@ -89,7 +89,7 @@
 				policyRules: {
 					name: [{
 							required: true,
-							message: '请输入车主姓名',
+							message: '请输入投保人姓名',
 							trigger: ['blur', 'change'],
 						},
 						{

components/common/commonFormItem/InsuredInfoForm.vue

@@ -89,7 +89,7 @@
 				insuredRules: {
 					name: [{
 							required: true,
-							message: '请输入车主姓名',
+							message: '请输入被保人姓名',
 							trigger: ['blur', 'change'],
 						},
 						{

manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "3.1.8",
-	"versionCode": 318,
+	"versionName": "3.2.5",
+	"versionCode": 325,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -101,12 +101,6 @@
 					}
 				},
 				"geolocation": {
-					"amap": {
-						"name": "amap_18335592986CWFSxSLAB",
-						"__platform__": ["android"],
-						"appkey_ios": "e410fdbf6be7110af9267b6d56c93c8d",
-						"appkey_android": "e410fdbf6be7110af9267b6d56c93c8d"
-					},
 					"system": {
 						"__platform__": ["ios", "android"]
 					}
@@ -118,13 +112,7 @@
 						"appsecret": "wTUMKWB4ReAoPyCp7Jyaz9"
 					}
 				},
-				"maps": {
-					"amap": {
-						"name": "amap_18335592986CWFSxSLAB",
-						"appkey_ios": "e410fdbf6be7110af9267b6d56c93c8d",
-						"appkey_android": "e410fdbf6be7110af9267b6d56c93c8d"
-					}
-				}
+				"maps": {}
 			},
 			"icons": {
 				"android": {

pages.json

@@ -1152,9 +1152,7 @@
 		"rpxCalcMaxDeviceWidth": 0,
 		// rpx 计算所支持的最大设备宽度，单位 px，默认值为 960
 		"rpxCalcBaseDeviceWidth": 375,
-		// rpx 计算使用的基准设备宽度，设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算，单位 px，默认值为 375
 		"rpxCalcIncludeWidth": 750,
-		// rpx 计算特殊处理的值，始终按实际的设备宽度计算，单位 rpx，默认值为 750
 		"pageOrientation": "portrait"
 	},
 	"tabBar": {
@@ -1190,4 +1188,4 @@
 			"query": "" //启动参数，在页面的onLoad函数里面得到
 		}]
 	}
-}
+}

pages/carInsure/Information.vue

@@ -34,7 +34,7 @@
 					<image v-show="!carfrontImg" @tap="ocrIdentify('carInfo')" src="/static/image/car-insure/carbg.png"
 						mode="" style="width: 100%;height: 198px;">
 					</image>
-					<view v-if='carfrontImg' class="movable-view dis f-c a-c">
+					<view v-if='carfrontImg' class="movable-view dis f-c a-c ">
 						<movable-area>
 							<movable-view direction="all" out-of-bounds :scale="true" :damping="30" :friction="10">
 								<image v-if="isActive" :src="carfrontImg" mode="widthFix"
@@ -311,6 +311,8 @@
 								<view>排量:<text style="color: #2432ff;">{{item.displacement}}</text></view>
 								<view>功率:<text style="color: #2432ff;">{{item.powerScale}}</text></view>
 							</view>
+							<view v-if="item.importFlag">车辆类型:<text style="color: #2432ff;">{{item.importFlag}}</text>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -357,6 +359,8 @@
 								<view>排量:<text style="color: #2432ff;">{{item.displacement}}</text></view>
 								<view>功率:<text style="color: #2432ff;">{{item.powerScale}}</text></view>
 							</view>
+							<view v-if="item.importFlag">车辆类型:<text style="color: #2432ff;">{{item.importFlag}}</text>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -425,6 +429,7 @@
 				policySwitching: true, //true识别 false录入
 				insuredSwitching: true, //true识别 false录入
 				carInfo: {
+					importFlag: "", //特种车类
 					licenseNo: "", //车牌号
 					brandName: "", //车辆品牌型号
 					vinNo: "", //车架号
@@ -630,6 +635,7 @@
 				productName: "",
 				isActive: true,
 				quoteno: "",
+				orderno: "",
 				carModificationLabel: true, //车辆修改标识
 				userModificationLabel: true, //人员修改标识
 			}
@@ -776,6 +782,7 @@
 									this[info.identifier] = false;
 								}
 								this.quoteno = info.quoteno;
+								this.orderno = info.orderno;
 								this.imageEcho(info.quoteno)
 								// this.carfrontImg = this.$base.baseUrl +
 								// 	'/upload/image/2024/10/21/8962531b02138cd842833fdc3b84b3df.jpg'
@@ -994,6 +1001,7 @@
 			//车型赋值
 			carModelLookupSubmit() {
 				if (this.isFocusedIndex !== "99") {
+					this.carInfo.importFlag = this.carTypeVINListIndex.importFlag; //特种车标识
 					this.carInfo.brandName = this.carTypeVINListIndex.brandCN; //车型
 					this.carInfo.modelcname = this.carTypeVINListIndex.modelName; //车型
 					this.carInfo.caryear = this.carTypeVINListIndex.marketYear; //年款
@@ -1025,6 +1033,7 @@
 			//品牌型号赋值
 			brandModelLookupSubmit() {
 				if (this.brandModelIndex !== "99") {
+					this.carInfo.importFlag = this.carTypeVINListIndex.importFlag; //特种车标识
 					this.carInfo.brandName = this.brandModelListIndex.brandCN; //车型
 					this.carInfo.modelcname = this.brandModelListIndex.modelName; //车型
 					this.carInfo.caryear = this.brandModelListIndex.marketYear; //年款
@@ -1240,12 +1249,12 @@
 				}
 				this.$refs.carForm.validate(valid => {
 					if (valid) {
-						this.$refs.ownerForm.validate(valid => {
-							if (valid) {
-								this.$refs.ownerForm.validate(valid => {
-									if (valid) {
-										this.$refs.ownerForm.validate(valid => {
-											if (valid) {
+						this.$refs.ownerForm.validate(valid1 => {
+							if (valid1) {
+								this.$refs.policyForm.validate(valid2 => {
+									if (valid2) {
+										this.$refs.insuredForm.validate(valid3 => {
+											if (valid3) {
 												_this.navigate({
 													url: '/pages/carInsure/companyQuotable',
 													success: (res) => {
@@ -1277,7 +1286,9 @@
 																	productName: _this
 																		.productName,
 																	quoteno: this
-																		.quoteno
+																		.quoteno,
+																	orderno: this
+																		.orderno,
 																})
 
 													}
@@ -1444,7 +1455,7 @@
 		padding: 1px 6px;
 	}
 
-	/deep/ {
+	::deep {
 		.u-form-item {
 			padding: 2px 0;
 		}

pages/carInsure/checkOption.vue

@@ -45,7 +45,7 @@
 					<text>{{taxRelifFlag}}</text>
 				</view>
 				<view class="Plancontent dis f-c " style="padding: 0;"
-					v-if="['034001','0330034002','0330034001'].includes(productId)">
+					v-if="['034001','034002','0330034002','0330034001'].includes(productId)">
 					<view class="dis j-s a-c">
 						<image src="../../static/image/car-insure/syrisk.png" mode="" style="height: 22px;width: 88px;"
 							class="mb-1"></image>
@@ -418,7 +418,7 @@
 
 	}
 
-	/deep/ {
+	::deep {
 		.jq {
 			.u-th {
 				background: #EBF7FF;

pages/carInsure/chooseOption.vue

@@ -1026,6 +1026,63 @@
 								</view>
 							</view>
 						</template>
+						<template
+							v-if=" planDataExpansion.namesimple=='阳光财险' && yangguangaccidentalDrivingVo.typeName ">
+							<view class="drivingSelection policyInfo">
+								<view class="dis a-c j-s " @click="renshouPopupshow=true">
+									<text class="tagHeader dis a-c">
+										<text>{{yangguangaccidentalDrivingVo.alias}}
+											<view class="tag"></view>
+										</text>
+									</text>
+									<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
+								</view>
+								<view>
+									<u-table border-color="#E3E9F8"
+										v-if="yangguangaccidentalDrivingVo.insDrivingIntentionInsuranceSon && yangguangaccidentalDrivingVo.insDrivingIntentionInsuranceSon.length>0">
+										<u-tr class="sy">
+											<u-th width="50%"
+												style="text-align: left;padding: 5px 10px !important">保险责任</u-th>
+											<u-th>保额</u-th>
+											<u-th>保费(元)</u-th>
+										</u-tr>
+										<view class="dis">
+											<view class="accident dis f-c">
+												<view class="diss dis"
+													v-for="(Sonitem,Sonindex) in yangguangaccidentalDrivingVo.insDrivingIntentionInsuranceSon"
+													:key="Sonindex">
+													<view style="width: 67%;padding: 5px 10px " class="boss">
+														<view class="dis a-c ">
+															<view class="circle dis a-c j-c"></view>
+															<view style="margin-left: 5px;width: 80%;"
+																class="dis j-start">
+																{{Sonitem.name}}
+															</view>
+														</view>
+													</view>
+													<view class="boss dis a-c j-c" style="width: 33%;">
+														{{Sonitem.amount}}
+													</view>
+												</view>
+											</view>
+											<view class="right dis j-c a-c">
+												{{yangguangaccidentalDrivingVo.sumPremium}}
+											</view>
+										</view>
+									</u-table>
+								</view>
+								<view class="dis a-c j-s">
+									<text>份数</text>
+									<u-number-box v-model="yangguangaccidentalDrivingVo.quantity" :min="1" :max="10"
+										:disabled-input="true" :input-width="70" :input-height="44" size="26"
+										:long-press="false"></u-number-box>
+								</view>
+								<view class="dis a-c j-s mt-2" style="font-size: 14px;color: #232832;">
+									<text>总保费</text>
+									<text>￥{{yangguangaccidentalDrivingVo.sumPremium*yangguangaccidentalDrivingVo.quantity}}</text>
+								</view>
+							</view>
+						</template>
 					</view>
 				</view>
 				<view class="footer-btn dis a-c j-c">
@@ -1353,6 +1410,10 @@
 				renshouPopupshow: false,
 				renshouInsuranceData: [],
 				renshouaccidentalDrivingVo: {},
+				/* 阳光 */
+				yangguangPopupshow: false,
+				yangguangInsuranceData: [],
+				yangguangaccidentalDrivingVo: {},
 				/* 紫金 */
 				zijinPopupshow: false,
 				zijinInsuranceData: [],
@@ -1547,7 +1608,10 @@
 						case '众安财险':
 						case '太平财险':
 						case '华农财险':
+						case '华安财险':
+						case '泰山财险':
 						case '中国人寿':
+						case '阳光财险':
 							if (res.data.length > 0) {
 								this[items.cnName + 'InsuranceData'] = res.data; //意外险list
 								this[items.cnName + 'accidentalDrivingVo'] = {
@@ -2052,7 +2116,7 @@
 	}
 
 	/* 交强险和商业险弹出框End */
-	/deep/ {
+	::deep {
 		.jq {
 			.u-th {
 				background: #EBF7FF;

pages/carInsure/companyQuotable.vue

@@ -286,6 +286,7 @@
 				productId: "",
 				productName: "",
 				quoteno: "",
+				orderno: "",
 			}
 		},
 		onShow() {
@@ -302,12 +303,13 @@
 			const eventChannel = this.getOpenerEventChannel()
 			// 监听acceptData事件，获取上一页面通过eventChannel传送到当前页面的数据
 			eventChannel.on('acceptData', (data) => {
-
+				console.log(data);
 				if (!!data) {
 					//读取上一个页面传过来数据（车辆信息，人员信息，险种信息）
 					this.productId = data.productId;
 					this.productName = data.productName;
 					this.quoteno = data.quoteno;
+					this.orderno = data.orderno;
 					this.carInfo = data.carInfo; //车辆信息
 					this.ownerInfo = data.ownerInfo; //车主信息
 					this.policyHolderInfo = data.policyHolderInfo; //投保人信息
@@ -434,7 +436,11 @@
 								quotableCompanyList: this.quotableCompanyList, //可报价公司
 								productId: this.productId, //险种id
 								productName: this.insuranceTypeName ? this.insuranceTypeName : this
-									.productName //险种名字
+									.productName, //险种名字
+								quoteno: this
+									.quoteno,
+								orderno: this
+									.orderno,
 
 							})
 					}

pages/carInsure/entry.vue

@@ -166,6 +166,8 @@
 								<view>排量:<text style="color: #2432ff;">{{item.displacement}}</text></view>
 								<view>功率:<text style="color: #2432ff;">{{item.powerScale}}</text></view>
 							</view>
+							<view v-if="item.importFlag">车辆类型:<text style="color: #2432ff;">{{item.importFlag}}</text>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -212,6 +214,8 @@
 								<view>排量:<text style="color: #2432ff;">{{item.displacement}}</text></view>
 								<view>功率:<text style="color: #2432ff;">{{item.powerScale}}</text></view>
 							</view>
+							<view v-if="item.importFlag">车辆类型:<text style="color: #2432ff;">{{item.importFlag}}</text>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -347,6 +351,7 @@
 				},
 				//车辆信息
 				carInfo: {
+					importFlag: "", //特种车标识
 					licenseNo: "", //车牌号
 					brandName: "", //车辆品牌型号
 					vinNo: "", //车架号
@@ -491,10 +496,12 @@
 			"carInfo.cartype": {
 				handler(val) {
 					if (val) {
-						this.carInfo1.cartype = this.dictionaryMatching(this.trafficManagementVehicleTypeoptions,
-							this
+						this.carInfo1.cartype = this
 							.carInfo
-							.cartype);
+							.cartype ? this.dictionaryMatching(this.trafficManagementVehicleTypeoptions,
+								this
+								.carInfo
+								.cartype) : "";
 					}
 				},
 				deep: true
@@ -554,10 +561,12 @@
 					this
 					.carInfo
 					.cimodelclass)
-				this.carInfo1.cartype = this.dictionaryMatching(this.trafficManagementVehicleTypeoptions,
-					this
+				this.carInfo1.cartype = this
 					.carInfo
-					.cartype);
+					.cartype ? this.dictionaryMatching(this.trafficManagementVehicleTypeoptions,
+						this
+						.carInfo
+						.cartype) : "";
 				this.carInfo1.carnature = this.carInfo.carnature ? this.dictionaryMatching(this
 					.natureOfVehicleUseoptions,
 					this
@@ -760,6 +769,7 @@
 			//车型赋值
 			carModelLookupSubmit() {
 				if (this.isFocusedIndex !== "99") {
+					this.carInfo.importFlag = this.carTypeVINListIndex.importFlag; //特种车标识
 					this.carInfo.brandName = this.carTypeVINListIndex.brandCN; //车型
 					this.carInfo.modelcname = this.carTypeVINListIndex.modelName; //车型
 					this.carInfo.caryear = this.carTypeVINListIndex.marketYear; //年款
@@ -768,7 +778,11 @@
 					this.carInfo.modelCode = this.carTypeVINListIndex.modelCode; //车辆型号编码
 					this.carInfo.familyName = this.carTypeVINListIndex.series; //系列
 					this.carInfo.enginedesc = this.carTypeVINListIndex.displacement; //排量
-					this.carInfo.energyType = this.carTypeVINListIndex.fuelTypeCode; //燃油种类
+					if (this.carInfo.licenseNo.length == 7) {
+						this.carInfo.energyType = this.carTypeVINListIndex.fuelTypeCode; //燃油种类
+					} else {
+						this.carInfo.energyType = "1"; //燃油种类
+					}
 					this.carInfo.powerScale = this.carTypeVINListIndex.powerScale; //功率
 					this.carModelLookupModal = false;
 					this.vehicleType = true;
@@ -791,6 +805,7 @@
 			//品牌型号赋值
 			brandModelLookupSubmit() {
 				if (this.brandModelIndex !== "99") {
+					this.carInfo.importFlag = this.carTypeVINListIndex.importFlag; //特种车标识
 					this.carInfo.brandName = this.brandModelListIndex.brandCN; //车型
 					this.carInfo.modelcname = this.brandModelListIndex.modelName; //车型
 					this.carInfo.caryear = this.brandModelListIndex.marketYear; //年款
@@ -799,7 +814,11 @@
 					this.carInfo.modelCode = this.brandModelListIndex.modelCode; //车辆型号编码
 					this.carInfo.familyName = this.brandModelListIndex.series; //系列
 					this.carInfo.enginedesc = this.brandModelListIndex.displacement; //排量
-					this.carInfo.energyType = this.brandModelListIndex.fuelTypeCode; //燃油种类
+					if (this.carInfo.licenseNo.length == 7) {
+						this.carInfo.energyType = this.carTypeVINListIndex.fuelTypeCode; //燃油种类
+					} else {
+						this.carInfo.energyType = "1"; //燃油种类
+					}
 					this.carInfo.powerScale = this.brandModelListIndex.powerScale; //功率
 					this.brandModelLookupModal = false;
 					this.vehicleType = true;
@@ -890,7 +909,7 @@
 		padding: 1px 6px;
 	}
 
-	/deep/ {
+	::deep {
 		.u-form-item {
 			padding: 2px 0;
 		}

pages/carInsure/insureItems.vue

@@ -1494,7 +1494,7 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/deep/ .uni-switch-input-checked {
+	::deep .uni-switch-input-checked {
 		background-color: #0052FF !important;
 		border-color: #0052FF !important;
 	}

pages/carInsure/premiumCalc.vue

@@ -78,14 +78,15 @@
 					</view>
 				</view>
 			</view>
-			<view class=" dis a-c j-s mt-3" style="position: relative;">
+			<view id="targetElement" class=" dis a-c j-s mt-3" style="position: relative;">
 				<view style="color:#FF5600;font-size: 15px;font-weight: bold;">投保注意：</view>
 				<view class="dis a-c  f-wrap">
-					<view class="status-data" :class="carInfo.transferFlag? 'active1':''"
+					<view class="status-data"
+						:class="carInfo.transferFlag? 'active1':isTransferRequired?'deepenStyle':''"
 						@tap="immediatelyClick('transferFlag')">
 						过户车
 					</view>
-					<view class="status-data" v-if="['034001','0330034002','0330034001'].includes(productId)"
+					<view class="status-data" v-if="['034001','034002','0330034002','0330034001'].includes(productId)"
 						:class="carInfo.transferFlagBi? 'active1':''" @tap="immediatelyClick('transferFlagBi')">
 						商业险过户
 					</view>
@@ -1411,6 +1412,7 @@
 		},
 		data() {
 			return {
+				isTransferRequired: false,
 				imagelist: [{
 						name: '车辆/人员信息'
 					},
@@ -1741,6 +1743,9 @@
 				const eventChannel = this.getOpenerEventChannel()
 				// 监听acceptData事件，获取上一页面通过eventChannel传送到当前页面的数据
 				await eventChannel.on('acceptData', (data) => {
+					console.log(data);
+					this.quoteno = data.quoteno;
+					this.orderno = data.orderno;
 					this.carInfo = data.carInfo; //车辆信息
 					this.ownerInfo = data.ownerInfo; //车主信息
 					this.policyHolderInfo = data.policyHolderInfo; //投保人信息
@@ -1764,6 +1769,7 @@
 
 		},
 		methods: {
+
 			CTcoefficientSubmit() {
 				this.quotableCompanyList[this.CTcoefficientIndex].coefficient = this.CTcoefficientForm.pricingCoefficient;
 				this.quotableCompanyList[this.CTcoefficientIndex].discount = this.CTcoefficientForm.expectedDiscount;
@@ -2492,6 +2498,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2547,6 +2554,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2602,6 +2610,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2657,6 +2666,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2718,6 +2728,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2774,6 +2785,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2831,6 +2843,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2892,6 +2905,7 @@
 						};
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].msg = res.msg;
+
 						return;
 					}
 				} catch (error) {
@@ -2923,6 +2937,14 @@
 			renshou(num, id) {
 				this.quoteInsurance(num, id);
 			},
+			//华安
+			huaan(num, id) {
+				this.quoteInsurance(num, id);
+			},
+			//人寿
+			taishan(num, id) {
+				this.quoteInsurance(num, id);
+			},
 			//恒邦
 			hengbang(num, id) {
 				this.quoteInsurance(num, id);
@@ -2979,6 +3001,8 @@
 						case '中国人寿':
 						case '太平财险':
 						case '华农财险':
+						case '华安财险':
+						case '泰山财险':
 						case '泰康财险':
 							if (res.code == '200') {
 								if (res.data.warnMessageList !=
@@ -3022,6 +3046,7 @@
 								this.quotableCompanyList.splice(num, 1, updatedItem);
 								this.quotableCompanyList[num].msg =
 									res.msg;
+
 							}
 							break;
 						case '众安财险':
@@ -3060,6 +3085,7 @@
 								this.quotableCompanyList.splice(num, 1, updatedItem);
 								this.quotableCompanyList[num].msg =
 									res.msg;
+
 							}
 							break;
 						default:
@@ -3174,13 +3200,36 @@
 			},
 			// 显示报错信息
 			ErrorMsg(msg, title) {
+				let _this = this;
 				uni.showModal({
 					title: title + "报价提示",
 					content: msg,
 					showCancel: false,
-					confirmText: "关闭"
+					confirmText: "关闭",
+					success: function(res) {
+						if (res.confirm) {
+							if (msg.includes('过户')) {
+								_this.isTransferRequired = true;
+								_this.scrollToElement();
+							}
+						}
+					}
 				})
 			},
+			scrollToElement() {
+				// 创建查询对象
+				const query = uni.createSelectorQuery().in(this);
+				// 获取目标元素的位置信息
+				query.select('#targetElement').boundingClientRect((rect) => {
+					if (rect) {
+						// 滚动到目标位置
+						uni.pageScrollTo({
+							scrollTop: rect.top, // 目标元素的顶部位置
+							duration: 500, // 滚动动画时长（单位：ms）
+						});
+					}
+				}).exec();
+			},
 			discountErrorMessageMsg(msg, title) {
 				this.discountInfoPopup = true;
 				this.discountInfoPopupContent = msg.replace(/\n/g, '<br>');
@@ -3282,6 +3331,8 @@
 						case '众安财险':
 						case '太平财险':
 						case '华农财险':
+						case '华安财险':
+						case '泰山财险':
 						case '中国人寿':
 							if (res.data.length > 0) {
 								this[items.cnName + 'InsuranceData'] = res.data; //意外险list
@@ -3509,6 +3560,7 @@
 								productId: this.productId, //险种id
 								productName: this.productName, //险种名称
 								quoteno: this.quoteno, //报价号
+								orderno: this.orderno, //订单号
 							})
 					}
 				}, "navigateTo", true);
@@ -3956,6 +4008,8 @@
 						case "中国人寿":
 						case "太平财险":
 						case "华农财险":
+						case "华安财险":
+						case "泰山财险":
 						case "泰康财险":
 							let pythonimage = await this.$http.post(
 								'/insurance/crawler/submitImage', {
@@ -4789,7 +4843,7 @@
 		}
 	}
 
-	/deep/ {
+	::deep {
 		.jq {
 			.u-th {
 				background: #F6F7FE;
@@ -4843,4 +4897,11 @@
 		color: #FFFFFF;
 		font-size: 20rpx;
 	}
+
+	.deepenStyle {
+		border-color: #FF4D4D;
+		color: #FF4D4D;
+		border-width: 4rpx;
+		font-weight: bold;
+	}
 </style>

pages/carInsure/quoteDetail.vue

@@ -1718,6 +1718,7 @@
 				let imgres = await this.$http.get('/ins/taskImage/findByQuoteNo?quoteNo=' + quotenos);
 				if (imgres.code == "200") {
 					Object.keys(imgres.data).forEach((keys) => {
+						console.log(imgres.data[keys]);
 						if (imgres.data[keys].url) {
 							imgres.data[keys].url = this.$base.baseUrl + imgres.data[keys].url;
 							switch (keys) {
@@ -2107,6 +2108,8 @@
 					case "中国人寿":
 					case "太平财险":
 					case "华农财险":
+					case "华安财险":
+					case "泰山财险":
 					case "泰康财险":
 						let pythonimage = await this.$http.post(
 							'/insurance/crawler/submitImage', {
@@ -3463,7 +3466,7 @@
 		}
 	}
 
-	/deep/ {
+	::deep {
 		.fen {
 			background-color: #FBF6FE;
 		}

pages/carWash/placeOrder.vue

@@ -100,7 +100,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-number-input {
 			background: transparent !important;
 		}

pages/caragent/addressSearch.vue

@@ -30,7 +30,7 @@
 			return {
 				city: "",
 				address: "",
-				mapKey: '197d1a12301a306f82533a23651807b8',
+				// mapKey: 'f6a5fce80b1093d42749c7edbf6aaee6',
 				latitude: 0,
 				longitude: 0,
 				addressList: [],

pages/caragent/map.vue

@@ -44,7 +44,7 @@
 			return {
 				mapshow: false,
 				timeKey: 0,
-				mapKey: '197d1a12301a306f82533a23651807b8',
+				// mapKey: 'f6a5fce80b1093d42749c7edbf6aaee6',
 				address: "",
 				city: "",
 				cityInfo: {},

pages/index/index.vue

@@ -628,7 +628,7 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, rgba(245, 128, 71, 0.8) 20%, rgba(242, 49, 78, 1) 100%) !important;
 			border-radius: 4px 4px 4px 4px;
@@ -763,7 +763,7 @@
 			background: #FFFFFF;
 			box-shadow: 0px 1px 3px 0px rgba(95, 107, 132, 0.05);
 			padding: 8px;
-			border-radius: 6px;
+			border-radius: 12rpx;
 			position: relative;
 
 			text:nth-child(1) {

pages/login/login.vue

@@ -756,7 +756,7 @@
 	};
 </script>
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
 			border-radius: 4px 4px 4px 4px;

pages/orders/orders.vue

@@ -238,7 +238,7 @@
 						<u-button v-if="item.orderstatus!='3'"
 							:custom-style="{fontSize:'12px',background:'rgba(159,159,159,0.05)',color:'#666666',borderColor:'#D2D2D2'}"
 							shape="circle" size="mini" :hair-line="false" :plain="true"
-							@click="closeOrder(item.orderno)">关闭订单 </u-button>
+							@click="closeOrder(item.orderno)">删除订单 </u-button>
 					</view>
 				</view>
 			</view>
@@ -261,13 +261,13 @@
 
 			</view>
 		</u-mask>
-		<u-modal v-model="closeOrderShow" title="提示"
+		<u-modal v-model="closeOrderShow" title="确认删除订单？"
 			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
 			:show-cancel-button="true"
-			:confirm-style="{background:'#E6EEFF',color:'#0052FF',height:'40px',lineHeight:'40px'}"
-			:cancel-style="{height:'40px',lineHeight:'40px'}" @confirm="closeOrderconfirm" confirm-text="确定">
+			:confirm-style="{background:'#fa3534',color:'#fff',height:'40px',lineHeight:'40px'}"
+			:cancel-style="{height:'40px',lineHeight:'40px'}" @confirm="closeOrderconfirm" confirm-text="确定删除">
 			<view class="slot-content dis  a-c j-c  p-2">
-				确认关闭订单?
+				删除订单后，订单数据将不可恢复，请谨慎操作。
 			</view>
 		</u-modal>
 		<service-widget @btnClick="btn_click"></service-widget>
@@ -856,18 +856,18 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/deep/ uni-tabbar .uni-tabbar-bottom {
+	::deep uni-tabbar .uni-tabbar-bottom {
 		position: fixed;
 		left: 0;
 		right: 0;
 		bottom: 0;
 	}
 
-	/deep/ .u-action[data-v-1a326067] {
+	::deep .u-action[data-v-1a326067] {
 		color: #FFFFFF;
 	}
 
-	/deep/ .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
+	::deep .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
 		color: #FFFFFF !important;
 	}
 

pages/orders/paymentCode.vue

@@ -345,6 +345,10 @@
 </script>
 
 <style lang="scss" scoped>
+	page {
+		background: #F8FAFE;
+	}
+
 	.page {
 		height: 100vh;
 		background: #F8FAFE;
@@ -387,7 +391,7 @@
 	}
 
 	.content {
-		padding: 16px;
+		padding: 16px 16px 150px;
 		margin-top: -190px;
 
 		.back {

pages/orders/quotation.vue

@@ -890,7 +890,7 @@
 		z-index: 9999;
 	}
 
-	/deep/ {
+	::deep {
 		.u-th {
 			background-color: #FEF9F6;
 		}

pages/orders/quoteHistory.vue

@@ -1857,7 +1857,7 @@
 	}
 </style>
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.o-empty {
 			position: absolute;
 			left: 0;

pages/register/orderissuer.vue

@@ -345,7 +345,7 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
 			border-radius: 4px 4px 4px 4px;

pages/register/register.vue

@@ -328,7 +328,7 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
 			border-radius: 4px 4px 4px 4px;

pages/roadRescue/Grounding.vue

@@ -75,7 +75,7 @@
 					success: function(res) {
 						console.log(res);
 						// uni.request({
-						// 	url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=197d1a12301a306f82533a23651807b8`,
+						// 	url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=f6a5fce80b1093d42749c7edbf6aaee6`,
 						// 	method: "GET",
 						// 	success: (res) => {
 						// 		console.log(res);

pages/roadRescue/map.vue

@@ -44,7 +44,7 @@
 			return {
 				mapshow: false,
 				timeKey: 0,
-				mapKey: '197d1a12301a306f82533a23651807b8',
+				// mapKey: 'f6a5fce80b1093d42749c7edbf6aaee6',
 				address: "",
 				city: "",
 				cityInfo: {},

pages/set/question.vue

@@ -46,11 +46,11 @@
 
 <style lang="scss" scoped>
 @import '@/style/mixin.scss';
-/deep/ .uni-collapse-cell--open .uni-collapse-cell__title { 
+::deep .uni-collapse-cell--open .uni-collapse-cell__title { 
 	background-color: rgba($themeColor,0.6);
 	color: #FFFFFF;
 }
-/deep/ .uni-collapse-cell--open .uni-collapse-cell__title span{ 
+::deep .uni-collapse-cell--open .uni-collapse-cell__title span{ 
 	color: #FFFFFF;
 }
 .content {

pages/shoppingMall/details.vue

@@ -98,7 +98,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-countdown-time {
 			padding: 2px !important;
 		}

pages/shoppingMall/paymentOrder.vue

@@ -107,7 +107,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-number-input {
 			background: #FFFFFF !important;
 		}

pages/tools/addStaff/addStaff.vue

@@ -210,6 +210,7 @@
 			save() {
 				base64ToPath(this.posterUrl)
 					.then(path => {
+						console.log(path);
 						uni.saveImageToPhotosAlbum({ //保存图片到系统相册。
 							filePath: path, //图片文件路径
 							success: function() {
@@ -371,6 +372,7 @@
 			},
 			//页面截图转路径
 			receiveRenderData(val) {
+				console.log(val);
 				this.posterUrl = val.replace(/[\r\n]/g, ''); // 去除base64位中的空格
 				// 将base64转化为临时地址
 				// base64ToPath(imageStr).then(path => {
@@ -431,7 +433,7 @@
 	}
 </script>
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, rgba(82, 199, 224, 1), rgba(43, 145, 239, 1)) !important;
 			border-radius: 4px 4px 4px 4px;

pages/tools/addStaff/authentication.vue

@@ -205,7 +205,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
 			border-radius: 4px 4px 4px 4px;

pages/tools/addStaff/employeeAdditionCount.vue

@@ -258,7 +258,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-subsection {}
 	}
 

pages/tools/customer/customer.vue

@@ -320,18 +320,18 @@
 		color: red !important;
 	}
 
-	/deep/ uni-tabbar .uni-tabbar-bottom {
+	::deep uni-tabbar .uni-tabbar-bottom {
 		position: fixed;
 		left: 0;
 		right: 0;
 		bottom: 0;
 	}
 
-	/deep/ .u-action[data-v-1a326067] {
+	::deep .u-action[data-v-1a326067] {
 		color: #FFFFFF;
 	}
 
-	/deep/ .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
+	::deep .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
 		color: #FFFFFF !important;
 	}
 

pages/tools/policy/policy.vue

@@ -479,18 +479,18 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/deep/ uni-tabbar .uni-tabbar-bottom {
+	::deep uni-tabbar .uni-tabbar-bottom {
 		position: fixed;
 		left: 0;
 		right: 0;
 		bottom: 0;
 	}
 
-	/deep/ .u-action[data-v-1a326067] {
+	::deep .u-action[data-v-1a326067] {
 		color: #FFFFFF;
 	}
 
-	/deep/ .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
+	::deep .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
 		color: #FFFFFF !important;
 	}
 

pages/tools/policy/quoteDetail.vue

@@ -3210,7 +3210,7 @@
 
 	}
 
-	/deep/ {
+	::deep {
 		.u-th {
 			background-color: #F2F6FF;
 		}

pages/tools/team/team1.vue

@@ -617,7 +617,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ {
+	::deep {
 		.u-tab-bar {
 			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
 			border-radius: 4px 4px 4px 4px;

pages/wallet/billInfo1.vue

@@ -3148,7 +3148,7 @@
 		}
 	}
 
-	/deep/ {
+	::deep {
 		.fen {
 			background-color: #FBF6FE;
 		}

pages/wallet/bindBank.vue

@@ -318,7 +318,7 @@
 
 	}
 
-	/deep/ {
+	::deep {
 		.u-input {
 			text-align: right !important;
 		}

pages/wallet/withdraw.vue

@@ -356,7 +356,7 @@
 		background-color: #F8FAFE;
 	}
 
-	/deep/ .uni-scroll-view-content {
+	::deep .uni-scroll-view-content {
 		background-color: #F8FAFE;
 	}
 

template.h5.html

@@ -36,9 +36,9 @@
 		<!-- 微信SDK文件 -->
 		<script src="<%= BASE_URL %>static/mp-h5/jweixin-1.4.0.js"></script>
 		<!-- 高德地图文件 -->
-		<script type="text/javascript"
+		<!-- <script type="text/javascript"
 			src="https://webapi.amap.com/maps?v=1.4.15&key=6484038843257c1966e26483c431777a&plugin=AMap.ToolBar">
-		</script>
+		</script> -->
 		<script src="//webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
 		<!-- built files will be auto injected -->
 		<!-- <script>