2023年7月6日18:20:20

composables/order/useOrderSkip.ts

@@ -8,6 +8,7 @@ export default function useOrderSkip() {
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo) => {
 		console.log('输出内容=====',orderInfo.orderType)
+		//已完成
 		if (orderInfo.orderType === 'ISSUE') {
 			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
 

pages/index/index.vue

@@ -333,11 +333,11 @@
 	onLoad(() => {
 
 		wx.login({
-			success: function(res){
-				console.log('输出内容========',res)
+			success: function (res) {
+				console.log('输出内容========', res)
 			}
 		})
-		
+
 		// //调用方式
 		// request('eeb51c66bcda48dc9dbb5997323a11ed', {}).then((res) => {
 		// 		console.log("====", stringToJson(res.bizContent));
@@ -352,10 +352,10 @@
 		// 		})
 		// 	})
 		// 	.catch((err) => {});
-			
-		
+
+
 		getInfo()
-		quanKeyAction().then((val: any) => {
+		quanKeyAction().then((val : any) => {
 			setItem('key', val.dictTypeAndItem)
 		})
 		highMsg(); //高速快讯
@@ -363,7 +363,7 @@
 
 	onMounted(() => {
 		uni.getSystemInfo({
-			success: (e: any) => {
+			success: (e : any) => {
 				// console.log(e.statusBarHeight);
 				statusBarHeight.value = e.statusBarHeight;
 			}
@@ -423,7 +423,7 @@
 	};
 
 	//轮播跳转
-	const gotoLink = (item: any) => {
+	const gotoLink = (item : any) => {
 		console.log("555555555555555555", item);
 	};
 
@@ -448,7 +448,7 @@
 	};
 
 	//全量枚举值查询
-	const quanKeyAction = (val: any) => {
+	const quanKeyAction = (val : any) => {
 		var data = {
 
 		};
@@ -472,8 +472,8 @@
 	}
 
 
-	const toCreatOrder = (val: number) => {
-		console.log(typeof(val));
+	const toCreatOrder = (val : number) => {
+		console.log(typeof (val));
 		state.userType = val;
 		// if (val === 1) {
 		// 	// navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`)
@@ -490,7 +490,7 @@
 		closeMask();
 	};
 
-	const showMask = (val: any) => {
+	const showMask = (val : any) => {
 		state.type = val; //1 客车 2货车
 		isShowMask.value = true;
 	};
@@ -526,7 +526,7 @@
 	}
 
 	//替换图片地址
-	const strReplace = (str: string) => {
+	const strReplace = (str : string) => {
 		return str.replace('192.168.100.63:8087', envs[process.env.NODE_ENV].baseUrl)
 	}
 	// 高速快讯查询接口
@@ -543,10 +543,10 @@
 
 		//调用方式
 		request(queryHighMsg, options).then((res) => {
-				console.log("高速快讯查询接口", stringToJson(res.bizContent));
-				state.highMsgData = stringToJson(res.bizContent).data
-			})
-			.catch((err) => {});
+			console.log("高速快讯查询接口", stringToJson(res.bizContent));
+			state.highMsgData = stringToJson(res.bizContent).data
+		})
+			.catch((err) => { });
 	}
 	const link = (item) => {
 		console.log("item", item)
@@ -983,4 +983,4 @@
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
 	}
-</style>
+</style>

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

@@ -9,14 +9,18 @@
 		<view class="search-btn" @click="doSearch">搜索</view>
 	</view> 	
 
+	<!-- 数据为空 -->
 	<empty-view  :mode="config.emptyHint.mode"  :content="config.emptyHint.hint" v-if="ordersList.length === 0" />
+	
 	<template v-else>
 		<!-- 列表 -->
 		<block v-for="(item,index) in ordersList" :key="index">
 			<!-- 新办订单 -->
 			<order-list-item-new :item="item" v-if="item.orderType == 'ISSUE'" />
 			<!-- 卡签同时更换/更换卡/更换签订单 -->
-			<order-list-item-card-sign :item="item" v-else-if="item.orderType == OrderTypes.同时换卡换签 || item.orderType == 'REPLACEMENT_CARD' || item.orderType == 'REPLACEMENT_SIGNATURE'" />
+			<order-list-item-card-sign :item="item" 
+			v-else-if="item.orderType == OrderTypes.同时换卡换签 || item.orderType == 'REPLACEMENT_CARD' 
+			|| item.orderType == 'REPLACEMENT_SIGNATURE'" />
 			<!-- 增补OBU订单 -->
 			<order-list-item-obu :item="item" v-else-if="item.orderType == 'SUPPLEMENT_OBU'" />
 			<!-- 公务车增补OBU订单 -->

subpackage/orders/order-details-new.vue

@@ -218,7 +218,7 @@
 						|| state.orderInfo.orderStep == OrderStatus['已申请-退货'] || isHaveAfterSaleInfo()" >
 						
 						<!-- 售后退货-->
-						<view v-if="state.orderInfo.orderStep == OrderStatus['已申请-退货'] || !isBlank(state.orderInfo.orderInfoExt.returnMode)">
+						<view v-if="state.orderInfo.orderStep == OrderStatus['已申请-退货'] || !isBlank(state.orderInfo.orderInfoExt && state.orderInfo.orderInfoExt.returnMode)">
 							<view class="d-row" v-if="state.orderInfo.XXX">
 								<text class="d-label">售后单号：</text>
 								<text class="d-value">{{state.orderInfo.XXX ?? ''}}</text>
@@ -416,7 +416,9 @@
 	import {OrderStatus} from "@/datas/enum";
 
 	const state = reactive({
-		orderInfo: {} as any, //订单信息
+		orderInfo: {
+			orderInfoExt: {}
+		} as any, //订单信息
 		showActiveOrder: false, //激活弹窗
 	});
 	
@@ -476,7 +478,7 @@
 	
 	//是否有售后信息
 	const isHaveAfterSaleInfo = () =>{
-		if(isBlank(state.orderInfo.orderInfoExt.returnMode ?? null) && isBlank(state.orderInfo.orderInfoExt.exchangeMode ?? null)){
+		if(state.orderInfo.orderInfoExt && isBlank(state.orderInfo.orderInfoExt.returnMode ?? null) && isBlank(state.orderInfo.orderInfoExt.exchangeMode ?? null)){
 			return false;
 		}
 		return true;

subpackage/service/process/process.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="wrapper">
 		<view class="flow-path">
-		
-			<view >
+			<view>
 				<view class="flow-list">
 					<flow-path-list :options="state.flowList"></flow-path-list>
 				</view>
@@ -12,12 +11,11 @@
 </template>
 
 <script setup lang="ts">
-	import {reactive} from "vue";
+	import { reactive } from "vue";
 	import flowPathList from "./components/flow-path-list.vue";
 	const state = reactive({
 		flowPathTabList: ["办理流程", "办理条件", "常见问题"],
-		flowList: [
-			//办理流程数据
+		flowList: [  //办理流程数据
 			{
 				title: "第一步：信息校验：",
 				desc: "提交车牌号、车牌颜色、收货地址相关信息",
@@ -37,71 +35,68 @@
 			{
 				title: "第五步：订单完成：",
 				desc: "支付完成订单",
-			},
-		],
+			}
+		]
 	});
-	
-
-	
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background: #eef7f7;
 	}
+
 	.flow-path {
-			padding: 20rpx 0rpx 20rpx;
-	
-			.scroll-view {
-				white-space: nowrap;
-				// position: sticky;
-				top: 0;
-			}
-	
-			.top-menu {
-				display: flex;
-			}
-	
-			.top-menu .tab {
-				font-size: 28rpx;
-				padding: 38rpx 30rpx;
-				color: #666666;
-				position: relative;
-			}
-	
-			.top-menu .active .border {
-				position: absolute;
-				width: 70%;
-				height: 16rpx;
-				background: #00b38b;
-				opacity: 0.3;
-				bottom: 40rpx;
-				z-index: -99;
-				left: 15%;
-				border-radius: 6rpx;
-			}
-	
-			.top-menu .active {
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #0d0f26;
-			}
-	
-			.top-menu .active::before {
-				width: 100%;
-				height: 16rpx;
-				background: #00b38b;
-				opacity: 0.3;
-			}
-	
-			.flow-list {
-				margin: 0rpx 30rpx;
-				min-height: 700rpx;
-				background: #ffffff;
-				box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
-				border-radius: 20rpx;
-				padding: 55rpx 30rpx 30rpx;
-			}
+		padding: 20rpx 0rpx 20rpx;
+
+		.scroll-view {
+			white-space: nowrap;
+			// position: sticky;
+			top: 0;
 		}
-	
+
+		.top-menu {
+			display: flex;
+		}
+
+		.top-menu .tab {
+			font-size: 28rpx;
+			padding: 38rpx 30rpx;
+			color: #666666;
+			position: relative;
+		}
+
+		.top-menu .active .border {
+			position: absolute;
+			width: 70%;
+			height: 16rpx;
+			background: #00b38b;
+			opacity: 0.3;
+			bottom: 40rpx;
+			z-index: -99;
+			left: 15%;
+			border-radius: 6rpx;
+		}
+
+		.top-menu .active {
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #0d0f26;
+		}
+
+		.top-menu .active::before {
+			width: 100%;
+			height: 16rpx;
+			background: #00b38b;
+			opacity: 0.3;
+		}
+
+		.flow-list {
+			margin: 0rpx 30rpx;
+			min-height: 700rpx;
+			background: #ffffff;
+			box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
+			border-radius: 20rpx;
+			padding: 55rpx 30rpx 30rpx;
+		}
+	}
 </style>