bug修改

subpackage/orders/sign-up.vue

@@ -57,11 +57,11 @@
 	import { stringToJson } from "@/utils/network/encryption";
 	import { fileURL } from "@/datas/fileURL.js";
 	import { getItem, setItem } from "@/utils/storage";
-	import { msg } from "@/utils/utils";
+	import { msg, navTo } from "@/utils/utils";
 	import FixedFooter from '@/components/common/FixedFooter.vue'
 	import {
 		infoQuery,
-		envs, channelSingQueryApi, userSign, getOpenId, reSign, getSignParams
+		envs, channelSingQueryApi, userSign, getOpenId, reSign, getSignParams, reSignCheck
 	} from "@/utils/network/api";
 	const imgURL = `${fileURL}image/`;
 	import useOrderSkip from "@/composables/order/useOrderSkip";
@@ -99,7 +99,11 @@
 	
 	onShow(() => {
 		if (state.isTestSign >= 1) {
-			isUserSign()
+			if (state.from == '37') { // 恢复签约
+				isReSignCheck()
+			} else {
+				isUserSign()
+			}
 		} else {
 			state.isTestSign += 1
 		}
@@ -151,6 +155,37 @@
 		})
 	}
 	
+	// 恢复签约检测
+	const isReSignCheck = () => {
+		let options = {
+			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
+			data: {
+				subOpenId: state.openid,
+				signChannelType: 1,
+				vehicleId: state.vehicleId,
+			}, //请求参数
+			method: "POST", //提交方式(默认POST)
+			showLoading: true, //是否显示加载中(默认显示)
+		};
+		
+		requestNew(reSignCheck, options).then(res => {
+			console.log(res)
+			let { userState, step } = res
+			if (userState === "NORMAL") {
+				msg("已开通车主服务");
+				// 如果是等待激活
+				navTo('/pages/service/service')
+				
+			} else if (userState === "PAUSED") {
+				msg("已暂停车主服务");
+				return;
+			} else if (userState === "OVERDUE") {
+				msg("用户已开通车主服务，但欠费状态。提示用户还款，请跳转到车主服务");
+				return;
+			}
+		})
+	}
+	
 	const getInfo = () => {
 		//参数说明
 		let options = {

utils/network/api.js

@@ -257,6 +257,7 @@ export const payApply = "/iaw/issue/order/payApply" //支付申请
 export const payQuery = "/iaw/issue/order/payQuery" //支付查询
 // export const userSign = "/iaw/app/issue/userSign/query" //签约检测
 export const userSign = "/iaw/issue/order/signQuery" //签约检测
+export const reSignCheck = "/iaw/api/sign/reSignCheck" // 恢复签约检测
 export const orderCancel = "/iaw/issue/order/orderCancel" //订单取消
 // export const queryPage= "/iaw/issue/order/queryPage"  //订单分页查询
 export const queryPage = "/iaw/issue/order/mOrderPage" //订单分页查询

utils/utils.ts

@@ -555,9 +555,14 @@ function formatNumber(n : any) {
 export const uploadFile = (tempImagePath, imageType) => {
 	console.log("tempImagePath", tempImagePath, tempImagePath.size,imageType)
 	return new Promise((resolve, reject) => {
+		let url = ''
+		if (process.env.NODE_ENV === 'development') {
+			url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev/minIo/upload";
+		} else if (process.env.NODE_ENV === 'production') {
+			url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod/minIo/upload";
+		}
 		uni.uploadFile({
-			url: 'https://qtzl.etcjz.cn/newDev/ndev/minIo/upload', //测试
-			// url: 'https://qtzl.etcjz.cn/newProd/prod/minIo/upload', //生产
+			url: url,
 			filePath: tempImagePath,
 			name: 'file',
 			formData: {