service

datas/mapData.js

@@ -0,0 +1,73 @@
+//34个省
+export const mapData={
+	"11":"北京市",
+	"12":"天津市",
+	"13":"河北省",
+	"14":"山西省",
+	"15":"内蒙古自治区",
+	"21":"辽宁省",
+	"22":"吉林省",
+	"23":"黑龙江省",
+	"31":"上海市",
+	"32":"江苏省",
+	"33":"浙江省",
+	"34":"安徽省",
+	"35":"福建省",
+	"36":"江西省",
+	"37":"山东省",
+	"41":"河南省",
+	"42":"湖北省",
+	"43":"湖南省",
+	"44":"广东省",
+	"45":"广西壮族自治区",
+	"50":"重庆市",
+	"51":"四川省",
+	"52":"贵州省",
+	"53":"云南省",
+	"61":"陕西省",
+	"62":"甘肃省",
+	"63":"青海省",
+	"64":"宁夏回族自治区",
+	"65":"新疆维吾尔自治区",
+	"90":"海南省",
+	"91":"台湾省",
+	"94":"西藏自治区",
+	"92":"澳门特别行政区",
+	"93":"香港特别行政区",
+}
+export const mapColor={
+	"北京市":0,
+	"天津市":1,
+	"河北省":2,
+	"山西省":3,
+	"内蒙古自治区":4,
+	"辽宁省":5,
+	"吉林省":6,
+	"黑龙江省":7,
+	"上海市":8,
+	"江苏省":9,
+	"浙江省":10,
+	"安徽省":11
+	"福建省":12,
+	"江西省":13,
+	"山东省":14,
+	"河南省":15,
+	"湖北省":16,
+	"湖南省":17,
+	"广东省":18,
+	"广西壮族自治区":19,
+	"海南省":20,
+	"重庆市":21,
+	"四川省":22,
+	"贵州省":23,
+	"云南省":24,
+	"西藏自治区":25,
+	"陕西省":26,
+	"甘肃省":27,
+	"青海省":28,
+	"宁夏回族自治区":29,
+	"新疆维吾尔自治区":30,
+	"台湾省":31,
+	"香港特别行政区":32,
+	"澳门特别行政区":33
+}

pages.json

@@ -1120,7 +1120,67 @@
 		},
 		{
 			"root": "subpackage/personal-center", //个人中心
-			"pages": [
+				"pages": [
+					{
+						"path": "search/carDetail",
+						"style": {
+							"navigationBarTitleText": "车辆详情"
+						}
+					},
+					{
+						"path": "search/etcFlowingWater",
+						"style": {
+							"navigationBarTitleText": "ETC通行流水记录"
+						}
+					},
+					{
+						"path": "search/select-car",
+						"style": {
+							"navigationBarTitleText": "选择车辆"
+						}
+					},
+					{
+						"path": "search/select-card",
+						"style": {
+							"navigationBarTitleText": "选择卡号"
+						}
+					},
+					{
+						"path": "search/unitUser",
+						"style": {
+							"navigationBarTitleText": "单位用户信息"
+						}
+					},
+					{
+						"path": "search/userInfo",
+						"style": {
+							"navigationBarTitleText": "个人用户信息"
+						}
+					},
+						{
+							"path": "search/obuCancel",
+							"style": {
+								"navigationBarTitleText": "卡签注销记录"
+							}
+						},
+						{
+							"path": "search/cardCancel",
+							"style": {
+								"navigationBarTitleText": "卡签注销记录"
+							}
+						},
+						{
+							"path": "capital/card-loop",
+							"style": {
+								"navigationBarTitleText": "存储卡圈存"
+							}
+						},
+					    {
+							"path": "help/help",
+							"style": {
+								"navigationBarTitleText": "常见问题"
+							       }
+						},
 						{
 							"path": "old-user",
 							"style": {
@@ -1407,111 +1467,46 @@
 					}
 				}
 			]
-		},
-		{
-			//其他服务模块
-			"root": "subpackage/service",
-			"pages": [
-				{
-					"path": "trajectory-map",
-					"style": {
-						"navigationBarTitleText": "我的轨迹"
-					}
-				},
-				{
-					"path": "remind/remind",
-					"style": {
-						"navigationBarTitleText": "服务提醒",
-						"enablePullDownRefresh": false
-					}
-				},
-				{
-					"path": "remind/satisfaction-evaluate",
-					"style": {
-						"navigationBarTitleText": "满意度评价"
-					}
-				},
-
-				{
-					"path": "remind/evaluate-list",
-					"style": {
-						"navigationBarTitleText": "评价列表"
-					}
-				},
-				{
-					"path": "search/carDetail",
-					"style": {
-						"navigationBarTitleText": "车辆详情"
-					}
-				},
-				{
-					"path": "search/etcFlowingWater",
-					"style": {
-						"navigationBarTitleText": "ETC通行流水记录"
-					}
-				},
-				{
-					"path": "search/select-car",
-					"style": {
-						"navigationBarTitleText": "选择车辆"
-					}
-				},
-				{
-					"path": "search/select-card",
-					"style": {
-						"navigationBarTitleText": "选择卡号"
-					}
-				},
-				{
-					"path": "search/unitUser",
-					"style": {
-						"navigationBarTitleText": "单位用户信息"
-					}
-				},
-				{
-					"path": "search/userInfo",
-					"style": {
-						"navigationBarTitleText": "个人用户信息"
-					}
-				},
-				{
-					"path": "search/obuCancel",
-					"style": {
-						"navigationBarTitleText": "卡签注销记录"
-					}
-				},
-				{
-					"path": "search/cardCancel",
-					"style": {
-						"navigationBarTitleText": "卡签注销记录"
-					}
-				},
-				{
-					"path": "capital/card-loop",
-					"style": {
-						"navigationBarTitleText": "存储卡圈存"
-					}
-				},
-				{
-					"path": "process/process",
-					"style": {
-						"navigationBarTitleText": "办理流程"
-					}
-				},
-				{
-					"path": "help/help",
-					"style": {
-						"navigationBarTitleText": "常见问题"
-					}
-				},
-				{
-					"path": "statistics/index",
-					"style": {
-						"navigationBarTitleText": "发行数据统计"
-					}
-				}
-			]
 		}
+		// ,
+		// {
+		// 	//其他服务模块
+		// 	"root": "subpackage/service",
+		// 	"pages": [
+		// 		{
+		// 			"path": "trajectory-map",
+		// 			"style": {
+		// 				"navigationBarTitleText": "我的轨迹"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "remind/remind",
+		// 			"style": {
+		// 				"navigationBarTitleText": "服务提醒",
+		// 				"enablePullDownRefresh": false
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "remind/satisfaction-evaluate",
+		// 			"style": {
+		// 				"navigationBarTitleText": "满意度评价"
+		// 			}
+		// 		},
+
+		// 		{
+		// 			"path": "remind/evaluate-list",
+		// 			"style": {
+		// 				"navigationBarTitleText": "评价列表"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "statistics/index",
+		// 			"style": {
+		// 				"navigationBarTitleText": "发行数据统计"
+		// 			}
+		// 		}
+		// 	]
+		// }
 	],
 	"tabBar": {
 		"color": "#666666",

pages/index/index.vue

@@ -37,7 +37,7 @@
 					</view>
 					<view class="text">储值卡充值</view>
 				</view>
-				<view class="item-box" @click="$util.navTo('/subpackage/service/search/select-car',true)">
+				<view class="item-box" @click="$util.navTo('/subpackage/personal-center/search/select-car',true)">
 					<view class="item item-2">
 						<image :src="fileURL + 'image/index/item-2.png'" />
 					</view>

subpackage/service/search/select-car.vue → subpackage/personal-center/search/select-car.vue

@@ -81,7 +81,7 @@
 	const flag = ref('0')
 
 	const choose = (i, item) => {
-		navTo(`/subpackage/service/search/select-card?vehicleId=${item.vehicleId}`)
+		navTo(`/subpackage/personal-center/search/select-card?vehicleId=${item.vehicleId}`)
 	}
 	
 </script>

subpackage/service/search/select-card.vue → subpackage/personal-center/search/select-card.vue

@@ -59,7 +59,7 @@
 		console.log(item, i)
 		console.log(item.vehicleId);
 		getCardList(item.vehicleId)
-		navTo(`/subpackage/service/search/etcFlowingWater?cardId=${item.cardId}`)
+		navTo(`/subpackage/personal-center/search/etcFlowingWater?cardId=${item.cardId}`)
 	}
 
 	const getCardList = (vehicleId) => {

subpackage/personal-center/trajectory/see-month.vue

@@ -1,31 +1,17 @@
 <template>
-	<view class="record">
+	<view class="record" v-for="(item,index) in state.msg.myTrajectoryStatisticsVos">
 		<view class="current">
-			<text>6月通行</text>
+			<text>{{item.accountDate}}月通行</text>
 		</view>
-		<view class="detail">木月九州EC比你通行了0次高速通行查看历史月度统计要消费0元要通行</view>
+		<view class="detail">本月九州ETC通行了{{item.frequency}}次高速通行查看历史月度统计要消费{{item.amount/100}}元要通行</view>
 	</view>
-	<view class="record">
-		<view class="current">
-			<text>6月通行</text>
-		</view>
-		<view class="detail">木月九州EC比你通行了0次高速通行查看历史月度统计要消费0元要通行</view>
-	</view>
-	<view class="record">
-		<view class="current">
-			<text>6月通行</text>
-		</view>
-		<view class="detail">木月九州EC比你通行了0次高速通行查看历史月度统计要消费0元要通行</view>
-	</view>
-	<view class="record">
-		<view class="current">
-			<text>6月通行</text>
-		</view>
-		<view class="detail">木月九州EC比你通行了0次高速通行查看历史月度统计要消费0元要通行</view>
-	</view>s
 </template>
 
-<script>
+<script setup>
+	import { onLoad} from "@dcloudio/uni-app";
+	onLoad((option) => {
+		console.log("1",JSON.parse(decodeURIComponent(option.data)))
+	})
 </script>
 
 <style scoped>

subpackage/personal-center/trajectory/trajectory-map.vue

@@ -1,104 +0,0 @@
-<template>
-	 <view class="charts-box">
-	  <!-- <qiun-data-charts 
-	      type="map"
-	      :opts="state.opts"
-	      :chartData="state.chartData"
-	    /> -->
-		<qiun
-		  type="map"
-		  :chartData="state.chartData"
-		  :opts="state.opts"
-		  :canvas2d="true"
-		  canvasId="pVNxVgTQDlKlgMCPbMtJrifnZlluhrNf"
-		/>
-	  </view>
-	<view class="describe">
-		<view>
-			<view class="all">您共到访过<text class="num">5</text>个城市</view>
-			<view>您的足迹已踏遍1500%的国土超过了99%的九州ETC用户</view>
-		</view>
-		<image class="car" src="../../../static/image/home-on.png" mode="aspectFit"></image>
-	</view>
-</template>
-
-<script lang="ts" setup>
-	import { reactive } from "vue";
-	import {request} from "@/utils/network/request.js";
-	import {stringToJson} from "@/utils/network/encryption.js";
-	import { onLoad,onMounted} from "@dcloudio/uni-app";
-	import mapChina from "@/datas/mapChina.json";
-	import qiun from "../../service/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue"
-	// import qiun from "/service/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
-	const state = reactive({
-		chartData: {},
-		opts: {
-			color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
-			padding: [0,0,0,0],
-			dataLabel: true,
-			enableScroll: false,
-			extra: {
-			  map: {
-				border: true,
-				borderWidth: 1,
-				borderColor: "#666666",
-				fillOpacity: 0.6,
-				activeBorderColor: "#F04864",
-				activeFillColor: "#FACC14",
-				activeFillOpacity: 1
-			  }
-			}
-		}
-	})
-	onLoad((option : any) => {
-		getServerData();
-	})
-	const getServerData=()=>{
-		console.log("111")
-      //模拟从服务器获取数据时的延时
-      setTimeout(() => {
-        //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-        let res = {series:mapChina.features};
-		console.log("111")
-        state.chartData = JSON.parse(JSON.stringify(res));
-		console.log("state.chartData",state.chartData)
-      }, 500);
-    }
-</script>
-
-<style scoped>
-	 .charts-box {
-	    width: 100%;
-	    height: 300px;
-	  }
-	.describe{
-		display: flex;
-		width: 90%;
-		margin: 20rpx auto;
-		padding: 30rpx 30rpx 60rpx 30rpx;
-		box-sizing: border-box;
-		background-color: #f6f6f6;
-		border-radius: 20rpx;
-		font-size: 30rpx;
-	}
-	.describe>view{
-		flex: 5;
-	}
-	.describe>image{
-		flex: 3;
-	}
-	.car{
-		width: 150rpx;
-		height: 150rpx;
-		display: inline-block;
-	}
-	.all{
-		font-size: 36rpx;
-		margin-bottom: 20rpx;
-		margin-left: 20rpx;
-	}
-	.num{
-		font-size: 38rpx;
-		font-weight: bold;
-	}
-</style>

subpackage/personal-center/trajectory/trajectory.vue

@@ -12,52 +12,52 @@
 					<view class="left-item">
 						<image src="../../static/image/home-on.png" ></image>
 						<view>
-							<view class="data">0km</view>
+							<view class="data">{{state.msg.mileages}}km</view>
 							<view>高速通行总里程</view>
 						</view>
 					</view>
 					<view class="left-item">
 						<image src="../../static/image/home-on.png" ></image>
 						<view>
-							<view class="data">0元</view>
+							<view class="data">{{state.msg.amounts/100}}元</view>
 							<view>高速通行总金额</view>
 						</view>
 					</view>
 					<view class="left-item">
 						<image src="../../static/image/home-on.png" ></image>
 						<view>
-							<view class="data">0次</view>
+							<view class="data">{{state.msg.frequencys}}次</view>
 							<view>高速通行总消费次数</view>
 						</view>
 					</view>
 					<view class="left-item">
 						<image src="../../static/image/home-on.png" ></image>
 						<view>
-							<view class="data">5个</view>
+							<view class="data">{{state.msg.cityQuantitys}}个</view>
 							<view>高速通行曾抵达过的城市教</view>
 						</view>
 					</view>
 					<view class="left-item" style="margin-bottom: 30rpx;">
 						<image src="../../static/image/home-on.png"></image>
 						<view>
-							<view class="data">暂无</view>
-							<view>您最喜爱的目的地，曾累计到访过0次</view>
+							<view class="data">{{state.msg.frequenteds}}</view>
+							<view>您最喜爱的目的地，曾累计到访过{{state.msg.frequentedQuantitys}}次</view>
 						</view>
 					</view>
 				</view>
 				<view class="right">
-					<view>您超过了1%的九州ETC用户</view>
+					<view>您超过了{{state.msg.ranking}}%的九州ETC用户</view>
 					<image src="../../../static/image/home-on.png" mode="" ></image>
 					<view class="see" @click="see()">查看我的轨迹图</view>
 				</view>
 			</view>
 		</view>
-		<view class="record">
+		<view class="record" v-for="item in [state.msg.myTrajectoryStatisticsVos][0]">
 			<view class="current">
-				<text>6月通行</text>
+				<text>{{item.accountDate}}月通行</text>
 				<view class="more" @click="seeMonth()">查看历史月度统计 <image src="../../../static/image/icon-back.png"></image></view>
 			</view>
-			<view class="detail">木月九州EC比你通行了0次高速通行查看历史月度统计要消费0元要通行</view>
+			<view class="detail">本月九州ETC通行了{{item.frequency}}次高速通行查看历史月度统计要消费{{item.amount/100}}元要通行</view>
 		</view>
 	</view>
 </template>
@@ -65,29 +65,78 @@
 <script setup lang="ts">
 	import { reactive } from "vue";
 	import {request} from "@/utils/network/request.js";
-	import {stringToJson} from "@/utils/network/encryption.js";
+	import {stringToJson} from "@/utils/network/encryption";
 	import { onLoad} from "@dcloudio/uni-app";
-	import {orderList} from "@/utils/network/api.js";
+	import {orderList,queryTrajectory} from "@/utils/network/api.js";
+	import {getItem,StorageKeys} from "@/utils/storage";
 	const state = reactive({
-		array: ['贵Z11111', '贵Z22222'],
+		array: [],
 		index: 0,
+		arrayVehicleId:[],  //要传给后端的vehicleId
+		msg:'',
 	})
 	onLoad((option : any) => {
+		quanCheckActionTrue().then((item: any) => {
+			for(var i=0;i<item.data.length;i++){
+				state.array.push(item.data[i].vehiclePlate)
+				state.arrayVehicleId.push(item.data[i].vehicleId)
+			}
+			getVehicleMsg();
+		})
 	})
+	const quanCheckActionTrue = () => {
+		var data = {
+			opId: getItem(StorageKeys.OpenId),
+			source: 'WECHAT', //渠道为小程序
+			tabIndex: '0', //0全部
+			orderStep: '11', //11 为已完成”
+		};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+	
+		return new Promise(async (resolve, reject) => {
+			const res = await request(orderList, options);
+			const data = stringToJson(res.bizContent);
+			resolve(data);
+		}).catch((error) => {
+			reject(error);
+		});
+	}
 	const bindPickerChange=(e)=> {
-		console.log('picker发送选择改变，携带值为', e.detail.value)
-		state.index = e.detail.value
+		state.index = e.detail.value;
+		getVehicleMsg();
 	}
 	const see=()=>{
+		const aa="41,51"
 		uni.navigateTo({
 			url:"/subpackage/service/trajectory-map"
 		})
 	}
 	const seeMonth=()=>{
 		uni.navigateTo({
-			url:"./see-month"
+			url:`./see-month?data=${encodeURIComponent(JSON.stringify(state.msg.myTrajectoryStatisticsVos))}`
 		})
 	}
+	const getVehicleMsg = () => {
+		const options = {
+			type: 2,
+			data: {
+				vehicleId: state.arrayVehicleId[state.index],
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		request(queryTrajectory, options).then((res) => {
+			const result = stringToJson(res.bizContent)
+			state.msg=result
+			console.log("getVehicleMsg",result);
+	
+		})
+	};
 </script>
 
 <style scoped>

subpackage/service/trajectory-map.vue

@@ -1,10 +1,5 @@
 <template>
 	 <view class="charts-box">
-	  <!-- <qiun-data-charts 
-	      type="map"
-	      :opts="state.opts"
-	      :chartData="state.chartData"
-	    /> -->
 		<qiun
 		  type="map"
 		  :chartData="state.chartData"
@@ -28,7 +23,6 @@
 	import {stringToJson} from "@/utils/network/encryption.js";
 	import { onLoad,onMounted} from "@dcloudio/uni-app";
 	import mapChina from "@/datas/mapChina.json";
-	// import qiun from "/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue"
 	import qiun from "./qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 	const state = reactive({
 		chartData: {},

utils/network/api.js

@@ -226,3 +226,4 @@ export const queryCardLimit="d6c1e39dccf44919a57c55457a9da21a"  //补卡额列
 export const refundQuan="52d32062470345a1915b0adeb458609e"  //储值卡圈存-半条流水-微信退费
 export const queryRefoundResult="a11d756827f848f79de027a2ec1943c3"  //储值卡圈存-半条流水-微信退费结果查询
 export const queryStoredQuan="cc907ba2683e481d92398bf6c4d74c57"  //储值卡圈存详情-多条件分页查询
+export const queryTrajectory="d6414e83a2a34c4cb0f3da33a0e901bd"  //我的上个月轨迹查询

utils/network/request.js

@@ -64,11 +64,11 @@ export function request(code, options = {}) {
 			mask: true
 		});
 	}
-	console.log('请求参数:', options.data)
+	// console.log('请求参数:', options.data)
 	//参数返回
 	return new Promise((resolve, reject) => {
 		options.success = (res) => {
-			console.log('请求成功返回参数:', res)
+			// console.log('请求成功返回参数:', res)
 			// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
 			wx.hideLoading()
 			if (res.data.statusCode !== 0) {