fix:修改

config/baseUrl.js

@@ -17,9 +17,9 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://192.168.0.52:8080/websocket";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	baseUrl = "http://192.168.0.115:8090"; //董鑫
-	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
-	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
+	// baseUrl = "http://192.168.0.115:8090"; //董鑫
+	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"; //生产

pages/carInsure/customerInterest.vue

@@ -104,7 +104,8 @@
 						if(res.data.equity.receiveName && res.data.equity.receivePhone) {
 							this.acceptCustomer = {
 								name: res.data.equity.receiveName,
-								mobile: res.data.equity.receivePhone
+								mobile: res.data.equity.receivePhone,
+								identifyNumber: res.data.equity.receiveIdentify
 							}
 						} else {
 							this.acceptCustomer = null

pages/carInsure/interest.vue

@@ -60,6 +60,7 @@
 		async onLoad(params) {
 			if (params.params) {
 				this.paramsObj = JSON.parse(params.params)
+				console.log(11111111, this.paramsObj)
 				let res = await this.$http.post('/equity/equityInfo', {
 					pageNum: 1,
 					pageSize: 99999,
@@ -72,6 +73,15 @@
 					this.integral = (obj.totalAmount - this.giftList[this.giftIndex].threeSettlementPrice) * res.data.pointProportion
 					this.localEquityPackageAssociationList = this.giftList[this.giftIndex]
 						.localEquityPackageAssociationList
+						if (res.data.equityInfoVo) {
+							if (res.data.pageResult.content && res.data.pageResult.content.length > 0) {
+								res.data.pageResult.content.forEach((item, index) => {
+									if (res.data.equityInfoVo.id == item.id) {
+										this.giftIndex = index
+									}
+								})
+							}
+						}
 				} else {
 					uni.showToast({
 						title: res.msg,
@@ -141,7 +151,7 @@
 				}).then(res => {
 					if (res.code === 200) {
 						uni.navigateTo({
-							url: `/pages/carInsure/customerInterest?params=${params}&&item=${item}`
+							url: `/pages/carInsure/premiumCalc?orderno=${this.paramsObj.orderno}`
 						})
 					} else {
 						uni.showToast({

pages/carInsure/premiumCalc.vue

@@ -153,7 +153,7 @@
 										@tap.stop.prevent="ErrorMsg(totalitem.msg,totalitem.namesimple)">报价失败，查看原因</text>
 								</view>
 								<view class=" dis j-end a-c mt-2 f-wrap">
-									<view class="ml-2 mb-1" v-if="totalitem.result.companyId" @click="handleCustomerInterest(totalitem)" style="border: 1px solid rgb(255 153 0);border-radius: 2px;padding:1px 6px;font-size: 24rpx; color: rgb(255 153 0);">客户权益</view>
+									<view class="ml-2 mb-1" v-if="totalitem.result.companyId && switchShow" @click="handleCustomerInterest(totalitem)" style="border: 1px solid rgb(255 153 0);border-radius: 2px;padding:1px 6px;font-size: 24rpx; color: rgb(255 153 0);">客户权益</view>
 									<view class="ml-2 mb-1 "
 										v-if="totalitem.namesimple=='诚泰财险' && totalitem.result.companyId"
 										style="border: 1px solid #06A8DC;border-radius: 2px;padding:1px 6px;color:#06A8DC;font-size: 24rpx;"
@@ -1711,86 +1711,21 @@
 				isInspectchange: false,
 				
 				// 优惠方式
-				acceptCustomerObj: {}
+				acceptCustomerObj: {},
+				switchShow: false,
+				orderNo: ''
 			}
 		},
 		onShow() {
-			if(uni.getStorageSync('orderno')) {
-					this.$http.post('/insurance/order/reviseApp', {
-						orderNo: uni.getStorageSync('orderno')
-					}).then(res => {
-						this.productId = res.data.productid; //险种id
-						this.productName = res.data.product; //险种name
-						this.quotableCompanyList = JSON.parse(JSON.stringify(res.data.companyDtos));
-						this.commpanyList();
-						this.carInfo = res.data.carinfo; //车辆信息
-						this.ownerInfo = res.data.ownerinfo; //车主信息
-						this.policyHolderInfo = res.data.applyinfo; //投保人信息
-						this.insuredPersonInfo = res.data.insureinfo; //被保人信息
-						this.riskList = res.data.risk; //险种大类
-						this.vehicleAndVesselTaxForm = res.data.vehicleAndVesselTax; //车船税信息
-						this.orderno = res.data.orderno;
-						this.quoteno = res.data.quoteno;
-						this.imageEcho(res.data.quoteno) // 影像获取完毕
-						if (this.riskList.length > 0) {
-							for (let i = 0; i < this.riskList.length; i++) {
-								if (this.riskList[i].riskCode == '0507') {
-									if (this.isDateBeforeToday(this.riskList[i].startDate)) {
-										this.jqstartDate = this.nextday();
-										this.jqendDate = this.oneYearPast(this.jqstartDate)
-										this.riskList[i].startDate = this.nextday()
-										this.riskList[i].endDate = this.oneYearPast(this.jqstartDate)
-									} else {
-										this.jqstartDate = this.riskList[i].startDate;
-										this.jqendDate = this.riskList[i].endDate;
-									}
-								}
-								if (this.riskList[i].riskCode == '0510') {
-									if (this.isDateBeforeToday(this.riskList[i].startDate)) {
-										this.systartDate = this.nextday();
-										this.syendDate = this.oneYearPast(this.systartDate)
-										this.riskList[i].startDate = this.nextday()
-										this.riskList[i].endDate = this.oneYearPast(this.systartDate)
-									} else {
-										this.systartDate = this.riskList[i].startDate;
-										this.syendDate = this.riskList[i].endDate;
-									}
-										
-								}
-							}
-						}
-					})
-				} else {
-					this.jqstartDate = this.nextday();
-					this.jqendDate = this.oneYearPast(this.jqstartDate);
-					this.systartDate = this.nextday();
-					this.syendDate = this.oneYearPast(this.jqstartDate);
-					const eventChannel = this.getOpenerEventChannel()
-					// 监听acceptData事件，获取上一页面通过eventChannel传送到当前页面的数据
-						eventChannel.on('acceptData', (data) => {
-						this.quoteno = data.quoteno;
-						this.orderno = data.orderno;
-						this.carInfo = data.carInfo; //车辆信息
-						this.ownerInfo = data.ownerInfo; //车主信息
-						this.policyHolderInfo = data.policyHolderInfo; //投保人信息
-						this.vehicleAndVesselTaxForm.identifyNumber = this.policyHolderInfo.identifyNumber;
-						this.vehicleAndVesselTaxForm.taxpayerName = this.policyHolderInfo.name;
-						this.insuredPersonInfo = data.insuredPersonInfo; //被保人信息
-						this.carInfoPositiveList = data.carInfoPositiveList; //车辆
-						this.ownerInfoPositiveList = data.ownerInfoPositiveList; //车主
-						this.policyHolderInfoPositiveList = data.policyHolderInfoPositiveList; //投保
-						this.insuredPersonInfoPositiveList = data.insuredPersonInfoPositiveList; //被保人
-						this.productId = data.productId; //险种id
-						this.productName = data.productName; //险种name
-						this.riskTypeEchoProcessing(this.productId)
-						this.quotableCompanyList = JSON.parse(JSON.stringify(data.quotableCompanyList)); //可报价公司
-						this.commpanyList();
-					})
+			this.$http.get('/sys/switch/isEnabled?keyWord=equityFlag').then(res => {
+				if(res.code === 200) {
+					this.switchShow = res.data
 				}
+			})
 		},
 		async onLoad(params) {
 			if (params.orderno) {
-				uni.setStorageSync('orderno', params.orderno)
+				this.orderNo = params.orderno
 				let res = await this.$http.post('/insurance/order/reviseApp', {
 					orderNo: params.orderno
 				});
@@ -1907,7 +1842,8 @@
 							identifyNumber: this.insuredPersonInfo.identifyNumber
 						},
 					],
-					companyId: item.editingDto.companyId
+					companyId: item.editingDto.companyId,
+					orderno: this.orderNo
 				}
 				uni.navigateTo({
 					url: `/pages/carInsure/customerInterest?params=${JSON.stringify(params)}`,
@@ -3870,17 +3806,19 @@
 										syappoint: ""
 									});
 								if (yaaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -3917,17 +3855,19 @@
 										syappoint: ""
 									});
 								if (zmaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -3958,17 +3898,19 @@
 										companyId: this.companyId,
 									});
 								if (ycaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -3999,17 +3941,19 @@
 										companyId: this.companyId,
 									});
 								if (graudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -4044,17 +3988,19 @@
 										[this.apiType == 2 ? "subOrderNo" : "companyId"]: this.companyId,
 									});
 								if (djaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -4086,17 +4032,19 @@
 										engageList: this.ziJinengageList,
 									});
 								if (zjaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -4132,17 +4080,19 @@
 										engageList: this.huaTaiengageList,
 									});
 								if (htaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -4175,17 +4125,19 @@
 										syappoint: ""
 									});
 								if (bhaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -4206,95 +4158,109 @@
 							}
 							break;
 						case "恒邦财险":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "诚泰财险":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "安盛天平":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "众安财险":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "中国人寿":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "太平财险":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "华农财险":
-							this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-								if(res.code === 200) {
-
-								} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-							})
+							if(this.switchShow) {
+								this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+									if(res.code === 200) {
+								
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none",
+											duration: 3000
+										});
+									}
+								})
+							}
 							break;
 						case "华安财险":
 						case "泰山财险":
@@ -4309,17 +4275,19 @@
 										subOrderNo: this.companyId,
 									});
 								if (pythonaudit.code == '200') {
-									this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
-										if(res.code === 200) {
-
-										} else {
-											uni.showToast({
-												title: res.msg,
-												icon: "none",
-												duration: 3000
-											});
-										}
-									})
+									if(this.switchShow) {
+										this.$http.post(`/equity/createEquityOrder?companyId=${this.companyId}`).then(res => {
+											if(res.code === 200) {
+										
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none",
+													duration: 3000
+												});
+											}
+										})
+									}
 									this.underwriteTitle = '订单自核成功';
 									this.cancelText = '暂不缴费';
 									this.confirmText = '立即缴费';
@@ -4349,17 +4317,21 @@
 				this.companyId = id;
 				this.apiType = apiType;
 				this.insuranceCompanyName = name;
-				if(item.editingDto.equityType === 1 || item.editingDto.equityType === 0) {
+				if(!this.switchShow) {
 					this.auditNextShow = true;
 				} else {
-					this.$http.post(`/equity/equityList`, {
-						companyId: id
-					}).then(res => {
-						if(res.code === 200) {
-							this.acceptCustomerObj = res.data
-						}
-					})
-					this.$refs.popup.open()
+					if(item.editingDto.equityType === 1 || item.editingDto.equityType === 0) {
+						this.auditNextShow = true;
+					} else {
+						this.$http.post(`/equity/equityList`, {
+							companyId: id
+						}).then(res => {
+							if(res.code === 200) {
+								this.acceptCustomerObj = res.data
+							}
+						})
+						this.$refs.popup.open()
+					}
 				}
 			},
 			closePopup() {

pages/carInsure/quoteDetail.vue

@@ -775,7 +775,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="car" v-if="orderInfo.equityPackageVo">
+			<view class="car" v-if="orderInfo.equityPackageVo && switchShow">
 				<view class="header d-flex a-center j-sb"
 					style="background: linear-gradient( 180deg, #DBFFBF 0%, rgba(219,255,191,0) 100%);" @click="toInterest">
 					<view class="title">客户权益</view>
@@ -1273,9 +1273,18 @@
 				outOfBusinessVehicleUseoptions: [],
 				carInfo1: {},
 				vehicleAndVesselidentifyNumber: "", //纳税人证件号
+				
+				
+				switchShow: false, // 控制客户权益显示
+				
 			}
 		},
 		async onLoad(params) {
+			this.$http.get('/sys/switch/isEnabled?keyWord=equityFlag').then(res => {
+				if(res.code === 200) {
+					this.switchShow = res.data
+				}
+			})
 			let pages = getCurrentPages(); // 当前页面路由
 			if (pages.length > 1) {
 				let beforePage = pages[pages.length - 2].route; // 上一个页面路由