5个分包

App.vue

@@ -92,9 +92,9 @@ export default {
           let routes = getCurrentPages();
           let curRoute = routes[routes.length - 1].route;
           console.log(curRoute);
-          if (curRoute === "applyCard/sign-up") {
+          if (curRoute === "orders/sign-up") {
             uni.navigateTo({
-              url: `/subpackage/applyCard/product-detail?orderId=${
+              url: `/subpackage/orders/product-detail?orderId=${
                 orders.orderId
               }&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
             });

composables/order/useOrderSkip.ts

@@ -7,12 +7,12 @@ export default function useOrderSkip() {
 
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo) => {
-		console.log('输出内容=====',orderInfo.orderType)
+		console.log('输出内容=====', orderInfo.orderType)
 		if (orderInfo.orderType === 'ISSUE') {
 			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
 
 		} else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
-		 orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
+			orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
 			navTo(`/subpackage/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);
 
 		} else if (orderInfo.orderType === 'SUPPLEMENT_OBU') {
@@ -66,13 +66,13 @@ export default function useOrderSkip() {
 		console.log("********555555555555**********", orderInfo);
 		let url = '';
 		if (orderInfo.orderStep == OrderStatus.完成填写基本信息) {
-			url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/applyCard/opening-account-people' : '/subpackage/applyCard/opening-account-unit';
+			url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/orders/opening-account-people' : '/subpackage/orders/opening-account-unit';
 		} else if (orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]) {
-			url = '/subpackage/applyCard/car-release';
+			url = '/subpackage/orders/car-release';
 		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传) {
-			url = `/subpackage/applyCard/release-products`;
+			url = `/subpackage/orders/release-products`;
 		} else {
-			url = `/subpackage/applyCard/essential-information`;
+			url = `/subpackage/orders/essential-information`;
 		}
 		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
 	}
@@ -98,8 +98,8 @@ export default function useOrderSkip() {
 			productId: orderInfo.productId,
 		}
 		navTo(`/subpackage/orders/payment?data=${JSON.stringify(data)}`);
-		//navTo(`/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`)
-		// navTo(`/applyCard/choice-product?orderId=${orderInfo.orderId}`);
+		//navTo(`/orders/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`)
+		// navTo(`/orders/choice-product?orderId=${orderInfo.orderId}`);
 	}
 
 	//申请退货
@@ -127,12 +127,12 @@ export default function useOrderSkip() {
 	const gotoEvaluateOrder = (orderInfo: any) => {
 		navTo(`/subpackage/orders/order-evaluate?id=${orderInfo.id}`);
 	}
-	
+
 	//新办订单-去评价 发行产品，权益产品
 	const gotoEvaluateProduct = (orderInfo: any) => {
 		navTo(`/subpackage/orders/order-evaluate-product?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 	}
-	
+
 	//新办订单-去评价  业务办理满意度，业务员满意度
 	const gotoEvaluateSalesman = (orderInfo: any) => {
 		navTo(`/subpackage/orders/order-evaluate-salesman?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
@@ -168,7 +168,7 @@ export default function useOrderSkip() {
 
 	return {
 		gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
-		gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateOrder,gotoEvaluateProduct,gotoEvaluateSalesman,
+		gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateOrder, gotoEvaluateProduct, gotoEvaluateSalesman,
 		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay,
 		gotoOrderDetails, gotoLogoffETC, gotoEditCarWriteInfo,
 		gotoEditCarApplyAgain, gotoCardSignPay

pages.json

@@ -774,9 +774,185 @@
 				}
 			]
 		},
+		// {
+		// 	"root": "subpackage/applyCard", //ETC申办下单
+		// 	"pages": [
+		// 		{
+		// 			"path": "essential-information",
+		// 			"style": {
+		// 				"navigationBarTitleText": "基本信息",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "signUserAgreement",
+		// 			"style": {
+		// 				"navigationBarTitleText": "签署用户协议"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "deductionAccountAssociation",
+		// 			"style": {
+		// 				"navigationBarTitleText": "扣款账户关联",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "release-products",
+		// 			"style": {
+		// 				"navigationBarTitleText": "支付账户签约",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "addAddress",
+		// 			"style": {
+		// 				"navigationBarTitleText": "新增收货地址"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "editAddress",
+		// 			"style": {
+		// 				"navigationBarTitleText": "修改收货地址"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "opening-account-unit",
+		// 			"style": {
+		// 				"navigationBarTitleText": "ETC开户新办申请-单位",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "opening-account-people",
+		// 			"style": {
+		// 				"navigationBarTitleText": "ETC开户新办申请-个人",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "car-release",
+		// 			"style": {
+		// 				"navigationBarTitleText": "行驶证信息上传",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "sign-up",
+		// 			"style": {
+		// 				"navigationBarTitleText": "微信车主服务"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "interestsList",
+		// 			"style": {
+		// 				"navigationBarTitleText": "加购权益产品"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "choice-product",
+		// 			"style": {
+		// 				"navigationBarTitleText": "选择产品",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "product-detail",
+		// 			"style": {
+		// 				"navigationBarTitleText": "产品详情",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		}
+		// 	]
+		// },
+		// {
+		// 	"root": "subpackage/invoice", //发票管理
+		// 	"pages": [
+		// 		{
+		// 			"path": "invoiceApply/create-invoice-header-company",
+		// 			"style": {
+		// 				"navigationBarTitleText": "创建抬头-单位"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/create-invoice-header-individual",
+		// 			"style": {
+		// 				"navigationBarTitleText": "创建抬头-个人"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/edit-invoice-header-company",
+		// 			"style": {
+		// 				"navigationBarTitleText": "编辑抬头-单位"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/edit-invoice-header-individual",
+		// 			"style": {
+		// 				"navigationBarTitleText": "编辑抬头-个人"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/invoice-header",
+		// 			"style": {
+		// 				"navigationBarTitleText": "选择抬头"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/invoiceList",
+		// 			"style": {
+		// 				"navigationBarTitleText": "开票申请"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/invoice-step1",
+		// 			"style": {
+		// 				"navigationBarTitleText": "开票申请"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoiceApply/invoice-step2",
+		// 			"style": {
+		// 				"navigationBarTitleText": "开票申请"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoice-download",
+		// 			"style": {
+		// 				"navigationBarTitleText": "下载发票"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "Invoice-mannager",
+		// 			"style": {
+		// 				"navigationBarTitleText": "发票管理"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "moreHighMsg/moreHighMsg",
+		// 			"style": {
+		// 				"navigationBarTitleText": "高速快讯",
+		// 				"enablePullDownRefresh":true
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoicing-record",
+		// 			"style": {
+		// 				"navigationBarTitleText": "开票记录"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "verification-apply",
+		// 			"style": {
+		// 				"navigationBarTitleText": "验证申请"
+		// 			}
+		// 		}
+		// 	]
+		// },
 		{
-			"root": "subpackage/applyCard", //ETC申办下单
-			"pages": [{
+			"root": "subpackage/orders", //订单管理模块
+			"pages": [
+				{
 					"path": "essential-information",
 					"style": {
 						"navigationBarTitleText": "基本信息",
@@ -861,12 +1037,7 @@
 						"navigationBarTitleText": "产品详情",
 						"navigationStyle": "custom"
 					}
-				}
-			]
-		},
-		{
-			"root": "subpackage/invoice", //发票管理
-			"pages": [
+				},
 				{
 					"path": "invoiceApply/create-invoice-header-company",
 					"style": {
@@ -945,12 +1116,8 @@
 					"style": {
 						"navigationBarTitleText": "验证申请"
 					}
-				}
-			]
-		},
-		{
-			"root": "subpackage/orders", //订单管理模块
-			"pages": [{
+				},
+				{
 					"path": "apply-ex-goods",
 					"style": {
 						"navigationBarTitleText": "申请换货"
@@ -1129,6 +1296,63 @@
 		{
 			"root": "subpackage/personal-center", //个人中心
 			"pages": [
+						{
+							"path": "old-user",
+							"style": {
+								"navigationBarTitleText": "历史用户申请",
+								"enablePullDownRefresh": true
+							}
+						},
+						{
+							"path": "address",
+							"style": {
+								"navigationBarTitleText": "邮寄地址",
+								"enablePullDownRefresh": true
+							}
+						},
+						{
+							"path": "install-activation-order",
+							"style": {
+								"navigationBarTitleText": "安装激活-选择订单",
+								"enablePullDownRefresh": true
+							}
+						},
+						{
+							"path": "car-submit-record",
+							"style": {
+								"navigationBarTitleText": "车辆提交记录"
+							}
+						},
+						{
+							"path": "official-car-issue",
+							"style": {
+								"navigationBarTitleText": "公务车发行"
+							}
+						},
+						{
+							"path": "query-company-list",
+							"style": {
+								"navigationBarTitleText": "单位查询"
+							}
+						},
+						{
+							"path": "add-company",
+							"style": {
+								"navigationBarTitleText": "新增单位"
+							}
+						},
+						{
+							"path": "add-car",
+							"style": {
+								"navigationBarTitleText": "新增车辆"
+							}
+						},
+						{
+							"path": "official-car-issue-result",
+							"style": {
+								"navigationBarTitleText": "公务车发行-查询结果"
+							}
+						},
 				{
 					"path": "trajectory/trajectory",
 					"style": {
@@ -1462,69 +1686,70 @@
 					}
 				}
 			]
-		},
-		{
-			//发行激活模块
-			"root": "subpackage/issueActivation",
-			"pages": [{
-					"path": "old-user",
-					"style": {
-						"navigationBarTitleText": "历史用户申请",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "address",
-					"style": {
-						"navigationBarTitleText": "邮寄地址",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "install-activation-order",
-					"style": {
-						"navigationBarTitleText": "安装激活-选择订单",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "car-submit-record",
-					"style": {
-						"navigationBarTitleText": "车辆提交记录"
-					}
-				},
-				{
-					"path": "official-car-issue",
-					"style": {
-						"navigationBarTitleText": "公务车发行"
-					}
-				},
-				{
-					"path": "query-company-list",
-					"style": {
-						"navigationBarTitleText": "单位查询"
-					}
-				},
-				{
-					"path": "add-company",
-					"style": {
-						"navigationBarTitleText": "新增单位"
-					}
-				},
-				{
-					"path": "add-car",
-					"style": {
-						"navigationBarTitleText": "新增车辆"
-					}
-				},
-				{
-					"path": "official-car-issue-result",
-					"style": {
-						"navigationBarTitleText": "公务车发行-查询结果"
-					}
-				}
-			]
 		}
+		// {
+		// 	//发行激活模块
+		// 	"root": "subpackage/issueActivation",
+		// 	"pages": [
+		// 		{
+		// 			"path": "old-user",
+		// 			"style": {
+		// 				"navigationBarTitleText": "历史用户申请",
+		// 				"enablePullDownRefresh": true
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "address",
+		// 			"style": {
+		// 				"navigationBarTitleText": "邮寄地址",
+		// 				"enablePullDownRefresh": true
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "install-activation-order",
+		// 			"style": {
+		// 				"navigationBarTitleText": "安装激活-选择订单",
+		// 				"enablePullDownRefresh": true
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "car-submit-record",
+		// 			"style": {
+		// 				"navigationBarTitleText": "车辆提交记录"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "official-car-issue",
+		// 			"style": {
+		// 				"navigationBarTitleText": "公务车发行"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "query-company-list",
+		// 			"style": {
+		// 				"navigationBarTitleText": "单位查询"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "add-company",
+		// 			"style": {
+		// 				"navigationBarTitleText": "新增单位"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "add-car",
+		// 			"style": {
+		// 				"navigationBarTitleText": "新增车辆"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "official-car-issue-result",
+		// 			"style": {
+		// 				"navigationBarTitleText": "公务车发行-查询结果"
+		// 			}
+		// 		}
+		// 	]
+		// }
 	],
 	"tabBar": {
 		"color": "#666666",

pages/index/index.vue

@@ -43,14 +43,14 @@
 					</view>
 					<view class="text">账单查询</view>
 				</view>
-				<view class="item-box" @click="$util.navTo('/subpackage/invoice/Invoice-mannager',true)">
+				<view class="item-box" @click="$util.navTo('/subpackage/orders/Invoice-mannager',true)">
 					<view class="item item-3">
 						<image :src="fileURL + 'image/index/item-3.png'" />
 					</view>
 					<view class="text">通行发票</view>
 				</view>
 				<view class="item-box"
-					@click="$util.navTo('/subpackage/issueActivation/install-activation-order',true)">
+					@click="$util.navTo('/subpackage/personal-center/install-activation-order',true)">
 					<view class="item item-4">
 						<image :src="fileURL + 'image/index/item-4.png'" />
 					</view>
@@ -151,7 +151,7 @@
 						<image :src="fileURL + item.speedUrl"></image>
 					</view>
 				</view>
-				<view class="more" @click="$util.navTo('/subpackage/invoice/moreHighMsg/moreHighMsg',true)">查看更多</view>
+				<view class="more" @click="$util.navTo('/subpackage/orders/moreHighMsg/moreHighMsg',true)">查看更多</view>
 			</view>
 		</view>
 
@@ -477,17 +477,17 @@
 		console.log(typeof(val));
 		state.userType = val;
 		// if (val === 1) {
-		// 	// navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`)
+		// 	// navTo(`/orders/essential-information?type=${state.type}&&userType=${state.userType}`)
 		// 	uni.navigateTo({
-		// 		url: `/subpackage/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`
+		// 		url: `/subpackage/orders/essential-information?type=${state.type}&&userType=${state.userType}`
 		// 	})
 		// } else {
-		// 	// navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`)
+		// 	// navTo(`/orders/essential-information?type=${state.type}&&userType=${state.userType}`)
 		// 	uni.navigateTo({
-		// 		url: `/subpackage/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`
+		// 		url: `/subpackage/orders/essential-information?type=${state.type}&&userType=${state.userType}`
 		// 	})
 		// }
-		navTo(`/subpackage/applyCard/choice-product?type=${state.type}&&userType=${state.userType}`)
+		navTo(`/subpackage/orders/choice-product?type=${state.type}&&userType=${state.userType}`)
 		closeMask();
 	};
 

subpackage/after-sale/account-change/release-products.vue

@@ -54,16 +54,16 @@ const imgURL = `${fileURL}image/`;
 const savaHandle = () => {
   console.log("执行点击事件");
   // uni.navigateTo({
-  // 	url: `/pages/applyCard/choice-product?orderId=${state.orderId}`
+  // 	url: `/pages/orders/choice-product?orderId=${state.orderId}`
   // })
   // uni.redirectTo({
-  // 	url: `/pages/applyCard/choice-product?orderId=${state.orderId}`
+  // 	url: `/pages/orders/choice-product?orderId=${state.orderId}`
   // });
 };
 const qianyueAction = (val) => {
   console.log(val);
   // uni.navigateTo({
-  // 	url: `/pages/applyCard/sign-up?orderId=${val.orderId}`
+  // 	url: `/pages/orders/sign-up?orderId=${val.orderId}`
   // })
   if (val.to == 1) {
     uni.redirectTo({

subpackage/after-sale/to-bookkeeping-card/mailing_information.vue

@@ -217,12 +217,12 @@
 
 	const goToAddAddress = () => {
 		uni.navigateTo({
-			url: "/subpackage/applyCard/addAddress",
+			url: "/subpackage/orders/addAddress",
 		});
 	};
 	const editAddress = (val) => {
 		uni.navigateTo({
-			url: `/subpackage/applyCard/editAddress?content=` + JSON.stringify(val),
+			url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
 		});
 	};
 

subpackage/invoice/Invoice-mannager.vue → subpackage/orders/Invoice-mannager.vue

@@ -33,9 +33,9 @@
 
 	const toPage = (type) => {
 		if (type == 1) {
-			navTo('/subpackage/invoice/invoiceApply/invoiceList')
+			navTo('/subpackage/orders/invoiceApply/invoiceList')
 		} else {
-			navTo('/subpackage/invoice/invoicing-record')
+			navTo('/subpackage/orders/invoicing-record')
 		}
 
 	}

subpackage/applyCard/addAddress.vue → subpackage/orders/addAddress.vue

@@ -162,7 +162,7 @@ const queryAddOrEditAddress = (code, data) => {
 			request(addressToOrder, options2).then((res) => {
 				console.log(res);
 				  uni.redirectTo({
-				  	url: `/subpackage/applyCard/release-products?orderId=${state.formData.orderId}&clientFee=${getItem('clientFee')}&&id=${getItem('productId')}`,
+				  	url: `/subpackage/orders/release-products?orderId=${state.formData.orderId}&clientFee=${getItem('clientFee')}&&id=${getItem('productId')}`,
 				  });
 			  })
 		  })

subpackage/applyCard/car-release.vue → subpackage/orders/car-release.vue

@@ -237,20 +237,20 @@
 						if(state.isSign == 1){
 							if (!hasLogin()) {
 								uni.redirectTo({
-									url: `/subpackage/applyCard/addAddress?orderId=${state.form.orderId
+									url: `/subpackage/orders/addAddress?orderId=${state.form.orderId
 										}&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 								});
 							} else {
 								uni.redirectTo({
-									// url: `/subpackage/applyCard/choice-product?orderId=${state.form.orderId}`,
-									url: `/subpackage/applyCard/release-products?orderId=${state.form.orderId
+									// url: `/subpackage/orders/choice-product?orderId=${state.form.orderId}`,
+									url: `/subpackage/orders/release-products?orderId=${state.form.orderId
 										}&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 								});
 							}
 						}else{
 							// 不签约
 							uni.redirectTo({
-							  url: `/subpackage/applyCard/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+							  url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 							});
 						}
 					}
@@ -498,7 +498,7 @@
 			const data = stringToJson(res.bizContent);
 			state.show = false;
 			uni.navigateTo({
-				url: `/subpackage/applyCard/choice-product?orderId=${state.form.orderId}`,
+				url: `/subpackage/orders/choice-product?orderId=${state.form.orderId}`,
 			});
 		}).catch((error) => {
 			reject(error);

subpackage/applyCard/choice-product.vue → subpackage/orders/choice-product.vue

@@ -1,353 +1,353 @@
-<template>
-  <navBar title="选择产品" :scrollTop="scrollTop"></navBar>
-  <navBgCar></navBgCar>
-  <view class="content-value">
-    <view
-      @click="savaHandle(item)"
-      class="ul-item"
-      v-for="(item, index) in state.dataArray"
-      :key="index"
-    >
-      <image
-        style="width: 100%; height: 170rpx; border-radius: 20rpx"
-        :src="`${$imgUrl}applyCard/product-bg.png`"
-      ></image>
-      <view class="item-value">
-        <image class="icon-tip" :src="`${$imgUrl}applyCard/wechat.png`"></image>
-        <view class="content">
-          <view class="title">
-            {{ item.promoteName }}
-          </view>
-		  <!-- 1记账卡2储值卡3记存卡 -->
-          <!-- <view style="margin-top: 15rpx" class="tip" v-if="item.cardType=='1'">
-            记账卡
-          </view> -->
-		  <view style="margin-top: 15rpx" class="tip">
-		    {{ item.cardTypeArr }}
-		  </view>
-        </view>
-		<view class="money">
-		  ￥：{{ item.fee * 0.01 }}
-		</view>
-      </view>
-    </view>
-    <view class="bottomTip"> 到底啦！敬请期待其他产品！ </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { onLoad, onPageScroll } from "@dcloudio/uni-app";
-import { reactive, ref } from "vue";
-import { etcQueryProduct, productReCode } from "@/utils/network/api.js";
-import { request } from "@/utils/network/request.js";
-
-import { stringToJson } from "@/utils/network/encryption";
-import { fileURL } from "@/datas/fileURL.js";
-import navBgCar from "./components/nav-bg-car1";
-import navBar from "@/components/nav-bar/nav-bar2.vue";
-
-import { getItem, StorageKeys,setItem} from "@/utils/storage.ts";
-import { msg } from "@/utils/utils";
-const imgURL = `${fileURL}image/`;
-// import { setItem } from "@/utils/storage";
-
-const scrollTop = ref(0); //滚动距离
-
-const savaHandle = (val) => {
-	console.log("vAL",val)
-  // productReCodeAction(val.id).then((value) => {
-    // if (val.isValueCard === 2) {
-      setItem("clientFee", val.clientFee);
-      setItem("promoteId", val.promoteId);
-      setItem("isValueCard", val.isValueCard);
-	  state.isSign=val.isSign;
-      uni.redirectTo({
-        url: `/subpackage/applyCard/essential-information?promoteId=${val.promoteId}&userType=${state.userType}&type=${state.type}&isSign=${state.isSign}`,
-      });
-
-    // if (state.userType === 1) {
-    //   uni.redirectTo({
-    //     url: `/subpackage/applyCard/opening-account-people?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
-    //   });
-    // } else {
-    //   uni.redirectTo({
-    //     url: `/subpackage/applyCard/opening-account-unit?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
-    //   });
-    // }
-
-    // if (val.isValueCard === 2) {
-    // 	setItem('clientFee', val.clientFee)
-    // 	setItem("productId", val.id)
-    // 	uni.navigateTo({
-    // 		url: `/subpackage/applyCard/release-products?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
-    // 	});
-    // } else {
-
-    // 	uni.navigateTo({
-    // 		url: `/subpackage/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
-    // 	});
-    // }
-  // });
-};
-
-onLoad((option: any) => {
-  // state.orderId = option.orderId;
-  // state.userType = option.userType;
-  // state.vehiclePlateColor = option.vehiclePlateColor;
-  state.userType = option.userType;
-  state.type = option.type;
-
-  // var data = {
-  // 	orderId: state.orderId,
-  // };
-  // const options = {
-  // 	type: 2,
-  // 	data: data,
-  // 	method: "POST",
-  // 	showLoading: true,
-  // };
-  // console.log('输出内容',options.data)
-  // request(etcQueryProduct, options).then((res) => {
-  // 	console.log(res.bizContent);
-  // 	const data = stringToJson(res.bizContent);
-  // 	console.log(data);
-  // 	console.log(typeof(data));
-  // 	state.dataArray = data??[];
-  // });
-
-  var data = {
-    type: state.type,
-	source:'WECHAT'  //请求方来源
-  };
-  const options = {
-    type: 2,
-    data: data,
-    method: "POST",
-    showLoading: true,
-  };
-  console.log("输出内容", options);
-  request(etcQueryProduct, options).then((res) => {
-    // console.log(res.bizContent);
-    const data = stringToJson(res.bizContent);
-    console.log(data);
-    // console.log(typeof(data));
-    state.dataArray = data.csmsnPromoteDistPro ?? [];
-	for(var i=0;i<state.dataArray.length;i++){
-		const cardTypeArr=[]
-		for(var j=0;j<state.dataArray[i].cardType.length;j++){
-			if(state.dataArray[i].cardType[j]=='1'){
-				cardTypeArr.push('记账卡')
-			}else if(state.dataArray[i].cardType[j]=='2'){
-				cardTypeArr.push('储值卡')
-			}else if(state.dataArray[i].cardType[j]=='3'){
-				cardTypeArr.push('预存卡')
-			}
-		}
-		state.dataArray[i].cardTypeArr=cardTypeArr.toString()
-	}
-	console.log("state.dataArray",state.dataArray)
-  });
-});
-
-//监听页面滚动
-onPageScroll((e) => {
-  scrollTop.value = e.scrollTop;
-});
-
-const productReCodeAction = (id) => {
-  var data = {
-    productId: id,
-    orderId: state.orderId,
-  };
-  const options = {
-    type: 2,
-    data: data,
-    method: "POST",
-    showLoading: true,
-  };
-
-  return new Promise(async (resolve, reject) => {
-    const res = await request(productReCode, options);
-    const data = stringToJson(res.bizContent);
-    resolve(data);
-  }).catch((error) => {
-    reject(error);
-  });
-};
-
-const state = reactive({
-  isSign:'',
-  orderId: "",
-  userType: 1, //1 个人 2单位
-  type: 0, //0 客车 1货车
-  vehiclePlateColor: "",
-  data: {
-    show: false,
-    src: imgURL + "applyCard/edit.png",
-  },
-  dataArray: [],
-  list: [
-    {
-      bg: imgURL + "applyCard/product-bg.png",
-      icon: imgURL + "applyCard/wechat.png",
-      title: "【货车】微信车主服务",
-      tip: "绑定微信支付，无需绑定银行卡",
-    },
-  ],
-});
-</script>
-
-<style lang="scss" scoped>
-.bottomTip {
-  margin-top: 100rpx;
-  text-align: center;
-  font-size: 28rpx;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #b3b3b3;
-}
-
-.content-value {
-  position: relative;
-  // margin-top: -50rpx;
-  padding: 0rpx 30rpx;
-  position: relative;
-
-  .img-pos {
-    position: absolute;
-    left: 500rpx;
-    top: -38rpx;
-    right: 50rpx;
-
-    .img-flex {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .car-img {
-        width: 86rpx;
-        height: 42rpx;
-      }
-
-      .flag-img {
-        width: 30rpx;
-        height: 35rpx;
-      }
-    }
-  }
-}
-
-.flex {
-  display: flex;
-  align-items: center;
-}
-
-.action {
-  margin-top: 30rpx;
-  padding-left: 20rpx;
-  padding-right: 20rpx;
-  padding-bottom: 30rpx;
-
-  .button {
-    height: 80rpx;
-    background: linear-gradient(-90deg, #43a1e0 0%, #13e7c1 100%);
-    border-radius: 40rpx;
-    font-size: 32rpx;
-    font-weight: 400;
-    color: #ffffff;
-    line-height: 80rpx;
-  }
-}
-
-.action-btn {
-  margin-left: 45rpx;
-  width: 121rpx;
-  height: 61rpx;
-  border: 1px solid rgba(255, 255, 255, 1);
-  border-radius: 30rpx;
-  background: rgba(255, 255, 255, 0.2);
-
-  text-align: center;
-  font-size: 30rpx;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-  line-height: 61rpx;
-}
-
-.tag1 {
-  padding: 5rpx;
-  background: rgba(0, 179, 139, 0.5);
-  border-radius: 6rpx;
-  font-size: 22rpx;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.tag3 {
-  padding: 5rpx;
-  background: rgba(139, 112, 228, 0.5);
-  border-radius: 6rpx;
-  font-size: 22rpx;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.tag2 {
-  padding: 5rpx;
-  background: rgba(249, 97, 60, 0.5);
-  border-radius: 6rpx;
-  font-size: 22rpx;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.ul-item {
-  padding: 5px 20rpx;
-  display: flex;
-  align-items: center;
-
-  .item-value {
-    padding: 20rpx;
-    position: absolute;
-    display: flex;
-    align-items: center;
-    // justify-content: space-around;
-	width: 80%;
-
-    .content {
-		width: 51%;
-      .title {
-        font-size: 32rpx;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-		
-      }
-
-      .tip {
-        font-size: 24rpx;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-      }
-    }
-  }
-
-  .icon-tip {
-    width: 100rpx;
-    height: 100rpx;
-  }
-
-  .content {
-    margin-left: 40rpx;
-  }
-}
-.money{
-	color: white;
-	// float: right;
-}
-</style>
+<template>
+  <navBar title="选择产品" :scrollTop="scrollTop"></navBar>
+  <navBgCar></navBgCar>
+  <view class="content-value">
+    <view
+      @click="savaHandle(item)"
+      class="ul-item"
+      v-for="(item, index) in state.dataArray"
+      :key="index"
+    >
+      <image
+        style="width: 100%; height: 170rpx; border-radius: 20rpx"
+        :src="`${$imgUrl}applyCard/product-bg.png`"
+      ></image>
+      <view class="item-value">
+        <image class="icon-tip" :src="`${$imgUrl}applyCard/wechat.png`"></image>
+        <view class="content">
+          <view class="title">
+            {{ item.promoteName }}
+          </view>
+		  <!-- 1记账卡2储值卡3记存卡 -->
+          <!-- <view style="margin-top: 15rpx" class="tip" v-if="item.cardType=='1'">
+            记账卡
+          </view> -->
+		  <view style="margin-top: 15rpx" class="tip">
+		    {{ item.cardTypeArr }}
+		  </view>
+        </view>
+		<view class="money">
+		  ￥：{{ item.fee * 0.01 }}
+		</view>
+      </view>
+    </view>
+    <view class="bottomTip"> 到底啦！敬请期待其他产品！ </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { onLoad, onPageScroll } from "@dcloudio/uni-app";
+import { reactive, ref } from "vue";
+import { etcQueryProduct, productReCode } from "@/utils/network/api.js";
+import { request } from "@/utils/network/request.js";
+
+import { stringToJson } from "@/utils/network/encryption";
+import { fileURL } from "@/datas/fileURL.js";
+import navBgCar from "./components/nav-bg-car1";
+import navBar from "@/components/nav-bar/nav-bar2.vue";
+
+import { getItem, StorageKeys,setItem} from "@/utils/storage.ts";
+import { msg } from "@/utils/utils";
+const imgURL = `${fileURL}image/`;
+// import { setItem } from "@/utils/storage";
+
+const scrollTop = ref(0); //滚动距离
+
+const savaHandle = (val) => {
+	console.log("vAL",val)
+  // productReCodeAction(val.id).then((value) => {
+    // if (val.isValueCard === 2) {
+      setItem("clientFee", val.clientFee);
+      setItem("promoteId", val.promoteId);
+      setItem("isValueCard", val.isValueCard);
+	  state.isSign=val.isSign;
+      uni.redirectTo({
+        url: `/subpackage/orders/essential-information?promoteId=${val.promoteId}&userType=${state.userType}&type=${state.type}&isSign=${state.isSign}`,
+      });
+
+    // if (state.userType === 1) {
+    //   uni.redirectTo({
+    //     url: `/subpackage/orders/opening-account-people?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+    //   });
+    // } else {
+    //   uni.redirectTo({
+    //     url: `/subpackage/orders/opening-account-unit?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+    //   });
+    // }
+
+    // if (val.isValueCard === 2) {
+    // 	setItem('clientFee', val.clientFee)
+    // 	setItem("productId", val.id)
+    // 	uni.navigateTo({
+    // 		url: `/subpackage/orders/release-products?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
+    // 	});
+    // } else {
+
+    // 	uni.navigateTo({
+    // 		url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
+    // 	});
+    // }
+  // });
+};
+
+onLoad((option: any) => {
+  // state.orderId = option.orderId;
+  // state.userType = option.userType;
+  // state.vehiclePlateColor = option.vehiclePlateColor;
+  state.userType = option.userType;
+  state.type = option.type;
+
+  // var data = {
+  // 	orderId: state.orderId,
+  // };
+  // const options = {
+  // 	type: 2,
+  // 	data: data,
+  // 	method: "POST",
+  // 	showLoading: true,
+  // };
+  // console.log('输出内容',options.data)
+  // request(etcQueryProduct, options).then((res) => {
+  // 	console.log(res.bizContent);
+  // 	const data = stringToJson(res.bizContent);
+  // 	console.log(data);
+  // 	console.log(typeof(data));
+  // 	state.dataArray = data??[];
+  // });
+
+  var data = {
+    type: state.type,
+	source:'WECHAT'  //请求方来源
+  };
+  const options = {
+    type: 2,
+    data: data,
+    method: "POST",
+    showLoading: true,
+  };
+  console.log("输出内容", options);
+  request(etcQueryProduct, options).then((res) => {
+    // console.log(res.bizContent);
+    const data = stringToJson(res.bizContent);
+    console.log(data);
+    // console.log(typeof(data));
+    state.dataArray = data.csmsnPromoteDistPro ?? [];
+	for(var i=0;i<state.dataArray.length;i++){
+		const cardTypeArr=[]
+		for(var j=0;j<state.dataArray[i].cardType.length;j++){
+			if(state.dataArray[i].cardType[j]=='1'){
+				cardTypeArr.push('记账卡')
+			}else if(state.dataArray[i].cardType[j]=='2'){
+				cardTypeArr.push('储值卡')
+			}else if(state.dataArray[i].cardType[j]=='3'){
+				cardTypeArr.push('预存卡')
+			}
+		}
+		state.dataArray[i].cardTypeArr=cardTypeArr.toString()
+	}
+	console.log("state.dataArray",state.dataArray)
+  });
+});
+
+//监听页面滚动
+onPageScroll((e) => {
+  scrollTop.value = e.scrollTop;
+});
+
+const productReCodeAction = (id) => {
+  var data = {
+    productId: id,
+    orderId: state.orderId,
+  };
+  const options = {
+    type: 2,
+    data: data,
+    method: "POST",
+    showLoading: true,
+  };
+
+  return new Promise(async (resolve, reject) => {
+    const res = await request(productReCode, options);
+    const data = stringToJson(res.bizContent);
+    resolve(data);
+  }).catch((error) => {
+    reject(error);
+  });
+};
+
+const state = reactive({
+  isSign:'',
+  orderId: "",
+  userType: 1, //1 个人 2单位
+  type: 0, //0 客车 1货车
+  vehiclePlateColor: "",
+  data: {
+    show: false,
+    src: imgURL + "applyCard/edit.png",
+  },
+  dataArray: [],
+  list: [
+    {
+      bg: imgURL + "applyCard/product-bg.png",
+      icon: imgURL + "applyCard/wechat.png",
+      title: "【货车】微信车主服务",
+      tip: "绑定微信支付，无需绑定银行卡",
+    },
+  ],
+});
+</script>
+
+<style lang="scss" scoped>
+.bottomTip {
+  margin-top: 100rpx;
+  text-align: center;
+  font-size: 28rpx;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #b3b3b3;
+}
+
+.content-value {
+  position: relative;
+  // margin-top: -50rpx;
+  padding: 0rpx 30rpx;
+  position: relative;
+
+  .img-pos {
+    position: absolute;
+    left: 500rpx;
+    top: -38rpx;
+    right: 50rpx;
+
+    .img-flex {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .car-img {
+        width: 86rpx;
+        height: 42rpx;
+      }
+
+      .flag-img {
+        width: 30rpx;
+        height: 35rpx;
+      }
+    }
+  }
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+}
+
+.action {
+  margin-top: 30rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  padding-bottom: 30rpx;
+
+  .button {
+    height: 80rpx;
+    background: linear-gradient(-90deg, #43a1e0 0%, #13e7c1 100%);
+    border-radius: 40rpx;
+    font-size: 32rpx;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 80rpx;
+  }
+}
+
+.action-btn {
+  margin-left: 45rpx;
+  width: 121rpx;
+  height: 61rpx;
+  border: 1px solid rgba(255, 255, 255, 1);
+  border-radius: 30rpx;
+  background: rgba(255, 255, 255, 0.2);
+
+  text-align: center;
+  font-size: 30rpx;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 61rpx;
+}
+
+.tag1 {
+  padding: 5rpx;
+  background: rgba(0, 179, 139, 0.5);
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #ffffff;
+}
+
+.tag3 {
+  padding: 5rpx;
+  background: rgba(139, 112, 228, 0.5);
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #ffffff;
+}
+
+.tag2 {
+  padding: 5rpx;
+  background: rgba(249, 97, 60, 0.5);
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #ffffff;
+}
+
+.ul-item {
+  padding: 5px 20rpx;
+  display: flex;
+  align-items: center;
+
+  .item-value {
+    padding: 20rpx;
+    position: absolute;
+    display: flex;
+    align-items: center;
+    // justify-content: space-around;
+	width: 80%;
+
+    .content {
+		width: 51%;
+      .title {
+        font-size: 32rpx;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #ffffff;
+		
+      }
+
+      .tip {
+        font-size: 24rpx;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #ffffff;
+      }
+    }
+  }
+
+  .icon-tip {
+    width: 100rpx;
+    height: 100rpx;
+  }
+
+  .content {
+    margin-left: 40rpx;
+  }
+}
+.money{
+	color: white;
+	// float: right;
+}
+</style>

subpackage/applyCard/editAddress.vue → subpackage/orders/editAddress.vue

@@ -117,7 +117,7 @@
 			});
 		}else{
 			uni.navigateTo({
-				url: `/subpackage/applyCard/essential-information?del=1`
+				url: `/subpackage/orders/essential-information?del=1`
 			});
 		}
 	}

subpackage/applyCard/essential-information.vue → subpackage/orders/essential-information.vue

@@ -187,13 +187,13 @@ const checkNumberplateColor = (item: any) => {
 
 const goToAddAddress = () => {
   uni.navigateTo({
-    url: "/subpackage/applyCard/addAddress",
+    url: "/subpackage/orders/addAddress",
   });
 };
 const editAddress = (val) => {
 	console.log("val",val)
   uni.navigateTo({
-    url: `/subpackage/applyCard/editAddress?content=` + JSON.stringify(val),
+    url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
   });
 };
 
@@ -260,20 +260,20 @@ const nextAction = () => {
 			console.log(result);
 			if (state.data.userType == 1) {
 			  uni.navigateTo({
-			    url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}&type=${state.data.type}`,
+			    url: `/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}&type=${state.data.type}`,
 			  });
 			} else {
 			  uni.navigateTo({
-			    url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}&type=${state.data.type}`,
+			    url: `/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}&type=${state.data.type}`,
 			  });
 			}
 			
 		})
         // uni.navigateTo({
-        // 	url: `/subpackage/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+        // 	url: `/subpackage/orders/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
         // })
         // uni.redirectTo({
-        //   url: `/subpackage/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+        //   url: `/subpackage/orders/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
         // });
 
         
@@ -307,28 +307,28 @@ const orderStepGoActon = (val: any) => {
   if (val.orderStep === 1) {
     if (state.data.userType === 1) {
       uni.redirectTo({
-        url: `/subpackage/applyCard/opening-account-people?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
+        url: `/subpackage/orders/opening-account-people?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
       });
     } else {
       uni.redirectTo({
-        url: `/subpackage/applyCard/opening-account-unit?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
+        url: `/subpackage/orders/opening-account-unit?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
       });
     }
   } else if (val.orderStep === 2) {
     uni.redirectTo({
-      url: `/subpackage/applyCard/car-release?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
+      url: `/subpackage/orders/car-release?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
     });
   } else if (val.orderStep === 3) {
     uni.redirectTo({
-      url: `/subpackage/applyCard/choice-product?orderId=${val.orderId}`,
+      url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
     });
   }else if (val.orderStep === 4) {
     uni.redirectTo({
-      url: `/subpackage/applyCard/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
+      url: `/subpackage/orders/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
     });
   } else if (val.orderStep === 26 || val.orderStep === 27) {
     uni.redirectTo({
-      url: `/subpackage/applyCard/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
+      url: `/subpackage/orders/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
     });
   }
 };

subpackage/applyCard/interestsList.vue → subpackage/orders/interestsList.vue

@@ -162,7 +162,7 @@
 	      } else if (data.userState === "NORMAL") {
 	        msg("已开通车主服务");
 	        uni.navigateTo({
-	          url: `/subpackage/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&data=${items}`,
+	          url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&data=${items}`,
 	        });
 	      } else if (data.userState === "PAUSED") {
 	        msg("已暂停车主服务");

subpackage/invoice/invoice-download.vue → subpackage/orders/invoice-download.vue

@@ -21,7 +21,7 @@
 	} from '@/utils/utils';
 
 	const toPage = () => {
-		navTo('/subpackage/invoice/invoiceApply/invoiceList')
+		navTo('/subpackage/orders/invoiceApply/invoiceList')
 	}
 </script>
 

subpackage/invoice/invoiceApply/invoice-header.vue → subpackage/orders/invoiceApply/invoice-header.vue

@@ -78,9 +78,9 @@
 	}
 	const toEdit = (type) => {
 		if (type == '公司') {
-			navTo('/subpackage/invoice/invoiceApply/edit-invoice-header-company')
+			navTo('/subpackage/orders/invoiceApply/edit-invoice-header-company')
 		} else {
-			navTo('/subpackage/invoice/invoiceApply/edit-invoice-header-individual')
+			navTo('/subpackage/orders/invoiceApply/edit-invoice-header-individual')
 		}
 	}
 </script>

subpackage/invoice/invoiceApply/invoice-step1.vue → subpackage/orders/invoiceApply/invoice-step1.vue

@@ -41,7 +41,7 @@
 	
 	const toheaderPage=()=>{
 		console.log(1);
-		navTo('/subpackage/invoice/invoiceApply/invoice-header')
+		navTo('/subpackage/orders/invoiceApply/invoice-header')
 	}
 </script>
 

subpackage/invoice/invoiceApply/invoice-step2.vue → subpackage/orders/invoiceApply/invoice-step2.vue

@@ -37,7 +37,7 @@
 	} from '@/utils/utils';
 
 	const toPage = () => {
-		navTo('/subpackage/invoice/invoice-download')
+		navTo('/subpackage/orders/invoice-download')
 	}
 </script>
 

subpackage/invoice/invoicing-record.vue → subpackage/orders/invoicing-record.vue

@@ -89,7 +89,7 @@
 	} from '@/utils/utils';
 
 	const toPage = () => {
-		navTo('/subpackage/invoice/invoice-download')
+		navTo('/subpackage/orders/invoice-download')
 	}
 </script>
 

subpackage/applyCard/opening-account-people.vue → subpackage/orders/opening-account-people.vue

@@ -378,7 +378,7 @@
 						// let result = stringToJson(res.bizContent);
 						console.log(res);
 						uni.redirectTo({
-							url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
+							url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
 						});
 					});
 				}
@@ -397,7 +397,7 @@
 				// let result = stringToJson(res.bizContent);
 				console.log(res);
 				uni.redirectTo({
-					url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
+					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
 				});
 			});
 		}

subpackage/applyCard/opening-account-unit.vue → subpackage/orders/opening-account-unit.vue

@@ -226,7 +226,7 @@ import {
 						// let result = stringToJson(res.bizContent);
 						console.log(res);
 						uni.redirectTo({
-							url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=1&isSign=${state.isSign}`,
+							url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=1&isSign=${state.isSign}`,
 						});
 					});
 				}
@@ -243,7 +243,7 @@ import {
 		// 	request(etcCompanyCardInfoSubmit, options).then((res) => {
 		// 		const data = stringToJson(res.bizContent);
 		// 		uni.redirectTo({
-		// 			url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&&vehiclePlateColor=${state.vehiclePlateColor}&isSign=${state.isSign}`,
+		// 			url: `/subpackage/orders/car-release?orderId=${state.orderId}&&vehiclePlateColor=${state.vehiclePlateColor}&isSign=${state.isSign}`,
 		// 		});
 		// 	});
 		// }

subpackage/applyCard/release-products.vue → subpackage/orders/release-products.vue

@@ -56,13 +56,13 @@ const imgURL = `${fileURL}image/`;
 const savaHandle = () => {
   console.log("执行点击事件");
   uni.navigateTo({
-    url: `/subpackage/applyCard/choice-product?orderId=${state.orderId}`,
+    url: `/subpackage/orders/choice-product?orderId=${state.orderId}`,
   });
 };
 const qianyueAction = (val) => {
   console.log(val);
   uni.navigateTo({
-    url: `/subpackage/applyCard/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
+    url: `/subpackage/orders/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
   });
 };
 onLoad((option: any) => {

subpackage/applyCard/sign-up.vue → subpackage/orders/sign-up.vue

@@ -89,7 +89,7 @@ const getOpenID = () => {
 
 const addInterestsList=()=>{
 	uni.navigateTo({
-		url:`/subpackage/applyCard/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
+		url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
 	});
 }
 const savaHandle = () => {
@@ -138,7 +138,7 @@ const savaHandle = () => {
       } else if (data.userState === "NORMAL") {
         msg("已开通车主服务");
         uni.navigateTo({
-          url: `/subpackage/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
+          url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
         });
       } else if (data.userState === "PAUSED") {
         msg("已暂停车主服务");

subpackage/issueActivation/address.vue → subpackage/personal-center/address.vue

@@ -157,12 +157,12 @@
 	};
 	const goToAddAddress = () => {
 		uni.navigateTo({
-			url: "/subpackage/applyCard/addAddress",
+			url: "/subpackage/orders/addAddress",
 		});
 	};
 	const editAddress = (val) => {
 		uni.navigateTo({
-			url: `/subpackage/applyCard/editAddress?content=` + JSON.stringify(val),
+			url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
 		});
 	};
 

subpackage/personal-center/baseMannager/base-change-people.vue

@@ -75,7 +75,7 @@
 	const savaHandle = () => {
 		console.log('执行点击事件')
 		// uni.navigateTo({
-		// 	url: '/pages/applyCard/car-release'
+		// 	url: '/pages/orders/car-release'
 		// })
 	};
 	const tabChange = (val) => {

subpackage/personal-center/baseMannager/base-change-unit.vue

@@ -74,7 +74,7 @@
 	const savaHandle = () => {
 		console.log('执行点击事件')
 		// uni.navigateTo({
-		// 	url: '/pages/applyCard/car-release'
+		// 	url: '/pages/orders/car-release'
 		// })
 	};
 	const state = reactive({

subpackage/issueActivation/car-submit-record.vue → subpackage/personal-center/car-submit-record.vue

@@ -79,7 +79,7 @@
 		console.log(item);
 		//去增补OBU
 		if (item.handleStatus === 4||item.handleStatus === 5) {
-			navTo("/subpackage/issueActivation/address?deptId="+item.funitID+"&vehicleId="+item.fvehPlateNo+"_"+item.fvehPlateColor);
+			navTo("/subpackage/personal-center/address?deptId="+item.funitID+"&vehicleId="+item.fvehPlateNo+"_"+item.fvehPlateColor);
 		} 
 	};
 	

subpackage/issueActivation/index.vue → subpackage/personal-center/index.vue

@@ -15,7 +15,7 @@
 import { navTo } from '@/utils/utils';
 	
 	const gotoPage = ()=>{
-		navTo("/subpackage/issueActivation/old-user")
+		navTo("/subpackage/personal-center/old-user")
 	}
 </script>
 

subpackage/issueActivation/official-car-issue.vue → subpackage/personal-center/official-car-issue.vue

@@ -59,7 +59,7 @@
 		 }
 		 
 		 if(true){//查询到结果
-			 navTo('/subpackage/issueActivation/official-car-issue-result');
+			 navTo('/subpackage/personal-center/official-car-issue-result');
 		 }else{//没查询到结果
 			 state.showPopup = true;
 		 }

subpackage/issueActivation/old-user.vue → subpackage/personal-center/old-user.vue

@@ -150,7 +150,7 @@
 				tools.showModalAlert("历史用户信息检测成功，请您前往特制卡申请进行单位查询", function (res) {
 					if (res.confirm) { //确定
 						// tools.toUrl(route.scompnayQuery + '?deptShortName=' + deptShortName)
-						navTo("/subpackage/issueActivation/query-company-list?deptShortName=" + deptName)
+						navTo("/subpackage/personal-center/query-company-list?deptShortName=" + deptName)
 						return;
 					}
 				});
@@ -159,7 +159,7 @@
 				tools.showModalAlert("未检测到历史用户信息，是否前往特制卡申请进行新增单位", function (res) {
 					if (res.confirm) { //确定
 						// tools.toUrl(route.scompnayQuery)
-						navTo("/subpackage/issueActivation/query-company-list")
+						navTo("/subpackage/personal-center/query-company-list")
 						return;
 					}
 				}, null, "", true);

subpackage/personal-center/progress-query/my-etc.vue

@@ -32,13 +32,13 @@
 	const savaHandle = () => {
 		console.log('执行点击事件')
 		uni.navigateTo({
-			url: '/pages/applyCard/choice-product'
+			url: '/pages/orders/choice-product'
 		})
 	};
 	const qianyueAction = () => {
 		console.log('执行点击事件')
 		uni.navigateTo({
-			url: '/pages/applyCard/sign-up'
+			url: '/pages/orders/sign-up'
 		})
 	};
 

subpackage/issueActivation/query-company-list.vue → subpackage/personal-center/query-company-list.vue

@@ -25,7 +25,7 @@
 			</view>
 			<view class="btns" v-if="item.status !== 1">
 				<!-- <view class="btn btn-normal as-gravity-center" @click="$util.navTo('/issueActivation/add-car')">新增车辆</view> -->
-				<view class="btn btn-primary as-gravity-center" @click="$util.navTo('/subpackage/issueActivation/car-submit-record?deptId='+item.deptID)">车辆提交记录</view>
+				<view class="btn btn-primary as-gravity-center" @click="$util.navTo('/subpackage/personal-center/car-submit-record?deptId='+item.deptID)">车辆提交记录</view>
 			</view>
 		</view>
 	</view>

subpackage/personal-center/setting/addressManager.vue

@@ -71,12 +71,12 @@
 
 	const goToAddAddress = () => {
 		uni.navigateTo({
-			url: "/subpackage/applyCard/addAddress",
+			url: "/subpackage/orders/addAddress",
 		});
 	};
 	const editAddress = (val) => {
 		uni.navigateTo({
-			url: `/subpackage/applyCard/editAddress?content=` + JSON.stringify(val),
+			url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
 		});
 	};