b97ce31f by yyx

Merge branch 'order' of https://code.itechtop.cn/yangyang/dance-pc into order

2 parents 7328b170 f7af94ca
...@@ -101,7 +101,8 @@ function popRemark(type){ ...@@ -101,7 +101,8 @@ function popRemark(type){
101 building() 101 building()
102 return 102 return
103 } 103 }
104 if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || type=='0' || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){ 104 if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){
105 //type == '0'
105 building() 106 building()
106 return 107 return
107 } 108 }
...@@ -116,8 +117,11 @@ function goBooking(n) { ...@@ -116,8 +117,11 @@ function goBooking(n) {
116 switch (n) { 117 switch (n) {
117 case 0: 118 case 0:
118 // 票务 119 // 票务
119 building() 120 router.push({
120 router.push({path: `/booking/ticket/${props.matchId}`}) 121 path: `/seat/detail`,
122 params: {id: 1},
123 query: {id: 1}
124 })
121 break; 125 break;
122 case 1: 126 case 1:
123 //酒店 127 //酒店
......
...@@ -70,20 +70,20 @@ export default defineConfig(({ mode, command }) => { ...@@ -70,20 +70,20 @@ export default defineConfig(({ mode, command }) => {
70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') 70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
71 }, 71 },
72 '/dev-api/ztx-match': { 72 '/dev-api/ztx-match': {
73 target: 'http://192.168.1.118:8083', 73 // target: 'http://192.168.1.118:8083',
74 // target: 'http://192.168.1.132:8081', 74 target: 'https://jijin.wtwuxicenter.com/stage-api',
75 changeOrigin: true, 75 changeOrigin: true,
76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
77 }, 77 },
78 '/dev-api/ztx-webSite': { 78 '/dev-api/ztx-webSite': {
79 // target: 'https://dance.itechtop.cn/stage-api', 79 target: 'https://jijin.wtwuxicenter.com/stage-api',
80 target: 'http://192.168.1.118:8081/', 80 // target: 'http://192.168.1.118:8081/',
81 changeOrigin: true, 81 changeOrigin: true,
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://dance.itechtop.cn/stage-api', 86 target: 'https://jijin.wtwuxicenter.com/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api', 87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
89 rewrite: (p) => p.replace(/^\/dev-api/, '') 89 rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!