@@ -1,6 +1,6 @@ | |||
<template> | |||
<view class="form"> | |||
<u-form label-width="122rpx" :model="state.formData" ref="uForm"> | |||
<u-form label-width="132rpx" :model="state.formData" ref="uForm"> | |||
<u-form-item label="收货人"> | |||
<u-input placeholder="名字" :customStyle="btnGetCode" v-model="state.formData.consignee" maxlength="20" /> | |||
</u-form-item> | |||
@@ -14,8 +14,8 @@ | |||
</u-form-item> | |||
<u-form-item label="详细地址"> | |||
<u-input placeholder="小区楼栋/乡村名称" :customStyle="textareaStyle" type="textarea" | |||
v-model="state.formData.address" maxlength="100" /> | |||
<u-input placeholder="小区楼栋/乡村名称" :customStyle="textareaStyle" v-model="state.formData.address" | |||
maxlength="100" /> | |||
</u-form-item> | |||
<u-form-item label="邮政编码"> | |||
<u-input placeholder="邮政编码" :customStyle="btnGetCode" v-model="state.formData.postalCode" |
@@ -291,33 +291,23 @@ | |||
state.show = true; | |||
} else { | |||
// 签约 | |||
if (state.isSign == 2 || state.isSign == 3) { | |||
if (!hasLogin()) { | |||
uni.redirectTo({ | |||
url: `/subpackage/orders/addAddress?orderId=${state.form.orderId | |||
}&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`, | |||
}); | |||
} else { | |||
// #ifdef MP-ALIPAY | |||
uni.redirectTo({ | |||
url: `/subpackage/orders/order_payment?orderId=${state.form.orderId}`, | |||
}); | |||
// #endif | |||
// #ifdef MP-WEIXIN | |||
// uni.redirectTo({ | |||
// url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`// url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`, | |||
// }); | |||
uni.redirectTo({ | |||
url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`, | |||
}); | |||
// #endif | |||
} | |||
// if (state.isSign == 2 || state.isSign == 3) { | |||
if (!hasLogin()) { | |||
uni.redirectTo({ | |||
url: `/subpackage/orders/addAddress?orderId=${state.form.orderId | |||
}&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`, | |||
}); | |||
} else { | |||
uni.redirectTo({ | |||
url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`, | |||
}); | |||
} | |||
// } else { | |||
// uni.redirectTo({ | |||
// url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`, | |||
// }); | |||
// } | |||
} | |||
}); | |||
}) |
@@ -1,6 +1,6 @@ | |||
<template> | |||
<view class="form"> | |||
<u-form label-width="120rpx" :model="state.formData" ref="uForm"> | |||
<u-form label-width="132rpx" :model="state.formData" ref="uForm"> | |||
<u-form-item label="收货人"> | |||
<u-input placeholder="名字" :customStyle="btnGetCode" v-model="state.formData.consignee" /> | |||
</u-form-item> | |||
@@ -14,8 +14,7 @@ | |||
</u-form-item> | |||
<u-form-item label="详细地址"> | |||
<u-input placeholder="小区楼栋/乡村名称" :customStyle="textareaStyle" type="textarea" | |||
v-model="state.formData.address" /> | |||
<u-input placeholder="小区楼栋/乡村名称" :customStyle="textareaStyle" v-model="state.formData.address" /> | |||
</u-form-item> | |||
<u-form-item label="邮政编码"> | |||
<u-input placeholder="邮政编码" :customStyle="btnGetCode" v-model="state.formData.postalCode" /> |
@@ -61,8 +61,8 @@ | |||
:disabled="state.isEnableOCRData" maxlength="18" /> | |||
</u-form-item> | |||
<u-form-item label="地址"> | |||
<u-input placeholder='请输入地址' height='38' type='textarea' :autoHeight='true' | |||
v-model="state.form.address" :disabled="state.isEnableOCRData" maxlength="100" /> | |||
<u-input placeholder='请输入地址' :autoHeight='true' v-model="state.form.address" | |||
:disabled="state.isEnableOCRData" maxlength="100" /> | |||
</u-form-item> | |||
<!-- <u-form-item label="证件有效期"> | |||
<u-input v-model="state.form.begindate" type="select" /> |
@@ -186,9 +186,10 @@ | |||
}; | |||
const downAuthD = () => { | |||
// tools.showLoadingAlert("加载中"); | |||
console.log("uni.env.USER_DATA_PATH '", uni.env.USER_DATA_PATH + '/' + '产品协议.docx') | |||
uni.downloadFile({ | |||
url: state.agreeURL, | |||
filePath: wx.env.USER_DATA_PATH + '/' + '产品协议.docx', | |||
filePath: uni.env.USER_DATA_PATH + '/' + '产品协议.docx', | |||
success(res) { | |||
const filePath = res.filePath | |||
uni.openDocument({ | |||
@@ -460,7 +461,7 @@ | |||
request(getAgreementApi, options).then((res) => { | |||
let data = stringToJson(res.bizContent); | |||
state.agreeURL = envs[process.env.NODE_ENV].baseUrl + data.supAgree | |||
console.log("查协议", envs[process.env.NODE_ENV].baseUrl) | |||
console.log("查协议", envs[process.env.NODE_ENV].baseUrl, data.supAgree, data) | |||
}); | |||
} | |||
const checkboxChange = (e) => { |