首页导航栏置灰

App.vue

 		font-family: "Microsoft Yahei";
 		// filter: grayscale(1)
 	}
-</style>
+</style>

composables/order/useOrderSkip.ts

 export default function useOrderSkip() {
 	const gotoOrderDetailsPay = (orderInfo) => {
 		// #ifdef MP-WEIXIN
-		// navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
 		navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
 		// #endif
 		// #ifdef MP-ALIPAY
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo) => {
 		console.log('输出内容=====', orderInfo)
-		if (orderInfo.orderType === 'ISSUE') {
+		// if (orderInfo.orderType === 'ISSUE') {
 			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
-			// // #ifdef MP-WEIXIN
+		// } else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
+		// 	orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
+		// 	navTo(`/subpackage/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);
 
-			// navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
-			// // #endif
-			// // #ifdef MP-ALIPAY
-			// navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
-			// // #endif
-		} else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
-			orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
-			navTo(`/subpackage/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);
+		// } else if (orderInfo.orderType === 'SUPPLEMENT_OBU') {
+		// 	navTo(`/subpackage/orders/order-details-obu?id=${orderInfo.id}`);
 
-		} else if (orderInfo.orderType === 'SUPPLEMENT_OBU') {
-			navTo(`/subpackage/orders/order-details-obu?id=${orderInfo.id}`);
+		// } else if (orderInfo.orderType === 'OFFICAL_SUPPLEMENT_OBU') {
+		// 	navTo(`/subpackage/orders/order-details-obu?id=${orderInfo.id}`);
+		// }
+		// else if (orderInfo.orderType === OrderTypes.ETC注销) {
+		// 	navTo(`/subpackage/orders/order-details-logoff-etc?id=${orderInfo.id}`);
 
-		} else if (orderInfo.orderType === 'OFFICAL_SUPPLEMENT_OBU') {
-			navTo(`/subpackage/orders/order-details-obu?id=${orderInfo.id}`);
-		}
-		else if (orderInfo.orderType === OrderTypes.ETC注销) {
-			navTo(`/subpackage/orders/order-details-logoff-etc?id=${orderInfo.id}`);
-
-		} else if (orderInfo.orderType === OrderTypes.车辆信息变更) {
-			navTo(`/subpackage/orders/order-details-edit-car?id=${orderInfo.id}`);
+		// } else if (orderInfo.orderType === OrderTypes.车辆信息变更) {
+		// 	navTo(`/subpackage/orders/order-details-edit-car?id=${orderInfo.id}`);
 
-		} else if (orderInfo.orderType === OrderTypes.解除车牌占用) {
-			navTo(`/subpackage/orders/order-details-cancel-numberplate?id=${orderInfo.id}`);
+		// } else if (orderInfo.orderType === OrderTypes.解除车牌占用) {
+		// 	navTo(`/subpackage/orders/order-details-cancel-numberplate?id=${orderInfo.id}`);
 
-		} else if (orderInfo.orderType === 'EXCHANGE_CARD_TYPE') {
-			navTo(`/subpackage/orders/order-details-recharge?id=${orderInfo.id}`);
-		}
+		// } else if (orderInfo.orderType === 'EXCHANGE_CARD_TYPE') {
+		// 	navTo(`/subpackage/orders/order-details-recharge?id=${orderInfo.id}`);
+		// }
 	}
 
 	//跳转到修改地址页面

pages/index/index.vue

 		highMsgData: '',//高速快讯内容
 		processeConditionText: "", //办理条件文本
 		commonQuestionText: "", //常见问题文本
+		isEnableSetGray:false
 	});
 	const isShowMask = ref(false);
 	const isShowBar = ref(false)
 		// uni.navigateTo({
 		// 	url: "/subpackage/after-sale/account-opening-template/account-opening-template"
 		// })
+		getGlobalParam()
 	})
 
 	onMounted(() => {
 		})
 		getSwiper()
 	});
-
+const getGlobalParam=()=>{
+				const data = getItem('globalParam')
+				console.log("全局配置数据1111", getCodeName('IS_ENABLE', data.setGray))
+				// 申办时是否允许修改OCR识别出来的车辆信息数据
+				if (getCodeName('IS_ENABLE', data.setGray) == '启用') {
+					uni.setNavigationBarColor({
+						backgroundColor:"#9C9C9C",
+						frontColor:"#ffffff"
+					})
+				} else {
+					uni.setNavigationBarColor({
+						backgroundColor:"#22dbc8",
+						frontColor:"#000000"
+					})
+				}
+				
+			}
 	//获取轮播
 	const getSwiper = () => {
 
 					state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
 				}
 			}
+			state.highMsgData.sort(function (a, b) {
+			  return a.sequence - b.sequence//正序
+			})
 		}).catch((err) => { console.log(err) });
 	}
 	const link = (item : any) => {

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

 		/*监听蓝牙回调*/
 		uni.$on('bluetoothLink', function (status) {
 			queryCardSignCancellation(1, 1, 1).then((item : any) => {
+				console.log("item========",item)
 				instructAction(item).then(value => {
 					console.log('orderStatus=======', value.orderStatus)
 
 	const instructAction = (data) => {
 
 		let cmdArr = data.command.split(",");
-		console.log(cmdArr);
+		console.log("cmdArr=========",cmdArr);
 		bluetoothUtil.transCmd(cmdArr, "10", function (res) {
 			console.log("透传");
 			console.log(res);

subpackage/after-sale/account-recharge/index.vue

 			<view>￥0</view>
 		</view>
 		<view class='item_wrap'>
-			<view class='item'  @click='navTo(`/pages/recharge/select-car`)'>
+			<view class='item'  @click='navTo(`/pages/recharge/recharge-pay`)'>
 				<view class='left_content'>
 					<image :src="fileURL + 'image/index/item-1.png'" mode="aspectFill"></image>
-					<view>去圈层</view>
+					<view>去圈存</view>
 				</view>
 				<u-icon name="arrow-right" color='#ccc'></u-icon>
 			</view>
 	})
 	onLoad((option : any) => {
 		state.name=option.name;
-		console.log("name",state.name)
+		console.log("option",option)
 	})
 </script>
 

subpackage/after-sale/account-recharge/login.vue

 		request(accountLogin, options).then((res) => {
 				let data = JSON.parse(res.bizContent);
 				console.log(data, "#################");
-				navTo(`/subpackage/after-sale/account-recharge/index?name=state.name`);
+				navTo(`/subpackage/after-sale/account-recharge/index?name=${state.name}`);
 			})
 			.catch((err) => {
 				console.log(err);
 			});
-		// navTo(`/subpackage/after-sale/account-recharge/index?name=state.name`);
-		// navTo(`/subpackage/after-sale/account-recharge/index?name=scyl12345`);
 	}
 	const goAccount = () => {
 		navTo(`/subpackage/after-sale/account-recharge/go-account`);
-		// navTo(`/pages/recharge/select-car?type=1`);
 	}
 	const forgetPassword = () => {
 		navTo(`/subpackage/after-sale/account-recharge/forget-password`);

subpackage/after-sale/account-recharge/recharge.vue

 			//关闭当前页面，跳转到应用内的某个页面。
 			url: `/subpackage/personal-center/setting/bank-card/bank-card?choiceCard=1&value=${params}`
 		});
-		// navTo(`/subpackage/personal-center/setting/bank-card/bank-card?choiceCard=1`)
 	}
 	const cardDbImageOcr = (val : any) => {
 		var imageType = val;

subpackage/after-sale/activation/activate.vue

 				tools.hideLoadingAlert();
 				console.log(stringToJson(res.bizContent));
 				//OBU发行申请 请求
-				getObuApply()
+				// getObuApply()
+				const cardId = orderInfo.cardId;
+				const cardStatus = orderInfo.cardStatus != null ? orderInfo.cardStatus : '0'
+				const obuId = orderInfo.obuId;
+				const obuStatus = orderInfo.obuStatus != null ? orderInfo.obuStatus : '9'
+				if (!obuId) { //OBU发行
+					getObuApply();
+				} else if (obuId && obuStatus == '9') { //OBU发行
+					getObuApply();
+				} else if (cardId && obuId && (obuStatus == '1' || obuStatus == '11' || obuStatus ==
+						'0')) {
+					getInstallApply(); //激活
+				}
 			})
 			.catch((err) => {
 				console.log(err);

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

 				</view>
 			</view>
 		</view>
-		<!-- <view class="title"> 注意事项 </view>
-		<view class="remark">
-			<view> 1.xxxxxxxx </view>
-			<view> 2.xxxxxxxx </view>
-			<view> 3.xxxxxxxx </view>
-			<view> 4.xxxxxxxx </view>
-		</view> -->
 		<button class="submit" @click="toPage" v-if="!state.flag">{{orderInfos.cardStatus ==1?'卡签停用':'卡签启用'}}</button>
 		<button class="submit" @click="toBack" v-else>返回服务中心</button>
 		<view class="mask" v-show="state.showPopup">

subpackage/orders/car-release.vue

 					console.log("过户检测", value)
 					if (value.transferLogs && value.transferLogs.length > 0) {
 						let arr = value.transferLogs;
+						state.data.transferLogs=[]
 						for (var k = 0; k < arr.length; k++) {
 							if (arr[k]['status'] == "WAITING") {
 								state.data.transferLogs.push(arr[k])
 	};
 	const pass = () => {
 		state.show = false
+		if (!state.form.vehBodyUrl) {
+			msg("请上传车头照");
+			return;
+		}
+		if (state.form.type == 1) {
+			state.form.axleCount = 2;
+		} else {
+			if (!state.form.axleCount) {
+				msg("请输入车轴数");
+				return;
+			}
+		}
+		state.form.vehicleId =
+			state.form.vehicleIdNum + "_" + state.vehiclePlateColor;
+		state.form.opId = getItem(StorageKeys.OpenId);
+		state.form.approvedCount = parseFloat(state.form.approvedCount);
+		state.form.maintenaceMass = parseFloat(state.form.maintenaceMass);
+		state.form.totalMass = parseFloat(state.form.totalMass);
+		state.form.permittedWeight = parseFloat(state.form.permittedWeight);
+		state.form.permittedTowWeight = parseFloat(state.form.permittedTowWeight);
+		
+		const options = {
+			type: 2,
+			data: state.form,
+			method: "POST",
+			showLoading: true,
+		};
+		request(etcCarCardInfoSubmit, options).then((res) => {
+			uni.redirectTo({
+				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
+			});
+		})
 	}
 	const selectConfirm = (index : any) => {
 		console.log(index);
 			const res = await request(queryGuoHuCaoZuo, options);
 			const data = stringToJson(res.bizContent);
 			state.show = false;
-			// uni.navigateTo({
-			// 	url: `/subpackage/orders/choice-product?orderId=${state.form.orderId}`,
-			// });
 			uni.redirectTo({
 				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
 			});

subpackage/orders/moreHighMsg/moreHighMsg.vue

 			for (var i = 0; i < state.highMsgData.length; i++) {
 				state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
 			}
+			state.highMsgData.sort(function (a, b) {
+			  return a.sequence - b.sequence//正序
+			})
 			// state.highMsgData=stringToJson(res.bizContent).data
 		})
 			.catch((err) => {

subpackage/orders/order-details-recharge.vue

 		}
 		request(orderDetail, options).then((res) => {
 			state.orderInfo = stringToJson(res.bizContent);
+			console.log("state.orderInfo",state.orderInfo)
 			setOrderData();
 		})
 	}

subpackage/personal-center/setting/usage-instructions.vue

 <template>
-	<view class="content">
-		<!-- 		本协议是由用户（以下简称为“您”）与北京巴别时代科技股份有限公司及其关联公司海南巴别时代科技有限公司（以下简称为“我们”）就我们所提供的产品和网络服务（包括我们的网站以及我们现在正在提供和将来可能向您提供的网络服务和游戏服务，以下统称为“产品和服务”）所订立的协议，本
-		协议包括《用户协议》、《用户个人信息保护政策》、《巴别时代儿童个人信息保护指引》、游戏规则（包括但不限于用户守则、玩家条例、游戏公告、提示及通知等内容）及其修订版本，上述内容一经正式发布，即为本协议不可分割的组成部分（以下简称“本协议”）。
-	 -->
+	<web-view v-if="isTextSrc" :src="textSrc"></web-view>
+	<view class="content" v-else>
 		{{textContent}}
 	</view>
 </template>
 		request
 	} from "@/utils/network/request.js";
 	import {
-		infoQuery
+		infoQuery, envs
 	} from "@/utils/network/api.js"
 
 	const textContent = ref('')
+	const textSrc = ref('')
+	const isTextSrc = ref(false)
 	// 获取文本信息----用户协议
 	const getInfo = (type) => {
 		//参数说明
 		request(infoQuery, options)
 			.then((res) => {
 				let data = stringToJson(res.bizContent)
-				console.log(data);
-				textContent.value = data.text
+				if (data.textType == "URL") {
+					textSrc.value = envs[process.env.NODE_ENV].baseUrl + data.text
+					isTextSrc.value = true
+				} else {
+					textContent.value = data.text
+					isTextSrc.value = false
+				}
+				console.log("textSrc.value", textSrc.value);
 			})
 			.catch((err) => {
 				console.log(err);
 			});
 	}
-
-
-
-
-
 	onLoad(() => {
 
 	})
 	onShow(() => {
 		getInfo()
-		console.log(1);
 	})
 </script>
 
-
-
 <style lang="scss" scoped>
 	.content {
-		padding: 98rpx 50rpx 0rpx 50rpx;
+		padding: 0 40rpx;
 		font-size: 28rpx;
 		font-weight: 400;
 		color: #333333;
 		line-height: 40px;
 	}
-</style>
+</style>