|
|
@@ -432,11 +432,11 @@
|
|
|
|
|
|
<div class="agreement">
|
|
|
<div class="price-notice">
|
|
|
- 实际费用以快递员核实为准,四舍五入取整
|
|
|
+ 实际费用以快递员核实为准
|
|
|
</div>
|
|
|
- <el-checkbox v-model="agreed" size="large">
|
|
|
- 我已理解并同意遵守《快件服务协议》
|
|
|
- </el-checkbox>
|
|
|
+<!-- <el-checkbox v-model="agreed" size="large">-->
|
|
|
+<!-- 我已理解并同意遵守《快件服务协议》-->
|
|
|
+<!-- </el-checkbox>-->
|
|
|
</div>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -580,7 +580,7 @@ const signReturnOptions = ref([
|
|
|
])
|
|
|
|
|
|
// 协议同意
|
|
|
-const agreed = ref(false)
|
|
|
+const agreed = ref(true)
|
|
|
|
|
|
// 表单验证规则(已添加长度限制)
|
|
|
const senderRules = {
|
|
|
@@ -891,9 +891,9 @@ const applyAddress = (address) => {
|
|
|
receiverForm.value.clearValidate()
|
|
|
}
|
|
|
}
|
|
|
- ElMessage.success('已应用选择的地址')
|
|
|
+ // ElMessage.success('已应用选择的地址')
|
|
|
} else {
|
|
|
- ElMessage.warning('请先选择一个地址')
|
|
|
+ // ElMessage.warning('请先选择一个地址')
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1027,7 +1027,13 @@ const validateFormData = () => {
|
|
|
return isValid
|
|
|
}
|
|
|
|
|
|
+function close() {
|
|
|
+ const obj = { path: "/waybill/order" }
|
|
|
+ proxy.$tab.closeOpenPage(obj)
|
|
|
+}
|
|
|
+
|
|
|
// 方法:提交订单
|
|
|
+const isSubmit = ref(false)
|
|
|
const submitOrder = async () => {
|
|
|
if (!agreed.value) {
|
|
|
ElMessage.warning('请先同意服务协议')
|
|
|
@@ -1094,8 +1100,11 @@ const submitOrder = async () => {
|
|
|
if (!validateFormData()) {
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ if(isSubmit.value){
|
|
|
+ return
|
|
|
+ }
|
|
|
+ isSubmit.value = true
|
|
|
+ proxy.$modal.loading("正在创建订单,请稍候...")
|
|
|
let formattedPickupStartTime = ''
|
|
|
let formattedPickupEndTime = ''
|
|
|
if (Array.isArray(deliveryForm.pickupTime) && deliveryForm.pickupTime.length > 0) {
|
|
|
@@ -1168,18 +1177,22 @@ const submitOrder = async () => {
|
|
|
}
|
|
|
|
|
|
console.log('提交订单数据:', orderData)
|
|
|
-
|
|
|
try {
|
|
|
const response = await addOrder(orderData)
|
|
|
+ proxy.$modal.closeLoading()
|
|
|
if(response.code == 200){
|
|
|
console.log('订单提交成功:', response.data)
|
|
|
ElMessage.success('订单创建成功!')
|
|
|
+ close()
|
|
|
} else {
|
|
|
+ isSubmit.value = false
|
|
|
ElMessage.error(response.msg || '订单创建失败!')
|
|
|
}
|
|
|
} catch (error) {
|
|
|
+ isSubmit.value = false
|
|
|
console.error('订单提交失败:', error)
|
|
|
ElMessage.error('订单提交失败,请重试')
|
|
|
+ }finally {
|
|
|
}
|
|
|
}
|
|
|
|