Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
8ea6b012 by zhangmeng
Options

Merge remote-tracking branch 'origin/devmatch' into devmatch

2 parents 3bb29bd7 e21670cf
Inline Side-by-side
Showing 5 changed files with 65 additions and 127 deletions
src/viewsPc/booking/ticket/addInvoice.vue
...@@ -20,43 +20,12 @@ ...@@ -20,43 +20,12 @@
20 <label class="blueTag">{{ paymentType != 3 ? '票务订单' : 'Ticket' }}</label> 20 <label class="blueTag">{{ paymentType != 3 ? '票务订单' : 'Ticket' }}</label>
21 <h3>{{ matchForm.name }}</h3> 21 <h3>{{ matchForm.name }}</h3>
22 <div> 22 <div>
23 <p>地址：{{ matchForm.address }}</p> 23 <p>票档：{{ ticketForm.extJson?.atName }}</p>
24 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p> 24 <p>场馆：{{ ticketForm.extJson?.atsName }}</p>
25 <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p> 25 <p>场次：{{ ticketForm.extJson?.sessionType =='1000'? '日间场' : '夜间场' }}</p>
26 <p>通票：{{ 26 <p>票型：{{ ticketForm.extJson?.atstName }}</p>
27 paymentType != 3 ? '¥' : '€'
28 }}
29 {{
30 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
31 }}
32 /1张</p>
33 <p>优惠票：{{
34 paymentType != 3 ? '¥' : '€'
35 }}
36 {{
37 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
38 }}
39 /1张</p>
40
41 <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
42 </div> 27 </div>
43 <div> 28 <div>
44 <el-row v-for="v in message" style="width: 100%">
45 <el-col :lg="8" :md="12" :sm="12" :xs="24">
46 <div>{{ v.name }}
47 </div>
48 </el-col>
49 <el-col :lg="8" :md="12" :sm="12" :xs="24">
50 <div>{{ !v.discount ? '通票' : '优惠票' }}
51 </div>
52 </el-col>
53 <el-col :lg="8" :md="12" :sm="12" :xs="24">
54 {{
55 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
56 }}
57 {{ paymentType != 3 ? '￥' : '€' }}/张
58 </el-col>
59 </el-row>
60 <el-row style="width: 100%"> 29 <el-row style="width: 100%">
61 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 30 <el-col :lg="8" :md="12" :sm="12" :xs="24">
62 <div>购票数量：{{ ticketForm.num }}张 31 <div>购票数量：{{ ticketForm.num }}张
...@@ -65,8 +34,8 @@ ...@@ -65,8 +34,8 @@
65 <el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }} 34 <el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
66 </el-col> 35 </el-col>
67 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 36 <el-col :lg="8" :md="12" :sm="12" :xs="24">
68 共计:{{ (totalMoney * 1).toFixed(2) }}{{ 37 共计:{{ (totalMoney*1).toFixed(2) }}{{
69 paymentType != 3 ? '￥' : '€' 38 paymentType == 1 ? '￥' : '€'
70 }} 39 }}
71 </el-col> 40 </el-col>
72 </el-row> 41 </el-row>
...@@ -82,7 +51,7 @@ ...@@ -82,7 +51,7 @@
82 class="mw500" 51 class="mw500"
83 > 52 >
84 <el-form-item :label="language==0 ?'开票金额':'Amount'"> 53 <el-form-item :label="language==0 ?'开票金额':'Amount'">
85 <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span> 54 <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ paymentType != 3?ticketForm.total:ticketForm.totalEn }}</span>
86 </el-form-item> 55 </el-form-item>
87 56
88 <el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required> 57 <el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
...@@ -248,16 +217,16 @@ async function getTickInfo() { ...@@ -248,16 +217,16 @@ async function getTickInfo() {
248 ticketForm.value = res.data 217 ticketForm.value = res.data
249 try { 218 try {
250 ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson) 219 ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
251 ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate) 220 // ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
252 ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType) 221 // ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
253 cptId = ticketForm.value.extJson.ticketDate.activityId 222 cptId = ticketForm.value.activeId
254 totalMoney.value.val = ticketForm.value.extJson.total 223 totalMoney.value = ticketForm.value.paymentType != 3 ? ticketForm.value.total : ticketForm.value.totalEn
255 message.value = JSON.parse(ticketForm.value.extJson.message) 224 // message.value = JSON.parse(ticketForm.value.extJson.message)
256 console.log(message.value) 225 // console.log(message.value)
257 paymentType.value = ticketForm.value.paymentType 226 paymentType.value = ticketForm.value.paymentType
258 totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total 227
259 await getDetail(ticketForm.value.extJson.ticketDate.activityId) 228 await getDetail(ticketForm.value.activeId)
260 console.log(ticketForm.value) 229 // console.log(ticketForm.value)
261 } catch (e) { 230 } catch (e) {
262 console.log(e) 231 console.log(e)
263 } finally { 232 } finally {
...@@ -268,7 +237,7 @@ async function getTickInfo() { ...@@ -268,7 +237,7 @@ async function getTickInfo() {
268 async function getDetail(activeId) { 237 async function getDetail(activeId) {
269 const res = await getTicketInfoByActivityId({ activityId: activeId }) 238 const res = await getTicketInfoByActivityId({ activityId: activeId })
270 matchForm.value = res.data 239 matchForm.value = res.data
271 console.log(matchForm.value) 240 // console.log(matchForm.value)
272 } 241 }
273 242
274 function getList() { 243 function getList() {
......
src/viewsPc/booking/ticket/invoiceDetail.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <div class="bg-lineg"> 6 <div class="bg-lineg">
7 <div class="pl-back" @click="goBack"> 7 <div class="pl-back" @click="goBack">
8 <el-icon> 8 <el-icon>
9 <ArrowLeftBold/> 9 <ArrowLeftBold />
10 </el-icon> 10 </el-icon>
11 返回 11 返回
12 </div> 12 </div>
...@@ -21,52 +21,22 @@ ...@@ -21,52 +21,22 @@
21 <label class="blueTag">票务订单</label> 21 <label class="blueTag">票务订单</label>
22 <h3>{{ matchForm.name }}</h3> 22 <h3>{{ matchForm.name }}</h3>
23 <div> 23 <div>
24 <p>地址：{{ matchForm.address }}</p> 24 <p>票档：{{ ticketForm.extJson?.atName }}</p>
25 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p> 25 <p>场馆：{{ ticketForm.extJson?.atsName }}</p>
26 <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p> 26 <p>场次：{{ ticketForm.extJson?.sessionType =='1000'? '日间场' : '夜间场' }}</p>
27 <p>通票：{{ paymentType != 3 ? '¥' : '€' }} 27 <p>票型：{{ ticketForm.extJson?.atstName }}</p>
28 {{
29 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
30 }}
31 /1张</p>
32 <p>优惠票：{{ paymentType != 3 ? '¥' : '€' }}
33 {{
34 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
35 }}
36 /1张</p>
37 <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
38 </div> 28 </div>
39 <div> 29 <div>
40 <el-row v-for="v in message" style="width: 100%">
41 <el-col :lg="8" :md="12" :sm="12" :xs="24">
42 <div>{{ v.name }}
43 </div>
44 </el-col>
45 <el-col :lg="8" :md="12" :sm="12" :xs="24">
46 <div>{{ !v.discount ? '通票' : '优惠票' }}
47 </div>
48 </el-col>
49 <el-col :lg="8" :md="12" :sm="12" :xs="24">
50 {{
51 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
52 }}
53 {{ paymentType != 3 ? '￥' : '€' }}/张
54 </el-col>
55 </el-row>
56 <el-row style="width: 100%"> 30 <el-row style="width: 100%">
57 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 31 <el-col :lg="8" :md="12" :sm="12" :xs="24">
58 <div>{{ 32 <div>购票数量：{{ ticketForm.num }}张
59 language == 0 ? '购票数量' : 'Number of tickets purchased'
60 }}：{{ ticketForm.num }}张
61 </div> 33 </div>
62 </el-col> 34 </el-col>
63 <el-col :lg="8" :md="12" :sm="12" :xs="24">{{ 35 <el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
64 language == 0 ? '联系方式' : 'Contact Information'
65 }}：{{ ticketForm.phone }}
66 </el-col> 36 </el-col>
67 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 37 <el-col :lg="8" :md="12" :sm="12" :xs="24">
68 共计:{{ (totalMoney * 1).toFixed(2) }}{{ 38 共计:{{ (totalMoney*1).toFixed(2) }}{{
69 paymentType != 3 ? '￥' : '€' 39 paymentType == 1 ? '￥' : '€'
70 }} 40 }}
71 </el-col> 41 </el-col>
72 </el-row> 42 </el-row>
...@@ -74,8 +44,10 @@ ...@@ -74,8 +44,10 @@
74 </div> 44 </div>
75 <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div> 45 <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div>
76 <div class="border-rr mt20 pd20"> 46 <div class="border-rr mt20 pd20">
77 <el-form ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules" 47 <el-form
78 class="mw500"> 48 ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
49 class="mw500"
50 >
79 <el-form-item :label="'开票金额'"> 51 <el-form-item :label="'开票金额'">
80 <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span> 52 <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
81 </el-form-item> 53 </el-form-item>
...@@ -124,27 +96,27 @@ ...@@ -124,27 +96,27 @@
124 <el-button plain round type="primary" @click="backList">返回</el-button> 96 <el-button plain round type="primary" @click="backList">返回</el-button>
125 </div> 97 </div>
126 </el-card> 98 </el-card>
127 <div style="height: 60px;"></div> 99 <div style="height: 60px;" />
128 </div> 100 </div>
129 </div> 101 </div>
130 </template> 102 </template>
131 103
132 <script setup> 104 <script setup>
133 import {useRouter, useRoute} from "vue-router"; 105 import { useRouter, useRoute } from 'vue-router'
134 import {ref, onMounted} from "vue"; 106 import { ref, onMounted } from 'vue'
135 import {useStorage} from "@vueuse/core/index"; 107 import { useStorage } from '@vueuse/core/index'
136 import dayjs from 'dayjs' 108 import dayjs from 'dayjs'
137 import {ElMessage, ElMessageBox} from "element-plus"; 109 import { ElMessage, ElMessageBox } from 'element-plus'
138 import useUserStore from "@/store/modules/user"; 110 import useUserStore from '@/store/modules/user'
139 import {getCurrentInstance} from "@vue/runtime-core"; 111 import { getCurrentInstance } from '@vue/runtime-core'
140 import { 112 import {
141 getInvoiceDetail, 113 getInvoiceDetail,
142 getTicketOrderInfo, 114 getTicketOrderInfo,
143 getTicketInfoByActivityId 115 getTicketInfoByActivityId
144 } from "@/apiPc/booking"; 116 } from '@/apiPc/booking'
145 import {getOrderDetail} from "@/viewsPc/seat/api/index"; 117 import { getOrderDetail } from '@/viewsPc/seat/api/index'
146 118
147 const {proxy} = getCurrentInstance() 119 const { proxy } = getCurrentInstance()
148 120
149 const user = useUserStore().user 121 const user = useUserStore().user
150 const language = useStorage('language', 0) 122 const language = useStorage('language', 0)
...@@ -164,58 +136,57 @@ const invoiceId = ref() ...@@ -164,58 +136,57 @@ const invoiceId = ref()
164 136
165 const rules = ref({ 137 const rules = ref({
166 invoiceType: [ 138 invoiceType: [
167 {required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change'} 139 { required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change' }
168 ], 140 ],
169 invoiceEmail: [ 141 invoiceEmail: [
170 {required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur'} 142 { required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur' }
171 ], 143 ],
172 invoiceForm: [ 144 invoiceForm: [
173 {required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change'} 145 { required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change' }
174 ], 146 ],
175 invoiceTitle: [ 147 invoiceTitle: [
176 {required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur'} 148 { required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur' }
177 ], 149 ],
178 invoiceTfn: [ 150 invoiceTfn: [
179 {required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur'} 151 { required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur' }
180 ], 152 ],
181 invoiceAddress: [ 153 invoiceAddress: [
182 {required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur'} 154 { required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur' }
183 ], 155 ],
184 invoicePhone: [ 156 invoicePhone: [
185 {required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur'} 157 { required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur' }
186 ], 158 ],
187 invoiceBank: [ 159 invoiceBank: [
188 {required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur'} 160 { required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur' }
189 ], 161 ],
190 invoiceAccount: [ 162 invoiceAccount: [
191 {required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur'} 163 { required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur' }
192 ], 164 ]
193 }) 165 })
194 onMounted(() => { 166 onMounted(() => {
195 if (route.query.invoiceId) { 167 if (route.query.invoiceId) {
196 invoiceId.value = route.query.invoiceId 168 invoiceId.value = route.query.invoiceId
197 getList() 169 getList()
198 } 170 }
199 // 获取票务订单信息 171 // 获取票务订单信息
200 getTickInfo() 172 getTickInfo()
201 }) 173 })
202 174
203 175
204 // 票务订单详情 176 // 票务订单详情
205 async function getTickInfo() { 177 async function getTickInfo() {
206 const res = await getTicketOrderInfo({orderId: route.query.orderId}) 178 const res = await getTicketOrderInfo({ orderId: route.query.orderId })
207 ticketForm.value = res.data 179 ticketForm.value = res.data
208 try { 180 try {
209 ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson) 181 ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
210 ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate) 182 // ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
211 ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType) 183 // ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
212 cptId = ticketForm.value.extJson.ticketDate.activityId 184 cptId = ticketForm.value.activeId
213 totalMoney.val = ticketForm.value.extJson.total 185 totalMoney.value = ticketForm.value.paymentType != 3 ? ticketForm.value.total : ticketForm.value.totalEn
214 message.value = JSON.parse(ticketForm.value.extJson.message) 186 // message.value = JSON.parse(ticketForm.value.extJson.message)
215 paymentType.value = ticketForm.value.paymentType 187 paymentType.value = ticketForm.value.paymentType
216 totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total 188 await getDetail(cptId)
217 await getDetail(ticketForm.value.extJson.ticketDate.activityId) 189 // console.log(ticketForm.value)
218 console.log(ticketForm.value)
219 } catch (e) { 190 } catch (e) {
220 console.log(e) 191 console.log(e)
221 } finally { 192 } finally {
...@@ -224,19 +195,19 @@ async function getTickInfo() { ...@@ -224,19 +195,19 @@ async function getTickInfo() {
224 } 195 }
225 196
226 async function getDetail(activeId) { 197 async function getDetail(activeId) {
227 const res = await getTicketInfoByActivityId({activityId: activeId}) 198 const res = await getTicketInfoByActivityId({ activityId: activeId })
228 matchForm.value = res.data 199 matchForm.value = res.data
229 console.log(matchForm.value) 200 console.log(matchForm.value)
230 } 201 }
231 202
232 async function getDataInfo() { 203 async function getDataInfo() {
233 const res = await getOrderDetail({orderSn: route.query.orderSn}) 204 const res = await getOrderDetail({ orderSn: route.query.orderSn })
234 formDate.value = res.data 205 formDate.value = res.data
235 } 206 }
236 207
237 function getList() { 208 function getList() {
238 getInvoiceDetail(invoiceId.value).then(res => { 209 getInvoiceDetail(invoiceId.value).then(res => {
239 form.value = res.data; 210 form.value = res.data
240 totalMoney.value = form.value.total 211 totalMoney.value = form.value.total
241 }) 212 })
242 } 213 }
......
src/viewsPc/center/myCanKP.vue
...@@ -86,10 +86,10 @@ ...@@ -86,10 +86,10 @@
86 <el-col :lg="9" :md="12" :sm="12" :xs="24"> 86 <el-col :lg="9" :md="12" :sm="12" :xs="24">
87 <h3 class="m0">{{ b.name }}</h3> 87 <h3 class="m0">{{ b.name }}</h3>
88 <p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{ 88 <p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{
89 b.messageObj.ticketDate.name 89 b.messageObj.atName
90 }}</p> 90 }}</p>
91 <p class="common"> 91 <p class="common">
92 {{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.num }}{{ language == 0 ? "张" : "tickets" }} 92 {{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.orderCustomerList.length }}{{ language == 0 ? "张" : "tickets" }}
93 </p> 93 </p>
94 </el-col> 94 </el-col>
95 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 95 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
...@@ -336,8 +336,6 @@ const getList = () => { ...@@ -336,8 +336,6 @@ const getList = () => {
336 list.value = res.rows 336 list.value = res.rows
337 for (const b of list.value) { 337 for (const b of list.value) {
338 b.messageObj = JSON.parse(b.extJson) 338 b.messageObj = JSON.parse(b.extJson)
339 b.messageObj.ticketDate = JSON.parse(b.messageObj.ticketDate)
340 b.messageObj.ticketType = JSON.parse(b.messageObj.ticketType)
341 } 339 }
342 loading.value = false 340 loading.value = false
343 console.log(list.value) 341 console.log(list.value)
......
src/viewsPc/components/homeQuick.vue
...@@ -126,7 +126,7 @@ function popRemark(type) { ...@@ -126,7 +126,7 @@ function popRemark(type) {
126 (form.value.isFoodView == 0 && type == '3') || 126 (form.value.isFoodView == 0 && type == '3') ||
127 (form.value.isMealView == 0 && type == '4') || 127 (form.value.isMealView == 0 && type == '4') ||
128 (form.value.isPhotoView == 0 && type == '5') || 128 (form.value.isPhotoView == 0 && type == '5') ||
129 (form.value.isTicket == 0 && type == '0') || 129 (form.value.isTicketView == 0 && type == '0') ||
130 (form.value.isScenicView == 0 && type == '8') 130 (form.value.isScenicView == 0 && type == '8')
131 ) { 131 ) {
132 building() 132 building()
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!