合并冲突

config/baseUrl.js

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

pages/carInsure/quote.vue

@@ -1884,7 +1884,7 @@
 					return ele;
 				})
 				uni.navigateTo({
-					url: `/pages/orders1/priceComparison?subOrderNoslist=${JSON.stringify(subOrderNoslist)}`
+					url: `/pages/orders/priceComparison?subOrderNoslist=${JSON.stringify(subOrderNoslist)}`
 				})
 
 			},
@@ -2074,11 +2074,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation?companyId=" + id
+						url: "/pages/orders/quotation?companyId=" + id
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation1?companyId=" + id
+						url: "/pages/orders/quotation1?companyId=" + id
 					})
 				}
 

pages/carInsure/quoteDetail.vue

@@ -1512,7 +1512,7 @@
 			...mapMutations(['setOrderStage', 'setOrderType']),
 			underwritecancel() {
 				this.navigate({
-						url: "/pages/orders1/orders"
+						url: "/pages/orders/orders"
 					}, "switchTab",
 					true);
 			},
@@ -1521,14 +1521,14 @@
 					case '订单自核成功':
 						if (this.quotationType.themeCode == 'QD') {
 							uni.navigateTo({
-								url: "/pages/orders1/paymentCode?companyId=" +
+								url: "/pages/orders/paymentCode?companyId=" +
 									this
 									.companyId + '&apiType=' + this.orderInfo
 									.apiType,
 							})
 						} else {
 							uni.navigateTo({
-								url: "/pages/orders1/paymentCode1?companyId=" +
+								url: "/pages/orders/paymentCode1?companyId=" +
 									this
 									.companyId + '&apiType=' + this.orderInfo
 									.apiType,
@@ -2688,7 +2688,7 @@
 								this.setOrderStage(0);
 								this.setOrderType(0);
 								this.navigate({
-									url: "/pages/orders1/orders"
+									url: "/pages/orders/orders"
 								}, "switchTab", true);
 							}, 2000);
 						} else if (res.cancel) {

pages/my/my.vue

@@ -540,7 +540,7 @@
 
 				this.setOrderStage(this.orderTypeList[e].orderStage);
 				this.navigate({
-					url: "/pages/orders1/orders"
+					url: "/pages/orders/orders"
 				}, "switchTab", true)
 			}
 		}

pages/orders/orders.vue

@@ -469,7 +469,7 @@
 					modelcname: val.carinfo.modelcname,
 				}
 				uni.navigateTo({
-					url: `/pages/orders1/subOrders?orderno=${JSON.stringify(params)}`
+					url: `/pages/orders/subOrders?orderno=${JSON.stringify(params)}`
 				})
 			},
 			//报价历史
@@ -481,7 +481,7 @@
 					modelcname: val.carinfo.modelcname,
 				}
 				uni.navigateTo({
-					url: `/pages/orders1/quoteHistory?orderno=${JSON.stringify(params)}`
+					url: `/pages/orders/quoteHistory?orderno=${JSON.stringify(params)}`
 				})
 			},
 			//打开步骤条弹框
@@ -494,7 +494,7 @@
 			//编辑
 			CloseEdit(val) {
 				uni.navigateTo({
-					url: "/pages/carInsure2/quote?orderno=" + val
+					url: "/pages/carInsure/quote?orderno=" + val
 				})
 				// this.navigate({
 				// 	url: '/pages/carInsure1/quote1',

pages/orders/paymentCode.vue

@@ -324,7 +324,7 @@
 			// },
 			navOrder() {
 				this.navigate({
-					url: "/pages/orders1/orders"
+					url: "/pages/orders/orders"
 				}, "switchTab", true);
 			},
 			//页面截图转路径

pages/orders/paymentCode1.vue

@@ -293,7 +293,7 @@
 			// },
 			navOrder() {
 				this.navigate({
-					url: "/pages/orders1/orders"
+					url: "/pages/orders/orders"
 				}, "switchTab", true);
 			},
 			//页面截图转路径

pages/orders/quoteHistory.vue

@@ -214,11 +214,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/paymentCode?companyId=" + id + '&apiType=' + type,
+						url: "/pages/orders/paymentCode?companyId=" + id + '&apiType=' + type,
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/paymentCode1?companyId=" + id + '&apiType=' + type,
+						url: "/pages/orders/paymentCode1?companyId=" + id + '&apiType=' + type,
 					})
 				}
 			},
@@ -227,11 +227,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation?companyId=" + id
+						url: "/pages/orders/quotation?companyId=" + id
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation1?companyId=" + id
+						url: "/pages/orders/quotation1?companyId=" + id
 					})
 				}
 			},

pages/orders/subOrders.vue

@@ -205,11 +205,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro !== "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/paymentCode?companyId=" + id + '&apiType=' + type,
+						url: "/pages/orders/paymentCode?companyId=" + id + '&apiType=' + type,
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/paymentCode1?companyId=" + id + '&apiType=' + type,
+						url: "/pages/orders/paymentCode1?companyId=" + id + '&apiType=' + type,
 					})
 				}
 			},
@@ -218,11 +218,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation?companyId=" + id
+						url: "/pages/orders/quotation?companyId=" + id
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation1?companyId=" + id
+						url: "/pages/orders/quotation1?companyId=" + id
 					})
 				}
 			},

pages/tools/customer/custormerDetail.vue

@@ -1551,20 +1551,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1583,7 +1583,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1600,7 +1600,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -1629,20 +1629,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1661,7 +1661,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1678,7 +1678,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -1705,20 +1705,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1737,7 +1737,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1754,7 +1754,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -1781,20 +1781,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1813,7 +1813,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1830,7 +1830,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -1857,20 +1857,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1889,7 +1889,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1906,7 +1906,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -1934,20 +1934,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1966,7 +1966,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -1984,7 +1984,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -2012,20 +2012,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -2044,7 +2044,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -2062,7 +2062,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -2091,20 +2091,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -2123,7 +2123,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -2140,7 +2140,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -2172,20 +2172,20 @@
 										if (res1.confirm) {
 											if (pro == "QD") {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode?companyId=" +
+													url: "/pages/orders/paymentCode?companyId=" +
 														this
 														.companyId
 												})
 											} else {
 												uni.navigateTo({
-													url: "/pages/orders1/paymentCode1?companyId=" +
+													url: "/pages/orders/paymentCode1?companyId=" +
 														this
 														.companyId
 												})
 											}
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -2204,7 +2204,7 @@
 												true);
 										} else {
 											this.navigate({
-													url: "/pages/orders1/orders"
+													url: "/pages/orders/orders"
 												}, "switchTab",
 												true);
 										}
@@ -2221,7 +2221,7 @@
 
 									} else {
 										this.navigate({
-												url: "/pages/orders1/orders"
+												url: "/pages/orders/orders"
 											}, "switchTab",
 											true);
 									}
@@ -2758,7 +2758,7 @@
 								this.setOrderStage(0);
 								this.setOrderType(0);
 								this.navigate({
-									url: "/pages/orders1/orders"
+									url: "/pages/orders/orders"
 								}, "switchTab", true);
 							}, 2000);
 						} else if (res.cancel) {

pages/tools/policy/policy.vue

@@ -384,7 +384,7 @@
 					modelcname: val.carinfo.modelcname,
 				}
 				uni.navigateTo({
-					url: `/pages/orders1/quoteHistory?orderno=${JSON.stringify(params)}`
+					url: `/pages/orders/quoteHistory?orderno=${JSON.stringify(params)}`
 				})
 			},
 			//编辑

pages/tools/policy/quoteDetail.vue

@@ -1516,7 +1516,7 @@
 			...mapMutations(['setOrderStage', 'setOrderType']),
 			underwritecancel() {
 				this.navigate({
-						url: "/pages/orders1/orders"
+						url: "/pages/orders/orders"
 					}, "switchTab",
 					true);
 			},
@@ -1525,14 +1525,14 @@
 					case '订单自核成功':
 						if (this.quotationType.themeCode == 'QD') {
 							uni.navigateTo({
-								url: "/pages/orders1/paymentCode?companyId=" +
+								url: "/pages/orders/paymentCode?companyId=" +
 									this
 									.companyId + '&apiType=' + this.orderInfo
 									.apiType,
 							})
 						} else {
 							uni.navigateTo({
-								url: "/pages/orders1/paymentCode1?companyId=" +
+								url: "/pages/orders/paymentCode1?companyId=" +
 									this
 									.companyId + '&apiType=' + this.orderInfo
 									.apiType,
@@ -2692,7 +2692,7 @@
 								this.setOrderStage(0);
 								this.setOrderType(0);
 								this.navigate({
-									url: "/pages/orders1/orders"
+									url: "/pages/orders/orders"
 								}, "switchTab", true);
 							}, 2000);
 						} else if (res.cancel) {

pages/tools/policy/subOrders.vue

@@ -205,11 +205,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/paymentCode?companyId=" + id + '&apiType=' + type,
+						url: "/pages/orders/paymentCode?companyId=" + id + '&apiType=' + type,
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/paymentCode1?companyId=" + id + '&apiType=' + type,
+						url: "/pages/orders/paymentCode1?companyId=" + id + '&apiType=' + type,
 					})
 				}
 			},
@@ -218,11 +218,11 @@
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation?companyId=" + id
+						url: "/pages/orders/quotation?companyId=" + id
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/orders1/quotation1?companyId=" + id
+						url: "/pages/orders/quotation1?companyId=" + id
 					})
 				}
 			},

pages/wallet/billInfo1.vue

@@ -2195,7 +2195,7 @@
 								this.setOrderStage(0);
 								this.setOrderType(0);
 								this.navigate({
-									url: "/pages/orders1/orders"
+									url: "/pages/orders/orders"
 								}, "switchTab", true);
 							}, 2000);
 						} else if (res.cancel) {