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

composables/order/useOrderSkip.ts

@@ -1,95 +1,95 @@
 // 订单跳转统一工具类
-import {msg, navTo} from "@/utils/utils";
+import { msg, navTo } from "@/utils/utils";
 import { OrderStatus } from "@/datas/enum";
-import {OrderTypes} from "@/datas/enum";
+import { OrderTypes } from "@/datas/enum";
+
+export default function useOrderSkip() {
 
-export default function useOrderSkip(){
-	
 	//根据订单类型 跳转到不同的订单详情页面
-	const gotoOrderDetails = (orderInfo) =>{
-		if(orderInfo.orderType === 'ISSUE'){
+	const gotoOrderDetails = (orderInfo) => {
+		if (orderInfo.orderType === 'ISSUE') {
 			navTo(`/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
-	
-		}else if(orderInfo.orderType == OrderTypes.同时换卡换签 || orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE'){
+
+		} else if (orderInfo.orderType == OrderTypes.同时换卡换签 || orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
 			navTo(`/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);
-		
-		}else if(orderInfo.orderType === 'SUPPLEMENT_OBU'){
+
+		} else if (orderInfo.orderType === 'SUPPLEMENT_OBU') {
+			navTo(`/orders/order-details-obu?id=${orderInfo.id}`);
+
+		} else if (orderInfo.orderType === 'OFFICAL_SUPPLEMENT_OBU') {
 			navTo(`/orders/order-details-obu?id=${orderInfo.id}`);
-		
-		}else if(orderInfo.orderType === 'OFFICAL_SUPPLEMENT_OBU'){
-			navTo(`/orders/order-details-obu?id=${orderInfo.id}`);		
 		}
-		 else if(orderInfo.orderType === OrderTypes.ETC注销){
+		else if (orderInfo.orderType === OrderTypes.ETC注销) {
 			navTo(`/orders/order-details-logoff-etc?id=${orderInfo.id}`);
-		
-		}else if(orderInfo.orderType === OrderTypes.车辆信息变更){
+
+		} else if (orderInfo.orderType === OrderTypes.车辆信息变更) {
 			navTo(`/orders/order-details-edit-car?id=${orderInfo.id}`);
-		
-		}else if(orderInfo.orderType === OrderTypes.解除车牌占用){
-			navTo(`/orders/order-details-cancel-numberplate?id=${orderInfo.id}`);	
-		
-		}else if(orderInfo.orderType === 'EXCHANGE_CARD_TYPE'){
+
+		} else if (orderInfo.orderType === OrderTypes.解除车牌占用) {
+			navTo(`/orders/order-details-cancel-numberplate?id=${orderInfo.id}`);
+
+		} else if (orderInfo.orderType === 'EXCHANGE_CARD_TYPE') {
 			navTo(`/orders/order-details-recharge?id=${orderInfo.id}`);
 		}
 	}
-	
+
 	//跳转到修改地址页面
-	const gotoEditAddress = (orderInfo:any) => {
+	const gotoEditAddress = (orderInfo: any) => {
 		const item = {
-			id:orderInfo.orderInfoExt.id ?? '',
-			consignee:orderInfo.orderInfoExt.consignee ?? '',
-			consigneeTel:orderInfo.orderInfoExt.consigneeTel ?? '',
-			region:orderInfo.orderInfoExt.region ?? '',
-			address:orderInfo.orderInfoExt.address ?? '',
-			postalCode:orderInfo.orderInfoExt.postalCode ?? '',
-			fromOrder:true, //是否来自订单
+			id: orderInfo.orderInfoExt.id ?? '',
+			consignee: orderInfo.orderInfoExt.consignee ?? '',
+			consigneeTel: orderInfo.orderInfoExt.consigneeTel ?? '',
+			region: orderInfo.orderInfoExt.region ?? '',
+			address: orderInfo.orderInfoExt.address ?? '',
+			postalCode: orderInfo.orderInfoExt.postalCode ?? '',
+			fromOrder: true, //是否来自订单
 		}
 		navTo(`/personal-center/setting/addressManager?fromOrder=true`);
 	}
-	
+
 	//取消订单
-	const gotoCancelOrder = (orderInfo:any) =>{
+	const gotoCancelOrder = (orderInfo: any) => {
 		const item = {
-			id:orderInfo.id,
-			orderId:orderInfo.orderId,
-			vehiclePlate:orderInfo.vehiclePlate,
-			orderStep:orderInfo.orderStep
+			id: orderInfo.id,
+			orderId: orderInfo.orderId,
+			vehiclePlate: orderInfo.vehiclePlate,
+			orderStep: orderInfo.orderStep
 		}
 		navTo(`/orders/cancel-order?data=${JSON.stringify(item)}`);
 	}
-	
+
 	//继续申请、修改资料
-	const gotoEditUserOrUnitInfo = (orderInfo:any) =>{
-		console.log("******************",orderInfo.orderStep);
-		console.log("********555555555555**********",orderInfo);
+	const gotoEditUserOrUnitInfo = (orderInfo: any) => {
+		console.log("******************", orderInfo.orderStep);
+		console.log("********555555555555**********", orderInfo);
 		let url = '';
-		if(orderInfo.orderStep == OrderStatus.完成填写基本信息){
+		if (orderInfo.orderStep == OrderStatus.完成填写基本信息) {
 			url = orderInfo.userType === 'PERSONAL_USER' ? '/applyCard/opening-account-people' : '/applyCard/opening-account-unit';
-		}else if(orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]){
+		} else if (orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]) {
 			url = '/applyCard/car-release';
-		}else if(orderInfo.orderStep === OrderStatus.完成车辆信息上传){
+		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传) {
 			url = `/applyCard/release-products`;
-		}else{
+		} else {
 			url = `/applyCard/essential-information`;
 		}
 		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
 	}
-	
+
 	//确认收货
-	const gotoConfirmReceipt = (orderInfo:any) =>{
+	const gotoConfirmReceipt = (orderInfo: any) => {
 		const item = {
-			id:orderInfo.id,
-			orderId:orderInfo.orderId,
-			vehiclePlate:orderInfo.vehiclePlate,
-			orderStep:orderInfo.orderStep,
-			cardId:orderInfo.cardId,
-			obuId:orderInfo.obuId,
+			id: orderInfo.id,
+			orderId: orderInfo.orderId,
+			vehiclePlate: orderInfo.vehiclePlate,
+			orderStep: orderInfo.orderStep,
+			cardId: orderInfo.cardId,
+			obuId: orderInfo.obuId,
 		}
 		navTo(`/orders/order-confirm-receipt?id=${orderInfo.id}`)
 	}
-	
+
 	//去支付-选择产品
-	const gotoPay = (orderInfo:any) => {
+	const gotoPay = (orderInfo: any) => {
 		const data = {
 			orderId: orderInfo.orderId,
 			amount: orderInfo.amount,
@@ -99,66 +99,66 @@ export default function useOrderSkip(){
 		//navTo(`/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`)
 		// navTo(`/applyCard/choice-product?orderId=${orderInfo.orderId}`);
 	}
-	
+
 	//申请退货
-	const gotoReturnOrder = (orderInfo:any) =>{
+	const gotoReturnOrder = (orderInfo: any) => {
 		const data = {
-			id:orderInfo.id,
-			orderId:orderInfo.orderId,
-			vehiclePlate:orderInfo.vehiclePlate,
-			orderStep:orderInfo.orderStep,
+			id: orderInfo.id,
+			orderId: orderInfo.orderId,
+			vehiclePlate: orderInfo.vehiclePlate,
+			orderStep: orderInfo.orderStep,
 		}
 		navTo(`/orders/apply-return-goods?data=${JSON.stringify(data)}`);
 	}
-	
+
 	//去换货
-	const gotoExchangeOrder = (orderInfo:any) =>{
+	const gotoExchangeOrder = (orderInfo: any) => {
 		navTo(`/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
 	}
-	
+
 	//去激活订单
-	const gotoActiveOrder = (orderInfo:any) =>{
+	const gotoActiveOrder = (orderInfo: any) => {
 		navTo(`/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}`);
 	}
-	
+
 	//新办订单-去评价
-	const gotoEvaluateOrder = (orderInfo:any) =>{
+	const gotoEvaluateOrder = (orderInfo: any) => {
 		navTo(`/orders/order-evaluate?id=${orderInfo.id}`);
 	}
-	
+
 	//查看物流
-	const gotoCheckLogistics = (orderInfo:any) =>{
+	const gotoCheckLogistics = (orderInfo: any) => {
 		navTo(`/orders/order-detail-logistics?id=${orderInfo.id}`);
 	}
-	
-	
+
+
 	//换卡、换签、同时换卡换签订单支付确认页面
-	const gotoCardSignPay = (orderInfo:any) =>{
+	const gotoCardSignPay = (orderInfo: any) => {
 		navTo(`/orders/order-card-sign-payment?id=${orderInfo.id}`);
 	}
-	
+
 	//重新申请ETC注销
-	const gotoLogoffETC = (orderInfo:any) =>{
+	const gotoLogoffETC = (orderInfo: any) => {
 		navTo(`/after-sale/ETC-log-off/log-off-confirm?orderId=${orderInfo.orderId}`);
 	}
-	
+
 	//车辆信息变更-信息重写
-	const gotoEditCarWriteInfo = (orderInfo:any) =>{
+	const gotoEditCarWriteInfo = (orderInfo: any) => {
 		// navTo(`/pages/bluetooth/bluetooth?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 		navTo(`/pages/bluetooth/bluetooth?routeType=3`);
 	}
-	
+
 	//车辆信息变更-重新申请
-	const gotoEditCarApplyAgain = (orderInfo:any) =>{
+	const gotoEditCarApplyAgain = (orderInfo: any) => {
 		//跳转到车辆信息变更界面
 		navTo(`/person-al-center/setting/car-information/car-change`);
 	}
-	
-	return{
-		gotoEditAddress,gotoCancelOrder,gotoEditUserOrUnitInfo,
-		gotoConfirmReceipt,gotoCheckLogistics,gotoEvaluateOrder,
-		gotoActiveOrder,gotoReturnOrder,gotoExchangeOrder,gotoPay,
-		gotoOrderDetails,gotoLogoffETC,gotoEditCarWriteInfo,
-		gotoEditCarApplyAgain,gotoCardSignPay
+
+	return {
+		gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
+		gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateOrder,
+		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay,
+		gotoOrderDetails, gotoLogoffETC, gotoEditCarWriteInfo,
+		gotoEditCarApplyAgain, gotoCardSignPay
 	}
 }

pages/order/order.vue

@@ -1,35 +1,39 @@
 <!-- 订单列表2 -->
 <template>
-	<empty-view  v-if="!data.login" mode="permission" content="请先登录再查看订单" btnTxt="立即登录" @btnClick="$util.navTo('/login/login')"></empty-view>
-	
+	<empty-view v-if="!data.login" mode="permission" content="请先登录再查看订单" btnTxt="立即登录"
+		@btnClick="$util.navTo('/login/login')">
+	</empty-view>
+
 	<view class="list-wrapper" v-else>
 		<order-tabbar ref="tabbarRef" :tabs="data.tabsList" v-model:curIndex="data.tabIndex"
 			v-if="data.tabsList.length > 0"></order-tabbar>
-			
-		<order-list-item ref="mescrollItem"  :index="data.tabIndex" :refresh="data.refresh">
+
+		<order-list-item ref="mescrollItem" :index="data.tabIndex" :refresh="data.refresh">
 		</order-list-item>
 	</view>
-	
-</template> 
+
+</template>
 
 <script setup lang="ts">
 	import orderTabbar from "./components/order-tabbar.vue";
 	import orderListItem from "./components/order-list-item";
 	import useOrderList from "@/composables/order/useOrderList";
-	
-	const { data,tabbarRef } = useOrderList();
+
+	const {
+		data,
+		tabbarRef
+	} = useOrderList();
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 	page {
 		background: #eef7f7;
 	}
-	:deep(.u-mode-center-box){
+
+	:deep(.u-mode-center-box) {
 		border-radius: 20rpx;
 	}
 </style>
 <style lang="scss" scoped>
-	.list-wrapper{
-		
-	}
-</style>
+	.list-wrapper {}
+</style>

pages/recharge/result.vue

@@ -10,7 +10,6 @@
 <script lang="ts" setup>
 	const view = () => {
 		uni.navigateBack()
-
 	}
 </script>