be427db8 by zrj

9.4 世锦赛本周功能更新

1 parent d4a4afaf
...@@ -225,6 +225,15 @@ export function cancelOrder2(orderId) { ...@@ -225,6 +225,15 @@ export function cancelOrder2(orderId) {
225 }) 225 })
226 } 226 }
227 227
228 // 取消
229 export function cancelOrderBody(data) {
230 return request({
231 url: `/ota/norder/cancelOrderBackBody`,
232 method: 'post',
233 data: data
234 })
235 }
236
228 export function addressList(userId) { 237 export function addressList(userId) {
229 return request({ 238 return request({
230 url: `/ota/invoiceInfo/list`, 239 url: `/ota/invoiceInfo/list`,
......
...@@ -130,14 +130,14 @@ ...@@ -130,14 +130,14 @@
130 }}</span> 130 }}</span>
131 <span v-else>{{ language == 0 ? '支付' : 'Pay' }}</span> 131 <span v-else>{{ language == 0 ? '支付' : 'Pay' }}</span>
132 </el-button> 132 </el-button>
133 <el-button class="mb10" plain round size="small" type="warning" @click="downInvoice(b)"> 133 <el-button v-if="b.orderType !== 1&&b.orderType !== 3" class="mb10" plain round size="small" type="warning" @click="downInvoice(b)">
134 <span>{{ language == 0 ? '下载缴费单' : 'Download Invoice' }}</span> 134 <span>{{ language == 0 ? '下载缴费单' : 'Download Invoice' }}</span>
135 </el-button> 135 </el-button>
136 <el-button v-if="b.viewStatus==0 &&!min" class="mb10" plain round size="small" type="warning" 136 <el-button v-if="b.viewStatus==0 &&!min" class="mb10" plain round size="small" type="warning"
137 @click="cancel(b)"> 137 @click="cancel(b)">
138 {{ language == 0 ? '取消订单' : 'Cancel Order' }} 138 {{ language == 0 ? '取消订单' : 'Cancel Order' }}
139 </el-button> 139 </el-button>
140 <el-button v-if="b.viewStatus==5 && !min" class="mb10" plain round size="small" @click="unsubscribe(b)"> 140 <el-button v-if="b.viewStatus==5 && !min" class="mb10" plain round size="small" @click="showunsubscribe(b)">
141 {{ language == 0 ? '退订' : 'Unsubscribe' }} 141 {{ language == 0 ? '退订' : 'Unsubscribe' }}
142 </el-button> 142 </el-button>
143 143
...@@ -164,13 +164,46 @@ ...@@ -164,13 +164,46 @@
164 </el-row> 164 </el-row>
165 </div> 165 </div>
166 </el-dialog> 166 </el-dialog>
167 <el-dialog v-model="show2" :title="language == 0 ? '退订' : 'Unsubscribe'" width="600px">
168 <el-form
169 ref="infoRef" :model="unsubscribeForm" style="background: #fff;padding: 40px" :rules="unsubscribeRules" label-width="auto" label-suffix=":"
170 >
171 <el-form-item :label="language == 0 ? '队伍名称' : 'NOC'" prop="noc">
172 <el-input v-model="unsubscribeForm.noc" :placeholder="language == 0 ? '队伍名称' : 'NOC'" style="width: 100%" />
173 </el-form-item>
174 <el-form-item :label="language == 0 ? '预定人名称' : 'Athlete Name'" prop="athleteName">
175 <el-input v-model="unsubscribeForm.athleteName" :placeholder="language == 0 ? '预定人名称' : 'Athlete Name'" style="width: 100%" />
176 </el-form-item>
177 <el-form-item :label="language == 0 ? '收款人名称' : 'Beneficiary Name'" prop="beneficiaryName">
178 <el-input v-model="unsubscribeForm.beneficiaryName" :placeholder="language == 0 ? '收款人名称' : 'Beneficiary Name'" style="width: 100%" />
179 </el-form-item>
180 <el-form-item :label="language == 0 ? '收款人地址' : 'Beneficiary Address'" prop="beneficiaryAddress">
181 <el-input v-model="unsubscribeForm.beneficiaryAddress" :placeholder="language == 0 ? '收款人地址' : 'Beneficiary Address'" clearable />
182 </el-form-item>
183 <el-form-item :label="language == 0 ? '收款人开户银行' : 'Beneficiary Bank Name'" prop="beneficiaryBankName">
184 <el-input v-model="unsubscribeForm.beneficiaryBankName" :placeholder="language == 0 ? '收款人开户银行' : 'Beneficiary Bank Name'" clearable />
185 </el-form-item>
186 <el-form-item :label="language == 0 ? '收款人银行账号' : 'Beneficiary Bank Account Number'" prop="beneficiaryBankAccountNumber">
187 <el-input v-model="unsubscribeForm.beneficiaryBankAccountNumber" :placeholder="language == 0 ? '收款人银行账号' : 'Beneficiary Bank Account Number'" clearable />
188 </el-form-item>
189 <el-form-item :label="language == 0 ? '“SWIFT 码”' : 'SWIFT Code'" prop="swiftCode">
190 <el-input v-model="unsubscribeForm.swiftCode" :placeholder="language == 0 ? '“SWIFT 码”' : 'SWIFT Code'" clearable />
191 </el-form-item>
192 <el-form-item :label="language == 0 ? '收款人银行地址' : 'Beneficiary Bank Address'" prop="beneficiaryBankAddress">
193 <el-input v-model="unsubscribeForm.beneficiaryBankAddress" :placeholder="language == 0 ? '收款人银行地址' : 'Beneficiary Bank Address'" clearable />
194 </el-form-item>
195 </el-form>
196 <el-row justify="center">
197 <el-button type="primary" @click="unsubscribe()">提交</el-button>
198 </el-row>
199 </el-dialog>
167 </div> 200 </div>
168 </template> 201 </template>
169 202
170 <script setup> 203 <script setup>
171 import dayjs from "dayjs"; 204 import dayjs from "dayjs";
172 import {useStorage} from "@vueuse/core"; 205 import {useStorage} from "@vueuse/core";
173 import {cancelOrder, cancelOrder2,renewalProof,mergeBind} from "/@/apiPc/booking"; 206 import {cancelOrder, cancelOrder2,renewalProof,mergeBind, cancelOrderBody} from "/@/apiPc/booking";
174 import {ElMessage} from "element-plus"; 207 import {ElMessage} from "element-plus";
175 import {getCurrentInstance} from "@vue/runtime-core"; 208 import {getCurrentInstance} from "@vue/runtime-core";
176 import {ref} from "vue"; 209 import {ref} from "vue";
...@@ -245,14 +278,26 @@ const cancel = (row) => { ...@@ -245,14 +278,26 @@ const cancel = (row) => {
245 }) 278 })
246 } 279 }
247 280
248 const unsubscribe = (row) => { 281 // const unsubscribe = (row) => {
282 // proxy.$modal.confirm(language.value == 0 ? `确定退款吗 ?` : 'Are you sure to refund?').then(() => {
283 // return cancelOrder(row.id).then(res => {
284 // ElMessage({
285 // message: language.value == 0 ? '已提交退款,请等待审核!' : 'Refund has been submitted, please wait for review!',
286 // type: 'success'
287 // })
288 //
289 // emit('refresh')
290 // })
291 // })
292 // }
293
294 const unsubscribe = () => {
249 proxy.$modal.confirm(language.value == 0 ? `确定退款吗 ?` : 'Are you sure to refund?').then(() => { 295 proxy.$modal.confirm(language.value == 0 ? `确定退款吗 ?` : 'Are you sure to refund?').then(() => {
250 return cancelOrder(row.id).then(res => { 296 return cancelOrderBody(unsubscribeForm.value).then(res => {
251 ElMessage({ 297 ElMessage({
252 message: language.value == 0 ? '已提交退款,请等待审核!' : 'Refund has been submitted, please wait for review!', 298 message: language.value == 0 ? '已提交退款,请等待审核!' : 'Refund has been submitted, please wait for review!',
253 type: 'success' 299 type: 'success'
254 }) 300 })
255
256 emit('refresh') 301 emit('refresh')
257 }) 302 })
258 }) 303 })
...@@ -329,6 +374,32 @@ const showDialog = () => { ...@@ -329,6 +374,32 @@ const showDialog = () => {
329 show.value = true 374 show.value = true
330 } 375 }
331 376
377 const show2 = ref(false)
378 const unsubscribeForm = ref({
379 noc:'',
380 athleteName:'',
381 beneficiaryName:'',
382 beneficiaryAddress:'',
383 beneficiaryBankName:'',
384 beneficiaryBankAccountNumber:'',
385 beneficiaryBankAddress:'',
386 swiftCode:'',
387 })
388 const unsubscribeRules = ref([])
389 const showunsubscribe = (row) => {
390 unsubscribeForm.value = {
391 id:row.id,
392 noc:'',
393 athleteName:'',
394 beneficiaryName:'',
395 beneficiaryAddress:'',
396 beneficiaryBankName:'',
397 beneficiaryBankAccountNumber:'',
398 beneficiaryBankAddress:'',
399 swiftCode:'',
400 }
401 show2.value = true
402 }
332 403
333 </script> 404 </script>
334 405
......
...@@ -84,7 +84,7 @@ export default defineConfig(({mode, command}) => { ...@@ -84,7 +84,7 @@ export default defineConfig(({mode, command}) => {
84 }, 84 },
85 '/dev-api': { 85 '/dev-api': {
86 // target: 'http://192.168.1.118:8082/', 86 // target: 'http://192.168.1.118:8082/',
87 target: 'http://192.168.1.52:8082', 87 target: 'http://192.168.1.22:8082',
88 // target: 'https://tk005.wxjylt.com/stage-api', 88 // target: 'https://tk005.wxjylt.com/stage-api',
89 // target: 'http://124.70.181.90:1880/stage-api', 89 // target: 'http://124.70.181.90:1880/stage-api',
90 // target: 'https://sys.2025wtcwuxi.com/stage-api/', 90 // target: 'https://sys.2025wtcwuxi.com/stage-api/',
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!