修改分包路由及测试

composables/order/useOrderSkip.ts

@@ -8,28 +8,28 @@ export default function useOrderSkip() {
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo) => {
 		if (orderInfo.orderType === 'ISSUE') {
-			navTo(`/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
+			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') {
-			navTo(`/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);
+			navTo(`/subpackage/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);
 
 		} else if (orderInfo.orderType === 'SUPPLEMENT_OBU') {
-			navTo(`/orders/order-details-obu?id=${orderInfo.id}`);
+			navTo(`/subpackage/orders/order-details-obu?id=${orderInfo.id}`);
 
 		} else if (orderInfo.orderType === 'OFFICAL_SUPPLEMENT_OBU') {
-			navTo(`/orders/order-details-obu?id=${orderInfo.id}`);
+			navTo(`/subpackage/orders/order-details-obu?id=${orderInfo.id}`);
 		}
 		else if (orderInfo.orderType === OrderTypes.ETC注销) {
-			navTo(`/orders/order-details-logoff-etc?id=${orderInfo.id}`);
+			navTo(`/subpackage/orders/order-details-logoff-etc?id=${orderInfo.id}`);
 
 		} else if (orderInfo.orderType === OrderTypes.车辆信息变更) {
-			navTo(`/orders/order-details-edit-car?id=${orderInfo.id}`);
+			navTo(`/subpackage/orders/order-details-edit-car?id=${orderInfo.id}`);
 
 		} else if (orderInfo.orderType === OrderTypes.解除车牌占用) {
-			navTo(`/orders/order-details-cancel-numberplate?id=${orderInfo.id}`);
+			navTo(`/subpackage/orders/order-details-cancel-numberplate?id=${orderInfo.id}`);
 
 		} else if (orderInfo.orderType === 'EXCHANGE_CARD_TYPE') {
-			navTo(`/orders/order-details-recharge?id=${orderInfo.id}`);
+			navTo(`/subpackage/orders/order-details-recharge?id=${orderInfo.id}`);
 		}
 	}
 
@@ -55,7 +55,7 @@ export default function useOrderSkip() {
 			vehiclePlate: orderInfo.vehiclePlate,
 			orderStep: orderInfo.orderStep
 		}
-		navTo(`/orders/cancel-order?data=${JSON.stringify(item)}`);
+		navTo(`/subpackage/orders/cancel-order?data=${JSON.stringify(item)}`);
 	}
 
 	//继续申请、修改资料
@@ -64,13 +64,13 @@ export default function useOrderSkip() {
 		console.log("********555555555555**********", orderInfo);
 		let url = '';
 		if (orderInfo.orderStep == OrderStatus.完成填写基本信息) {
-			url = orderInfo.userType === 'PERSONAL_USER' ? '/applyCard/opening-account-people' : '/applyCard/opening-account-unit';
+			url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/applyCard/opening-account-people' : '/subpackage/applyCard/opening-account-unit';
 		} else if (orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]) {
-			url = '/applyCard/car-release';
+			url = '/subpackage/applyCard/car-release';
 		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传) {
-			url = `/applyCard/release-products`;
+			url = `/subpackage/applyCard/release-products`;
 		} else {
-			url = `/applyCard/essential-information`;
+			url = `/subpackage/applyCard/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'}`);
 	}
@@ -85,7 +85,7 @@ export default function useOrderSkip() {
 			cardId: orderInfo.cardId,
 			obuId: orderInfo.obuId,
 		}
-		navTo(`/orders/order-confirm-receipt?id=${orderInfo.id}`)
+		navTo(`/subpackage/orders/order-confirm-receipt?id=${orderInfo.id}`)
 	}
 
 	//去支付-选择产品
@@ -95,7 +95,7 @@ export default function useOrderSkip() {
 			amount: orderInfo.amount,
 			productId: orderInfo.productId,
 		}
-		navTo(`/orders/payment?data=${JSON.stringify(data)}`);
+		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}`);
 	}
@@ -108,38 +108,38 @@ export default function useOrderSkip() {
 			vehiclePlate: orderInfo.vehiclePlate,
 			orderStep: orderInfo.orderStep,
 		}
-		navTo(`/orders/apply-return-goods?data=${JSON.stringify(data)}`);
+		navTo(`/subpackage/orders/apply-return-goods?data=${JSON.stringify(data)}`);
 	}
 
 	//去换货
 	const gotoExchangeOrder = (orderInfo: any) => {
-		navTo(`/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
+		navTo(`/subpackage/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
 	}
 
 	//去激活订单
 	const gotoActiveOrder = (orderInfo: any) => {
-		navTo(`/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}`);
+		navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}`);
 	}
 
 	//新办订单-去评价
 	const gotoEvaluateOrder = (orderInfo: any) => {
-		navTo(`/orders/order-evaluate?id=${orderInfo.id}`);
+		navTo(`/subpackage/orders/order-evaluate?id=${orderInfo.id}`);
 	}
 
 	//查看物流
 	const gotoCheckLogistics = (orderInfo: any) => {
-		navTo(`/orders/order-detail-logistics?id=${orderInfo.id}`);
+		navTo(`/subpackage/orders/order-detail-logistics?id=${orderInfo.id}`);
 	}
 
 
 	//换卡、换签、同时换卡换签订单支付确认页面
 	const gotoCardSignPay = (orderInfo: any) => {
-		navTo(`/orders/order-card-sign-payment?id=${orderInfo.id}`);
+		navTo(`/subpackage/orders/order-card-sign-payment?id=${orderInfo.id}`);
 	}
 
 	//重新申请ETC注销
 	const gotoLogoffETC = (orderInfo: any) => {
-		navTo(`/after-sale/ETC-log-off/log-off-confirm?orderId=${orderInfo.orderId}`);
+		navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?orderId=${orderInfo.orderId}`);
 	}
 
 	//车辆信息变更-信息重写
@@ -151,7 +151,7 @@ export default function useOrderSkip() {
 	//车辆信息变更-重新申请
 	const gotoEditCarApplyAgain = (orderInfo: any) => {
 		//跳转到车辆信息变更界面
-		navTo(`/person-al-center/setting/car-information/car-change`);
+		navTo(`/subpackage/personal-center/setting/car-information/car-change`);
 	}
 
 	return {

manifest.json

@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx2fe4cb115b48eff6",
+        "appid" : "wx008c60533388527a",
         "setting" : {
             "urlCheck" : false,
             "checkSiteMap" : false,

pages.json

@@ -1161,6 +1161,13 @@
 					"style": {
 						"navigationBarTitleText": "修改手机号"
 					}
+				}, 
+				{
+					"path": "excel",
+					"style": {
+						"navigationBarTitleText": "表格报表",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
@@ -1414,4 +1421,4 @@
 			"query": "" //启动参数，在页面的onLoad函数里面得到
 		}]
 	}
-}
+}

pages/index/index.vue

@@ -456,7 +456,7 @@
 		// 		url: `/subpackage/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`
 		// 	})
 		// }
-		navTo(`/applyCard/choice-product?type=${state.type}&&userType=${state.userType}`)
+		navTo(`/subpackage/applyCard/choice-product?type=${state.type}&&userType=${state.userType}`)
 		closeMask();
 	};
 

subpackage/applyCard/choice-product.vue

@@ -36,7 +36,7 @@ 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-car2";
+import navBgCar from "./components/nav-bg-car1";
 import navBar from "@/components/nav-bar/nav-bar2.vue";
 
 import { getItem, StorageKeys } from "@/utils/storage.ts";
@@ -47,21 +47,24 @@ import { setItem } from "@/utils/storage";
 const scrollTop = ref(0); //滚动距离
 
 const savaHandle = (val) => {
-  productReCodeAction(val.id).then((value) => {
-    if (val.isValueCard === 2) {
+  // productReCodeAction(val.id).then((value) => {
+    // if (val.isValueCard === 2) {
       setItem("clientFee", val.clientFee);
       setItem("productId", val.id);
-    }
-
-    if (state.userType === "1") {
+      setItem("isValueCard", val.isValueCard);
       uni.redirectTo({
-        url: `/subpackage/applyCard/opening-account-people?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+        url: `/subpackage/applyCard/essential-information?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
       });
-    } else {
-      uni.redirectTo({
-        url: `/subpackage/applyCard/opening-account-unit?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
-      });
-    }
+
+    // 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)
@@ -75,7 +78,7 @@ const savaHandle = (val) => {
     // 		url: `/subpackage/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
     // 	});
     // }
-  });
+  // });
 };
 
 onLoad((option: any) => {

subpackage/applyCard/essential-information.vue

@@ -135,7 +135,7 @@
 
 <script setup lang="ts">
 /*导航*/
-import navBgCar from "./components/nav-bg-car1";
+import navBgCar from "./components/nav-bg-car2";
 import carNumberInput from "@/components/car-number-input/car-number-input.vue";
 import numberplateColor from "./components/layout-numberplate-color";
 import { getItem, StorageKeys } from "@/utils/storage";
@@ -159,7 +159,7 @@ const state = reactive({
     vehiclePlateNumber: "贵A12345", //车牌号
     vehiclePlateColor: 0, //车盘颜色
     type: "0", //车牌类型
-    userType: "1",
+    userType: 1,
     whetherToMail: getItem(StorageKeys.OpenId) ? 0 : "", //是否需要邮寄 小程序默认邮寄 0邮寄||1不邮寄 不登录为1
     orderSource: "WECHAT",
     opId: "",
@@ -246,19 +246,19 @@ const nextAction = () => {
         // uni.navigateTo({
         // 	url: `/subpackage/applyCard/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}`,
-        });
-
-        // if (state.data.userType === "1") {
-        //   uni.navigateTo({
-        //     url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
-        //   });
-        // } else {
-        //   uni.navigateTo({
-        //     url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
-        //   });
-        // }
+        // uni.redirectTo({
+        //   url: `/subpackage/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+        // });
+
+        if (state.data.userType === 1) {
+          uni.navigateTo({
+            url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+          });
+        } else {
+          uni.navigateTo({
+            url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+          });
+        }
       }
     });
   });

subpackage/issueActivation/old-user.vue

@@ -55,7 +55,7 @@
 	import popupNumberplateColor from "./components/popup-choose-numberplate-color";
 	import numberplateColor from "./components/layout-numberplate-color";
 	import carNumerInput from "@/components/car-number-input/car-number-input";
-	const tools = require("../static/etcUtil/tools.js");
+	const tools = require("../../static/etcUtil/tools.js");
 	
 	onLoad((option) => {
 		console.log(option);

subpackage/personal-center/excel.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>