添加去签署协议

pages.json

@@ -1123,6 +1123,12 @@
 						"navigationBarTitleText": "签署用户协议"
 					}
 				},
+				{
+					"path": "webView",
+					"style": {
+						"navigationBarTitleText": "签署用户协议"
+					}
+				},
 				{
 					"path": "payment/payment",
 					"style": {
@@ -1552,18 +1558,6 @@
 					"style": {
 						"navigationBarTitleText": "储值卡圈存-退款"
 					}
-				},
-				{
-					"path": "refund-order-balance",
-					"style": {
-						"navigationBarTitleText": "余额补零",
-						"navigationStyle": "custom",
-						"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
-							"transparentTitle": "always",
-							"titlePenetrate": "YES",
-							"defaultTitle": "" // 将导航栏默认的 title 置空
-						}
-					}
 				}, {
 					"path": "verify/verify-phone/verify-phone",
 					"style": {

subpackage/orders/product-detail.vue

@@ -44,7 +44,7 @@
 
 <script setup lang="ts">
 	import {
-		onLoad,
+		onLoad,onShow
 	} from "@dcloudio/uni-app";
 	import {
 		reactive,
@@ -193,9 +193,11 @@
 			console.log("state.agreeURL", state.agreeURL)
 		}
 		queryAgreement();
-		contractRequest()
+		
 	});
-
+onShow(()=>{
+	contractRequest()
+})
 	const state = reactive({
 		openid: "",
 		orderId: "",
@@ -343,11 +345,11 @@
 			showLoading: true,
 		};
 		requestNew(accountSign, options).then((res) => {
-			
-			console.log("查询是否签约", res)
+			navTo(`/subpackage/orders/webView?url=${res.shortUrl}`)
+			console.log("去签署协议", res.shortUrl)
 		});
 	}
-	// 查询是否签约
+	// 查询是否签署协议
 	const contractRequest=()=>{
 		const options = {
 			type: 2,
@@ -359,8 +361,12 @@
 			showLoading: true,
 		};
 		requestNew(contractQuery, options).then((res) => {
-			
-			console.log("查询是否签约", res)
+			if(res.contractState==1){
+				state.isSign=true
+			}else{
+				state.isSign=false
+			}
+			console.log("查询是否签署协议", res)
 		});
 	}
 </script>

subpackage/orders/refund-order-balance.vue

@@ -1,187 +0,0 @@
-<template>
-	<nav-bar title="余额补领"></nav-bar>
-	<view class="oderPage">
-		<view class="details">
-			<view class="header">
-				<image :src="`${$imgUrl}order/no1.png`" mode=""></image>
-				<text>091110019133110</text>
-			</view>
-			<view class="hr">
-
-			</view>
-			<view class="row">
-				<view class="">
-					订单车牌号：
-				</view>
-				<text>贵A01234</text>
-			</view>
-			<view class="row">
-				<view class="">
-					旧卡号：
-				</view>
-				<text>1293030566565</text>
-			</view>
-			<view class="row">
-				<view class="">
-					旧卡金额：
-				</view>
-				<text>102.00</text>
-			</view>
-			<view class="row">
-				<view class="">
-					换卡时间：
-				</view>
-				<text>2023-02-12 10:00:00</text>
-			</view>
-			<view class="row">
-				<view class="">
-					新卡号：
-				</view>
-				<text style="color: #00B38B;">10220100001</text>
-			</view>
-			<view class="line">
-			</view>
-
-			<button>余额补领</button>
-		</view>
-
-	</view>
-
-</template>
-
-<script setup lang="ts">
-	import {
-		ref,
-		reactive
-	} from "vue";
-
-	const reason = ref('')
-
-	// 单选数据列表
-	const radiolist1 = reactive([{
-			name: '退货原因1',
-			disabled: false
-		},
-		{
-			name: '退货原因2',
-			disabled: false
-		},
-		{
-			name: '退货原因3',
-			disabled: false
-		},
-		{
-			name: '退货原因4',
-			disabled: false
-		},
-		{
-			name: '退货原因5',
-			disabled: false
-		},
-	], )
-
-	// 单选
-	const radioChange = (n) => {
-		console.log('radioChange', n);
-	}
-</script>
-
-
-<style>
-	page {
-		/* width: 100%;
-		height: 100%; */
-		display: flex;
-		flex-direction: column;
-		background-color: #F3F3F3;
-		box-sizing: border-box;
-	}
-</style>
-<style lang="scss" scoped>
-	.oderPage {
-		background-color: #EEF7F7;
-		margin: 30rpx;
-
-		.details {
-			position: relative;
-			background: #fff;
-			border-radius: 20rpx;
-			padding: 30rpx;
-			height: 540rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
-			border-radius: 20rpx;
-
-			.header {
-				align-items: center;
-				display: flex;
-				padding-bottom: 30rpx;
-				// border-bottom: 1px solid #DCDCDC;
-
-				image {
-					width: 51rpx;
-					height: 31rpx;
-				}
-
-				text {
-					font-size: 30rpx;
-					margin-left: 20rpx;
-					font-weight: 600;
-				}
-			}
-
-			.hr {
-				height: 1rpx;
-				background: #DCDCDC;
-				width: 100%;
-				position: absolute;
-				left: 50%;
-				transform: translate(-50%);
-			}
-
-			.row {
-				display: flex;
-				margin: 34rpx 0;
-				font-size: 26rpx;
-				font-family: Noto Sans S Chinese;
-				font-weight: 400;
-				color: #333333;
-				line-height: 30rpx;
-
-				view {
-					font-size: 26rpx;
-					font-family: Noto Sans S Chinese;
-					font-weight: 400;
-					color: #999999;
-					line-height: 30rpx;
-
-				}
-			}
-
-			.line {
-				width: 100%;
-				height: 1rpx;
-				background: #DCDCDC;
-
-			}
-
-			button {
-				width: 141rpx;
-				height: 61rpx;
-				background: #FFFFFF;
-				border: 1px solid #00B38B;
-				border-radius: 30rpx;
-				font-size: 26rpx;
-				font-family: Noto Sans S Chinese;
-				font-weight: 400;
-				color: #00B38B;
-				line-height: 61rpx;
-				position: absolute;
-				right: 30rpx;
-				bottom: 20rpx;
-				padding: 0;
-			}
-		}
-
-	}
-</style>

subpackage/orders/sign-up.vue

@@ -214,6 +214,7 @@
 							data: {
 								plateNumber: state.vehiclePlate,
 								openid: state.openid,
+								channelId: '52010188925',
 								tradeScene: 'HIGHWAY',
 								code: state.code
 							},

subpackage/orders/webView.vue

@@ -0,0 +1,18 @@
+<template>
+	<web-view :src="state.url"></web-view>
+</template>
+
+<script setup>
+	import {onLoad} from "@dcloudio/uni-app";
+	import {reactive} from "vue";
+	const state = reactive({
+		url:""
+	})
+	onLoad((option) => {
+		console.log("option",option)
+		state.url=option.url
+	});
+</script>
+
+<style>
+</style>