e6381328 by 杨炀

Merge commit 'aa887c8a' into dev

2 parents ffb67970 aa887c8a
......@@ -117,6 +117,9 @@
<el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
<el-input v-model="form.invoiceEmail"/>
</el-form-item>
<el-form-item label="备注" v-if="form.invoiceForm=='1'" prop="remarks">
<el-input type="textarea" v-model="form.remarks"/>
</el-form-item>
<div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
<el-form-item :label="`地址`" required prop="invoiceAddress">
<el-input v-model="form.invoiceAddress"/>
......
......@@ -95,7 +95,10 @@
<el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
{{form.invoiceEmail}}
</el-form-item>
<el-form-item :label="`邮寄地址`" v-else required>
<el-form-item label="备注" prop="remarks">
{{form.remarks}}
</el-form-item>
<el-form-item v-if="!form.invoiceForm=='1'" :label="`邮寄地址`" required>
<div class="flexCenter">
<div>
<div class="bigSize">{{nowAddress.contact}} {{nowAddress.phone}}</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!