修改bug

composables/order/useOrderListItem.ts

@@ -181,10 +181,10 @@ export default function useOrderListItem(props) {
 
 	}
 
-	// watch(() => props.index, () => {
-	// 	console.log("watch1111")
-	// 	refreshList(true);
-	// });
+	watch(() => props.index, () => {
+		console.log("watch1111")
+		refreshList(true);
+	});
 	// onMounted(() => {
 	// 	if (props.refresh) {
 	// 		refreshList(false);

pages/bluetooth/bluetooth.vue

@@ -18,6 +18,7 @@
 			<view class="grey-txt">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				指令执行过程中，请勿关闭蓝牙，勿将手机远离电子标签，以免导致写卡、写签失败。</view>
 		</view>
+
 		<view class="btn">
 			<submit-button title="点击重新搜索蓝牙" @submit="load"></submit-button>
 		</view>
@@ -81,7 +82,7 @@
 		orderNum: 0,//消费明细 传orderNum说明去支付
 		payMoney: 0,//0 修复  1 支付
 		accountId: "",//对公账户名称
-		difference: "",  //routeType==5的区分 1重新激活 
+		difference: "",//区分routeType5  1二次激活
 	});
 	const deviceList = ref([]);
 	const connectPrefixName = ref(null);
@@ -129,9 +130,8 @@
 			state.accountId = option.accountId
 		}
 		if (option.difference) {
-			state.difference = option.difference
+			state.difference = option.difference;
 		}
-
 		console.log("传过来的参数", option)
 	});
 
@@ -388,7 +388,7 @@
 				connectPrefixName.value = item.prefixName;
 				console.log(item);
 				// datas.setData("connectPrefixName", connectPrefixName.value);
-				//断开蓝牙
+				// //断开蓝牙
 				// bluetoothUtil.disconnectDevice();
 				tools.showLoadingAlert("蓝牙连接中");
 				console.info("连接的是" + prefixName, device);
@@ -488,15 +488,12 @@
 						break;
 
 					case "TD":
-						console.info("连接的是=====456" + prefixName, device);
 						tdApi.connectDevice(
 							device,
 							function (res) {
 								connectSuccess(res)
-								console.info("连接的是=====456", res);
 							}, function (res) {
 								listenStatus(res);
-								console.info("连接的是=====456789", res);
 							}
 						);
 						break;
@@ -541,7 +538,7 @@
 	 * 连接成功
 	 */
 	const connectSuccess = (res) => {
-		console.log("连接回调函数func1===", routeType.value);
+		console.log("连接回调函数func1");
 		console.log(res);
 		if (res.code == 0) {
 			console.log("连接成功");
@@ -578,7 +575,6 @@
 				url: "/subpackage/after-sale/activation-once-again/activation-once-again-ali?state=true&id=" + state.id,
 			});
 			// #endif
-
 			// #ifdef MP-WEIXIN
 			if (state.difference == "1") {
 				uni.navigateTo({
@@ -590,11 +586,7 @@
 					delta: 1
 				})
 			}
-
 			// #endif
-
-
-
 		} else if (routeType.value == "6") {
 			uni.navigateTo({
 				url: "/subpackage/after-sale/activation-once-again/activation-once-again?state=true&id=" + state.id
@@ -759,4 +751,14 @@
 			margin: 70rpx 40rpx;
 		}
 	}
+
+
+	.red {
+		display: inline-block;
+		color: red;
+		background-color: red;
+		width: 26rpx;
+		height: 26rpx;
+		border-radius: 100%;
+	}
 </style>

pages/index/index.vue

@@ -551,7 +551,7 @@
 		} else if (val == 2) {
 			navTo('/subpackage/after-sale/rescind-carId/rescind-carId-select', true)
 		} else if (val == 3) {
-			navTo('/subpackage/after-sale/card-loss-reporting/select-car', true)
+			navTo('/subpackage/after-sale/ETC-log-off/select-car', true)
 		}
 		// #endif
 	}

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

@@ -1,141 +0,0 @@
-<!-- 订单列表 -->
-<template>
-	<!-- 搜索框 -->
-	<view class="as-layout-horizontal as-gravity-center-start search-layout">
-		<view class="search-box">
-			<image :src="`${$imgUrl}service/icon-search.png`" class="icon" mode="aspectFill"></image>
-			<input class="search" placeholder="请输入车牌号" @input="onKeyInput" />
-		</view>
-		<view class="search-btn" @click="doSearch">搜索</view>
-	</view>
-</template> -->
-</template>
-
-<script setup lang="ts">
-	import orderListItemNew from "./order-list-item-new.vue";
-	import orderListItemCardSign from "./order-list-item-card-sign.vue";
-	import orderListItemObu from "./order-list-item-obu.vue";
-	import orderListItemLogoffEtc from "./order-list-item-logoff-etc.vue";
-	import orderListItemEditCar from "./order-list-item-edit-car.vue";
-	import orderListItemCancelNumberplate from './order-list-item-cancel-numberplate.vue';
-	import orderListItemRecharge from "./order-list-item-cancel-recharge.vue";
-	import { OrderTypes } from "@/datas/enum";
-	import useOrderListItem from "@/composables/order/useOrderListItem";
-	import { reactive, watch } from "vue";
-	import { onLoad } from "@dcloudio/uni-app";
-	import { getItem, StorageKeys, setItem } from "@/utils/storage";
-	import { hasLogin, msg, timesDiff } from "@/utils/utils";
-	import { request } from "@/utils/network/request.js";
-	import { orderList, appPage } from "@/utils/network/api";
-	const tools = require("../../static/etcUtil/tools.js");
-	import { stringToJson } from "@/utils/network/encryption";
-	const state = reactive({
-		triggered: false, //设置当前下拉刷新的状态
-		freshing: true,
-		_freshing: false,
-		ordersList: []
-	})
-	const searchKeyWords = ref('');
-	const props = defineProps({
-		index: {
-			type: Number,
-			default() {
-				return 0
-			}
-		},
-		refresh: { //是否刷新列表
-			type: Boolean,
-			default: true
-		}
-	})
-
-	const { config, params, onKeyInput, refreshList } = useOrderListItem(props);
-	//自定义下拉刷新被触发
-	const onRefresh = () => {
-		console.log("22222")
-		refreshList(true)
-		if (state._freshing) return;
-		state._freshing = true;
-		setTimeout(() => {
-			state.triggered = false;
-			state._freshing = false;
-		}, 1000)
-	}
-	const onPulling = (e) => {
-		console.log("11111")
-		if (e.detail.deltaY < 0) {
-			return
-		}
-		state.triggered = true
-	}
-	onLoad(() => {
-		getList()
-	})
-	//搜索
-	const doSearch = () => {
-		// #ifdef MP-WEIXIN
-		if (!searchKeyWords.value) {
-			msg('请输入需要搜索的车牌号！');
-			return;
-		}
-		refreshList(true);
-		// #endif
-		// #ifdef MP-ALIPAY
-		tools.showLoadingAlert("加载中");
-		refreshList(true);
-		tools.hideLoadingAlert();
-		// #endif
-
-	}
-</script>
-
-<style lang="scss" scoped>
-	.setHight {
-		min-height: calc(100vh - 200rpx);
-	}
-
-	.search-layout {
-		padding-top: 180rpx;
-
-		.search-box {
-			margin: 30rpx 30rpx 0rpx 30rpx;
-			height: 80rpx;
-			background: #FFFFFF;
-			border: 1px solid #DCDCDC;
-			border-radius: 40rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			box-sizing: border-box;
-			flex: 1;
-		}
-
-		.search-box .icon {
-			width: 48rpx;
-			height: 48rpx;
-			margin: 0 20rpx;
-		}
-
-		.search-box .search {
-			flex: 1;
-			margin-right: 20rpx;
-			height: 100%;
-			padding: 0 10rpx;
-			font-size: 28rpx;
-			color: #00b38b;
-		}
-
-		.search-btn {
-			color: white;
-			background-color: #00B38B;
-			width: 140rpx;
-			height: 75rpx;
-			line-height: 75rpx;
-			font-size: 32rpx;
-			border-radius: 40rpx;
-			text-align: center;
-			margin-right: 30rpx;
-			margin-top: 30rpx;
-		}
-	}
-</style>

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

@@ -35,6 +35,7 @@
 	import useOrderListItem from "@/composables/order/useOrderListItem";
 	import { reactive, watch } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
+
 	const state = reactive({
 		triggered: false, //设置当前下拉刷新的状态
 		freshing: true,
@@ -52,7 +53,7 @@
 			default: true
 		}
 	})
-
+	console.log("props.index", props)
 	const { config, params, ordersList, doSearch, onKeyInput, refreshList, searchKeyWords } = useOrderListItem(props);
 	//自定义下拉刷新被触发
 	const onRefresh = () => {

pages/order/order.vue

@@ -122,13 +122,19 @@
 		OrderStatus
 	} from "@/datas/enum";
 	import {
-		reactive, watch
+		reactive, watch, ref
 	} from "vue";
 	import { request } from "@/utils/network/request.js";
 	import { appPage } from "@/utils/network/api";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { log } from "console";
 	const tools = require("../../static/etcUtil/tools.js");
+	const state = reactive({
+		tabActive: "小程序",
+		flowPathTabList: ["小程序", "线下网点"],
+		appOrdersList: [],
+		index: 0
+	})
 	const {
 		data,
 		tabbarRef
@@ -147,17 +153,16 @@
 		status: 'more',
 		reload: false,
 	})
-	const state = reactive({
-		tabActive: "小程序",
-		flowPathTabList: ["小程序", "线下网点"],
-		appOrdersList: [],
-		index: 0
-	})
-
 	function test(index) {
-		console.log("test", index)
+		console.log("test", index, data.tabIndex)
 		state.index = index
-		getList();
+		if (state.tabActive == '小程序') {
+			changeTab(state.tabActive)
+		} else {
+			console.log("apppppppp",)
+			getList()
+		}
+
 	}
 
 	const props = defineProps({
@@ -227,7 +232,7 @@
 			type: 2,
 			data: {
 				"opId": getItem(StorageKeys.OpenId),
-				"vehiclePlate": "",
+				"vehiclePlate": searchKeyWords,
 				"tabIndex": state.index + '',
 				"pageNo": params.pageNum,
 				"pageSize": params.pageSize,

subpackage/after-sale/account-change/product-detail.vue

@@ -58,12 +58,6 @@
 			provider: "weixin",
 			success: function (e) {
 				getOpenid(e.code);
-				// uni.request({
-				//   url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
-				//   success: (res: any) => {
-				//     state.openid = res.data.openid;
-				//   },
-				// });
 			},
 		});
 	};
@@ -80,7 +74,6 @@
 		request(getOpenidApi, options).then((res) => {
 			const result = stringToJson(res.bizContent);
 			console.log("获取微信小程序openid", result);
-			// setItem("QYorder", result.data);
 			const openidData = stringToJson(result.data);
 			state.openid = openidData.openid
 		});

subpackage/after-sale/activation/operation-tips.vue

@@ -19,9 +19,19 @@
 				</view>
 			</view>
 		</view>
-		<view class="hint">
+		<!-- <view class="hint">
 			<image :src="`${$imgUrl}common/icon-hint.png`" class="icon"></image>
 			<view>激活时，确保OBU蓝牙和手机蓝牙处于打开状态。</view>
+		</view> -->
+		<view class="hint">
+			<view class="orange-txt ">
+				<text class="red"></text>
+				<view style="margin: 0 24rpx;">重要提示</view>
+				<text class="red"></text>
+			</view>
+			<view class="grey-txt">1.激活前必须将ETC设备安装到相应车辆上，确保安装车辆信息与激活后OBU内信息一致后才能正常使用。</view>
+			<view class="grey-txt">2.如因激活的ETC设备未安装到对应车辆上产生的异常扣费，我司不承担任何赔偿责任。</view>
+			<view class="grey-txt">3.激活时，需要录入您的车牌号和手机号并确保OBU蓝牙和手机蓝牙处于打开状态。</view>
 		</view>
 		<view class="btn">
 			<submit-button @submit="gotoNextStep" title="已知悉，下一步"></submit-button>
@@ -152,26 +162,51 @@
 		}
 
 		.hint {
-			display: flex;
-			flex-direction: row;
-			justify-content: center;
-			font-size: 26rpx;
-			color: #666666;
-			padding: 0px 30rpx;
-
-			.icon {
-				width: 36rpx;
-				height: 36rpx;
-				margin-right: 10rpx;
+			margin: 0rpx 30rpx 0px;
+
+			.orange-txt {
+				font-size: 30rpx;
+				color: #ff8000;
+				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-bottom: 50rpx;
+
+				image {
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 10rpx;
+				}
 			}
 
-			view {
-				width: calc(100% - 36rpx);
+			.grey-txt {
+				font-size: 26rpx;
+				color: #666666;
+				line-height: 40rpx;
+				margin-top: 16rpx;
 			}
 		}
 
 		.btn {
-			margin: 150rpx 40rpx 60px;
+			margin: 70rpx 40rpx;
 		}
 	}
+
+
+	.grey-txt {
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 40rpx;
+		margin-top: 16rpx;
+	}
+
+	.red {
+		display: inline-block;
+		color: red;
+		background-color: red;
+		width: 26rpx;
+		height: 26rpx;
+		border-radius: 100%;
+	}
 </style>

subpackage/after-sale/replace-equipment/product-detail.vue

@@ -58,12 +58,6 @@
 			provider: "weixin",
 			success: function (e) {
 				getOpenid(e.code)
-				// uni.request({
-				//   url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
-				//   success: (res: any) => {
-				//     state.openid = res.data.openid;
-				//   },
-				// });
 			},
 		});
 	};
@@ -81,7 +75,6 @@
 			const result = stringToJson(res.bizContent);
 			console.log("获取微信小程序openid", result);
 			const openidData = stringToJson(result.data);
-			// setItem("QYorder", result.data);
 			state.openid = openidData.openid
 		});
 		// #endif

subpackage/after-sale/to-bookkeeping-card/detail.vue

@@ -154,12 +154,6 @@
 			provider: "weixin",
 			success: function (e) {
 				getOpenid(e.code)
-				// uni.request({
-				//   url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
-				//   success: (res: any) => {
-				//     state.openid = res.data.openid;
-				//   },
-				// });
 			},
 		});
 	};
@@ -176,7 +170,6 @@
 		request(getOpenidApi, options).then((res) => {
 			const result = stringToJson(res.bizContent);
 			console.log("获取微信小程序openid", result);
-			// setItem("QYorder", result.data);
 			const openidData = stringToJson(result.data);
 			state.openid = openidData.openid
 		});

subpackage/orders/interestsList.vue

@@ -1,26 +1,6 @@
 <template>
 	<view class="content" style="padding: 20rpx;overflow: hidden;padding-bottom: 160rpx;">
-		<rich-text :nodes="richText">
-
-		</rich-text>
-
-		<!-- <view @click="addInterestsList(item)" class="ul-item" v-for="(item, index) in state.list" :key="index">
-			<image style="width: 100%; height: 170rpx; border-radius: 20rpx"
-				:src="`${$imgUrl}applyCard/product-bg.png`"></image>
-			<view class="item-value">
-				<image class="icon-tip"
-					:src="state.sysType === 'WECHAT'?`${$imgUrl}applyCard/wechat.png` : `${$imgUrl}applyCard/alibaba.png`">
-				</image>
-				<view class="content">
-					<view class="title">
-						{{ item.productName }}
-					</view>
-				</view>
-				<view class="money">
-					￥：{{ item.discountPrice * 0.01 }}
-				</view>
-			</view>
-		</view> -->
+		<rich-text :nodes="richText"></rich-text>
 	</view>
 	<view class="btn-wrap">
 		<button type="default" class="button" @click="addInterestsList()">
@@ -96,11 +76,9 @@
 		state.applyId = option.applyId;
 		state.orderId = option.orderId;
 		getInfo();
-		// getList();
 		getOpenID();
 	})
 	const addInterestsList = () => {
-		// state.totalAmount = Number(state.totalAmount) + Number(item.discountPrice)
 		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}`
@@ -128,29 +106,6 @@
 			richText.value = data.productIntro
 		})
 	}
-
-	const getList = () => {
-		const options = {
-			type: 2,
-			data: {
-				"promoteId": state.promoteId,
-			},
-			method: 'POST',
-			showLoading: true,
-		}
-		request(equityProductsApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
-			for (var i = 0; i < data.data.length; i++) {
-				data.data[i]['isShow'] = false;
-			}
-			state.list = data.data
-			console.log("222", data.data)
-		})
-	}
-	const change = (e) => {
-		console.log(e);
-	}
-
 	//获取微信小程序openid
 	const getOpenID = () => {
 		// #ifdef MP-WEIXIN
@@ -182,27 +137,6 @@
 		});
 		// #endif
 	}
-	const changeIsShow = (index) => {
-		console.log(index, state.list[index]['isShow'], !state.list[index]['isShow'])
-		state.list[index]['isShow'] = !state.list[index]['isShow']
-		console.log("state.list", state.list)
-	}
-	const getValue = (value) => {
-		if (state.choiceValue.length == 0) {
-			console.log("第一次")
-			state.choiceValue.push(value)
-			console.log("state.choiceValue", state.choiceValue)
-		} else {
-			var index = state.choiceValue.indexOf(value);
-			if (index > -1) {//大于0 代表存在，
-				state.choiceValue.splice(index, 1);//存在就删除
-			} else {
-				state.choiceValue.push(value)
-			}
-			console.log("state.choiceValue", state.choiceValue)
-		}
-
-	}
 </script>
 
 <style scoped lang="scss">

subpackage/personal-center/trapping-and-repairing/recharge-two.vue

@@ -724,7 +724,6 @@
 			const result = stringToJson(res.bizContent);
 			console.log("获取微信小程序openid", result);
 			const openidData = stringToJson(result.data);
-			// setItem("QYorder", result.data);
 			state.openid = openidData.openid
 			/*读卡*/
 			getCardId(1);