2023年9月22日15:07:38

App.vue

@@ -147,9 +147,7 @@
 						console.log(curRoute);
 						if (curRoute === "orders/sign-up") {
 							uni.navigateTo({
-								url: `/subpackage/orders/product-detail?orderId=${
-                orders.orderId
-              }&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+								url: `/subpackage/orders/product-detail?orderId=${orders.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 							});
 						}
 						if (curRoute === "pages/app/sign") {

pages/index/index.vue

@@ -252,6 +252,8 @@
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
+	
+	const tools = require("../../static/etcUtil/tools.js");
 	const bgOrange = `url(${fileURL}image/index/bg-orange.png) center center no-repeat`;
 	const bgBlue = `url(${fileURL}image/index/bg-blue.png) center center no-repeat`;
 	const list = reactive(["您有一条待办事项，还未办理完成"])
@@ -268,29 +270,7 @@
 		userType: 1, //1个人 2单位
 		notice: "",
 		swiperList: [],
-		noticeList: [
-			//公告栏列表
-			// {
-			// 	title: "您有{}条未完成订单，前往处理",
-			// 	id: 1,
-			// },
-			// {
-			// 	title: "XXX刚刚申请了公交车发行",
-			// 	id: 2,
-			// },
-			// {
-			// 	title: "您还有一条订单已经发货了",
-			// 	id: 3,
-			// },
-			// {
-			// 	title: "订单等您确认收货",
-			// 	id: 4,
-			// },
-			// {
-			// 	title: "最新的新闻资讯请点击哈哈哈哈哈哈哈假的假的假的假的基督教",
-			// 	id: 5,
-			// },
-		],
+		noticeList: [], //公告栏列表
 		flowPathTabList: ["办理流程", "办理条件", "常见问题"],
 		tabActive: "办理流程",
 		flowList: [
@@ -336,29 +316,6 @@
 		}
 	});
 	onLoad(() => {
-
-		uni.login({
-			success: function (res) {
-				console.log('输出内容========', res)
-			}
-		})
-
-		// //调用方式
-		// request('eeb51c66bcda48dc9dbb5997323a11ed', {}).then((res) => {
-		// 		console.log("====", stringToJson(res.bizContent));
-		// 		uni.requestSubscribeMessage({
-		// 			tmplIds: [''],
-		// 			success: function(res){
-		// 				console.log('输出内容========',res)
-		// 			},
-		// 			fail: function(res){
-		// 				console.log('内容========',res)
-		// 			}
-		// 		})
-		// 	})
-		// 	.catch((err) => {});
-
-
 		getInfo();
 		quanKeyAction().then((val : any) => {
 			setItem('key', val.dictTypeAndItem)
@@ -377,31 +334,6 @@
 			}
 		})
 		getSwiper()
-
-		// console.log(credentialType);
-
-		//参数说明
-		// let code = "30" //请求编码
-		// let options = {
-		// 	type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
-		// 	data: {
-		// 		opId: getItem("openId"),
-		// 		source: "WECHAT",
-		// 		tabIndex: "0",
-		// 	}, //请求参数
-		// 	method: "POST", //提交方式(默认POST)
-		// 	showLoading: true, //是否显示加载中(默认显示)
-		// };
-
-		//调用方式
-		// request(searchOrder, options)
-		//   .then((res) => {
-		//     console.log(stringToJson(res.bizContent));
-		//     // stringToJson(res.bizContent)
-		//   })
-		//   .catch((err) => {
-		//     console.log(err);
-		//   });
 	});
 
 	//获取轮播
@@ -443,24 +375,18 @@
 
 	//安装激活
 	const goActivation = () => {
-		uni.navigateTo({
-			url: "/pages/order/order",
-		});
+		tools.toUrl("/pages/order/order");
 	};
 
 	const goToRecharge = () => {
 		console.log("执行点击事件");
 		console.log('321')
-		uni.navigateTo({
-			url: "/pages/recharge/select-car",
-		});
+		tools.toUrl("/pages/recharge/select-car");
 	};
 
 	//全量枚举值查询
-	const quanKeyAction = (val : any) => {
-		var data = {
-
-		};
+	const quanKeyAction = () => {
+		var data = {};
 		const options = {
 			type: 2,
 			data: data,
@@ -471,8 +397,6 @@
 		return new Promise(async (resolve, reject) => {
 			const res = await request(queryKey, options);
 			const data = stringToJson(res.bizContent);
-
-
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -484,17 +408,6 @@
 	const toCreatOrder = (val : number) => {
 		console.log(typeof (val));
 		state.userType = val;
-		// if (val === 1) {
-		// 	// navTo(`/orders/essential-information?type=${state.type}&&userType=${state.userType}`)
-		// 	uni.navigateTo({
-		// 		url: `/subpackage/orders/essential-information?type=${state.type}&&userType=${state.userType}`
-		// 	})
-		// } else {
-		// 	// navTo(`/orders/essential-information?type=${state.type}&&userType=${state.userType}`)
-		// 	uni.navigateTo({
-		// 		url: `/subpackage/orders/essential-information?type=${state.type}&&userType=${state.userType}`
-		// 	})
-		// }
 		navTo(`/subpackage/orders/choice-product?type=${state.type}&&userType=${state.userType}`)
 		closeMask();
 	};
@@ -508,8 +421,6 @@
 		isShowMask.value = false;
 	};
 
-
-
 	// 获取文本信息----用户协议
 	const getInfo = () => {
 		//参数说明
@@ -560,23 +471,17 @@
 					state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
 				}
 			}
-		})
-			.catch((err) => { console.log(err) });
+		}).catch((err) => { console.log(err) });
 	}
-	const link = (item) => {
-		console.log("item", item)
+	const link = (item : any) => {
 		if (item.type == 1) {
 			const params = encodeURIComponent(JSON.stringify(item.hyperLink))
-			uni.navigateTo({
-				url: `/subpackage/personal-center/webview?url=` + params
-			})
+			tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 		} else if (item.type == 2) {
 			navTo(item.hyperLink)
 		} else if (item.type == 3) {
 			const param = encodeURIComponent(JSON.stringify(item))
-			uni.navigateTo({
-				url: `/subpackage/orders/moreHighMsg/textDetails?item=` + param
-			})
+			tools.toUrl(`/subpackage/orders/moreHighMsg/textDetails?item=` + param);
 		} else if (item.type == 4) {
 			uni.navigateToMiniProgram({
 				appId: item.hyperLink,