10846c05 by 杨炀

no message

1 parent 4cc86c07
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 <el-form-item :label="language == 0 ?`税号`:'Duty Paragraph'" required v-if="form.invoiceType=='0'" prop="invoiceTfn"> 114 <el-form-item :label="language == 0 ?`税号`:'Duty Paragraph'" required v-if="form.invoiceType=='0'" prop="invoiceTfn">
115 <el-input v-model="form.invoiceTfn"/> 115 <el-input v-model="form.invoiceTfn"/>
116 </el-form-item> 116 </el-form-item>
117 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail"> 117 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required>
118 <el-input v-if="orderType==6" v-model="form.invoiceEmail"/> 118 <el-input v-if="orderType==6" v-model="form.invoiceEmail"/>
119 <el-input v-else v-model="form.address"/> 119 <el-input v-else v-model="form.address"/>
120 </el-form-item> 120 </el-form-item>
...@@ -206,9 +206,6 @@ const rules = ref({ ...@@ -206,9 +206,6 @@ const rules = ref({
206 invoiceType: [ 206 invoiceType: [
207 {required: true, message: language.value==0?'请选择发票类型':'Please select invoice type', trigger: 'change'} 207 {required: true, message: language.value==0?'请选择发票类型':'Please select invoice type', trigger: 'change'}
208 ], 208 ],
209 invoiceEmail: [
210 {required: true, message: language.value==0?'请输入邮箱':'Please enter email', trigger: 'blur'}
211 ],
212 invoiceForm: [ 209 invoiceForm: [
213 {required: true, message: language.value==0?'请选择发票形式':'Please select invoice form', trigger: 'change'} 210 {required: true, message: language.value==0?'请选择发票形式':'Please select invoice form', trigger: 'change'}
214 ], 211 ],
...@@ -378,6 +375,14 @@ function getAddress(obj) { ...@@ -378,6 +375,14 @@ function getAddress(obj) {
378 nowAddress.value = obj 375 nowAddress.value = obj
379 } 376 }
380 function submit() { 377 function submit() {
378 if(orderType.value==6 && !form.value.invoiceEmail){
379 ElMessage.warning(language.value == 0 ?'请输入邮箱':'Please enter email')
380 return
381 }
382 if(orderType.value!=6 && !form.value.address){
383 ElMessage.warning(language.value == 0 ?'请输入邮箱':'Please enter email')
384 return
385 }
381 proxy.$refs['formRef'].validate((valid) => { 386 proxy.$refs['formRef'].validate((valid) => {
382 if(valid){ 387 if(valid){
383 // 提交确认 388 // 提交确认
......
...@@ -92,10 +92,11 @@ ...@@ -92,10 +92,11 @@
92 <el-form-item :label="`税号`" required v-if="form.invoiceType=='0'" prop="invoiceTfn"> 92 <el-form-item :label="`税号`" required v-if="form.invoiceType=='0'" prop="invoiceTfn">
93 {{form.invoiceTfn}} 93 {{form.invoiceTfn}}
94 </el-form-item> 94 </el-form-item>
95 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail"> 95 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required>
96 {{form.invoiceEmail}} 96 <view v-if="form.address">{{form.address}}</view>
97 <view v-else-if="form.invoiceEmail">{{form.invoiceEmail}}</view>
97 </el-form-item> 98 </el-form-item>
98 <el-form-item label="备注" prop="remarks"> 99 <el-form-item label="备注" prop="remarks">
99 {{form.remarks}} 100 {{form.remarks}}
100 </el-form-item> 101 </el-form-item>
101 <el-form-item v-if="!form.invoiceForm=='1'" :label="`邮寄地址`" required> 102 <el-form-item v-if="!form.invoiceForm=='1'" :label="`邮寄地址`" required>
......
...@@ -92,8 +92,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -92,8 +92,8 @@ export default defineConfig(({ mode, command }) => {
92 '/ticket': { 92 '/ticket': {
93 // target: 'http://192.168.1.131:8098/', 93 // target: 'http://192.168.1.131:8098/',
94 // target: 'http://192.168.1.131:8081/', 94 // target: 'http://192.168.1.131:8081/',
95 // target: 'http://124.70.181.90:1880/h5/', 95 target: 'https://jijin.wtwuxicenter.com/h5/',
96 target: 'https://ticketh5.wdsfwuxicenter.com/h5/', 96 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
97 changeOrigin: true, 97 changeOrigin: true,
98 rewrite: (p) => p.replace(/^\/ticket/, '') 98 rewrite: (p) => p.replace(/^\/ticket/, '')
99 } 99 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!