'调整邮寄页面'

.env.development

@@ -12,5 +12,5 @@ ENV = 'development'
 # VITE_APP_UPLOAD_URL = 'https://qtzl.etcjz.cn' #试运行地址
 # VITE_APP_BASE_URL ='https://testmedusa.etcjz.cn/ifzt/api/interfaceMidGroundIn'
 
-# VITE_APP_TYPE = 'dev' #打测试环境的包
-VITE_APP_TYPE = 'production' #打生产环境的包
+VITE_APP_TYPE = 'dev' #打测试环境的包
+# VITE_APP_TYPE = 'production' #打生产环境的包

pages/mailingAddress/mailingAddress.vue

@@ -1,135 +1,122 @@
 <template>
 	<div>
 		<custom-header :back="false" title="邮寄"></custom-header>
-		<div style="padding-top: 20rpx" v-if='isShow'>
-			<form-builder-vue :formData="formData" :config="config" @radioChange="radioChange" @submit="submit">
-			</form-builder-vue>
+		<div style="padding-top: 20rpx" v-if="isShow">
+			<form-builder-vue
+				:formData="formData"
+				:config="config"
+				@radioChange="radioChange"
+				@submit="submit"
+			></form-builder-vue>
 		</div>
 	</div>
 </template>
-<script setup lang='ts'>
-	import {
-		unifyTemplate
-	} from '@/hooks/unifyTemplate'
-	import {
-		TypeData,
-		Index
-	} from '@/components/form-builder/tools'
-	import {
-		ref,
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
-	import {
-		request
-	} from '@/utils/network/request'
-	import fromData from './fromData.js'
-	let config = ref < any > ({
-		submitName: '提交',
-		titleWidth: 160
-	})
-	let formData = ref(fromData)
-	const {
-		formBuilderVue, //组件
-		CustomHeader, //头部组件
-		initData, //初始化数据
-		isShow, //是否展示formBuilderVue组件
-		qdOrderVal //qdOrder中数据 ref
-	} = unifyTemplate() //初始化数据
-	//获取页面配置
-	onLoad((opin) => {
-		initData(opin, 0).then(data => {
-			
-			formData.value = JSON.parse(data.config.tableConfig)
-			console.log(formData.value,data);
-			isShow.value = true
-			delete data.config.tableConfig
-			config.value = Object.assign(data.config, config.value)
-		})
-	})
+<script setup lang="ts">
+import { unifyTemplate } from '@/hooks/unifyTemplate';
+import { TypeData, Index } from '@/components/form-builder/tools';
+import { ref } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { request } from '@/utils/network/request';
+import fromData from './fromData.js';
+let config = ref<any>({
+	submitName: '提交',
+	titleWidth: 160
+});
+let formData = ref(fromData);
+const {
+	formBuilderVue, //组件
+	CustomHeader, //头部组件
+	initData, //初始化数据
+	isShow, //是否展示formBuilderVue组件
+	qdOrderVal //qdOrder中数据 ref
+} = unifyTemplate(); //初始化数据
+//获取页面配置
+onLoad((opin) => {
+	initData(opin, 0).then((data) => {
+		// formData.value = JSON.parse(data.config.tableConfig)
+		// console.log(formData.value,data);
+		// isShow.value = true
+		delete data.config.tableConfig;
+		config.value = Object.assign(data.config, config.value);
+		submit({
+			whetherToMail: 1
+		});
+	});
+});
 
-
-
-	//单项选择器
-	function radioChange(e: any, item: TypeData) {
-		if (item.title === '是否邮寄') {
-			if (parseInt(e.detail.value) == 1) {
-				formData.value[Index('收件人', formData.value)].show = true
-				formData.value[Index('收件人手机号', formData.value)].show = true
-				formData.value[Index('省市区', formData.value)].show = true
-				formData.value[Index('详细地址', formData.value)].show = true
-				formData.value[Index('邮政编码', formData.value)].show = true
-			} else {
-				formData.value[Index('收件人', formData.value)].show = false
-				formData.value[Index('收件人手机号', formData.value)].show = false
-				formData.value[Index('省市区', formData.value)].show = false
-				formData.value[Index('详细地址', formData.value)].show = false
-				formData.value[Index('邮政编码', formData.value)].show = false
-			}
+//单项选择器
+function radioChange(e: any, item: TypeData) {
+	if (item.title === '是否邮寄') {
+		if (parseInt(e.detail.value) == 1) {
+			formData.value[Index('收件人', formData.value)].show = true;
+			formData.value[Index('收件人手机号', formData.value)].show = true;
+			formData.value[Index('省市区', formData.value)].show = true;
+			formData.value[Index('详细地址', formData.value)].show = true;
+			formData.value[Index('邮政编码', formData.value)].show = true;
+		} else {
+			formData.value[Index('收件人', formData.value)].show = false;
+			formData.value[Index('收件人手机号', formData.value)].show = false;
+			formData.value[Index('省市区', formData.value)].show = false;
+			formData.value[Index('详细地址', formData.value)].show = false;
+			formData.value[Index('邮政编码', formData.value)].show = false;
 		}
 	}
-	/**
-	 * 请求函数，e为处理后的value
-	 * */
-	function submit(e: any) {
-		// qdorder数据
-		let {
-			userType,
-			vanType,
-			vehicleColor,
-			vehiclePlate,
-			qdOrderNo
-		} = qdOrderVal.value
-		// 客货类型
-		qdOrderVal.value.type = vanType > 3 ? 2 : vanType
-		const data = {
-			userType,
-			qdOrderNo,
-			vehiclePlate,
-			vehiclePlateColor: vehicleColor,
-			type: vanType > 3 ? 2 : vanType,
-			orderSource: 'H5',
-			...e
-		}
-
-		let {
-			commitInterface,
-			jumpPage
-		} = config.value
-		console.log(data);
-		request(commitInterface || '3dc2df0ba7004fffbd97192cbaa66b6f', {
-			data,
-		}).then((res) => {
-			if (res.statusCode === 0) {
-				// 通过orderId关联产品
-				relatedProducts(qdOrderVal.value.productCode || qdOrderVal.value.promoteId, JSON.parse(res
-					.bizContent).orderId)
-				uni.navigateTo({
-					url: '/' + jumpPage,
-					animationType: 'pop-in',
-					animationDuration: 500
-				})
-			}
-		})
+}
+/**
+ * 请求函数，e为处理后的value
+ * */
+function submit(e: any) {
+	// qdorder数据
+	let { userType, vanType, vehicleColor, vehiclePlate, qdOrderNo } =
+		qdOrderVal.value;
+	// 客货类型
+	qdOrderVal.value.type = vanType > 3 ? 2 : vanType;
+	const data = {
+		userType,
+		qdOrderNo,
+		vehiclePlate,
+		vehiclePlateColor: vehicleColor,
+		type: vanType > 3 ? 2 : vanType,
+		orderSource: 'H5',
+		...e
+	};
 
-	}
-	/**
-	 * 关联产品
-	 * */
-	function relatedProducts(promoteId: string, orderId: string) {
-		const data = {
-			promoteId,
-			orderId
+	let { commitInterface, jumpPage } = config.value;
+	console.log('邮件请求数据', data,e);
+	// return;
+	
+	request(commitInterface || '3dc2df0ba7004fffbd97192cbaa66b6f', {
+		data,
+		showTitle: '正在提交订单...'
+	}).then((res) => {
+		if (res.statusCode === 0) {
+			// 通过orderId关联产品
+			relatedProducts(
+				qdOrderVal.value.productCode || qdOrderVal.value.promoteId,
+				JSON.parse(res.bizContent).orderId
+			);
+			uni.navigateTo({
+				url: '/' + jumpPage,
+				animationType: 'pop-in',
+				animationDuration: 500
+			});
 		}
-		request('198172b1858d474fa8e35225d65014d7', {
-			showLoading: true,
-			data,
-		}).then((res) => {
-			console.log('关联成功', res)
-		})
-	}
+	});
+}
+/**
+ * 关联产品
+ * */
+function relatedProducts(promoteId: string, orderId: string) {
+	const data = {
+		promoteId,
+		orderId
+	};
+	request('198172b1858d474fa8e35225d65014d7', {
+		showLoading: true,
+		data
+	}).then((res) => {
+		console.log('关联成功', res);
+	});
+}
 </script>
-<style lang='scss' scoped>
-
-</style>
+<style lang="scss" scoped></style>

vite.config.js

@@ -14,8 +14,8 @@ export default defineConfig({
 				// 	"^": ""
 				// },
 				// target: 'http://192.168.100.63:8087/ifzt', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务  
-				target: 'https://qtzl.etcjz.cn/', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务  
+				// target: 'https://qtzl.etcjz.cn/', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/api/, ''),
 			},
@@ -24,8 +24,8 @@ export default defineConfig({
 				// 	"^": ""
 				// },
 				// target: 'http://192.168.100.63:8087', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务  
-				target: 'https://qtzl.etcjz.cn', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务  
+				// target: 'https://qtzl.etcjz.cn', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/api/, ''),
 			},
@@ -34,8 +34,8 @@ export default defineConfig({
 				// 	"^": ""
 				// },
 				// target: 'http://192.168.100.63:8087', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务  
-				target: 'https://qtzl.etcjz.cn', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务  
+				// target: 'https://qtzl.etcjz.cn', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/api/, ''),
 			},
@@ -44,8 +44,8 @@ export default defineConfig({
 				// 	"^": ""
 				// },
 				// target: 'http://192.168.100.63:8087', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务  
-				target: 'https://qtzl.etcjz.cn', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务  
+				// target: 'https://qtzl.etcjz.cn', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/api/, ''),
 			},
@@ -55,8 +55,8 @@ export default defineConfig({
 				// },
 				// target: 'http://192.168.100.63:8087/ifzt', // 目标服务  
 				// target: 'https://api.weixin.qq.com', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务
-				target: 'https://qtzl.etcjz.cn', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务
+				// target: 'https://qtzl.etcjz.cn', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/wxApi/, ''),
 			},
@@ -66,8 +66,8 @@ export default defineConfig({
 				// },
 				// target: 'http://192.168.100.63:8087/ifzt', // 目标服务  
 				// target: 'https://api.weixin.qq.com', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务
-				target: 'https://qtzl.etcjz.cn', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务
+				// target: 'https://qtzl.etcjz.cn', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/wxApi/, ''),
 			},
@@ -76,8 +76,8 @@ export default defineConfig({
 				// 	"^": ""
 				// },
 				// target: 'http://192.168.100.63:8087/ifzt', // 目标服务  
-				// target: 'https://trial.etcjz.cn', // 目标服务  
-				target: 'https://qtzl.etcjz.cn/', // 目标服务  
+				target: 'https://trial.etcjz.cn', // 目标服务  
+				// target: 'https://qtzl.etcjz.cn/', // 目标服务  
 				changeOrigin: true,
 				// rewrite: path => path.replace(/^\/wxApi/, ''),
 			},