|
@@ -219,8 +219,8 @@ const closePushPopup = () => {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const handlePushOrderSubmit = () => {
|
|
const handlePushOrderSubmit = () => {
|
|
|
- const f = flow.value
|
|
|
|
|
- if (!f) return
|
|
|
|
|
|
|
+ const currentFlow = flow.value
|
|
|
|
|
+ if (!currentFlow) return
|
|
|
|
|
|
|
|
if (!inputName.value || !inputPhone.value) {
|
|
if (!inputName.value || !inputPhone.value) {
|
|
|
return uni.showToast({ title: '请输入接收人姓名和手机号', icon: 'none' })
|
|
return uni.showToast({ title: '请输入接收人姓名和手机号', icon: 'none' })
|
|
@@ -234,8 +234,8 @@ const handlePushOrderSubmit = () => {
|
|
|
receiver: inputName.value,
|
|
receiver: inputName.value,
|
|
|
receiverPhone: inputPhone.value,
|
|
receiverPhone: inputPhone.value,
|
|
|
// ZXXX 不传邮箱,其它类型使用路由带入的接收邮箱
|
|
// ZXXX 不传邮箱,其它类型使用路由带入的接收邮箱
|
|
|
- receiverEmail: f.pushEmailDisabled ? '' : receiverEmail.value,
|
|
|
|
|
- businessType: f.businessType,
|
|
|
|
|
|
|
+ receiverEmail: currentFlow.pushEmailDisabled ? '' : receiverEmail.value,
|
|
|
|
|
+ businessType: currentFlow.businessType,
|
|
|
signUrl: getSignUrl(),
|
|
signUrl: getSignUrl(),
|
|
|
orderItemId: orderItemId.value || undefined,
|
|
orderItemId: orderItemId.value || undefined,
|
|
|
securityCheckId: securityCheckId.value,
|
|
securityCheckId: securityCheckId.value,
|