代办完成

pages/index/index.vue

@@ -90,7 +90,7 @@
 
 			<!-- 消息滚动显示 -->
 			<view class="backlog-notice">
-				<notice-bar :noticeList="state.noticeList" @noticeClick="$util.msg('该功能正在开发中，敬请期待！')"></notice-bar>
+				<notice-bar :noticeList="state.noticeList" @noticeClick="goOrder(3)"></notice-bar>
 			</view>
 
 			<!--快速办理通道  -->
@@ -236,7 +236,8 @@
 		querySwiper,
 		envs,
 		infoQuery,
-		queryHighMsg
+		queryHighMsg,
+		orderList
 	} from "@/utils/network/api.js";
 	import {
 		reactive
@@ -269,26 +270,26 @@
 		swiperList: [],
 		noticeList: [
 			//公告栏列表
-			{
-				title: "您有一条待办事项，还未办理完成",
-				id: 1,
-			},
-			{
-				title: "XXX刚刚申请了公交车发行",
-				id: 2,
-			},
-			{
-				title: "您还有一条订单已经发货了",
-				id: 3,
-			},
-			{
-				title: "订单等您确认收货",
-				id: 4,
-			},
-			{
-				title: "最新的新闻资讯请点击哈哈哈哈哈哈哈假的假的假的假的基督教",
-				id: 5,
-			},
+			// {
+			// 	title: "您有{}条未完成订单，前往处理",
+			// 	id: 1,
+			// },
+			// {
+			// 	title: "XXX刚刚申请了公交车发行",
+			// 	id: 2,
+			// },
+			// {
+			// 	title: "您还有一条订单已经发货了",
+			// 	id: 3,
+			// },
+			// {
+			// 	title: "订单等您确认收货",
+			// 	id: 4,
+			// },
+			// {
+			// 	title: "最新的新闻资讯请点击哈哈哈哈哈哈哈假的假的假的假的基督教",
+			// 	id: 5,
+			// },
 		],
 		flowPathTabList: ["办理流程", "办理条件", "常见问题"],
 		tabActive: "办理流程",
@@ -365,6 +366,7 @@
 		highMsg(); //高速快讯
 		processeCondition();//办理条件
 		commonQuestion();
+		doSomething();//代办事项
 	})
 
 	onMounted(() => {
@@ -634,6 +636,41 @@
 				console.log(err);
 			});
 	}
+	// 代办事项
+	const doSomething = () => {
+		let options = {
+			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
+			data: {
+				"opId": getItem(StorageKeys.OpenId),
+				"source": "WECHAT",
+				"vehiclePlate": "",
+				"tabIndex": 3 + '',
+				"pageNo": 1,
+				"pageSize": 100,
+				"promotionModes": 1
+			},
+			method: "POST", //提交方式(默认POST)
+		};
+
+		//调用方式
+		request(orderList, options)
+			.then((res) => {
+				let data = stringToJson(res.bizContent)
+				let obj = {};
+				obj["id"] = 1;
+				obj['title'] = "您有" + data.data.length + "条未完成订单，前往处理"
+				state.noticeList.push(obj)
+				console.log("代办事项", data.data)
+			})
+			.catch((err) => {
+				console.log(err);
+			});
+	}
+	const goOrder = (index) => {
+		uni.reLaunch({
+			url: `../order/order?index=${index}`
+		})
+	}
 </script>
 
 <style>

pages/user/user.vue

@@ -168,7 +168,8 @@
 					<view class="car-item" v-for="(item,index) in state.list">
 						<image :src="`${$imgUrl}che.png`" class="car-pic"></image>
 						<view class="car-info">
-							<view class="car-no"><text class="no">{{item.vehiclePlate}}</text><text class="color">{{item.color}}</text></view>
+							<view class="car-no"><text class="no">{{item.vehiclePlate}}</text><text
+									class="color">{{item.color}}</text></view>
 							<view class="card-no">卡号：{{item.cardId}}</view>
 							<view class="card-no">签号：{{item.obuId}}</view>
 						</view>
@@ -221,7 +222,7 @@
 		stringToJson
 	} from "@/utils/network/encryption.js";
 	import filter from '@/components/filter/filter.vue';
-	import { vehiclePlateColor, vehiclePlateColorPai} from "@/datas/vehiclePlateColor.js";
+	import { vehiclePlateColor, vehiclePlateColorPai } from "@/datas/vehiclePlateColor.js";
 	const height = ref(null);
 	const top = ref(null);
 	const margin = ref(null);
@@ -233,7 +234,7 @@
 			opId: "",
 		},
 		accountInfoVo: {
-			nickName:'',
+			nickName: '',
 			mobile: ''
 		},
 		monthFlowingVo: {
@@ -251,7 +252,7 @@
 			vehicleSum: 0,
 			orderStatus0: 0
 		},//车数量 ,代办数量
-		isTrajectory:false,  //是否有轨迹
+		isTrajectory: false,  //是否有轨迹
 	});
 	onMounted(() => {
 		const res = uni.getMenuButtonBoundingClientRect();
@@ -264,12 +265,12 @@
 		state.data.opId = getItem(StorageKeys.OpenId);
 		mobile.value = getItem("mobile");
 	});
-	const goTrajectory=()=>{
-		if(state.isTrajectory){
+	const goTrajectory = () => {
+		if (state.isTrajectory) {
 			uni.navigateTo({
-				url:"/subpackage/personal-center/trajectory/trajectory"
+				url: "/subpackage/personal-center/trajectory/trajectory"
 			})
-		}else{
+		} else {
 			msg("暂无轨迹")
 		}
 	}
@@ -326,9 +327,9 @@
 				console.log('用户信息', res)
 				let data = stringToJson(res.bizContent)
 				state.accountInfoVo = data.accountInfoVo;
-				if(data.monthFlowingVo && JSON.stringify(data.monthFlowingVo) != "{}"){
+				if (data.monthFlowingVo && JSON.stringify(data.monthFlowingVo) != "{}") {
 					state.monthFlowingVo = data.monthFlowingVo;
-					state.isTrajectory=true;
+					state.isTrajectory = true;
 				}
 				state.userVehicleInfoSumQueryVo.vehicleSum = JSON.parse(JSON.stringify(data.userVehicleInfoSumQueryVo)).vehicleSum;
 				state.userVehicleInfoSumQueryVo.orderStatus0 = JSON.parse(JSON.stringify(data.userVehicleInfoSumQueryVo)).orderStatus0;
@@ -374,9 +375,9 @@
 			}
 		});
 	}
-	const goOrder=(index)=>{
+	const goOrder = (index) => {
 		uni.reLaunch({
-			url:`../order/order?index=${index}`
+			url: `../order/order?index=${index}`
 		})
 	}
 </script>
@@ -820,7 +821,8 @@
 	.menu .sub-tit {
 		padding-right: 20rpx;
 	}
-	.color{
+
+	.color {
 		padding: 4rpx 8rpx;
 		border-radius: 10rpx;
 		color: white;

utils/network/request.js

@@ -60,10 +60,6 @@ export function request(code, options = {}, start = false) {
 		accessToken: getItem(StorageKeys.Token)
 	}
 	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-<<<<<<< HEAD
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
-=======
->>>>>>> 29fd2fd4ca7fc1cfd9a89c58cda5f16861e566da
 	// options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'