Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

pages/index/index.vue

@@ -231,6 +231,7 @@
 		queryKey,
 		querySwiper,
 		envs,
+		infoQuery,
 	} from "@/utils/network/api.js";
 	import {
 		reactive
@@ -238,9 +239,6 @@
 	import {
 		fileURL
 	} from "@/datas/fileURL.js";
-	import {
-		infoQuery
-	} from "@/utils/network/api.js"
 	import {
 		navTo,
 		confirm

pages/user/user.vue

@@ -12,9 +12,9 @@
 						<view class="nickname">登录/注册</view>
 					</view>
 					<view v-else class="name">
-						<view class="nickname">林晨曦</view>
+						<view class="nickname">{{state.accountInfoVo.nickName}}</view>
 						<view class="user-id">
-							<view class="phone">15885137270</view>
+							<view class="phone">{{state.accountInfoVo.mobile}}</view>
 							<view @click="$util.navTo('/subpackage/personal-center/setting/change-phone', true)"
 								class="btn-change">已关联</view>
 						</view>
@@ -113,29 +113,29 @@
 				</view>
 				<view class="pass">
 					<view class="total m-top">
+						<text>通行消费</text>
 						<text>总消费</text>
-						<text>总充值</text>
 					</view>
 					<view class="amount m-top">
-						<text>¥ 501,220.00</text>
-						<text>¥ 620,227.00</text>
+						<text>¥ {{state.monthFlowingVo.money/100}}</text>
+						<text>¥ {{state.monthFlowingVo.totalAmount/100}}</text>
 					</view>
 					<view class="line m-top">
-						<view class="line1" style="width: 75%;"></view>
+						<view class="line1" :style="{width: state.monthFlowingVo.money*100/state.monthFlowingVo.totalAmount+'%'}"></view>
 						<view class="line2"></view>
 					</view>
 					<view class="mileage">
 						<view class="txt">
 							<text class="tit">通行里程</text>
-							<text class="val">81880km</text>
+							<text class="val">{{state.monthFlowingVo.mileage}}km</text>
 						</view>
 						<view class="txt">
 							<text class="tit">通行时长</text>
-							<text class="val">21小时30分钟</text>
+							<text class="val">{{state.monthFlowingVo.duration}}</text>
 						</view>
 						<view class="txt">
 							<text class="tit ">通行次数</text>
-							<text class="val">103次</text>
+							<text class="val">{{state.monthFlowingVo.num}}次</text>
 						</view>
 					</view>
 					<view class="detail">查看通行轨迹</view>
@@ -193,7 +193,15 @@
 	import { getItem, StorageKeys } from "@/utils/storage";
 	import navBar from "../../components/nav-bar/nav-bar2.vue";
 	import { onLoad, onShow, onPageScroll } from "@dcloudio/uni-app";
-
+	import {
+		userInfoIndex
+	} from "@/utils/network/api.js";
+	import {
+		request
+	} from "@/utils/network/request.js";
+	import {
+		stringToJson
+	} from "@/utils/network/encryption.js";
 	const height = ref(null);
 	const top = ref(null);
 	const margin = ref(null);
@@ -204,6 +212,20 @@
 		data: {
 			opId: "",
 		},
+		accountInfoVo: {
+			nickName: '',
+			mobile: ''
+		},
+		monthFlowingVo: {
+			duration: "",
+			mileage: 0,
+			money: 0,
+			num: 0,
+			parkingLotMoney: 0,
+			parkingLotNum: 0,
+			totalAmount: 0,
+		},
+		vehicleManageList: [],
 	});
 	onMounted(() => {
 		const res = uni.getMenuButtonBoundingClientRect();
@@ -222,7 +244,35 @@
 	});
 	onShow((option : any) => {
 		state.data.opId = getItem(StorageKeys.OpenId);
+		if(state.data.opId){
+			getUserInfo()
+		}
+		
 	});
+
+	const getUserInfo = () => {
+
+		const options = {
+			type: 2,
+			data: {
+				openId: state.data.opId
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		//调用方式
+		request(userInfoIndex, options)
+			.then((res) => {
+				let data = stringToJson(res.bizContent)
+				console.log(data);
+				state.accountInfoVo = data.accountInfoVo;
+				state.monthFlowingVo = data.monthFlowingVo;
+				state.vehicleManageList = data.monthFlowingVo
+			})
+			.catch((err) => {
+				console.log(err);
+			});
+	}
 </script>
 <style>
 	page {

stores/user.js

@@ -60,7 +60,6 @@ export const useUserStore = defineStore("userStore", {
 				showLoading: false,
 			};
 
-console.log("option********",options);
 			return new Promise(async (resolve, reject) => {
 				const res = await request(getToken, options);
 				const data = stringToJson(res.bizContent);

subpackage/personal-center/setting/setting.vue

@@ -3,7 +3,7 @@
 		<view class="title">{{col.title}}</view>
 		<u-cell-group>
 			<u-cell-item :title="item.title"  v-for="(item,i) in col.columns" :key="i"  
-			@click="itemClick(item)" :titleStyle="titleStyle"></u-cell-item>
+			@click="itemClick(item)" :titleStyle="titleStyle" borderBottom></u-cell-item>
 		</u-cell-group>
 	</template>
 	

utils/network/api.js

@@ -123,8 +123,9 @@ export const createCarInfo = "1028"; //车辆管理信息添加
 export const selectCarInfo = "1030"; //车辆管理信息查询
 export const delCarInfo = "1031"; //车辆管理信息删除
 export const  infoQuery= "935"; //8.212.文本信息查询接口
-export const  userInfoQuery= "510"; //-用户信息变更查询接口
-export const  userInfoChange= "520"; //-用户信息变更查询接口
+export const  userInfoQuery= "510"; //BDS-用户信息变更查询接口
+export const  userInfoChange= "520"; //ASS-变更个人用户信息
+export const  userInfoIndex= "9a78e7c35f31439990dc4b778ca84ad1"; //USER-获取用户个人简单信息