优化

src/api/index.ts

@@ -44,3 +44,6 @@ export const getCollectList = (data: any) => request('/wx/collect/list', 'GET',
 
 // 添加或取消收藏
 export const collectAddordelete = (data: any) => request('/wx/collect/addordelete', 'POST', data);
+
+// 添加或取消收藏
+export const getTax = () => request('/wx/config/tax', 'GET');

src/pages/order/checkout.vue

@@ -73,7 +73,7 @@
 <script setup lang="ts">
 import { onShow, onLoad } from '@dcloudio/uni-app';
 import { ref } from 'vue';
-import { checkoutCart, orderDetail, orderSubmit } from '@/api/index';
+import { checkoutCart, orderSubmit } from '@/api/index';
 import config from '@/utils/config';
 
 let baseUrl = config.baseUrl;

src/pages/order/downPdf.vue

@@ -100,7 +100,7 @@ import { onLoad, onBackPress } from '@dcloudio/uni-app';
 import config from '@/utils/config';
 import { useStore } from '@/store/useStore';
 import { getOrderPdf } from '@/api/cart';
-import { orderDetail } from '@/api/index';
+import { orderDetail, getTax } from '@/api/index';
 
 let baseUrl = config.baseUrl;
 let store = useStore();
@@ -108,6 +108,7 @@ let enclosure = ref(''); // pdf key值
 let detailData = ref();
 let type = ref();
 let orderId = ref();
+let tax = ref(0) // 税率
 
 onLoad((options: any) => {
 	type.value = options.type;
@@ -126,6 +127,7 @@ onLoad((options: any) => {
 	// detailData.value = data.orderGoods;
 	// orderId.value = data.orderInfo.id;
 	initPdf(options.orderId);
+	initTax()
 });
 
 // 返回首页
@@ -138,7 +140,7 @@ let toIndex = () => {
 // 生成报价
 let generateQuote = () => {
 	uni.navigateTo({
-		url: `./quotation?orderId=${orderId.value}&data=${detailData.value}`,
+		url: `./quotation?orderId=${orderId.value}&data=${JSON.stringify(detailData.value)}`,
 	});
 };
 
@@ -187,6 +189,7 @@ let download = () => {
 	});
 };
 
+// 获取下载pdf信息
 let initPdf = (orderId: number) => {
 	getOrderPdf({ orderId }).then((res: any) => {
 		if (res.data.code === 200) {
@@ -195,6 +198,16 @@ let initPdf = (orderId: number) => {
 	});
 };
 
+// 获取税率
+let initTax = () => {
+	getTax().then((res: any) => {
+		if (res.data.code === 200) {
+			tax.value = res.data.data
+			console.log(res, 'tax');
+		}
+	});
+};
+
 onBackPress(() => {
 	if (type.value === 'productline') {
 		store.$reset();

src/pages/order/quotation.vue

 <template>
 	<view style="padding: 30rpx;">
 		<u-form :model="formData" ref="uFormRef" label-width="200">
-			<u-form-item label="联系人:" prop="attend">
-				<u-input v-model="formData.attend" />
+			<u-form-item label="发货人:" prop="attend">
+				<u-input v-model="formData.attend" placeholder="请输入发货人" />
 			</u-form-item>
-			<u-form-item label="联系电话:" prop="tel">
-				<u-input v-model="formData.tel" />
+			<u-form-item label="发货联系人:" prop="tel">
+				<u-input v-model="formData.tel" placeholder="请输入发货联系人" />
 			</u-form-item>
-			<u-form-item label="单价:" prop="price">
-				<!-- <u-input v-model="formData.price" /> -->
+			<!-- <u-form-item label="单价:" prop="price">
 				<view style="width: 100%; text-align: left;">
 					<u-button type="primary" size="mini" @tap="fillIn">填写商品单价</u-button>
 				</view>
+			</u-form-item> -->
+			<u-form-item label="发货email:" prop="email">
+				<u-input v-model="formData.email" placeholder="请输入发货email" />
 			</u-form-item>
-			<u-form-item label="地址:" prop="addr"><u-input v-model="formData.addr" /></u-form-item>
-			<u-form-item label="no:" prop="noOrder">
-				<u-input v-model="formData.noOrder" />
+			<u-form-item label="发货地址:" prop="addr">
+				<u-input
+					:disabled="true"
+					v-model="formData.addr"
+					placeholder="请选择地区"
+					@tap="pickerShow = true"
+				/>
 			</u-form-item>
-			<u-form-item label="交货地点:" prop="deliveryAddr">
-				<u-input v-model="formData.deliveryAddr" />
+
+			<u-form-item label="收货公司名称:" prop="toCust">
+				<u-input v-model="formData.toCust" placeholder="请输入收货公司名称" />
 			</u-form-item>
-			<u-form-item label="交货日期:" prop="deliveryDate">
-				<u-input v-model="formData.deliveryDate" />
+			<u-form-item label="收货人:" prop="quotationAttend">
+				<u-input v-model="formData.quotationAttend" placeholder="请输入收货人" />
 			</u-form-item>
-			<u-form-item label="Email:" prop="email">
-				<u-input v-model="formData.email" />
+			<u-form-item label="收货email:" prop="quotationEmail">
+				<u-input v-model="formData.quotationEmail" placeholder="请输入收货email" />
 			</u-form-item>
-			<u-form-item label="付款方式:" prop="pay">
-				<u-input v-model="formData.pay" />
+			<u-form-item label="收货联系人:" prop="toCust">
+				<u-input v-model="formData.quotationTel" placeholder="请输入收货联系人" />
+			</u-form-item>
+			<u-form-item label="交货日期:" prop="deliveryDate">
+				<u-input
+					:disabled="true"
+					v-model="formData.deliveryDate"
+					placeholder="请选择日期"
+					@tap="pickerDateShow = true"
+				/>
+			</u-form-item>
+			<u-form-item label="收货地址:" prop="deliveryAddr">
+				<u-input
+					:disabled="true"
+					v-model="formData.deliveryAddr"
+					placeholder="请选择地区"
+					@tap="pickerShow1 = true"
+				/>
 			</u-form-item>
-			<u-form-item label="报价联系人:" prop="quotationAttend">
-				<u-input v-model="formData.quotationAttend" />
+			<u-form-item label="订单号:" prop="noOrder">
+				<u-input type="number" v-model="formData.noOrder" placeholder="请输入订单号" />
 			</u-form-item>
-			<u-form-item label="报价Email:" prop="quotationEmail">
-				<u-input v-model="formData.quotationAttend" />
+			<u-form-item label="付款方式:" prop="pay">
+				<u-input v-model="formData.pay" placeholder="请输入付款方式" />
 			</u-form-item>
-			<u-form-item label="收货方:" prop="toCust">
-				<u-input v-model="formData.toCust" />
+			<u-form-item label="保修:" prop="guarantee">
+				<u-input v-model="formData.guarantee" placeholder="请输入保修" />
 			</u-form-item>
 			<u-form-item label="备注:" prop="remarks">
-				<u-input v-model="formData.remarks" />
+				<u-input type="textarea" v-model="formData.remarks" placeholder="请输入备注" />
 			</u-form-item>
 		</u-form>
-		<u-button @click="submit">提交</u-button>
+		<u-button type="error" @click="submit">提交</u-button>
 	</view>
-
+	<u-picker mode="region" v-model="pickerShow" @confirm="regionConfirm"></u-picker>
+	<u-picker mode="region" v-model="pickerShow1" @confirm="regionConfirm1"></u-picker>
+	<u-picker mode="time" v-model="pickerDateShow" @confirm="dateConfirm"></u-picker>
 	<order-form ref="orderRef" @onSubmit="onSubmit" />
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, getCurrentInstance, ComponentInternalInstance  } from 'vue';
 import { fillQuotation, quotationInit } from '@/api/cart';
 import { onLoad, onReady } from '@dcloudio/uni-app';
 import orderForm from './components/orderForm.vue';
 
+let {proxy} : any = getCurrentInstance() as ComponentInternalInstance
+console.log(proxy.$u.test.mobile('15616168157'));
 let orderRef = ref()
-
+let pickerShow = ref(false)
+let pickerShow1 = ref(false)
+let pickerDateShow = ref(false)
 let formData = ref({
-	createdBy: '',
 	attend: '',
 	tel: '',
 	addr: '',
@@ -68,29 +96,62 @@ let formData = ref({
 	pay: '',
 	quotationAttend: '',
 	quotationEmail: '',
+	quotationTel: '',
 	remarks: '',
-	price: '',
 	noOrder: '',
+	guarantee: ''
 });
 
+
 let rules = ref({
-	attend: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	tel: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	addr: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	noOrder: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	deliveryAddr: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	deliveryDate: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	email: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	pay: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	quotationAttend: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	toCust: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-	intro: [{ min: 5, message: '简介不能少于5个字', trigger: 'change' }],
+	attend: [{ required: true, message: '请输入发货人', trigger: 'blur' }],
+	tel: [{ required: true, message: '请输入发货人手机号', trigger: 'blur' },
+	{
+		validator: (rule, value: any, callback) => {
+			return proxy.$u.test.mobile(value);
+		},
+		message: '手机号码不正确',
+		trigger: 'blur',
+	}],
+	email: [{ required: true, message: '请输入发货email', trigger: 'blur' },
+	{
+		validator: (rule, value: any, callback) => {
+			return proxy.$u.test.email(value);
+		},
+		message: 'email不正确',
+		trigger: 'blur',
+	}],
+	addr: [{ required: true, message: '请选择发货地址', trigger: ['blur', 'change'] }],
+	toCust: [{ required: true, message: '请输入收货公司名称', trigger: 'blur' }],
+	quotationAttend: [{ required: true, message: '请输入收货人', trigger: 'blur' }],
+	quotationEmail: [{ required: true, message: '请输入收货email', trigger: 'blur' },
+	{
+		validator: (rule, value: any, callback) => {
+			return proxy.$u.test.email(value);
+		},
+		message: 'email不正确',
+		trigger: 'blur',
+	}],
+	quotationTel: [{ required: true, message: '请输入收货联系人', trigger: 'blur' },
+	{
+		validator: (rule, value: any, callback) => {
+			return proxy.$u.test.mobile(value);
+		},
+		message: '手机号码不正确',
+		trigger: 'blur',
+	}],
+	deliveryAddr: [{ required: true, message: '请选择收货地址', trigger: 'blur' }],
+	deliveryDate: [{ required: true, message: '请选择交货日期', trigger: 'change' }],
+	noOrder: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
+	pay: [{ required: true, message: '请输入付款方式', trigger: 'blur' }],
+	guarantee: [{ required: true, message: '请输入保修', trigger: 'blur' }],
 });
 
 let uFormRef = ref();
 let quotationData = ref();
 
 onLoad((options: any) => {
+	console.log(options);
 	initQuotation(options.orderId);
 });
 
@@ -130,6 +191,22 @@ let onSubmit = (data: any) => {
 	orderRef.value.show = false
 }
 
+// 选择地区回调
+let regionConfirm = (e: any) => {
+	formData.value.addr = e.province.name + '-' + e.city.name + '-' + e.area.name;
+}
+// 选择地区回调
+let regionConfirm1 = (e: any) => {
+	formData.value.quotationAttend = e.province.name + '-' + e.city.name + '-' + e.area.name;
+}
+
+// 选择时间回调
+let dateConfirm = (e: any) => {
+	console.log(e);
+	formData.value.deliveryDate = e.year + '-' + e.month + '-' + e.day
+}
+
+// 初始化数据
 let initQuotation = (orderId: number) => {
 	quotationInit({ orderId }).then((res: any) => {
 		if (res.data.code === 200) {