去签署协议

login/login.vue

@@ -35,7 +35,6 @@
 				</checkbox>
 				<label>我已阅读并同意</label>
 			</checkbox-group>
-			<!-- <view class="txt-grey">我已阅读并同意</view> -->
 			<view class="txt-green" @click="toRead">《平台用户服务隐私协议》</view>
 		</view>
 

subpackage/after-sale/progress-query/progress-query-business-details.vue

@@ -1,21 +1,39 @@
 <template>
 	<view class="allContent">
 		<view class="list-item">
-			<view><text>车牌号：</text><text>{{state.params['vehiclePlate']}}</text></view>
-			<view><text>车牌颜色：</text><text>{{state.params['vehiclePlateColorC']}}</text></view>
-			<view v-if="state.params['cardId']"><text>卡号：</text><text>{{state.params['cardId']}}</text></view>
-			<view v-if="state.params['obuId']"><text>OBU号：</text><text>{{state.params['obuId']}}</text></view>
-			<view><text>订单ID：</text><text>{{state.params['orderNo']}}</text></view>
+			<view><text>订单号：</text><text>{{state.params['orderNo']}}</text></view>
 			<view><text>业务类型：</text><text>{{state.params['businessTypeC']}}</text></view>
-			<view><text>用户名称：</text><text>{{state.params['customerName']}}</text></view>
-			<view><text>审核状态：</text><text>{{state.params['auditStatusStr']}}</text></view>
 			<view><text>订单状态：</text><text>{{state.params['orderStatusStr']}}</text></view>
-			<view><text>订单阶段：</text><text>{{state.params['orderStepStr']}}</text></view>
-			<view v-if="state.params['orderStepValue']"><text>订单状态：</text><text>{{state.params['orderStepValue']}}</text></view>
-			<view v-if="state.params['reason']"><text>原因：</text><text>{{state.params['reason']}}</text></view>
-			<view><text>申请时间：</text><text>{{state.params['applyTime']}}</text></view>
-			<view v-if="state.params['auditTime']"><text>审核时间：</text><text>{{state.params['auditTime']}}</text></view>
-			<view v-if="state.params['address']"><text>邮寄地址：</text><text>{{state.params['address']}}</text></view>
+			<view><text>车牌号：</text><text>{{state.params['vehiclePlate']}}</text></view>
+			<view><text>车牌颜色：</text><text>{{getVehiclePlateColorPai(state.params['vehiclePlateColorC'])}}</text></view>
+			<template v-if="state.paramsdData.orderType=='VEHICLEINFOCHANGE'">
+				<view v-if="state.params['beforeChangeData']&&state.params['beforeChangeData']['type']"><text>原车型：</text><text>{{state.params['beforeChangeData']['typeStr']}}</text></view>
+				<view  v-if="state.params['afterChangeData']&&state.params['afterChangeData']['type']"><text>现车型：</text><text>{{state.params['afterChangeData']['typeStr']}}</text></view>
+				<view v-if="state.params['beforeChangeData']"><text>原车牌：</text><text>{{state.params['beforeChangeData']['vehiclePlate']}}</text></view>
+				<view><text>现车牌：</text><text>{{state.params['afterChangeData']['vehiclePlate']}}</text></view>
+				<view v-if="state.params['beforeChangeData']"><text>原车牌颜色：</text><text>{{getVehiclePlateColorPai(state.params['beforeChangeData']['vehiclePlateColor'])}}</text></view>
+				<view><text>现车牌颜色：</text><text>{{getVehiclePlateColorPai(state.params['afterChangeData']['vehiclePlateColor'])}}</text></view>
+			</template>
+			<template v-if="state.paramsdData.orderType=='SIGNOUT'">
+				<view><text>ETC卡号：</text><text>{{state.params['cardId']}}</text></view>
+				<view><text>OBU号：</text><text>{{state.params['obuId']}}</text></view>
+				<!-- <view><text>退款金额：</text><text>{{state.params['aa']}}</text></view>
+				<view><text>退款方式：</text><text>{{state.params['aa']}}</text></view>
+				<view><text>注销原图：</text><text>{{state.params['aa']}}</text></view> -->
+			</template>
+			<template v-if="state.paramsdData.orderType=='EXCHANGE_CARD' || state.paramsdData.orderType=='EXCHANGE_OBU' || state.paramsdData.orderType=='EXCHANGE_ALL'">
+				<view v-if="state.params['newCardId']"><text>更换ETC卡号：</text><text>{{state.params['newCardId']}}</text></view>
+				<view v-if="state.params['newObuId']"><text>更换OBU号：</text><text>{{state.params['newObuId']}}</text></view>
+			</template>
+			<template v-if="state.paramsdData.orderType=='CARDLOSS' || state.paramsdData.orderType=='OBULOSS' || state.paramsdData.orderType=='CARDOBULOSS'">
+				<view><text>ETC卡号：</text><text>{{state.params['cardId']}}</text></view>
+				<view><text>OBU号：</text><text>{{state.params['obuId']}}</text></view>
+			</template>
+			<template v-if="state.paramsdData.orderType=='CUSTOMERINFOCHANGE'">
+				<view><text>原手机号：</text><text>{{state.params['oldMobile']}}</text></view>
+				<view><text>现手机号：</text><text>{{state.params['newMobile']}}</text></view>
+			</template>
+			
 			<view class="btns">
 				<view class="btn btn-primary" v-if="state.params['orderStep']=='WAIT_PAY'" @click="pay(state.params['orderNo'],state.params['orderType'])">支付</view>
 				<view class="btn btn-primary" v-if="state.params['orderStep']=='DELIVER'" @click="gotoConfirmReceiptSH(state.params['id'])">确认收货</view>
@@ -105,13 +123,27 @@
 		requestNew(api, options).then((res) => {
 			console.log("res==",res)
 			for (var i in res) {
-				res['vehiclePlateColorC']=getVehiclePlateColorPai(res['vehiclePlateColor'])
 				for (var m = 0; m < state.businessRange.length; m++) {
 					if (res['orderType'] == state.businessRange[m]['value']) {
 						res['businessTypeC'] = state.businessRange[m]['text']
 						break;
 					}
 				}
+				// 车型字典
+				let typeData=getItem('key')['VEHICLE_MODEL_TYPE']
+				for (var n = 0; n < typeData.length; n++) {
+					if(res['beforeChangeData']){
+						if(typeData[n]['code']==res['beforeChangeData']['type']){
+							res['beforeChangeData']['typeStr']=typeData[n]['name']
+							break;
+						}
+					}
+					if(typeData[n]['code']==1){
+						res['afterChangeData']['typeStr']=typeData[n]['name']
+						break;
+					}
+				}
+				
 			}
 			state.params=res
 		})

subpackage/after-sale/progress-query/progress-query-business.vue

@@ -126,7 +126,7 @@
 			vehiclePlate: state.vehiclePlate,
 			vehiclePlateColor: state.vehiclePlateColor,
 			orderStep: state.status,
-			businessType: state.businessTypeVal,
+			orderType: state.businessTypeVal,
 			startTime: state.range[0] ? state.range[0] + ' 00:00:00' : state.range[0],
 			endTime: state.range[1] ? state.range[1] + ' 00:00:00' : state.range[1],
 			pageNo: state.pageNo,

subpackage/orders/product-detail.vue

@@ -31,9 +31,12 @@
 		</view>
 
 		<view class="action">
-			<button type="default" class="button" @click="savaHandle()">
+			<button type="default" class="button" @click="savaHandle()" v-if="state.isSign">
 				确认办理
 			</button>
+			<button type="default" class="button" @click="sign()" v-else>
+				去签署协议
+			</button>
 		</view>
 
 	</view>
@@ -49,7 +52,7 @@
 	} from "vue";
 	import {
 		getOpenId,
-		envs, payQuery, agreementInSertOrder, agreeOrderProdcut
+		envs, payQuery, agreementInSertOrder, agreeOrderProdcut,contractQuery,accountSign
 	} from "@/utils/network/api.js";
 	import { requestNew} from "@/utils/network/request.js";
 
@@ -190,6 +193,7 @@
 			console.log("state.agreeURL", state.agreeURL)
 		}
 		queryAgreement();
+		contractRequest()
 	});
 
 	const state = reactive({
@@ -219,7 +223,8 @@
 		agreeURL: [],
 		typeScanCode: 0,//扫码进来得
 		vehicleId: "",
-		agreements: []
+		agreements: [],
+		isSign:false
 	});
 	// 查协议
 	const queryAgreement = () => {
@@ -326,11 +331,42 @@
 			console.log("state.dataArray", state.dataArray)
 		});
 	}
+	// 去签署协议
+	const sign=()=>{
+		const options = {
+			type: 2,
+			data: {
+				orderId: state.orderId, //订单编号
+		
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		requestNew(accountSign, options).then((res) => {
+			
+			console.log("查询是否签约", res)
+		});
+	}
+	// 查询是否签约
+	const contractRequest=()=>{
+		const options = {
+			type: 2,
+			data: {
+				orderId: state.orderId, //订单编号
+		
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		requestNew(contractQuery, options).then((res) => {
+			
+			console.log("查询是否签约", res)
+		});
+	}
 </script>
 
 <style lang="scss" scoped>
 	.action {
-		// padding-bottom: 100rpx;
 		position: absolute;
 		bottom: 0rpx;
 		left: 0;

subpackage/orders/sign-up.vue

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

utils/network/api.js

@@ -452,5 +452,8 @@ export const cardCzPayResultCheck = "/iaw/cardCharge/payButNotCircle"; //储值
 export const cardCzXFCheck = "/iaw/cardCharge/circle"; //储值卡充值-圈存(消费)
 export const quanXf = "/iaw/cardCharge/cardChargeFixWithCosByVfj"; //圈存修复V (写指令)
 export const quanConfirm = "/iaw/cardCharge/cardChargeConfirmWithCosByVfj"; //圈存确认
+// 解除挂起
+export const relieveHandUp = "/iaw/api/afterSale/cardObuHangUp/relieveHandUp"; //解除挂起
 
-export const relieveHandUp = "/iaw/api/afterSale/cardObuHangUp/relieveHandUp"; //解除挂起
+export const contractQuery = "/iaw/anXinSign/contractQuery"; //查询是否去签署协议
+export const accountSign = "/iaw/anXinSign/accountSign"; //查询去签署协议链接