Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
bda7af21 by 杨炀
Options

Merge commit 'c12af2e4' into dev

2 parents ebbb2bbe c12af2e4
Inline Side-by-side
Showing 6 changed files with 54 additions and 16 deletions
.env.development
...@@ -17,3 +17,5 @@ VITE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login' ...@@ -17,3 +17,5 @@ VITE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
17 VITE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin' 17 VITE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
18 18
19 VITE_APP_SOCKET_URL='http://192.168.1.133:8088' 19 VITE_APP_SOCKET_URL='http://192.168.1.133:8088'
20
21 VITE_TICKET_BASE_API = 'ticket'
......
.env.staging
...@@ -19,4 +19,6 @@ VITE_APP_BASE_API = '/stage-api' ...@@ -19,4 +19,6 @@ VITE_APP_BASE_API = '/stage-api'
19 # 是否在打包时开启压缩，支持 gzip 和 brotli 19 # 是否在打包时开启压缩，支持 gzip 和 brotli
20 VITE_BUILD_COMPRESS = gzip 20 VITE_BUILD_COMPRESS = gzip
21 21
22 VITE_APP_SOCKET_URL='http://192.168.1.133:8088'
...\ No newline at end of file ...\ No newline at end of file
22 VITE_APP_SOCKET_URL='http://192.168.1.133:8088'
23
24 VITE_TICKET_BASE_API = 'https://ticketh5.wdsfwuxicenter.com/ticket'
......
src/viewsPc/booking/component/dailog.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog 3 <el-dialog
4 v-model="show" title="详情" :close-on-click-modal="true" width="800px"> 4 v-model="show" :title="language==0?'详情':'Details'" :close-on-click-modal="true" width="80%">
5 <div v-html="content"> 5 <div class="box-Dialog">
6 <div v-html="content"/>
6 </div> 7 </div>
7 </el-dialog> 8 </el-dialog>
8 </div> 9 </div>
...@@ -10,6 +11,9 @@ ...@@ -10,6 +11,9 @@
10 11
11 <script setup> 12 <script setup>
12 import {ref} from 'vue' 13 import {ref} from 'vue'
14 import {useStorage} from "@vueuse/core/index";
15
16 const language= useStorage('language',0)
13 const show=ref(false) 17 const show=ref(false)
14 const content=ref() 18 const content=ref()
15 19
...@@ -24,5 +28,11 @@ defineExpose({ ...@@ -24,5 +28,11 @@ defineExpose({
24 </script> 28 </script>
25 29
26 <style lang="scss" scoped> 30 <style lang="scss" scoped>
27 31 .box-Dialog{
32 display: flex;
33 justify-content: center;
34 //overflow: hidden;
35 overflow-x: scroll ;
36 overflow-y: hidden ;
37 }
28 </style> 38 </style>
......
src/viewsPc/booking/pay.vue
...@@ -66,17 +66,19 @@ ...@@ -66,17 +66,19 @@
66 <span style="margin-left: 40px">{{language==0?'工作室电话':'Studio phone number' }}：{{formInfo.contact}}</span> 66 <span style="margin-left: 40px">{{language==0?'工作室电话':'Studio phone number' }}：{{formInfo.contact}}</span>
67 </el-col> 67 </el-col>
68 <el-col> 68 <el-col>
69 {{ language == 0 ?'套餐说明':'Package Description' }}：{{ formInfo.introduction}} 69 <div class="esp_3 s" @click="handleView()">
70 </el-col> 70 {{ language == 0 ?'套餐说明':'Package Description' }}：{{ formInfo.introduction}}
71 <el-col>
72 <div v-if="language == 0">
73 套餐详情: <span v-html="form.details"></span>
74 </div>
75 <div v-else>
76 Package details:<span v-html="form.detailsEn"></span>
77 </div> 71 </div>
78 <!-- {{ language == 0 ?'套餐详情':'Package details' }}：{{ language == 0?form.details:form.detailsEn}}-->
79 </el-col> 72 </el-col>
73 <!-- <el-col>-->
74 <!-- <div v-if="language == 0">-->
75 <!-- 套餐详情: <span v-html="form.details"></span>-->
76 <!-- </div>-->
77 <!-- <div v-else>-->
78 <!-- Package details:<span v-html="form.detailsEn"></span>-->
79 <!-- </div>-->
80 <!--&lt;!&ndash; {{ language == 0 ?'套餐详情':'Package details' }}：{{ language == 0?form.details:form.detailsEn}}&ndash;&gt;-->
81 <!-- </el-col>-->
80 </el-row> 82 </el-row>
81 </div> 83 </div>
82 </div> 84 </div>
...@@ -366,6 +368,7 @@ ...@@ -366,6 +368,7 @@
366 </template> 368 </template>
367 </el-result> 369 </el-result>
368 </div> 370 </div>
371 <Dialog ref="DialogRef" />
369 </div> 372 </div>
370 </template> 373 </template>
371 374
...@@ -375,8 +378,10 @@ import {getCurrentInstance, ref} from 'vue' ...@@ -375,8 +378,10 @@ import {getCurrentInstance, ref} from 'vue'
375 import {onMounted} from "@vue/runtime-core" 378 import {onMounted} from "@vue/runtime-core"
376 import {useRoute, useRouter} from "vue-router" 379 import {useRoute, useRouter} from "vue-router"
377 import * as booking from "@/apiPc/booking" 380 import * as booking from "@/apiPc/booking"
381 import Dialog from '@/viewsPc/booking/component/dailog.vue'
378 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row"; 382 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row";
379 383
384
380 const {proxy} = getCurrentInstance() 385 const {proxy} = getCurrentInstance()
381 const route = useRoute() 386 const route = useRoute()
382 const router = useRouter() 387 const router = useRouter()
...@@ -654,6 +659,12 @@ function exportPdf() { ...@@ -654,6 +659,12 @@ function exportPdf() {
654 659
655 } 660 }
656 661
662 // 套餐详情
663 function handleView(){
664 console.log(form.value)
665 proxy.$refs['DialogRef'].open(language.value==0? form.value.details:form.value.detailsEn)
666 }
667
657 </script> 668 </script>
658 669
659 <style scoped lang="scss"> 670 <style scoped lang="scss">
......
src/viewsPc/seat/utils/request.js
...@@ -7,8 +7,11 @@ import { ElMessage } from "element-plus"; ...@@ -7,8 +7,11 @@ import { ElMessage } from "element-plus";
7 7
8 import { useStorage } from "@vueuse/core/index"; 8 import { useStorage } from "@vueuse/core/index";
9 const language = useStorage("language", 0); 9 const language = useStorage("language", 0);
10 const baseURL = import.meta.env.VITE_TICKET_BASE_API
11 // const baseURL = VITE_TICKET_BASE_API; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
12
13 // const baseURL = "ticket"; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
10 14
11 const baseURL = "https://ticketh5.wdsfwuxicenter.com/ticket"; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
12 const timeout = 15000; // 请求超时时间 15 const timeout = 15000; // 请求超时时间
13 16
14 const http = axios.create({ 17 const http = axios.create({
......
vite.config.js
...@@ -82,10 +82,20 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,10 +82,20 @@ export default defineConfig(({ mode, command }) => {
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.118:8081/', 85 target: 'http://192.168.1.118:8081/',
86 target: 'https://jijin.wtwuxicenter.com/stage-api', 86 // target: 'http://192.168.1.131:8081/',
87 // target: 'https://jijin.wtwuxicenter.com/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/',
87 changeOrigin: true, 89 changeOrigin: true,
88 rewrite: (p) => p.replace(/^\/dev-api/, '') 90 rewrite: (p) => p.replace(/^\/dev-api/, '')
91 },
92 '/ticket': {
93 target: 'http://192.168.1.118:8098/',
94 // target: 'http://192.168.1.131:8081/',
95 // target: 'https://jijin.wtwuxicenter.com/stage-api',
96 // target: 'https://wdsfwuxicenter.com/stage-api/',
97 changeOrigin: true,
98 rewrite: (p) => p.replace(/^\/ticket/, '')
89 } 99 }
90 } 100 }
91 }, 101 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!