替换所有接口

composables/order/useOrderListItem.ts

@@ -2,12 +2,12 @@
  * 订单列表业务逻辑
  */
 import { reactive, ref, watch, nextTick, onMounted } from "vue";
-import { request } from "@/utils/network/request.js";
+import { request, requestNew } from "@/utils/network/request.js";
 import { stringToJson } from "@/utils/network/encryption";
-import { onLoad, onUnload, onReachBottom, onPullDownRefresh, onShow } from "@dcloudio/uni-app";
+import {onReachBottom, onPullDownRefresh, onShow } from "@dcloudio/uni-app";
 import { getItem, StorageKeys, setItem } from "@/utils/storage";
 import { hasLogin, msg, timesDiff } from "@/utils/utils";
-import { orderList} from "@/utils/network/api";
+import { orderList,queryPage} from "@/utils/network/api";
 import { PageData } from "@/datas/enum";
 const tools = require("../../static/etcUtil/tools.js");
 const searchKeyWords = ref('');
@@ -124,9 +124,10 @@ export default function useOrderListItem(props) {
 		}
 		try {
 
-			request(orderList, options).then((res) => {
+			requestNew(queryPage, options).then((res) => {
 				uni.hideLoading()
-				var data = stringToJson(res.bizContent);
+				console.log("订单",res)
+				var data = res;
 				console.log("ordersList.value", data)
 
 				params.total = data.totalCount;

pages.json

@@ -460,6 +460,7 @@
 						"enablePullDownRefresh": false
 					}
 				},
+
 				{
 					"path": "card-deactivation-activation/deactivation-activation-confirm",
 					"style": {
@@ -1892,20 +1893,20 @@
 		"height": "100px",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/image/home.png",
-				"selectedIconPath": "static/image/home-on.png",
+				"iconPath": "static/image/homex.png",
+				"selectedIconPath": "static/image/homex-on.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/order/order",
-				"iconPath": "static/image/fuwu.png",
-				"selectedIconPath": "static/image/fuwu.png",
+				"iconPath": "static/image/menu.png",
+				"selectedIconPath": "static/image/menu-on.png",
 				"text": "服务"
 			},
 			{
 				"pagePath": "pages/user/user",
-				"iconPath": "static/image/wode.png",
-				"selectedIconPath": "static/image/wode.png",
+				"iconPath": "static/image/myx.png",
+				"selectedIconPath": "static/image/myx-on.png",
 				"text": "我的"
 			}
 		]

pages/index/index - 副本.vue

@@ -4,8 +4,8 @@
 			<!-- Banner -->
 			<view class="banner">
 				<swiper class="swiper" circular :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay"
-					:interval="swiper.interval" :duration="swiper.duration"
-					indicator-active-color="rgba(0, 179, 139, 1)" :easing-function="swiper.easing">
+					:interval="swiper.interval" :duration="swiper.duration" indicator-active-color="rgba(0, 179, 139, 1)"
+					:easing-function="swiper.easing">
 					<block v-if="state.swiperList.length >0" v-for="item in state.swiperList" :key="item.id">
 						<swiper-item class="swiper-item" @click="link(item)">
 							<image :src="fileURLList + item.imgUrl" mode="widthFix"></image>
@@ -14,8 +14,7 @@
 				</swiper>
 
 				<view class="notice">
-					<image class="icon" :src="fileURL + 'image/index/icon-notice.png'" lazy-load="false"
-						mode="aspectFill">
+					<image class="icon" :src="fileURL + 'image/index/icon-notice.png'" lazy-load="false" mode="aspectFill">
 					</image>
 					<uni-notice-bar style="width: 100%;" scrollable single :text="state.notice">
 					</uni-notice-bar>
@@ -36,8 +35,7 @@
 					</view>
 					<view class="text">卡签信息查询</view>
 				</view>
-				<view class="item-box"
-					@click="$util.navTo('/subpackage/personal-center/install-activation-order',true)">
+				<view class="item-box" @click="$util.navTo('/subpackage/personal-center/install-activation-order',true)">
 					<view class="item item-4">
 						<image :src="fileURL + 'image/index/item-4.png'" mode="aspectFill" />
 					</view>
@@ -93,8 +91,8 @@
 			<view class="flow-path">
 				<scroll-view scroll-x="true" class="scroll-view">
 					<view class="top-menu">
-						<view :class="item == state.tabActive ? 'tab active' : 'tab'"
-							v-for="item in state.flowPathTabList" :key="item" @click="flowPathTabHandle(item)">
+						<view :class="item == state.tabActive ? 'tab active' : 'tab'" v-for="item in state.flowPathTabList"
+							:key="item" @click="flowPathTabHandle(item)">
 							<view class="border"></view>{{ item }}
 						</view>
 					</view>
@@ -165,7 +163,7 @@
 	} from "vue";
 	import {
 		onPageScroll,
-		onLoad, onReachBottom,onReady
+		onLoad, onReachBottom, onReady
 	} from "@dcloudio/uni-app";
 	import flowPathList from "./components/flow-path-list.vue";
 	import filter from '@/components/filter/filter.vue';
@@ -276,15 +274,15 @@
 		scrollTop.value = e.scrollTop;
 	});
 	onLoad((options) => {
-		console.log("wechatSignNo",options)
-			getInfo();
+		console.log("wechatSignNo", options)
+		getInfo();
 	})
 	// 页面初次渲染完成时触发
-		onReady(()=>{
-			setTimeout(()=>{
-				quanKeyAction()
-			},5000)
-		})
+	onReady(() => {
+		setTimeout(() => {
+			quanKeyAction()
+		}, 5000)
+	})
 
 	onMounted(() => {
 		uni.getSystemInfo({
@@ -343,15 +341,15 @@
 			method: "POST",
 			showLoading: true,
 		};
-		  request(queryKey, options).then((res) => {
+		request(queryKey, options).then((res) => {
 			console.log(stringToJson(res.bizContent));
 			const data = stringToJson(res.bizContent)
 			console.log("轮播图", data)
 			setItem('key', data.dictTypeAndItem)
 		})
-		.catch((err) => {
-			console.log(err);
-		});
+			.catch((err) => {
+				console.log(err);
+			});
 	}
 
 
@@ -387,11 +385,11 @@
 		request(infoQuery, options)
 			.then((res) => {
 				let data = stringToJson(res.bizContent)
-				console.log(data,'公告');
+				console.log(data, '公告');
 				state.notice = data.text
 			})
 			.catch((err) => {
-				console.log(err);
+				console.log(err, '错误');
 			});
 	}
 	// 高速快讯查询接口

pages/index/index.vue

@@ -5,9 +5,10 @@
 		</view>
 		<view class="content">
 			<view class="header">
+				<!-- <navBar :isBack='false' :title='首页'></navBar> -->
 				<view class="title">
 					<view :style="{ height: `${statusBarHeight}px` }"></view>
-					<!-- 自定义导航栏高度  -->
+					<!-- 自定义导航栏高度 -->
 					<view class='title-txt' :style="{
 					          height: `${barHeight}px`,
 					          'line-height': `${barHeight}px`
@@ -22,7 +23,7 @@
 			</view>
 
 			<view class="nav">
-				<view class="item-box" v-for='item in navList' @click="handleNav(item)">
+				<view class="item-box" v-for='(item,index) in navList' :key='index' @click="handleNav(item)">
 					<view class="icon-img">
 						<image :src="item.imgUrl" mode="aspectFit" class='img'></image>
 					</view>
@@ -38,12 +39,22 @@
 					<image :src="`${fileURL}image/newHome/tongzhi-l.png`" class='img' mode="aspectFit"></image>
 				</view>
 				<view class="r-info">
-					如何授权登录小程序？
+					<!-- <u-notice-bar mode="vertical" :list="state.noticeList" type="none" :volume-icon="false" :no-list-hidden='true'></u-notice-bar> -->
+					{{state.notice}}
 				</view>
 			</view>
 
 			<view class="supervision-con">
-				<view class="txt">
+				<!-- <u-swiper :list="state.swiperListArr"></u-swiper> -->
+				<swiper class="swiper" circular :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay"
+					:interval="swiper.interval" :duration="swiper.duration" :easing-function="swiper.easing">
+					<block v-if="state.swiperList.length >0" v-for="item in state.swiperList" :key="item.id">
+						<swiper-item class="swiper-item" @click="link(item)">
+							<image :src="fileURLList + item.imgUrl" mode="widthFix" class='img'></image>
+						</swiper-item>
+					</block>
+				</swiper>
+				<!-- 				<view class="txt">
 					ETC服务监督电话
 				</view>
 				<view class="phone">
@@ -51,25 +62,25 @@
 				</view>
 				<view class="btn">
 					<text>立即拨打 ＞</text>
-				</view>
+				</view> -->
 			</view>
 
 			<view class="title-name">
 				快速办理
 			</view>
 			<view class="express-lane">
-				<view class="item keche" @click="showMask(1)">
-					<view class="item-con">
+				<view class="item keche">
+					<view class="item-con" @click="showMask(1)">
 						<view class="top-txt">
 							客车用户
 						</view>
-						<view class="btn" >
+						<view class="btn">
 							进入
 						</view>
 					</view>
 				</view>
-				<view class="item huoche" @click="showMask(2)">
-					<view class="item-con">
+				<view class="item huoche">
+					<view class="item-con" @click="showMask(2)">
 						<view class="top-txt">
 							货车用户
 						</view>
@@ -79,57 +90,36 @@
 					</view>
 				</view>
 			</view>
-
-
 			<view class="news-con">
 				<view class="title-con">
 					<text>高速快讯</text>
-					<view class="r-more">
+					<view class="r-more" @click="$util.navTo('/subpackage/orders/moreHighMsg/moreHighMsg',true)">
 						<text class='txt'>更多</text>
 						<image :src="`${fileURL}image/newHome/r-icon.png`" mode="aspectFit" class='icon'></image>
 					</view>
 				</view>
 				<view class="news-box">
-					<view class="news-item">
-						<view class="l-img">
-							<image :src="`${fileURL}image/newHome/图层 5.png`" mode="aspectFill" class="img"></image>
-						</view>
-						<view class="r-txt">
-							<view class="tit">
-								后装ETC与选装ETC的介绍
-							</view>
-							<view class="b-time">
-								2024-09-22
-							</view>
-						</view>
-					</view>
-					<view class="news-item">
-						<view class="l-img">
-							<image :src="`${fileURL}image/newHome/图层 5.png`" mode="aspectFill" class="img"></image>
-						</view>
-						<view class="r-txt">
-							<view class="tit">
-								后装ETC与选装ETC的介绍
-							</view>
-							<view class="b-time">
-								2024-09-22
-							</view>
-						</view>
-					</view>
-					<view class="news-item">
-						<view class="l-img">
-							<image :src="`${fileURL}image/newHome/图层 5.png`" mode="aspectFill" class="img"></image>
-						</view>
-						<view class="r-txt">
-							<view class="tit">
-								后装ETC与选装ETC的介绍
+					<template v-if='state.highMsgData'>
+						<view class="news-item" v-for="(item,index) in state.highMsgData" :key='index' @click="link(item)">
+							<view class="l-img">
+								<image :src="fileURLList + item.imgUrl" mode="aspectFill" class="img"></image>
 							</view>
-							<view class="b-time">
-								2024-09-22
+							<view class="r-txt">
+								<view class="tit">
+									{{item.title}}
+								</view>
+								<view class="b-time">
+									{{item.updateTime}}
+								</view>
 							</view>
 						</view>
+					</template>
+					<view class="empty-news" v-else>
+						<u-empty text="暂无数据" mode="news" :icon-size='90' :font-size='24'></u-empty>
 					</view>
+
 				</view>
+
 			</view>
 
 			<!-- 办理流程 -->
@@ -165,7 +155,7 @@
 				</view>
 				<view v-else-if="state.tabActive === '常见问题'">
 					<view class="flow-list wenti">
-						<view class="item-box" v-for='item in state.commonQuestionArr'>
+						<view class="item-box" v-for='(item,index) in state.commonQuestionArr' :key='index'>
 							<view class="l-icon">
 								<image :src="`${fileURL}image/newHome/wenhao.png`" mode="scaleToFill" class="icon-img"></image>
 							</view>
@@ -177,13 +167,13 @@
 					</view>
 				</view>
 			</view>
-		</view>
 
 
+		</view>
 	</view>
 	<!-- ETC选择弹窗 -->
 	<view class="mask" v-if="isShowMask">
-	
+
 		<view class="mask-content">
 			<filter>
 				<view class="mask-close">
@@ -250,23 +240,49 @@
 		getCodeName
 	} from "@/datas/queryKey.js";
 	// import { jump } from "@/datas/9901Jump.js";
-	import navBar from "@/components/nav-bar/nav-bar2.vue";
+	// import navBar from "@/components/nav-bar/nav-bar2.vue";
+	import { getCurrentInstance } from 'vue';
+	const tools = require("../../static/etcUtil/tools.js");
+	const instance = getCurrentInstance();
+	const swiper = reactive({
+		indicatorDots: false,
+		autoplay: true,
+		interval: 6000,
+		duration: 3000,
+		easing: "easeInOutCubic"
+	})
+
 	onLoad((options) => {
 		console.log("wechatSignNo", options)
 		getInfo();
 	})
 	onMounted(() => {
-		statusBarHeight.value = uni.getSystemInfoSync().statusBarHeight;
+		const query = uni.createSelectorQuery().in(instance.proxy);
+		query
+			.select(".news-con")
+			.boundingClientRect((data) => {
+				console.log("得到布局位置信息", data);
+				console.log("节点离页面顶部的距离为" + data.top);
+				newTop.value = data.top
+			})
+			.exec();
+		let systemInfo = uni.getSystemInfoSync()
+		viewHeight.value = systemInfo.windowHeight
+		statusBarHeight.value = systemInfo.statusBarHeight;
 		const {
 			top,
 			height
 		} = uni.getMenuButtonBoundingClientRect();
 		barHeight.value = height ? height + (top - statusBarHeight.value) * 2 : 38;
-		console.log(barHeight.value, statusBarHeight.value, '计算的顶部高度');
+		console.log(barHeight.value, statusBarHeight.value, systemInfo, '计算的顶部高度');
+		getSwiper()
 	})
 	const statusBarHeight = ref(0)
+	const viewHeight = ref(0) //可视区高度
 	const barHeight = ref(0)
 	const searchParams = ref('')
+	const newTop = ref(0) //高速快讯距离顶部距离
+	const isShowMask = ref(false);
 	//搜索
 	const onKeyInput = (event) => {
 		searchParams.value = event.target.value;
@@ -333,10 +349,11 @@
 		// #endif
 	}
 	const state = reactive({
-		type: 0, //1客车 2货车
+		vanType: 0, //1客车 2货车
 		userType: 1, //1个人 2单位
 		notice: "",
 		swiperList: [],
+		swiperListArr: [],
 		noticeList: [], //公告栏列表
 		flowPathTabList: ["办理流程", "办理条件", "常见问题"],
 		tabActive: "办理流程",
@@ -374,35 +391,20 @@
 		commonQuestionArr: [], //常见问题数组
 		isEnableSetGray: false
 	});
-	const isShowMask = ref(false);
-	const isShowBar = ref(false)
-	const userStore = useUserStore();
-	const type = 0;
-	const title = ref("我是测试");
-	const scrollTop = ref("");
 
 
-	//监听页面滚动
-	onPageScroll((e) => {
-		if (e.scrollTop > statusBarHeight.value) {
-			isShowBar.value = true;
-		} else {
-			isShowBar.value = false;
-		}
-		scrollTop.value = e.scrollTop;
-	});
 	// 页面初次渲染完成时触发
-	onReady(()=>{
-		setTimeout(()=>{
+	onReady(() => {
+		setTimeout(() => {
 			quanKeyAction()
-		},5000)
+		}, 5000)
 	})
 	// 页面初次渲染完成时触发
-		onReady(()=>{
-			setTimeout(()=>{
-				quanKeyAction()
-			},5000)
-		})
+	onReady(() => {
+		setTimeout(() => {
+			quanKeyAction()
+		}, 5000)
+	})
 
 	onMounted(() => {
 		uni.getSystemInfo({
@@ -419,29 +421,7 @@
 	// 	const params = encodeURIComponent(JSON.stringify("https://webzeus.hltgz.com/throughBilManager/index"))
 	// 	tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 	// }
-	//获取轮播
-	const getSwiper = () => {
-
-		let options = {
-			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
-			data: {
-			}, //请求参数
-			method: "POST", //提交方式(默认POST)
-			showLoading: true, //是否显示加载中(默认显示)
-		};
 
-		//调用方式
-		request(querySwiper, options).then((res) => {
-			console.log(stringToJson(res.bizContent));
-			const data = stringToJson(res.bizContent)
-			console.log("轮播图", data)
-			state.swiperList = data.swipers ? data.swipers : []
-		})
-			.catch((err) => {
-				console.log(err);
-			});
-
-	};
 	//办理流程tab选择
 	const flowPathTabHandle = (tab) => {
 		state.tabActive = tab;
@@ -451,38 +431,10 @@
 			commonQuestion();
 		}
 	};
-	// //全量枚举值查询
-	const quanKeyAction = () => {
-		var data = {};
-		const options = {
-			type: 2,
-			data: data,
-			method: "POST",
-			showLoading: true,
-		};
-        request(queryKey, options).then((res) => {
-			console.log(stringToJson(res.bizContent));
-			const data = stringToJson(res.bizContent)
-			console.log("轮播图", data)
-			setItem('key', data.dictTypeAndItem)
-		})
-		.catch((err) => {
-			console.log(err);
-		});
-	}
-
-
-	const toCreatOrder = (val : number) => {
-		console.log(typeof (val));
-		state.userType = val;
-		navTo(`/subpackage/orders/choice-product?vanType=${state.type}&&userType=${state.userType}`)
-		closeMask();
-	};
 
 	const showMask = (val : any) => {
-		state.type = val; //1 客车 2货车
+		state.vanType = val; //1 客车 2货车
 		isShowMask.value = true;
-		console.log("showMask",val)
 	};
 
 	const closeMask = () => {
@@ -505,15 +457,18 @@
 		request(infoQuery, options)
 			.then((res) => {
 				let data = stringToJson(res.bizContent)
-				console.log(data);
 				state.notice = data.text
+				state.noticeList = [data.text || '暂无公告', '平明送客楚山孤',]
+				console.log(data, state.noticeList, '公告');
 			})
 			.catch((err) => {
-				console.log(err);
+				console.log(err, '错误');
 			});
 	}
+	let newLock = false
 	// 高速快讯查询接口
 	const highMsg = () => {
+		newLock = true
 		let options = {
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 			data: {
@@ -527,9 +482,10 @@
 		//调用方式
 		request(queryHighMsg, options).then((res) => {
 			console.log("高速快讯查询接口", stringToJson(res.bizContent));
-			state.highMsgData = stringToJson(res.bizContent).data
+			state.highMsgData = stringToJson(res.bizContent).data.slice(0, 4)
 			for (var i = 0; i < state.highMsgData.length; i++) {
 				state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
+				state.highMsgData[i]["updateTime"] = state.highMsgData[i]["updateTime"].replace('T', ' ')
 				if (state.highMsgData[i]["type"] == 3) {
 					state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
 				}
@@ -539,32 +495,7 @@
 			})
 		}).catch((err) => { console.log(err) });
 	}
-	const link = (item : any) => {
-		if (item.type == 1) {
-			const params = encodeURIComponent(JSON.stringify(item.hyperLink))
-			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))
-			tools.toUrl(`/subpackage/orders/moreHighMsg/textDetails?item=` + param);
-		} else if (item.type == 4) {
-			uni.navigateToMiniProgram({
-				appId: item.hyperLink,
-				path: item.speedUrl,
-				success(res) {
-					console.log(res);
-				},
-				complete(res) {
-					console.log(res);
-				},
-				fail(res) {
-					console.log(res);
-					// 未成功跳转到车主小程序
-				},
-			});
-		}
-	}
+
 	const processeCondition = () => {
 		let options = {
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
@@ -610,8 +541,93 @@
 	}
 	//监听页面滚动
 	onPageScroll((e) => {
-		console.log(e.scrollTop,);
+		let h = viewHeight.value + e.scrollTop
+		if (h >= newTop.value - 50 && !newLock) {
+			highMsg()
+		}
 	});
+	const toCreatOrder = (val : number) => {
+		console.log(typeof (val));
+		state.userType = val;
+		navTo(`/subpackage/orders/choice-product?vanType=${state.vanType}&&userType=${state.userType}`)
+		closeMask();
+	};
+
+
+	//全量枚举值查询
+	const quanKeyAction = () => {
+		var data = {};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+		request(queryKey, options).then((res) => {
+			console.log(stringToJson(res.bizContent));
+			const data = stringToJson(res.bizContent)
+			console.log("枚举", data)
+			setItem('key', data.dictTypeAndItem)
+		})
+			.catch((err) => {
+				console.log(err);
+			});
+	}
+	onReady(() => {
+		setTimeout(() => {
+			quanKeyAction()
+		}, 5000)
+	})
+	//获取轮播
+	const getSwiper = () => {
+		let options = {
+			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
+			data: {
+			}, //请求参数
+			method: "POST", //提交方式(默认POST)
+			showLoading: true, //是否显示加载中(默认显示)
+		};
+
+		//调用方式
+		request(querySwiper, options).then((res) => {
+			console.log(stringToJson(res.bizContent));
+			const data = stringToJson(res.bizContent)
+			console.log("轮播图", data)
+			state.swiperList = data.swipers ? data.swipers : [],
+				state.swiperListArr = state.swiperList.map(item => fileURLList + item.imgUrl)
+		})
+			.catch((err) => {
+				console.log(err);
+			});
+
+	};
+	const link = (item : any) => {
+		console.log(item);
+		if (item.type == 1) {
+			const params = encodeURIComponent(JSON.stringify(item.hyperLink))
+			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))
+			tools.toUrl(`/subpackage/orders/moreHighMsg/textDetails?item=` + param);
+		} else if (item.type == 4) {
+			uni.navigateToMiniProgram({
+				appId: item.hyperLink,
+				path: item.speedUrl,
+				success(res) {
+					console.log(res);
+				},
+				complete(res) {
+					console.log(res);
+				},
+				fail(res) {
+					console.log(res);
+					// 未成功跳转到车主小程序
+				},
+			});
+		}
+	}
 </script>
 <style lang="scss" scoped>
 	.container {
@@ -679,7 +695,7 @@
 				color: #fff;
 				font-weight: 500;
 				font-size: 26rpx;
-
+				background: #1a394d;
 			}
 		}
 
@@ -762,10 +778,25 @@
 		height: 180rpx;
 		width: 690rpx;
 		margin: 24rpx 30rpx 0;
-		background-image: url(https://qtzl.etcjz.cn/default-bucket/image/newHome/phone.png);
-		background-size: 100% 100%;
-		background-repeat: no-repeat;
-		padding: 35rpx 0 0 52rpx;
+		// background-image: url(https://qtzl.etcjz.cn/default-bucket/image/newHome/phone.png);
+		// background-size: 100% 100%;
+		// background-repeat: no-repeat;
+		// padding: 35rpx 0 0 52rpx;
+		// background: #FFFFFF;
+		border-radius: 12rpx;
+		overflow: hidden;
+
+		.swiper {
+			height: 180rpx;
+			width: 690rpx;
+		}
+
+		.swiper-item .img {
+			overflow: hidden;
+			border-radius: 12rpx;
+			height: 180rpx !important;
+			width: 690rpx;
+		}
 
 		.txt {
 			font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
@@ -881,6 +912,8 @@
 			}
 		}
 
+		.empty-news {}
+
 		.news-box {
 			border-radius: 12rpx;
 			background-color: #fff;
@@ -1041,6 +1074,7 @@
 			}
 		}
 	}
+
 	.mask {
 		background: $uni-bg-color-mask;
 		position: fixed;
@@ -1049,7 +1083,7 @@
 		right: 0;
 		bottom: 0;
 	}
-	
+
 	.mask-content {
 		background: $uni-bg-color;
 		width: 570rpx;
@@ -1062,42 +1096,48 @@
 		flex-direction: column;
 		border-radius: 20rpx;
 	}
-	
+
 	.mask-close {
 		text-align: right;
 	}
-	
+
 	.mask-title {
 		text-align: center;
 		font-size: 32rpx;
 		color: $uni-text-color-black;
 		margin-bottom: 50rpx;
 	}
-	
+
 	.mask-tab {
 		display: flex;
 		justify-content: space-evenly;
 	}
+
+	.icon-closed {
+		width: 48rpx;
+		height: 48rpx;
+		margin: 24rpx 24rpx 0 0;
+	}
+
 	.tab-item {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 	}
-	
+
 	.tab-tit {
 		font-size: 32rpx;
 		margin-top: 20rpx;
 		color: #666;
 	}
-	
+
 	.tab-item image {
 		width: 160rpx;
 		height: 160rpx;
 	}
-	.icon-closed {
-		width: 48rpx;
-		height: 48rpx;
-		margin: 24rpx 24rpx 0 0;
+
+	.backlog-notice {
+		margin: 50rpx 30rpx 0rpx;
 	}
 </style>

pages/order/components/order-list-item-new.vue

@@ -219,7 +219,7 @@
 	}
 	//获取车牌颜色文字	
 	const getVehiclePlateColor = (id : number) => {
-
+        console.log("id",id)
 		const colors = vehiclePlateColor.filter(item => item.id == id);
 		return colors[0].color
 	}

subpackage/orders/cancel-order.vue

@@ -8,9 +8,9 @@
 <script setup lang="ts">
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
-	import { request } from "@/utils/network/request.js";
+	import { request,requestNew } from "@/utils/network/request.js";
 	import { msg, confirm, getOrderStatusName } from "@/utils/utils";
-	import { cancelOrder, cancelOrderNew } from "@/utils/network/api";
+	import { cancelOrder, cancelOrderNew,orderCancel } from "@/utils/network/api";
 	import { getItem, StorageKeys } from "@/utils/storage";
 import { deviceType } from "@/utils/network/difference";
 	const config = {
@@ -71,7 +71,8 @@ import { deviceType } from "@/utils/network/difference";
 					data: {
 						id: state.orderInfo.id,
 						reason: e.orderReason,
-						openId: getItem(StorageKeys.OpenId)
+						orderId:state.orderInfo.orderId
+						
 					},
 					method: "POST",
 					showLoading: true,
@@ -86,7 +87,7 @@ import { deviceType } from "@/utils/network/difference";
 				options.data['source'] = 'ALI'
 				// #endif  
 				console.log("options", options)
-				request(cancelOrder, options).then((res) => {
+				requestNew(orderCancel, options).then((res) => {
 					cancelOrderSuccess();
 				});
 			},

subpackage/orders/car-release.vue

@@ -50,7 +50,7 @@
 			</view>
 		</view>
 		<view class="uni-list tractor">
-			<radio-group @change="radioChange" v-if="state.form.type=='2'">
+			<radio-group @change="radioChange" v-if="state.form.vanType=='2'">
 				<text class="title">是否是牵引车</text>
 				<label style="margin-right: 60rpx;" class="uni-list-cell uni-list-cell-pd "
 					v-for="(item, index) in state.items" :key="item.value">
@@ -59,7 +59,7 @@
 			</radio-group>
 		</view>
 		<!-- 货车 牵引车 需要传道路运输许可证-->
-		<view class="picture-wrapper" v-if="state.form.type=='2' && state.form.tractorSign==1"
+		<view class="picture-wrapper" v-if="state.form.vanType=='2' && state.form.tractorSign==1"
 			@click="cardFileImageUpdate(2)">
 			<view class="bg">
 				<view class="">
@@ -81,7 +81,7 @@
 				<u-form label-width="200" :model="state.form" ref="uForm">
 					<u-form-item label="车牌号">
 						<car-number-input @numberInputResult="carNumber"
-							:defaultStr="state.form.vehicleIdNum"></car-number-input>
+							:defaultStr="state.form.vehiclePlate"></car-number-input>
 					</u-form-item>
 
 					<u-form-item label="所有人">
@@ -110,10 +110,10 @@
 					</u-form-item>
 
 					<u-form-item label="注册日期">
-						<picker mode="date" :value="state.form.register" @change="bindDateChange1"
+						<picker mode="date" :value="state.form.registerDate" @change="bindDateChange1"
 							:disabled="state.isEnableChangeOCRCarInfo">
 							<view class="uni-input" style="text-align: right;" :class="state.changeColor?'hei':'hui'">
-								{{state.form.register}}
+								{{state.form.registerDate}}
 							</view>
 						</picker>
 					</u-form-item>
@@ -241,9 +241,10 @@
 		queryGuoHuJianCe,
 		queryGuoHuCaoZuo,
 		ocrAllQuery,
-		carMessageApi
+		carMessageApi,
+		vehicleUpload
 	} from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
+	import { request, requestNew } from "@/utils/network/request.js";
 
 	import { stringToJson } from "@/utils/network/encryption";
 	import { onLoad, onPageScroll } from "@dcloudio/uni-app";
@@ -261,7 +262,7 @@
 
 	//车牌号输入
 	const carNumber = (val : any) => {
-		state.form.vehicleIdNum = val.trim();
+		state.form.vehiclePlate = val.trim();
 	};
 
 	const camera = () => {
@@ -322,7 +323,7 @@
 			msg("请上传道路运输许可证");
 			return;
 		}
-		if (state.form.type == 1) {
+		if (state.form.vanType == 1) {
 			state.form.axleCount = 2;
 		} else {
 			if (!state.form.axleCount) {
@@ -331,7 +332,7 @@
 			}
 		}
 		state.form.vehicleId =
-			state.form.vehicleIdNum + "_" + state.vehiclePlateColor;
+			state.form.vehiclePlate + "_" + state.vehiclePlateColor;
 		state.form.opId = getItem(StorageKeys.OpenId);
 		state.form.approvedCount = parseFloat(state.form.approvedCount);
 		state.form.maintenaceMass = parseFloat(state.form.maintenaceMass);
@@ -362,7 +363,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(etcCarCardInfoSubmit, options)
+		requestNew(vehicleUpload, options)
 			.then((res) => {
 				const data = stringToJson(res.bizContent);
 				queryGuoHuJianCeAction().then((value) => {
@@ -408,7 +409,7 @@
 	const pass = () => {
 		state.show = false
 		state.form.vehicleId =
-			state.form.vehicleIdNum + "_" + state.vehiclePlateColor;
+			state.form.vehiclePlate + "_" + state.vehiclePlateColor;
 		state.form.opId = getItem(StorageKeys.OpenId);
 		state.form.approvedCount = parseFloat(state.form.approvedCount);
 		state.form.maintenaceMass = parseFloat(state.form.maintenaceMass);
@@ -474,15 +475,15 @@
 		form: {
 			orderId: "", //订单ID
 			character: "", //使用性质
-			register: "请输入注册日期", //注册日期
+			registerDate: "请输入注册日期", //注册日期
 
 			customerId: "", //用户编号
 			vehicleId: "",
-			vehicleIdNum: "", //车牌编号
+			vehiclePlate: "", //车牌编号
 			issueDate: "请输入发证日期", //发证日期
 			vehPosImgUrl: "", //行驶证正面
 			vehNegImgUrl: "", //行驶证证反面
-			type: "0", //1，客车 2.货车
+			vanType: "0", //1，客车 2.货车
 			useUserType: 0, //车辆用户类型
 			useUserTypeName: "普通车",
 			vehicleSign: 2, //前/后装标识
@@ -538,7 +539,7 @@
 	});
 	onLoad((option : any) => {
 		state.form.orderId = option.orderId;
-		state.form.type = option.type;
+		state.form.vanType = option.vanType;
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		if (option.vehicleId) {
 			state.form.vehicleId = option.vehicleId;
@@ -673,7 +674,7 @@
 		state.form.vehPosImgUrl = allData['vehPosImgUrl']
 		state.form.vehNegImgUrl = allData['vehNegImgUrl']
 		state.form.vehBodyUrl = allData['vehBodyUrl']
-		state.form.vehicleIdNum = allData['vehiclePlate']
+		state.form.vehiclePlate = allData['vehiclePlate']
 		state.form.ownerName = allData['ownerName']
 		state.form.vehicleType = allData['vehicleType']
 		if (allData['useCharacter'] == 1) {
@@ -685,7 +686,7 @@
 		}
 		state.form.vin = allData['vin']
 		state.form.engineNum = allData['engineNum']
-		state.form.register = allData['registerDate']
+		state.form.registerDate = allData['registerDate']
 		state.form.issueDate = allData['issueDate']
 		state.form.approvedCountShow = allData['approvedCount']
 		state.form.maintenaceMassShow = allData['maintenaceMass']
@@ -725,7 +726,7 @@
 
 	}
 	const bindDateChange1 = (e) => {
-		state.form.register = e.detail.value
+		state.form.registerDate = e.detail.value
 		state.changeColor = true;
 	}
 	const bindDateChange2 = (e) => {
@@ -766,16 +767,17 @@
 			console.log('输出内容=====================', state.choiceIndex)
 			if (state.choiceIndex === "3") {
 				if (data.plate_a.length > 8) {
-					state.form.vehicleIdNum = data.plate_a.substring(0, 8);
+					state.form.vehiclePlate = data.plate_a.substring(0, 8);
 				} else {
-					state.form.vehicleIdNum = data.plate_a;
+					state.form.vehiclePlate = data.plate_a;
 				}
 				state.form.ownerName = data.man;
 				state.form.vehicleType = data.vehicle;
-				state.form.character = data.character;
+				// state.form.character = data.character;
+				state.form.character = 2;
 				state.form.vin = data.vin;
 				state.form.engineNum = data.engine;
-				state.form.register = data.register;
+				state.form.registerDate = data.register;
 				state.form.issueDate = data.issue;
 				state.form.vehPosImgUrl = data.imageUrl;
 				state.form.vehicleModel = data.model;

subpackage/orders/choice-product.vue

@@ -66,14 +66,12 @@
 <script setup lang="ts">
 	import { onLoad, onPageScroll, onShow } from "@dcloudio/uni-app";
 	import { reactive, ref } from "vue";
-	import { etcQueryProduct, pageQuery } from "@/utils/network/api.js";
-	import { request,requestNew } from "@/utils/network/request.js";
-	import { stringToJson } from "@/utils/network/encryption";
+	import { pageQuery } from "@/utils/network/api.js";
+	import { requestNew } from "@/utils/network/request.js";
 	import { fileURL } from "@/datas/fileURL.js";
 	import navBgCar from "./components/nav-bg-car1";
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
-	import { getItem, StorageKeys, setItem } from "@/utils/storage.ts";
-	import { msg } from "@/utils/utils";
+	import { getItem, setItem } from "@/utils/storage.ts";
 	import { agentId } from "@/utils/network/difference";
 	const imgURL = `${fileURL}image/`;
 
@@ -99,13 +97,13 @@
 		}
 		setItem("isValueCard", state.isValueCard);
 		uni.navigateTo({
-			url: `/subpackage/orders/interestsList?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`,
+			url: `/subpackage/orders/interestsList?userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`,
 		});
 	}
 	const savaHandle = (val, idx) => {
 		console.log("vAL", val)
 		setItem("clientFee", val.clientFee);
-		setItem("promoteId", val.promoteId);
+		// setItem("promoteId", val.promoteId);
 
 		state.isSign = val.isSign;
 		state.signAgencyId = val['deviceType'];
@@ -125,7 +123,7 @@
 			console.log("state.isValueCard", state.isValueCard)
 			setItem("isValueCard", state.isValueCard);
 			uni.navigateTo({
-				url: `/subpackage/orders/interestsList?equityId=${val.equityList[idx].equityId}&promoteId=${val['promoteId']}&userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['deviceType']}`,
+				url: `/subpackage/orders/interestsList?equityId=${val.equityList[idx].equityId}&userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['deviceType']}&productId=${val['productId']}`,
 			});
 		} else {
 			state.radiolist1 = [];
@@ -195,6 +193,9 @@
 					showCancel: false,
 					success: function (res) {
 						if (res.confirm) {
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
 							console.log('用户点击确定');
 						} else if (res.cancel) {
 							console.log('用户点击取消');

subpackage/orders/essential-information-two.vue

@@ -95,13 +95,9 @@
 	import { onLoad, onShow, onPageScroll, onUnload } from "@dcloudio/uni-app";
 	import {
 		addressQuery,
-		etcCreatOrder,
 		searchOrder,
 		productReCode,
-		infoQuery,
-		envs,
 		addProduct,
-		isSubmitOrderApi,
 		orderAdd
 	} from "@/utils/network/api.js";
 	import { request,requestNew } from "@/utils/network/request.js";
@@ -123,11 +119,11 @@
 			region: "",
 			address: "",
 			postalCode: "",
-			promoteId: "",
 			longitude: "",
 			latitude: "",
 			detailedAddress: '',  //通过经纬度转的地址
-			cardType: ''  //卡类型
+			cardType: '',  //卡类型
+			productId:"",//产品编号
 		},
 		show: false,
 		addressArray: [],
@@ -175,18 +171,17 @@
 		};
 
 		requestNew(orderAdd, options).then((res) => {
-			console.log(res);
+			console.log("res===",res);
 			if (res.statusCode === 600) {
 				orderGoAction();
 			} else {
-				const data = stringToJson(res.bizContent);
+				const data = res;
 				state.orderId = data.orderId
 				console.log(data);
-				//提交产品信息
-				productReCodeAction(data.orderId).then((result) => {
-					console.log("产品信息", result);
+				//提交产品信息  接口直接不要了
+				// productReCodeAction(data.orderId).then((result) => {
 					// 加购权益产品
-					addProductRequest().then((res) => {
+					// addProductRequest().then((res) => {  //接口直接不要了
 						var vehicleId = state.data.vehiclePlate + "_" + state.data.vehiclePlateColor
 						console.log("state.data.vehiclePlate", state.data.vehiclePlate, state.data.vehiclePlateColor, vehicleId)
 						if (state.data.userType == 1) {
@@ -198,8 +193,8 @@
 								url: `/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
 							});
 						}
-					})
-				})
+					// })
+				// })
 			}
 		});
 	}
@@ -259,7 +254,7 @@
 		state.data.vanType = Number(option.vanType); //1客车  2货车
 		state.data.opId = getItem(StorageKeys.OpenId);
 		state.data.userType =Number(option.userType);
-		state.data.promoteId = option.promoteId;
+		state.data.productId = option.productId;
 		state.data.vehiclePlate = option.vehiclePlate;
 		state.data.vehiclePlateColor = option.vehiclePlateColor;
 		state.isValueCard = option.isValueCard
@@ -342,7 +337,7 @@
 
 	const productReCodeAction = (orderId) => {
 		var data = {
-			promoteId: state.data.promoteId,
+			promoteId: state.data.productId,
 			orderId: orderId,
 			isValueCard: state.isValueCard,
 			loginSource: getItem("loginSource")
@@ -364,50 +359,30 @@
 			reject(error);
 		});
 	};
-	const addProductRequest = () => {
-		const options = {
-			type: 2,
-			data: {
-				orderId: state.orderId, //订单编号	
-				openId: getItem(StorageKeys.OpenId), //操作人 id
-				equityId: state.equityId, //权益Id
-				totalAmount: state.totalAmount, //总金额
-				isRepeatPurchase: 0
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		console.log("optionss", options);
-		return new Promise(async (resolve, reject) => {
-			const res = await request(addProduct, options);
-			const data = stringToJson(res.bizContent);
-			console.log("111")
-			resolve(data);
-		}).catch((error) => {
-			console.log("222")
-			reject(error);
-		});
-	}
-	// 老中台-检测能否提交订单
-	const isSubmitOrderRequest = (vehiclePlate, vehiclePlateColor) => {
-		const options = {
-			type: 2,
-			data: {
-				vehicleId: vehiclePlate + "_" + vehiclePlateColor
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		return new Promise(async (resolve, reject) => {
-			const res = await request(isSubmitOrderApi, options);
-			const data = stringToJson(res.bizContent);
-			console.log("111")
-			resolve(data);
-		}).catch((error) => {
-			console.log("222")
-			reject(error);
-		});
-	}
+	// const addProductRequest = () => {
+	// 	const options = {
+	// 		type: 2,
+	// 		data: {
+	// 			orderId: state.orderId, //订单编号	
+	// 			openId: getItem(StorageKeys.OpenId), //操作人 id
+	// 			equityId: state.equityId, //权益Id
+	// 			totalAmount: state.totalAmount, //总金额
+	// 			isRepeatPurchase: 0
+	// 		},
+	// 		method: "POST",
+	// 		showLoading: true,
+	// 	};
+	// 	console.log("optionss", options);
+	// 	return new Promise(async (resolve, reject) => {
+	// 		const res = await request(addProduct, options);
+	// 		const data = stringToJson(res.bizContent);
+	// 		console.log("111")
+	// 		resolve(data);
+	// 	}).catch((error) => {
+	// 		console.log("222")
+	// 		reject(error);
+	// 	});
+	// }
 </script>
 
 <style lang="scss" scoped>

subpackage/orders/essential-information.vue

@@ -74,18 +74,14 @@
 	import { onLoad, onShow, onPageScroll, onUnload } from "@dcloudio/uni-app";
 	import {
 		addressQuery,
-		etcCreatOrder,
-		etcVehiclePlateVer,
 		searchOrder,
-		productReCode,
-		envs,
-		addProduct,
-		isSubmitOrderApi
+		isSubmitOrderApi,
+		plateCheck,
+		etcVehiclePlateVer
 	} from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
+	import { request, requestNew } from "@/utils/network/request.js";
 	import { reactive, ref } from "vue";
 	import { msg, noticeUser } from "@/utils/utils";
-	// import  amap from "../../lib/amap-uni.130.js";//引入高德地图小程序插件
 	const scrollTop = ref(0);
 	const state = reactive({
 		data: {
@@ -102,11 +98,11 @@
 			region: "",
 			address: "",
 			postalCode: "",
-			promoteId: "",
 			longitude: "",
 			latitude: "",
 			detailedAddress: '',  //通过经纬度转的地址
-			cardType: ''  //卡类型
+			cardType: ''  ,//卡类型
+			productId:""
 		},
 		show: false,
 		addressArray: [],
@@ -186,11 +182,18 @@
 					showLoading: true,
 				};
 				console.log("车牌信息", options)
+				// 车牌校验有问题 还没改好
+				// requestNew(plateCheck, options).then((res) => {
+					// uni.redirectTo({
+					// 	url: `/subpackage/orders/essential-information-two?userType=${state.data.userType}&vanType=${state.data.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&vehiclePlate=${state.data.vehiclePlate}&vehiclePlateColor=${state.data.vehiclePlateColor}&productId=${state.data.productId}`,
+					// });
+				// });
 				request(etcVehiclePlateVer, options).then((res) => {
 					uni.redirectTo({
-						url: `/subpackage/orders/essential-information-two?promoteId=${getItem("promoteId")}&userType=${state.data.userType}&vanType=${state.data.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&vehiclePlate=${state.data.vehiclePlate}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+						url: `/subpackage/orders/essential-information-two?userType=${state.data.userType}&vanType=${state.data.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&vehiclePlate=${state.data.vehiclePlate}&vehiclePlateColor=${state.data.vehiclePlateColor}&productId=${state.data.productId}`,
 					});
 				});
+
 			} else {
 				msg(item.data.data.canSubmitMsg);
 			}
@@ -252,7 +255,7 @@
 		state.data.vanType = option.vanType; //1客车  2货车
 		state.data.opId = getItem(StorageKeys.OpenId);
 		state.data.userType = option.userType;
-		state.data.promoteId = option.promoteId;
+		state.data.productId = option.productId;
 		state.isValueCard = option.isValueCard
 		state.data.cardType = option.isValueCard
 		state.totalAmount = option.totalAmount;
@@ -307,55 +310,7 @@
 	onUnload(() => {
 		uni.$off('updateData');
 	})
-
-	const productReCodeAction = (orderId) => {
-		var data = {
-			promoteId: state.data.promoteId,
-			orderId: orderId,
-			isValueCard: state.isValueCard,
-			loginSource: getItem("loginSource")
-		};
-		const options = {
-			type: 2,
-			data: data,
-			method: "POST",
-			showLoading: true,
-		};
-
-		return new Promise(async (resolve, reject) => {
-			const res = await request(productReCode, options);
-			const data = stringToJson(res.bizContent);
-			console.log("111")
-			resolve(data);
-		}).catch((error) => {
-			console.log("222")
-			reject(error);
-		});
-	};
-	const addProductRequest = () => {
-		const options = {
-			type: 2,
-			data: {
-				orderId: state.orderId, //订单编号	
-				openId: getItem(StorageKeys.OpenId), //操作人 id
-				equityId: state.equityId, //权益Id
-				totalAmount: state.totalAmount, //总金额
-				isRepeatPurchase: 0
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		console.log("optionss", options);
-		return new Promise(async (resolve, reject) => {
-			const res = await request(addProduct, options);
-			const data = stringToJson(res.bizContent);
-			console.log("111")
-			resolve(data);
-		}).catch((error) => {
-			console.log("222")
-			reject(error);
-		});
-	}
+	
 	// 老中台-检测能否提交订单
 	const isSubmitOrderRequest = (vehiclePlate, vehiclePlateColor) => {
 		const options = {

subpackage/orders/interestsList.vue

@@ -15,7 +15,7 @@
 	import { equityProductsInfo } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { request } from "@/utils/network/request";
-	import { msg, navTo } from "@/utils/utils";
+	import {  navTo } from "@/utils/utils";
 	import { jump } from "@/datas/9901Jump.js";
 	import {
 		getOpenidApi
@@ -36,13 +36,13 @@ import { deviceType } from "@/utils/network/difference";
 		isValueCard: "",
 		vanType: 0,
 		userType: 0,
-		promoteId: "",  //产品id
 		totalAmount: 0,  //产品+权益产品金额
 		changeCardType: "",//储值卡转记账卡选权益产品
 		applyId: "",
 		orderId: "",
 		sysType: "",
 		signAgencyId:"",
+		productId:"",//产品编号
 	})
 
 	let richText = ref('')
@@ -60,7 +60,7 @@ import { deviceType } from "@/utils/network/difference";
 		state.userType = option.userType;
 		state.vanType = option.vanType;
 		state.isValueCard = option.isValueCard;
-		state.promoteId = option.promoteId;
+		state.productId = option.productId;
 		state.totalAmount = option.fee;
 		// 储值卡转记账卡传过来的参数
 		state.changeCardType = option.changeCardType;
@@ -76,19 +76,19 @@ import { deviceType } from "@/utils/network/difference";
 			let obj={
 				type:state.vanType,
 				userType:state.userType,
-				promoteId:state.promoteId
+				promoteId:state.productId
 			}
 			const params = encodeURIComponent(JSON.stringify(obj))
 			jump("15",params)
 		}else{
 			if (state.changeCardType == "1") {
 				navTo(
-					`/subpackage/after-sale/to-bookkeeping-card/mailing_information?orderId=${state.orderId}&&applyId=${state.applyId}&&productId=${state.promoteId}&&totalAmount=${state.totalAmount}&&equityId=${state.equityId}`
+					`/subpackage/after-sale/to-bookkeeping-card/mailing_information?orderId=${state.orderId}&&applyId=${state.applyId}&&productId=${state.productId}&&totalAmount=${state.totalAmount}&&equityId=${state.equityId}`
 				)
 			} else {
 				// 正常流程
 				uni.redirectTo({
-					url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}`,
+					url: `/subpackage/orders/essential-information?userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&productId=${state.productId}`,
 				});
 			}
 		}

subpackage/orders/opening-account-people.vue

@@ -56,7 +56,7 @@
 						:disabled="state.isEnableOCRData" maxlength="18" />
 				</u-form-item>
 				<u-form-item label="地址">
-					<u-input placeholder='请输入地址' :autoHeight='true' v-model="state.form.address"
+					<u-input placeholder='请输入地址' :autoHeight='true' v-model="state.form.userAddress"
 						:disabled="state.isEnableOCRData" maxlength="50" />
 				</u-form-item>
 				<u-form-item label="联系方式">
@@ -127,7 +127,7 @@
 						type="number" />
 				</u-form-item>
 				<u-form-item label="地址">
-					<u-input placeholder='请输入地址' inputAlign="right" :autoHeight='true' v-model="state.form.address"
+					<u-input placeholder='请输入地址' inputAlign="right" :autoHeight='true' v-model="state.form.userAddress"
 						:disabled="state.isEnableOCRData" maxlength="50" />
 				</u-form-item>
 			</u-form>
@@ -244,10 +244,7 @@
 	} from "@dcloudio/uni-app";
 	import {
 		etcOcrCard,
-		etcUserCardInfoSubmit,
-		fileUpload,
 		register,
-		envs,
 		getUserMsg,
 		ocrAllQuery,
 		userUpload
@@ -293,7 +290,7 @@
 			userPosImgUrl: "", //身份证正面
 			userNegImgUrl: "", //身份证反面
 			tel: "", //开户人手机号
-			address: "", //开户人地址
+			userAddress: "", //开户人地址
 			sceneType: "", //用户协议支撑服务场景（发行服务机构和用户签订的协议）
 			channelId: "", //渠道id
 			gender: "",
@@ -311,6 +308,7 @@
 			agentIdVld: '',
 			opId: '',
 			orderSource: 'WECHAT',
+			isAgent:false
 		},
 
 		genderShow: false,
@@ -318,7 +316,7 @@
 		vehiclePlateColor: undefined,
 		isMyPeopple: true,
 		isSign: '',
-		type: 1,
+		vanType: 1,
 		isEnableOther: true,  //小程序是否支持他人办理
 		isEnableBook: true,  //他人办理时是否上传委托书
 		isEnableInfo: true,  //小程序信息带出
@@ -385,7 +383,7 @@
 			requestNew(userUpload, options).then((res) => {
 				console.log(res);
 				uni.redirectTo({
-					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}&vehicleId=${state.vehicleId}`,
+					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&isSign=${state.isSign}&vehicleId=${state.vehicleId}`,
 				});
 			});
 		})
@@ -409,8 +407,10 @@
 		state.isTakePhotoModeShow = false
 		if (val) {
 			state.isMyPeopple = true;
+			state.form.isAgent=false
 		} else {
 			state.isMyPeopple = false;
+			state.form.isAgent=true
 		}
 		state.form = {
 			orderId: state.orderId, //订单ID
@@ -420,7 +420,7 @@
 			userPosImgUrl: "", //身份证正面
 			userNegImgUrl: "", //身份证反面
 			tel: "", //开户人手机号
-			address: "", //开户人地址
+			userAddress: "", //开户人地址
 			sceneType: "", //用户协议支撑服务场景（发行服务机构和用户签订的协议）
 			channelId: "", //渠道id
 			gender: "",
@@ -437,6 +437,7 @@
 			agentAddress: "",
 			agentIdVld: '',
 			orderSource: 'WECHAT',
+			isAgent:false
 		};
 	};
 	onLoad((option : any) => {
@@ -445,7 +446,7 @@
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		state.form.opId = getItem('openId') ? getItem('openId') : '';
 		state.isSign = option.isSign;
-		state.type = option.type;
+		state.vanType = option.vanType;
 		state.vehicleId = option.vehicleId;
 		getGlobalParam(); //全局配置数据
 		console.log("option", option)
@@ -531,7 +532,7 @@
 			state.form.userNegImgUrl = data.customerNegImgUrl;
 			state.form.userName = data.customerName;
 			state.form.userIdNum = data.customerIdNum;
-			state.form.address = data.customerAddress;
+			state.form.userAddress = data.customerAddress;
 			state.form.tel = data.customerTel;
 		})
 	}
@@ -570,7 +571,7 @@
 					state.form.gender = data.gender;
 					state.form.userIdNum = data.idno;
 					state.form.userPosImgUrl = data.imageUrl;
-					state.form.address = data.address;
+					state.form.userAddress = data.address;
 				} else {
 					state.form.customerIdVld = data.enddate;
 					state.form.userNegImgUrl = data.imageUrl;
@@ -632,7 +633,7 @@
 			userName: state.form.userName,
 			gender: state.form.gender == '男' ? 'MALE' : 'FEMALE',
 			certifyChannel: "BAIDUOCR",
-			address: state.form.address,
+			address: state.form.userAddress,
 			agentIdNum: state.form.agentIdNum,
 			agentIdType: state.form.agentIdType,
 			agentName: state.form.agentName,

subpackage/orders/order-confirm-receipt.vue

@@ -25,9 +25,9 @@
 	import orderInfoItem from "./components/order-info-item";
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
-	import { request } from "@/utils/network/request.js";
+	import { request, requestNew } from "@/utils/network/request.js";
 	import { msg, confirm, getOrderStatusName } from "@/utils/utils";
-	import { orderDetail, receiveOrder } from "@/utils/network/api";
+	import { orderDetail, receiveOrder,orderReceiveGoods } from "@/utils/network/api";
 	import { getItem, StorageKeys } from "@/utils/storage";
 	import { stringToJson } from "@/utils/network/encryption";
 
@@ -64,14 +64,13 @@
 		const options = {
 			type: 2,
 			data: {
-				id: state.orderInfo.id,
-				source: "WECHAT",
-				opId: getItem(StorageKeys.OpenId)
+				opId: getItem(StorageKeys.OpenId),
+				orderId:state.orderInfo.orderId
 			},
 			method: "POST",
 			showLoading: true,
 		};
-		request(receiveOrder, options).then((res) => {
+		requestNew(orderReceiveGoods, options).then((res) => {
 			confirm(
 				"您已完成订单收货",
 				() => {

subpackage/orders/order_payment.vue

@@ -27,20 +27,18 @@
 	import { onLoad, onPageScroll } from "@dcloudio/uni-app";
 	import { reactive, ref } from "vue";
 	import {
-		PAYDETECTION,
+		// PAYDETECTION,
 		PAYMENTORDERAPPLY,
 		aliPayConfigIdTwo,
 		obtainUserId,
 		getOpenidApi,
-		etcVehiclePlateVer
+		etcVehiclePlateVer,payApply,payQuery
 	} from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
+	import { request,requestNew } from "@/utils/network/request.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { fileURL } from "@/datas/fileURL.js";
 	import navBgCar from "./components/nav-bg-car5";
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
-	import { getItem, StorageKeys, setItem } from "@/utils/storage.ts";
-	import { msg } from "@/utils/utils";
 	const imgURL = `${fileURL}image/`;
 	import { confirm } from "@/utils/utils";
 	let imageUrl = ""
@@ -150,7 +148,7 @@
 									method: "POST",
 									showLoading: true,
 								};
-								request(PAYMENTORDERAPPLY, options).then((res) => {
+								requestNew(payApply, options).then((res) => {
 									const data = stringToJson(res.bizContent);
 									console.log("data======111", data)
 									if (data) {
@@ -235,7 +233,7 @@
 			showLoading: true,
 		};
 		console.log("输出内容", options);
-		request(PAYDETECTION, options).then((res) => {
+		requestNew(payQuery, options).then((res) => {
 			const data = stringToJson(res.bizContent);
 			console.log(data);
 			if (data.paymentStatus == 'ALLSUCCESS') {
@@ -311,7 +309,7 @@
 			showLoading: true,
 		};
 		console.log("输出内容", options);
-		request(PAYDETECTION, options).then((res) => {
+		requestNew(payQuery, options).then((res) => {
 			const data = stringToJson(res.bizContent);
 			console.log(data);
 			if (data.paymentStatus == 'ALLSUCCESS') {

subpackage/orders/product-detail.vue

@@ -50,10 +50,10 @@
 		getAgreementApi,
 		PAYDETECTION,
 		envs,
-		agreementConfirmApi
+		agreementConfirmApi,payQuery
 	} from "@/utils/network/api.js";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -276,7 +276,7 @@ console.log("fileType",fileType)
 			showLoading: true,
 		};
 		console.log("输出内容", options);
-		request(PAYDETECTION, options).then((res) => {
+		requestNew(payQuery, options).then((res) => {
 			// console.log(res.bizContent);
 			const data = stringToJson(res.bizContent);
 			console.log(data);

subpackage/orders/sign-up.vue

@@ -34,7 +34,7 @@
 <script setup lang="ts">
 	import { onLoad, onShow } from "@dcloudio/uni-app";
 	import { reactive } from "vue";
-	import { request } from "@/utils/network/request.js";
+	import { request,requestNew } from "@/utils/network/request.js";
 
 	import { stringToJson } from "@/utils/network/encryption";
 	import { fileURL } from "@/datas/fileURL.js";
@@ -43,7 +43,7 @@
 	import {
 		getOpenidApi,
 		infoQuery,
-		envs, etcQYAction, channelSingQueryApi
+		envs, etcQYAction, channelSingQueryApi,userSign
 	} from "@/utils/network/api";
 	const imgURL = `${fileURL}image/`;
 
@@ -172,7 +172,7 @@
 				method: "POST",
 				showLoading: true,
 			};
-			request(etcQYAction, options).then((res) => {
+			requestNew(userSign, options).then((res) => {
 				const data = stringToJson(res.bizContent);
 				console.log("data", data)
 				if (data.userState === "UNAUTHORIZED") {

utils/network/api.js

@@ -316,4 +316,11 @@ export const signTest = "880ae48d40704572bac521b2fa11e93e"  //异地支付宝签
 export const pageQuery = "/iaw/issue/product/pageQuery"  //产品分页查询
 export const orderAdd = "/iaw/issue/order/add"  //创建订单
 export const userUpload = "/iaw/issue/user/userUpload"  //用户信息上传
-export const vehicleUpload= "/iaw/issue/vehicle/vehicleUpload"  //车辆信息上传
+export const vehicleUpload= "/iaw/issue/vehicle/vehicleUpload"  //车辆信息上传
+export const plateCheck= "/iaw/app/issue/plateCheck/check"  //车牌校验
+export const payApply= "/iaw/issue/order/payApply"  //支付申请
+export const payQuery= "/iaw/issue/order/payQuery"  //支付查询
+export const userSign= "/iaw/app/issue/userSign/query"  //签约检测
+export const orderCancel= "/iaw/issue/order/orderCancel"  //订单取消
+export const queryPage= "/iaw/issue/order/queryPage"  //订单分页查询
+export const orderReceiveGoods= "/iaw/issue/order/orderReceiveGoods"  //订单收货