Merge remote-tracking branch 'origin/master'

App.vue

@@ -150,9 +150,7 @@
 						console.log(curRoute);
 						if (curRoute === "orders/sign-up") {
 							uni.navigateTo({
-								url: `/subpackage/orders/product-detail?orderId=${
-                orders.orderId
-              }&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+								url: `/subpackage/orders/product-detail?orderId=${orders.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 							});
 						}
 						if (curRoute === "pages/app/sign") {

login/agreement.vue

@@ -25,8 +25,8 @@
 	import {
 		infoQuery
 	} from "@/utils/network/api.js"
-	
-	const content=ref('')
+
+	const content = ref('')
 
 	// 获取文本信息----用户协议
 	const getInfo = (type) => {
@@ -43,9 +43,9 @@
 		//调用方式
 		request(infoQuery, options)
 			.then((res) => {
-				let data=stringToJson(res.bizContent)
+				let data = stringToJson(res.bizContent)
 				console.log(data);
-				content.value=data.text
+				content.value = data.text
 			})
 			.catch((err) => {
 				console.log(err);
@@ -62,7 +62,6 @@
 </script>
 
 
-
 <style lang="scss" scoped>
 	.content {
 		padding: 98rpx 50rpx 0rpx 50rpx;
@@ -71,4 +70,4 @@
 		color: #333333;
 		line-height: 40px;
 	}
-</style>
+</style>

pages/index/index.vue

@@ -258,6 +258,8 @@
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
+	
+	const tools = require("../../static/etcUtil/tools.js");
 	const bgOrange = `url(${fileURL}image/index/bg-orange.png) center center no-repeat`;
 	const bgBlue = `url(${fileURL}image/index/bg-blue.png) center center no-repeat`;
 	const list = reactive(["您有一条待办事项，还未办理完成"])
@@ -274,29 +276,7 @@
 		userType: 1, //1个人 2单位
 		notice: "",
 		swiperList: [],
-		noticeList: [
-			//公告栏列表
-			// {
-			// 	title: "您有{}条未完成订单，前往处理",
-			// 	id: 1,
-			// },
-			// {
-			// 	title: "XXX刚刚申请了公交车发行",
-			// 	id: 2,
-			// },
-			// {
-			// 	title: "您还有一条订单已经发货了",
-			// 	id: 3,
-			// },
-			// {
-			// 	title: "订单等您确认收货",
-			// 	id: 4,
-			// },
-			// {
-			// 	title: "最新的新闻资讯请点击哈哈哈哈哈哈哈假的假的假的假的基督教",
-			// 	id: 5,
-			// },
-		],
+		noticeList: [], //公告栏列表
 		flowPathTabList: ["办理流程", "办理条件", "常见问题"],
 		tabActive: "办理流程",
 		flowList: [
@@ -342,29 +322,6 @@
 		}
 	});
 	onLoad(() => {
-
-		uni.login({
-			success: function (res) {
-				console.log('输出内容========', res)
-			}
-		})
-
-		// //调用方式
-		// request('eeb51c66bcda48dc9dbb5997323a11ed', {}).then((res) => {
-		// 		console.log("====", stringToJson(res.bizContent));
-		// 		uni.requestSubscribeMessage({
-		// 			tmplIds: [''],
-		// 			success: function(res){
-		// 				console.log('输出内容========',res)
-		// 			},
-		// 			fail: function(res){
-		// 				console.log('内容========',res)
-		// 			}
-		// 		})
-		// 	})
-		// 	.catch((err) => {});
-
-
 		getInfo();
 		quanKeyAction().then((val : any) => {
 			setItem('key', val.dictTypeAndItem)
@@ -384,31 +341,6 @@
 			}
 		})
 		getSwiper()
-
-		// console.log(credentialType);
-
-		//参数说明
-		// let code = "30" //请求编码
-		// let options = {
-		// 	type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
-		// 	data: {
-		// 		opId: getItem("openId"),
-		// 		source: "WECHAT",
-		// 		tabIndex: "0",
-		// 	}, //请求参数
-		// 	method: "POST", //提交方式(默认POST)
-		// 	showLoading: true, //是否显示加载中(默认显示)
-		// };
-
-		//调用方式
-		// request(searchOrder, options)
-		//   .then((res) => {
-		//     console.log(stringToJson(res.bizContent));
-		//     // stringToJson(res.bizContent)
-		//   })
-		//   .catch((err) => {
-		//     console.log(err);
-		//   });
 	});
 
 	//获取轮播
@@ -450,24 +382,18 @@
 
 	//安装激活
 	const goActivation = () => {
-		uni.navigateTo({
-			url: "/pages/order/order",
-		});
+		tools.toUrl("/pages/order/order");
 	};
 
 	const goToRecharge = () => {
 		console.log("执行点击事件");
 		console.log('321')
-		uni.navigateTo({
-			url: "/pages/recharge/select-car",
-		});
+		tools.toUrl("/pages/recharge/select-car");
 	};
 
 	//全量枚举值查询
-	const quanKeyAction = (val : any) => {
-		var data = {
-
-		};
+	const quanKeyAction = () => {
+		var data = {};
 		const options = {
 			type: 2,
 			data: data,
@@ -478,8 +404,6 @@
 		return new Promise(async (resolve, reject) => {
 			const res = await request(queryKey, options);
 			const data = stringToJson(res.bizContent);
-
-
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -491,17 +415,6 @@
 	const toCreatOrder = (val : number) => {
 		console.log(typeof (val));
 		state.userType = val;
-		// if (val === 1) {
-		// 	// navTo(`/orders/essential-information?type=${state.type}&&userType=${state.userType}`)
-		// 	uni.navigateTo({
-		// 		url: `/subpackage/orders/essential-information?type=${state.type}&&userType=${state.userType}`
-		// 	})
-		// } else {
-		// 	// navTo(`/orders/essential-information?type=${state.type}&&userType=${state.userType}`)
-		// 	uni.navigateTo({
-		// 		url: `/subpackage/orders/essential-information?type=${state.type}&&userType=${state.userType}`
-		// 	})
-		// }
 		navTo(`/subpackage/orders/choice-product?type=${state.type}&&userType=${state.userType}`)
 		closeMask();
 	};
@@ -515,8 +428,6 @@
 		isShowMask.value = false;
 	};
 
-
-
 	// 获取文本信息----用户协议
 	const getInfo = () => {
 		//参数说明
@@ -567,23 +478,17 @@
 					state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
 				}
 			}
-		})
-			.catch((err) => { console.log(err) });
+		}).catch((err) => { console.log(err) });
 	}
-	const link = (item) => {
-		console.log("item", item)
+	const link = (item : any) => {
 		if (item.type == 1) {
 			const params = encodeURIComponent(JSON.stringify(item.hyperLink))
-			uni.navigateTo({
-				url: `/subpackage/personal-center/webview?url=` + params
-			})
+			tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 		} else if (item.type == 2) {
 			navTo(item.hyperLink)
 		} else if (item.type == 3) {
 			const param = encodeURIComponent(JSON.stringify(item))
-			uni.navigateTo({
-				url: `/subpackage/orders/moreHighMsg/textDetails?item=` + param
-			})
+			tools.toUrl(`/subpackage/orders/moreHighMsg/textDetails?item=` + param);
 		} else if (item.type == 4) {
 			uni.navigateToMiniProgram({
 				appId: item.hyperLink,

subpackage/orders/car-release.vue

@@ -53,45 +53,58 @@
 			<view class="title"> 识别内容如下 </view>
 			<view class="">
 				<u-form label-width="200" :model="state.form" ref="uForm">
-					<u-form-item label="车牌号" >
+					<u-form-item label="车牌号">
 						<!-- <u-input inputAlign="right" placeholder='请输入车牌号' v-model="state.form.vehicleIdNum" /> -->
 						<car-number-input @numberInputResult="carNumber"
-							:defaultStr="state.form.vehicleIdNum" ></car-number-input>
+							:defaultStr="state.form.vehicleIdNum"></car-number-input>
 					</u-form-item>
 
 					<u-form-item label="所有人">
-						<u-input inputAlign="right" placeholder="请输入所有人" v-model="state.form.man" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入所有人" v-model="state.form.man"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<u-form-item label="车辆类型">
-						<u-input inputAlign="right" placeholder="请输入车辆类型" v-model="state.form.vehicleType" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入车辆类型" v-model="state.form.vehicleType"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<u-form-item label="使用性质">
-						<u-input inputAlign="right" placeholder="请输入使用性质" v-model="state.form.character" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入使用性质" v-model="state.form.character"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<u-form-item label="车辆识别代号">
-						<u-input inputAlign="right" placeholder="请输入车辆识别代号" v-model="state.form.vin" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入车辆识别代号" v-model="state.form.vin"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<u-form-item label="发动机号码">
-						<u-input inputAlign="right" placeholder="请输入发动机号码" v-model="state.form.engineNum" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入发动机号码" v-model="state.form.engineNum"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 
 					<u-form-item label="注册日期">
-						<picker mode="date" :value="state.form.register"  @change="bindDateChange1" :disabled="state.isEnableChangeOCRCarInfo">
-							<view class="uni-input" style="text-align: right;" :class="state.changeColor?'hei':'hui'">{{state.form.register}}</view>
+						<picker mode="date" :value="state.form.register" @change="bindDateChange1"
+							:disabled="state.isEnableChangeOCRCarInfo">
+							<view class="uni-input" style="text-align: right;" :class="state.changeColor?'hei':'hui'">
+								{{state.form.register}}
+							</view>
 						</picker>
 						<!-- <u-input inputAlign="right" placeholder="请输入注册日期" v-model="state.form.register" :disabled="state.isEnableChangeOCRCarInfo" /> -->
 					</u-form-item>
 					<u-form-item label="发证日期">
-						<picker mode="date" :value="state.form.issueDate"  @change="bindDateChange2" :disabled="state.isEnableChangeOCRCarInfo">
-							<view class="uni-input" style="text-align: right;" :class="state.changeColor?'hei':'hui'">{{state.form.issueDate}}</view>
+						<picker mode="date" :value="state.form.issueDate" @change="bindDateChange2"
+							:disabled="state.isEnableChangeOCRCarInfo">
+							<view class="uni-input" style="text-align: right;" :class="state.changeColor?'hei':'hui'">
+								{{state.form.issueDate}}
+							</view>
 						</picker>
 						<!-- <u-input inputAlign="right" placeholder="请输入发证日期" v-model="state.form.issueDate" :disabled="state.isEnableChangeOCRCarInfo"/> -->
 					</u-form-item>
 					<u-form-item label="核定载人数">
-						<u-input inputAlign="right" placeholder="请输入核定载人数" v-model="state.form.approvedCount" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入核定载人数" v-model="state.form.approvedCount"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<u-form-item label="整备质量">
-						<u-input inputAlign="right" placeholder="请输入整备质量" v-model="state.form.maintenaceMass" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入整备质量" v-model="state.form.maintenaceMass"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<!-- <u-form-item label="外廊尺寸">
 						<u-input inputAlign="right" placeholder='请输入外廊尺寸' v-model="state.form.vehicleDimensions" />
@@ -100,18 +113,22 @@
 						<label>外廊尺寸</label>
 						<view class="input-box">
 							<text class="sub-label">长</text>
-							<input v-model="state.outlineL" @input="outlineInput" :disabled="state.isEnableChangeOCRCarInfo"/>
+							<input v-model="state.outlineL" @input="outlineInput"
+								:disabled="state.isEnableChangeOCRCarInfo" />
 							<text class="sub-text">X</text>
 							<text class="sub-label">宽</text>
-							<input v-model="state.outlineW" @input="outlineInput" :disabled="state.isEnableChangeOCRCarInfo"/>
+							<input v-model="state.outlineW" @input="outlineInput"
+								:disabled="state.isEnableChangeOCRCarInfo" />
 							<text class="sub-text">X</text>
 							<text class="sub-label">高</text>
-							<input v-model="state.outlineH" @input="outlineInput" :disabled="state.isEnableChangeOCRCarInfo"/>
+							<input v-model="state.outlineH" @input="outlineInput"
+								:disabled="state.isEnableChangeOCRCarInfo" />
 							<text class="sub-text">mm</text>
 						</view>
 					</view>
 					<u-form-item label="总质量">
-						<u-input inputAlign="right" placeholder="请输入总质量" v-model="state.form.totalMass" :disabled="state.isEnableChangeOCRCarInfo"/>
+						<u-input inputAlign="right" placeholder="请输入总质量" v-model="state.form.totalMass"
+							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
 					<view class="form-item">
 						<label>车辆用户类型</label>
@@ -151,7 +168,7 @@
 			<view v-if="state.data.transferLogs && state.data.transferLogs.length" class="">
 				<view class="bettwen-center">
 					<view style="padding: 20rpx" class="title"> 选择卡签 </view>
-					<view class="goto" > 直接跳过，不使用此套卡签 </view>
+					<view class="goto"> 直接跳过，不使用此套卡签 </view>
 				</view>
 				<view @click="guohuAction(item)" class="card" v-for="(item, index) in state.data.transferLogs"
 					:key="index" style="margin-top: 30rpx; margin-bottom: 30rpx">
@@ -199,8 +216,8 @@
 	import { getObuStatus } from "@/datas/obuStatus.js";
 
 	import { getEtcCardStatus } from "@/datas/etcCardStatus.js";
-	import { getItem } from "@/utils/storage";
-	import {hasLogin} from "@/utils/utils.ts"
+	import { getItem, StorageKeys } from "@/utils/storage";
+	import { hasLogin } from "@/utils/utils.ts"
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
@@ -220,6 +237,7 @@
 	const savaHandle = () => {
 		state.form.vehicleId =
 			state.form.vehicleIdNum + "_" + state.vehiclePlateColor;
+		state.form.opId = getItem(StorageKeys.OpenId);
 		const options = {
 			type: 2,
 			data: state.form,
@@ -235,7 +253,7 @@
 						state.show = true;
 					} else {
 						// 签约
-						if(state.isSign == 2 || state.isSign == 3){
+						if (state.isSign == 2 || state.isSign == 3) {
 							if (!hasLogin()) {
 								uni.redirectTo({
 									url: `/subpackage/orders/addAddress?orderId=${state.form.orderId
@@ -253,22 +271,22 @@
 								// #endif
 								// #ifdef MP-WEIXIN
 								uni.redirectTo({
-								  url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+									url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 								});
 								// #endif
 								
 							}
-						}else{
+						} else {
 							// 不签约
 							// uni.redirectTo({
 							//   url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 							// });
 							uni.redirectTo({
-								url:`/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`
+								url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`
 							});
 							// uni.redirectTo({
 							//    url: `/subpackage/orders/release-products?orderId=${state.form.orderId}&clientFee=${getItem('clientFee')}&&id=${getItem('productId')}`,
-						 //    });
+							//    });
 						}
 					}
 				});
@@ -321,7 +339,7 @@
 	};
 
 	const state = reactive({
-		changeColor:false,
+		changeColor: false,
 		data: {
 			transferLogs: [],
 		},
@@ -366,6 +384,7 @@
 			licenseIdNum: "", //经营许可证编号
 			vehBodyUrl: "", //车身照片
 			proxyUrl: "", //委托书地址
+			opId: "",
 		},
 		vehiclePlateColor: undefined,
 		orderId: "",
@@ -375,24 +394,24 @@
 		outlineL: "",
 		outlineW: "",
 		outlineH: "",
-		isSign:'',
-		isEnableChangeOCRCarInfo:true,  //申办时是否允许修改OCR识别出来的车辆信息数据
+		isSign: '',
+		isEnableChangeOCRCarInfo: true,  //申办时是否允许修改OCR识别出来的车辆信息数据
 	});
 	onLoad((option : any) => {
 		state.form.orderId = option.orderId;
 		// state.type = option.type;
 		state.form.type = option.type;
 		state.vehiclePlateColor = option.vehiclePlateColor;
-		state.isSign=option.isSign
-		console.log("option",option)
+		state.isSign = option.isSign
+		console.log("option", option)
 		getGlobalParam();
-		if(option.type==1){
-			state.actionSheetList=[{
+		if (option.type == 1) {
+			state.actionSheetList = [{
 				text: "普通车",
 				value: 0,
 			}]
-		}else{
-			state.actionSheetList=[{
+		} else {
+			state.actionSheetList = [{
 				text: "普通车",
 				value: 0,
 			},
@@ -419,17 +438,17 @@
 
 	//orc接口调用
 	const cardImageOcr = (val : any) => {
-		state.changeColor=true;
+		state.changeColor = true;
 		var imageType = val;
 		uni.chooseImage({
 			count: 1, //只能选取一张照片
 			sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ["camera", "album"], //从相册选择
 			success: function (res) {
-				
+
 				pathToBase64(res.tempFilePaths[0])
 					.then((path) => {
-						console.log("Base64返回",path)
+						console.log("Base64返回", path)
 						var data = {
 							source: "1",
 							agencyId: "52010106004",
@@ -471,7 +490,7 @@
 							}
 						});
 					})
-					.catch((error) => { console.log("Base64异常",error)});
+					.catch((error) => { console.log("Base64异常", error) });
 			},
 		});
 	};
@@ -530,33 +549,35 @@
 		imgUrl = imgUrl.replace("http://100.64.2.113:9000", envs[process.env.NODE_ENV].baseUrl);
 		return imgUrl;
 	};
-	const getGlobalParam=()=>{
-		const data=getItem('globalParam')
-		console.log("全局配置数据",getCodeName('IS_ENABLE',data.applyChangeOCRCarInfo))
+	const getGlobalParam = () => {
+		const data = getItem('globalParam')
+		console.log("全局配置数据", getCodeName('IS_ENABLE', data.applyChangeOCRCarInfo))
 		// 申办时是否允许修改OCR识别出来的车辆信息数据
-		if(getCodeName('IS_ENABLE',data.applyChangeOCRCarInfo)=='启用'){
-			state.isEnableChangeOCRCarInfo=true;
-		}else{
-			state.isEnableChangeOCRCarInfo=false;
+		if (getCodeName('IS_ENABLE', data.applyChangeOCRCarInfo) == '启用') {
+			state.isEnableChangeOCRCarInfo = true;
+		} else {
+			state.isEnableChangeOCRCarInfo = false;
 		}
 	}
-	const  bindDateChange1=(e)=> {
+	const bindDateChange1 = (e) => {
 		state.form.register = e.detail.value
-		state.changeColor=true;
+		state.changeColor = true;
 	}
-	const  bindDateChange2=(e)=> {
+	const bindDateChange2 = (e) => {
 		state.form.issueDate = e.detail.value
-		state.changeColor=true;
+		state.changeColor = true;
 	}
 </script>
 
 <style lang="scss" scoped>
-	.hui{
+	.hui {
 		color: #ccc;
 	}
-	.hei{
+
+	.hei {
 		color: black;
 	}
+
 	.goto {
 		margin-right: 20rpx;
 		padding: 10rpx;
@@ -858,7 +879,8 @@
 		font-size: 30rpx;
 		margin-bottom: 10rpx;
 	}
-	::v-deep .u-input__input{
+
+	::v-deep .u-input__input {
 		background: transparent;
 	}
 </style>

subpackage/personal-center/setting/conceal-agreement.vue

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

subpackage/personal-center/setting/risk-agreement.vue

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

subpackage/personal-center/setting/user-agreement.vue

@@ -1,6 +1,7 @@
 <template>
-	<view class="content">
-	{{textContent}}
+	<web-view v-if="isTextSrc" :src="textSrc"></web-view>
+	<view class="content" v-else>
+		{{textContent}}
 	</view>
 </template>
 
@@ -27,8 +28,9 @@
 		infoQuery
 	} from "@/utils/network/api.js"
 
-	const textContent=ref('')
-	
+	const textContent = ref('')
+	const textSrc = ref('')
+	const isTextSrc = ref(false)
 	// 获取文本信息----用户协议
 	const getInfo = (type) => {
 		//参数说明
@@ -46,32 +48,32 @@
 			.then((res) => {
 				let data = stringToJson(res.bizContent)
 				console.log(data);
-				textContent.value=data.text
+				if (data.textType == "URL") {
+					textSrc.value = data.text
+					isTextSrc.value = true
+				} else {
+					textContent.value = data.text
+					isTextSrc.value = false
+				}
 			})
 			.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>