修改bug

pages.json

@@ -476,56 +476,56 @@
 				{
 					"path": "card-loss-reporting/select-car",
 					"style": {
-						"navigationBarTitleText": " 卡签挂失/解除挂失-选择车辆",
+						"navigationBarTitleText": "卡签挂失/解除挂失-选择车辆",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "card-loss-reporting/cardloss-confirm",
 					"style": {
-						"navigationBarTitleText": " 卡签挂失/解除挂失-确认",
+						"navigationBarTitleText": "卡签挂失/解除挂失-确认",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "card-loss-reporting/card-result",
 					"style": {
-						"navigationBarTitleText": " 卡签挂失/解除挂失-结果",
+						"navigationBarTitleText": "卡签挂失/解除挂失-结果",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "transfer-ownership/select-car-transfer",
 					"style": {
-						"navigationBarTitleText": " ETC过户-选择车辆",
+						"navigationBarTitleText": "ETC过户-选择车辆",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "transfer-ownership/card-result",
 					"style": {
-						"navigationBarTitleText": " ETC过户-结果",
+						"navigationBarTitleText": "ETC过户-结果",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "transfer-ownership/transfer-confirm",
 					"style": {
-						"navigationBarTitleText": " ETC过户-确认",
+						"navigationBarTitleText": "ETC过户-确认",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "transfer-ownership/transfer-verification",
 					"style": {
-						"navigationBarTitleText": " ETC过户-验证",
+						"navigationBarTitleText": "ETC过户-验证",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "card-supplement/reissueForm",
 					"style": {
-						"navigationBarTitleText": " 补办ETC卡-填写",
+						"navigationBarTitleText": "补办ETC卡-填写",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -686,7 +686,7 @@
 				{
 					"path": "additional-equipment/result",
 					"style": {
-						"navigationBarTitleText": "设备补增",
+						"navigationBarTitleText": "设备补增-结果",
 						"enablePullDownRefresh": false
 					}
 				},

pages/index/index.vue

@@ -18,7 +18,7 @@
 					<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 style="width: 100%;" scrollable single :text="state.notice" @click="tip()">
 					</uni-notice-bar>
 				</view>
 			</view>
@@ -48,7 +48,7 @@
 					<view class="item item-3">
 						<image :src="fileURL + '20230511/24e179d44e2d4e5687339bff_obucxjh.png'" mode="aspectFill" />
 					</view>
-					<view class="text">二次激活</view>
+					<view class="text">OBU重新激活</view>
 				</view>
 				<view class="item-box"
 					@click="$util.navTo('/subpackage/personal-center/install-activation-order',true)">
@@ -64,12 +64,12 @@
 					</view>
 					<view class="text">设备注销</view>
 				</view>
-				<view class="item-box" @click="cardRecharge(2)">
+				<!-- <view class="item-box" @click="cardRecharge(2)">
 					<view class="item item-6">
 						<image :src="fileURL + 'image/index/item-6.png'" mode="aspectFill" />
 					</view>
-					<view class="text">通行费补缴</view>
-				</view>
+					<view class="text">解除车牌占用</view>
+				</view> -->
 				<!-- <view class="item-box"
 					@click="$util.navTo(`/subpackage/personal-center/setting/personal-information/corrections`,true)">
 					<view class="item item-7">
@@ -91,11 +91,6 @@
 				</view>
 			</view>
 
-			<!-- 消息滚动显示 -->
-			<!-- 		<view v-if="false" class="backlog-notice">
-				<notice-bar :noticeList="state.noticeList" @noticeClick="goOrder(3)"></notice-bar>
-			</view> -->
-
 			<!--快速办理通道  -->
 			<view class="express-lane">
 				<view class="title">快速办理</view>
@@ -320,6 +315,10 @@
 	onReachBottom(() => {
 		highMsg(); //高速快讯
 	})
+	const tip = () => {
+		const params = encodeURIComponent(JSON.stringify("https://webzeus.hltgz.com/throughBilManager/index"))
+		tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
+	}
 	//获取轮播
 	const getSwiper = () => {
 
@@ -539,11 +538,6 @@
 			});
 
 	}
-	const goOrder = (index) => {
-		uni.reLaunch({
-			url: `../order/order?index=${index}`
-		})
-	}
 	const cardRecharge = (val) => {
 		// #ifdef MP-ALIPAY
 		if (val == 1 || val == 2 || val == 3) {

pages/recharge/recharge-weixin.vue

@@ -362,7 +362,6 @@
 				tools.hideLoadingAlert();
 			}
 		}
-		console.error("CMD_READBINARY指令长度不符" + res[2]);
 		tools.hideLoadingAlert();
 	}
 	function getCardIdReturn(res : any) {
@@ -736,7 +735,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/ETC-log-off/select-car.vue

@@ -58,10 +58,10 @@
 	const quanCheckActionTrue = () => {
 		let source = ""
 		// #ifdef MP-ALIPAY
-			source ="ALI"
+		source = "ALI"
 		// #endif
 		// #ifdef MP-WEIXIN
-			source ="WECHAT"
+		source = "WECHAT"
 		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
@@ -108,7 +108,6 @@
 	}
 
 	.selectCar-box {
-		// width: 100%;
 		height: 100%;
 		padding: 30rpx;
 
@@ -163,7 +162,5 @@
 			}
 
 		}
-
-
 	}
 </style>

subpackage/after-sale/ETC-log-off/upload-card.vue

@@ -260,7 +260,6 @@
 					reject("指令执行失败！");
 				}
 			}).catch((error) => {
-				console.log('指令执行失败', error)
 				reject(error);
 			});
 		});

subpackage/after-sale/add-equity/add-equity-details.vue

@@ -61,7 +61,7 @@
 			if (data.hasData) {
 				uni.showModal({
 					title: '提示',
-					content: '重复购买此产品',
+					content: '重复购买此权益',
 					success: function (res) {
 						if (res.confirm) {
 							console.log('用户点击确定');

subpackage/after-sale/add-equity/choice-order.vue

@@ -128,7 +128,7 @@
 			if (data.hasData) {
 				uni.showModal({
 					title: '提示',
-					content: '重复购买此产品',
+					content: '重复购买此权益',
 					success: function (res) {
 						if (res.confirm) {
 							console.log('用户点击确定');

subpackage/after-sale/additional-equipment/additional-equipment-confirm.vue

@@ -177,8 +177,6 @@
 </style>
 <style lang="scss" scoped>
 	.selectCar-box {
-		// width: 100%;
-		// height: 100%;
 		padding: 30rpx;
 
 		.title {

subpackage/after-sale/card-deactivation-activation/deactivation-activation-confirm.vue

@@ -196,7 +196,6 @@
 			let result = stringToJson(res.bizContent);
 			let cmdArray = result.command ? result.command.split(",") : [];
 			console.log(result);
-			// console.log(result.cosRecordId);			
 			if (cmdArray.length > 0) {
 				tools.showLoadingAlert("正在执行指令");
 				bluetoothUtil.transCmd(cmdArray, "10", function(res) {

subpackage/after-sale/card-loss-reporting/cardloss-confirm.vue

@@ -300,8 +300,6 @@
 </style>
 <style lang="scss" scoped>
 	.selectCar-box {
-		// width: 100%;
-		// height: 100%;
 		padding: 30rpx;
 
 		.title {

subpackage/after-sale/card-loss-reporting/select-car.vue

@@ -58,10 +58,10 @@
 	const quanCheckActionTrue = () => {
 		let source = ""
 		// #ifdef MP-ALIPAY
-			source ="ALI"
+		source = "ALI"
 		// #endif
 		// #ifdef MP-WEIXIN
-			source ="WECHAT"
+		source = "WECHAT"
 		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
@@ -108,7 +108,6 @@
 	}
 
 	.selectCar-box {
-		// width: 100%;
 		height: 100%;
 		padding: 30rpx;
 
@@ -161,9 +160,6 @@
 				background: #00B38B;
 				border-radius: 50%;
 			}
-
 		}
-
-
 	}
 </style>

subpackage/after-sale/month-statement/month-statement-query-list.vue

@@ -2,7 +2,6 @@
 	<view class="content">
 		<view class="top-content">
 			<view class="example-body">
-				<!-- <uni-datetime-picker v-model="state.range" type="daterange" /> -->
 				<text>请选择月份：</text>
 				<picker mode="date" @change="bindDateChange" fields="month">
 					<view class="uni-input">{{state.date}}</view>
@@ -17,7 +16,8 @@
 
 
 		<view class="uni-container" v-if="state.listData.length>0">
-			<view class="list-item" v-for="(item,index) in state.listData">
+			<view class="list-item" v-for="(item,index) in state.listData"
+				@click="query(item.handleDate,item.vehicleId)">
 				<view><text>姓名：</text><text>{{item.customerName}}</text></view>
 				<view><text>证件号码：</text><text>{{item.customerIdNum}}</text></view>
 				<view><text>通行次数：</text><text>{{item.num}}</text></view>
@@ -28,9 +28,6 @@
 			</view>
 			<view class="bottom-line" v-if="state.flags">我是有底线的~~~</view>
 		</view>
-		<!-- <view v-else class="uni-container" style="text-align: center;">
-			暂无数据
-		</view> -->
 
 	</view>
 
@@ -48,7 +45,7 @@
 	import { request } from "@/utils/network/request.js";
 	import { getItem, StorageKeys } from "@/utils/storage";
 	import { getVehiclePlateColor } from "@/datas/vehiclePlateColor";
-	import { msg } from "@/utils/utils";
+	import { msg, navTo } from "@/utils/utils";
 	const state = reactive({
 		startTime: Date.now(), //日期
 		listData: [],
@@ -64,7 +61,6 @@
 		console.log("option", option.vehicleId)
 		state.vehicleId = option.vehicleId;
 		state.vehicleNum = option.vehicleId.split('_')[0];
-		console.log("option.vehicleId.split('_')[1]", getVehiclePlateColor(option.vehicleId.split('_')[1]))
 		state.vehicleColor = getVehiclePlateColor(option.vehicleId.split('_')[1]);
 		getUserinfo()
 	})
@@ -109,6 +105,9 @@
 			console.log("业务完成日志", state.listData,)
 		});
 	}
+	const query = (handleDate, vehicleId) => {
+		navTo(`/subpackage/personal-center/search/select-card?vehicleId=${vehicleId}&&handleDate=${handleDate}`)
+	}
 </script>
 
 <style scoped>

subpackage/after-sale/pin-code-deblocking/select-car.vue

@@ -37,10 +37,10 @@
 	const quanCheckActionTrue = () => {
 		let source = ""
 		// #ifdef MP-ALIPAY
-			source ="ALI"
+		source = "ALI"
 		// #endif
 		// #ifdef MP-WEIXIN
-			source ="WECHAT"
+		source = "WECHAT"
 		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
@@ -66,17 +66,6 @@
 			reject(error);
 		});
 	};
-	const list = reactive([
-		{
-			name: "A12345",
-		},
-		{
-			name: "B12345",
-		},
-		{
-			name: "C12345",
-		},
-	]);
 	const flag = ref("0");
 
 	const choose = (i, item) => {

subpackage/after-sale/refund-order-balance/refund-order-balance.vue

@@ -228,7 +228,6 @@
 						checkQuanCengEvent(val);
 					});
 				} else {
-					console.error("CMD_READBINARY指令长度不符" + res[2]);
 					tools.hideLoadingAlert();
 				}
 			}

subpackage/after-sale/to-bookkeeping-card/choice-product-new.vue

@@ -37,29 +37,6 @@
 		</view>
 		<view class="bottomTip"> 到底啦！敬请期待其他产品！ </view>
 	</view>
-	<!-- <view class="content-value">
-		<view @click="savaHandle(item)" class="ul-item" v-for="(item, index) in state.dataArray" :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.promoteName }}
-					</view>
-					<view style="margin-top: 15rpx" class="tip">
-						{{ item['releaseProductStandards']['productStandards']['cardTypeArr'] }}
-					</view>
-				</view>
-				<view class="money">
-					￥：{{ item.fee * 0.01 }}
-				</view>
-			</view>
-		</view>
-		<view class="bottomTip"> 到底啦！敬请期待其他产品！ </view>
-	</view> -->
 </template>
 
 <script setup lang="ts">

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

@@ -172,8 +172,6 @@
 </style>
 <style lang="scss" scoped>
 	.selectCar-box {
-		// width: 100%;
-		// height: 100%;
 		padding: 30rpx;
 
 		.title {

subpackage/after-sale/transfer-ownership/select-car-transfer.vue

@@ -51,7 +51,6 @@
 
 	onLoad(() => {
 		quanCheckActionTrue().then((item : any) => {
-			console.log("过户", item)
 			let data = item.data
 			for (var k = 0; k < data.length; k++) {
 				if (data[k]['orderStatus'] != "99999") {

subpackage/after-sale/transfer-ownership/transfer-verification.vue

@@ -5,13 +5,6 @@
 				<u-form-item prop="cardState">
 					<view class="from_item">
 						<text><text style="color: red">*</text>是否保留卡签：</text>
-						<!-- <u-radio-group v-model="form.serviceTypeName">
-							<u-radio :customStyle="{ marginBottom: '8px' }" activeColor="#2CE242"
-								v-for="(item, index) in radiolist1" :key="index" :label="item.disabled"
-								:name="item.name">
-								{{ item.name }}
-							</u-radio>
-						</u-radio-group> -->
 						<radio-group @change="radioChange" class="radios">
 							<block v-for="(item, index) in radiolist1" :key="item.val">
 								<view class="radio-box">
@@ -23,25 +16,6 @@
 						</radio-group>
 					</view>
 				</u-form-item>
-
-				<!-- 	<u-form-item prop="phone">
-					<view class="from_item" style="background-color: #f7f7f7">
-						<text><text style="color: red"></text>手机号：</text>
-						<u-input v-model="form.mobile" :disabled="true" class="input" />
-					</view>
-				</u-form-item>
-				<u-form-item prop="code">
-					<view class="from_item">
-						<text><text style="color: red"></text>验证码：</text>
-						<u-input v-model="form.code" placeholder="请输入验证码" class="input" />
-						<view class="hint2">
-							<view class="green">{{ codeDuration === 0 ? "" : codeDuration }}</view>
-							<view class="grey" @click="getCode">{{
-						    codeDuration === 0 ? "发送验证码" : "秒后可重发"
-						  }}</view>
-						</view>
-					</view>
-				</u-form-item> -->
 			</view>
 		</u-form>
 		<button class="submit" @click="toPage()">下一步</button>
@@ -54,26 +28,9 @@
 		ref,
 		reactive
 	} from "vue";
-	import {
-		navTo
-	} from "@/utils/utils";
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
-	import {
-		request
-	} from "@/utils/network/request.js";
-	import {
-		sendCode,
-		checkCode,
-		changeCardApply
-	} from "@/utils/network/api.js";
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
-	import {
-		msg
-	} from "@/utils/utils";
 
 	// 表单数据
 	const form = reactive({
@@ -119,61 +76,13 @@
 	const radioChange = (e : any) => {
 		console.log(e);
 		form.serviceType = e.detail.value
-		// if (val.name === '是') {
-		// 	form.equipmentState = '1';
-		// } else {
-		// 	form.equipmentState = '2';
-		// }
 	};
-	const getCode = () => {
-		if (codeDuration.value !== 0) {
-			return;
-		}
-		const options = {
-			type: 2,
-			data: {
-				mobile: form.mobile
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		request(sendCode, options)
-			.then((res) => {
-				codeInterval();
-
-				msg("验证码发送成功！");
-			})
-			.catch((err) => {
-				console.log(err);
-			});
-	}
-
 	//下一步
 	const toPage = () => {
-		// if (form.serviceTypeName === '保留卡签') {
-		// 	form.serviceType = 'WITHVEHICLE'
-		// } else {
-		// 	form.serviceType = 'WITHCUSTOMER'
-		// }
-		// const options = {
-		// 	type: 2,
-		// 	data: {
-		// 		mobile: form.mobile,
-		// 		code: form.code
-		// 	},
-		// 	method: "POST",
-		// 	showLoading: true,
-		// };
-		// request(checkCode, options)
-		// 	.then((res) => {
 		uni.$emit('queryCardlossStatus', {
 			type: form.serviceType
 		})
 		uni.navigateBack()
-		// })
-		// .catch((err) => {
-		// 	console.log(err);
-		// });
 	};
 </script>
 

subpackage/orders/flowingWater.vue

@@ -201,7 +201,6 @@
 						checkQuanCengEvent(val);
 					});
 				} else {
-					console.error("CMD_READBINARY指令长度不符1111" + res[2]);
 					tools.hideLoadingAlert();
 				}
 			}

subpackage/orders/invoiceApply/invoice-content.vue

@@ -72,7 +72,7 @@
 		navTo, msg
 	} from "@/utils/utils";
 	import { reactive, ref } from "vue";
-	import { onLoad, onReachBottom } from "@dcloudio/uni-app";
+	import { onLoad, onReachBottom, onShow } from "@dcloudio/uni-app";
 	import { queryEtcOrderApi, getUserMsg, trafficFlowApi } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { request } from "@/utils/network/request.js";
@@ -114,6 +114,11 @@
 		state.type = option.type
 		getUserinfo()
 	})
+	// onShow(() => {
+	// 	if (state.type == 1) {
+	// 		etcOrder(1)
+	// 	}
+	// })
 	const value = ref('')
 	const getUserinfo = () => {
 		const options = {
@@ -191,8 +196,17 @@
 		console.log(e)
 	}
 	const apply = () => {
+		let newArr = []
+		for (var i = 0; i < state.ordersArr.length; i++) {
+			for (var k = 0; k < state.data.length; k++) {
+				if (state.ordersArr[i] == state.data[k]['orderNo']) {
+					newArr.push(state.data[k])
+				}
+			}
+		}
+		const params = encodeURIComponent(JSON.stringify(newArr))
 		if (state.ordersArr.length >= 1) {
-			navTo(`/subpackage/orders/invoiceApply/invoice-step1?type=${state.type}&&ordersArr=${state.ordersArr}&&userMobile=${state.userMobile}`)
+			navTo(`/subpackage/orders/invoiceApply/invoice-step1?type=${state.type}&&ordersArr=${params}&&userMobile=${state.userMobile}`)
 		} else {
 			msg("请选择订单开票")
 		}

subpackage/orders/invoiceApply/invoice-step1.vue

@@ -15,7 +15,7 @@
 					<view class="from_item">
 						<text><text style="color: red;">*</text>车辆所有人证件号后6位：</text>
 						<view style="display: flex;">
-							<u-input v-model="state.subIdentNo" class="input" />
+							<u-input v-model="state.subIdentNo" class="input" maxlength="6" type="number" />
 						</view>
 					</view>
 				</u-form-item>
@@ -32,8 +32,8 @@
 		reactive
 	} from "vue";
 	import { onLoad, onShow } from "@dcloudio/uni-app";
-	import { navTo } from "@/utils/utils"
-	import { ETCProductInvoiceApi } from "@/utils/network/api.js";
+	import { navTo, msg } from "@/utils/utils"
+	import { ETCProductInvoiceApi, flowServiceFee } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { request } from "@/utils/network/request.js";
 	const state = reactive({
@@ -41,7 +41,8 @@
 		params: "",
 		orders: [],
 		userMobile: "",
-		subIdentNo: ""
+		subIdentNo: "",
+		invoiceAmount: 0
 	})
 	onShow(() => {
 		uni.$once('list', (query) => {
@@ -50,16 +51,17 @@
 		})
 	})
 	onLoad((option) => {
+		let ordersArr = JSON.parse(decodeURIComponent(option.ordersArr))
 		state.type = option.type
 		state.userMobile = option.userMobile
-		if (option.ordersArr.indexOf(',') > 1) {
-			// 数组
-			state.orders = option.ordersArr.split(',')
-		} else {
-			// 一个
-			state.orders.push(option.ordersArr)
+		console.log("ordersArr", ordersArr)
+		for (var i = 0; i < ordersArr.length; i++) {
+			let obj = {}
+			obj['orderNo'] = ordersArr[i]['orderNo']
+			state.orders.push(obj)
+			state.invoiceAmount += Number(ordersArr[i]['invoiceAmount'])
 		}
-		console.log("option", state.orders)
+		console.log("option", state.orders, state.invoiceAmount)
 	})
 	const toheaderPage = () => {
 		console.log(1);
@@ -68,9 +70,12 @@
 	const submit = () => {
 		if (state.type == '1') {
 			ETCProductInvoiceRequest()
+		} else {
+			flowServiceFeeRequest()
 		}
 	}
 	const ETCProductInvoiceRequest = () => {
+		console.log("state.params", state.params['id'])
 		const options = {
 			type: 2,
 			data: {
@@ -78,13 +83,44 @@
 				titleId: state.params['id'], //发票抬头编号
 				subIdentNo: state.subIdentNo,  //证件号后6位
 				userMobile: state.userMobile, //手机号
-				sellerId: "", //售方信息编号
+				sellerId: "31dc9b8068604823b42b05522843560f", //售方信息编号
 			},
 			method: "POST",
 			showLoading: true,
 		};
 		request(ETCProductInvoiceApi, options).then((res) => {
 			const data = stringToJson(res.bizContent);
+			msg("开票成功")
+			setTimeout(() => {
+				uni.navigateBack({
+					delta: 3
+				})
+			}, 1500)
+			console.log(data, "通行");
+		});
+	}
+	const flowServiceFeeRequest = () => {
+		const options = {
+			type: 2,
+			data: {
+				listNos: state.orders, //订单号列表
+				titleId: state.params['id'], //发票抬头编号
+				subIdentNo: state.subIdentNo,  //证件号后6位
+				invoiceAmount: state.invoiceAmount, //开票金额  分
+				sellerId: "31dc9b8068604823b42b05522843560f", //售方信息编号
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		request(flowServiceFee, options).then((res) => {
+			const data = stringToJson(res.bizContent);
+			msg("开票成功")
+
+			setTimeout(() => {
+				uni.navigateBack({
+					delta: 3
+				})
+			}, 1500)
 			console.log(data, "通行");
 		});
 	}

subpackage/orders/invoiceApply/invoiceList.vue

@@ -26,9 +26,6 @@
 				<!-- <text>新办订单</text> -->
 			</view>
 			<view class="content">
-				<!-- <view class="row">
-					订单类型：<text>新办订单</text>
-				</view> -->
 				<view class="row">
 					开票日期：<text>{{item.invoiceDate}}</text>
 				</view>

subpackage/orders/opening-account-people.vue

@@ -347,7 +347,7 @@
 			return;
 		}
 		if (!checkStr(state.form.userIdNum, 'card')) {
-			msg('请输入正确身份证');
+			msg('请输入正确身份证号');
 			return;
 		}
 		if (!checkStr(state.form.tel, 'mobile')) {

subpackage/orders/opening-account-unit.vue

@@ -209,15 +209,15 @@
 			return;
 		}
 		if (!state.form.agentPosImgUrl) {
-			msg('上传身份证的人像面');
+			msg('请上传身份证的人像面');
 			return;
 		}
 		if (!state.form.agentNegImgUrl) {
-			msg('上传身份证的国徽面');
+			msg('请上传身份证的国徽面');
 			return;
 		}
 		if (!state.form.proxyUrl) {
-			msg('上传身份证的委托书');
+			msg('请上传身份证的委托书');
 			return;
 		}
 		if (!state.form.userName) {

subpackage/orders/order-details-new.vue

@@ -646,7 +646,7 @@
 					}
 				}
 			}
-			state.orderInfo.appraise = appraise;
+			// state.orderInfo.appraise = appraise;
 			console.log("获取订单详情", state.orderInfo)
 		})
 	}
@@ -706,7 +706,6 @@
 			requestEditOrderAddr(addr);
 		});
 		console.log("optionssdsfd", options)
-		// getOrderDetails(options.id, options.appraise);
 		state.id = options.id
 		state.appraise = options.appraise
 	})

subpackage/orders/product-detail.vue

@@ -73,7 +73,6 @@
 		StorageKeys
 	} from "@/utils/storage.ts";
 	import {
-		checkOrderStatus,
 		wechatAppID,
 		wechatPayConfigId,
 		wechatSecret,
@@ -122,7 +121,6 @@
 					fileType: 'docx',
 					showMenu: true, //关键点
 					success: function (res) {
-						// msg("成功查看协议详情");
 					},
 					fail: function (err) {
 						msg("打开文档失败");
@@ -166,27 +164,6 @@
 		// #endif
 	}
 
-	//支付成功改变订单状态
-	const checkOrder = () => {
-		const options = {
-			type: 2,
-			data: {
-				orderId: state.orderId,
-				payConfigId: wechatPayConfigId,
-			},
-			method: "POST",
-			showLoading: true,
-		};
-
-		request(checkOrderStatus, options).then((res) => {
-			msg("支付成功!");
-			var pages = getCurrentPages().length;
-			uni.$emit("refreshOrder");
-			uni.switchTab({
-				url: "/pages/order/order"
-			})
-		});
-	};
 	// 协议确认接口
 	const agreementConfirm = () => {
 		const options = {

subpackage/orders/release-products.vue

@@ -25,11 +25,6 @@
 				<view class="action-btn"> 签约 </view>
 			</view>
 		</view>
-		<!--   <view class="action">
-      <button type="default" class="button" @click="savaHandle()">
-        已有签约，跳过。
-      </button>
-    </view> -->
 	</view>
 </template>
 
@@ -150,7 +145,6 @@
 	.content-value {
 		position: relative;
 		margin-top: -50rpx;
-		// padding: 0rpx 30rpx;
 		position: relative;
 	}
 

subpackage/personal-center/search/etcFlowingWater.vue

@@ -111,6 +111,9 @@
 	import {
 		downloadFileURL
 	} from '@/datas/fileURL.js'
+	import {
+		msg,
+	} from "@/utils/utils";
 	const dataTime = reactive({
 		startDate: "开始时间",
 		endDate: "结束时间"
@@ -125,10 +128,34 @@
 		pageSize: 10, //每页数据量
 		pageNo: 1, // 当前页
 		flags: false,
+		handleDate: "", //月结单选择时间
+		vehicleId: ""
 	})
 	onLoad((option) => {
 		state.cardId = option.cardId;
+		state.handleDate = option.handleDate;
+		state.vehicleId = option.vehicleId;
+		console.log("月结单111", state.handleDate)
+		if (state.handleDate != "undefined") {
+			// "2024-04-25"
+			let deadLine = getDaysInMonth(state.handleDate.substring(0, 4), state.handleDate.substring(4, 6))
+			dataTime.startDate = state.handleDate.substring(0, 4) + "-" + state.handleDate.substring(4, 6) + "-" +
+				"01"
+			dataTime.endDate = state.handleDate.substring(0, 4) + "-" + state.handleDate.substring(4, 6) + "-" +
+				deadLine
+
+			console.log("月结单", dataTime.startDate, state.handleDate != "")
+			search(1)
+		}
 	})
+
+	function getDaysInMonth(year, month) {
+		var date = new Date();
+		date.setFullYear(year);
+		date.setMonth(month);
+		date.setDate(0);
+		return date.getDate();
+	}
 	// 触底加载
 	onReachBottom(() => {
 		if (state.list.length < state.pageNo * 10) return state.flags = true
@@ -137,6 +164,14 @@
 		search(2)
 	})
 	const search = (val) => {
+		if (dataTime.startDate == "开始时间") {
+			msg('请选择开始时间');
+			return;
+		}
+		if (dataTime.endDate == "结束时间") {
+			msg('请选择结束时间');
+			return;
+		}
 		getPpassBillCount()
 		if (val == 1) {
 			state.pageNo = 1
@@ -227,8 +262,10 @@
 			type: 2,
 			data: {
 				cardId: state.cardId,
-				starDate: dataTime.startDate,
-				endDate: dataTime.endDate,
+				beforeDate: dataTime.startDate,
+				afterDate: dataTime.endDate,
+				vehiclePlate: state.vehicleId.split('_')[0],
+				vehiclePlateColor: state.vehicleId.split('_')[1]
 			},
 			method: "POST",
 			showLoading: true,

subpackage/personal-center/search/select-card.vue

@@ -48,8 +48,12 @@
 
 	const state = reactive({
 		cards: [],
+		vehicleId: "",
+		handleDate: ""
 	});
 	onLoad((option) => {
+		state.handleDate = option.handleDate
+		state.vehicleId = option.vehicleId
 		getCardList(option.vehicleId)
 	});
 
@@ -58,7 +62,9 @@
 	const choose = (i, item) => {
 		console.log(item, i)
 		console.log(item.vehicleId);
-		navTo(`/subpackage/personal-center/search/etcFlowingWater?cardId=${item.cardId}`)
+		navTo(
+			`/subpackage/personal-center/search/etcFlowingWater?cardId=${item.cardId}&&handleDate=${state.handleDate}&&vehicleId=${state.vehicleId}`
+			)
 	}
 
 	const getCardList = (vehicleId) => {

utils/network/api.js

@@ -312,5 +312,6 @@ export const delInvoiceHeaderApi = "12ec4fcab2944f36b0a3c0dbe49d87f8" // 删除
 export const trafficFlowApi = "4c5a8512929945ae93828e184fbd9082" // 查询通行流水服务费订单
 export const ETCProductInvoiceApi = "32bab1eee9c34694baa37c9ed222d431" // ETC产品合并开票
 export const invoiceQueryApi = "bd1340041fab4303899d41d23109e46a" // 发票查询
+export const flowServiceFee = "1a78cda7cace443f9cff63902fb3d35c" // 通行流水服务费批量开票
 
 export const silentLoginApi = "abaf0013caa24dafad12b0f571e8ee40" // 无感登录

utils/network/request.js

@@ -70,8 +70,8 @@ export function request(code, options = {}, start = false) {
 
 	}
 
-	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
+	// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
+	options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'