9dc18f50 by 杨炀

大师课

1 parent c1726908
...@@ -47,6 +47,7 @@ export function newbilllist(query) { ...@@ -47,6 +47,7 @@ export function newbilllist(query) {
47 params: query 47 params: query
48 }) 48 })
49 } 49 }
50
50 export function vistorRegister(data) { 51 export function vistorRegister(data) {
51 return request({ 52 return request({
52 url: `/pcSimpleRegister`, 53 url: `/pcSimpleRegister`,
...@@ -68,3 +69,40 @@ export function upgradeTeam(data) { ...@@ -68,3 +69,40 @@ export function upgradeTeam(data) {
68 data: data 69 data: data
69 }) 70 })
70 } 71 }
72
73 export function submitMasterApply(data) {
74 return request({
75 url: `/league/courseUser`,
76 method: 'post',
77 data: data
78 })
79 }
80 export function masterClassList(query) {
81 return request({
82 url: `/league/courseItem/list`,
83 method: 'get',
84 params: query
85 })
86 }
87 export function getByCard(query) {
88 return request({
89 url: `/league/courseUser/getByCard`,
90 method: 'get',
91 params: query
92 })
93 }
94 export function getMasterApply(query) {
95 return request({
96 url: `/league/courseUser/getCourseByUser`,
97 method: 'get',
98 params: query
99 })
100 }
101 export function delByCard(card) {
102 return request({
103 url: `/league/courseUser/delByCard?card=${card}`,
104 method: 'delete'
105 })
106 }
107
108
......
...@@ -5,81 +5,121 @@ ...@@ -5,81 +5,121 @@
5 destroy-on-close 5 destroy-on-close
6 > 6 >
7 <div class="boxInvitation pd20"> 7 <div class="boxInvitation pd20">
8 8 <el-steps :active="activeStep" align-center class="mb20">
9 <div class="text-center pd20" v-if="showR"> 9 <el-step :title="language==0?'报名须知':'Notice'" />
10 <img class="mauto" src="@/assets/dance/ok.png"/> 10 <el-step :title="language==0?'填写信息':'Information'" />
11 <!-- <h2 class="text-center">{{ language == 0 ? '申请已提交' : 'Submitted successfully' }}</h2>--> 11 <el-step :title="language==0?'选择课程':'Courses'" />
12 <h4 class="text-center" v-if="language == 0"> 12 </el-steps>
13 我们已收到您的邀请函申请,并将尽快处理。请耐心等待。 13 <div v-if="activeStep==0">
14 </h4> 14 <div class="mb60">
15 <h4 v-else> 15 1.每班够开课标准后,将电话通知开课时间,请保持电话畅通。
16 Your invitation letter application has been received,<br/> 16 <br/>
17 and we will process it as soon as possible. 17 2.报名缴费成功后五日内,可申请全额退费;时间超出五日,申请退费则需缴纳总课程费用的20%(占用名额手续费);第二节课(含第二节)后不再接收办理退费事宜。(退费到账时间预计二十个工作日完成)
18 <br/>
19 3.我单位所有培训课程根据法定节假日正常休息,如遇不可抗力,课程顺延。
20 <br/>
21 4.课程所需书本教材、部分课程画笔颜料、舞蹈服装、跳绳等学习用品皆需学员自行准备。
18 <br/> 22 <br/>
19 Please be patient while waiting. 23 5.学员在首次开课前需填写免责协议书并交给所在班级的班主任。
20 </h4> 24 </div>
21 <el-button size="large" type="primary" @click="conti" round class="btn-lineG"> 25 <div class="text-center">
22 {{ language == 0 ? '继续提交' : 'Continue To Submit' }} 26 <el-button type="primary" class="btn-lineG" round @click="setActive(1)">下一步</el-button>
23 </el-button> 27 </div>
24 </div> 28 </div>
29 <div v-if="activeStep==1">
30 <el-form :model="form" :rules="rules" ref="iformRef" label-position="right" :label-width="language==0?'80px':'150px'">
31 <el-form-item :label="language==0?'姓名':'Name'" required prop="name">
32 <el-input v-model="form.name"/>
33 </el-form-item>
34 <el-form-item :label="language==0?'性别':'Gender'" required prop="gender">
35 <el-radio-group v-model="form.gender">
36 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio>
37 <el-radio value="1">{{ language == 0 ? '男' : 'male' }}</el-radio>
38 </el-radio-group>
39 </el-form-item>
40 <el-form-item :label="language==0?'国籍':'Nationality'" required prop="nationality">
41 <el-select filterable v-model="form.nationality" style="width: 100%;">
42 <el-option v-for="item in countrys" :key="item.id" :label="language==0?item.name:item.enName"
43 :value="item.id"/>
44 </el-select>
45 </el-form-item>
46 <el-form-item :label="language==0?'出生日期':'Date of Birth'" required prop="birth">
47 <el-date-picker
48 v-model="form.birth"
49 style="width: 100%;" placeholder="YYYY-MM-DD"
50 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
51 />
52 </el-form-item>
53 <el-form-item :label="language==0?'邮箱':'Email'" required prop="email">
54 <el-input v-model="form.email" type="email"/>
55 </el-form-item>
56 <el-form-item :label="language==0?'证件号':'ID No.'" required prop="passportNo">
57 <el-input v-model="form.passportNo" @blur="checkCard"/>
58 </el-form-item>
59 <el-form-item :label="language==0?'有效证件':'Passport Copy'" required prop="passportCopy">
60 <image-upload v-model="form.passportCopy" :limit="1" :is-show-tip="false"
61 :button-text="language==0?'上传':'Upload'"/>
62 </el-form-item>
63 <el-form-item :label="language==0?'抵达日期':'Date of Arrival'" required prop="arrival">
64 <el-date-picker
65 v-model="form.arrival" placeholder="YYYY-MM-DD"
66 style="width: 100%;"
67 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
68 />
69 </el-form-item>
70 <el-form-item :label="language==0?'出发日期':'Date of Departure'" required prop="departure">
71 <el-date-picker
72 v-model="form.departure"
73 style="width: 100%;" placeholder="YYYY-MM-DD"
74 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
75 />
76 </el-form-item>
77 <el-form-item :label="language==0?'备注':'Remark '">
78 <el-input type="textarea" v-model="form.remark" rows="3"/>
79 </el-form-item>
80
81 <div class="text-center">
82 <el-button size="large" @click="setActive(0)" round plain type="primary">{{ language == 0 ? '上一步' : 'PREV' }}</el-button>
83 <el-button type="primary" size="large" @click="checkApplyCourse(2)" round class="btn-lineG">
84 {{ language == 0 ? '下一步' : 'NEXT' }}
85 </el-button>
86 </div>
87 </el-form>
88 </div>
89 <div v-if="activeStep==2">
90 <div class="text-center pd20" v-if="showR">
91 <img class="mauto" src="@/assets/dance/ok.png"/>
92 <h2 class="text-center">{{ language == 0 ? '申请已提交' : 'Submitted successfully' }}</h2>
93 <h4 class="text-center" v-if="language == 0">
94 我们已收到您的申请,并将尽快处理。请耐心等待。
95 </h4>
96 <h4 v-else>
97 Your application has been received,<br/>
98 and we will process it as soon as possible.
99 <br/>
100 Please be patient while waiting.
101 </h4>
102 </div>
103 <div v-else>
104 <div class="tip text-danger mb20">*选择参加的课程(最少一项,最多两项)</div>
105 <el-checkbox-group size="large" v-model="form.courseId" @change="courseChange">
106 <div v-for="c in courseList" class="mb20">
107 <el-checkbox :value="c.id" border class="w100" :disabled="(form.courseId?.length>=2&&form.courseId.indexOf(c.id)==-1)||disChoose">{{language == 0 ?c.name:c.nameEn}}</el-checkbox>
108
109 </div>
110 </el-checkbox-group>
25 111
26 <el-form :model="form" :rules="rules" ref="iformRef" label-position="right" label-width="150px" v-else>
27 <el-form-item :label="language==0?'姓名':'Name'" required prop="name">
28 <el-input v-model="form.name"/>
29 </el-form-item>
30 <el-form-item :label="language==0?'性别':'Gender'" required prop="gender">
31 <el-radio-group v-model="form.gender">
32 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio>
33 <el-radio value="1">{{ language == 0 ? '男' : 'male' }}</el-radio>
34 </el-radio-group>
35 </el-form-item>
36 <el-form-item :label="language==0?'国籍':'Nationality'" required prop="nationality">
37 <el-select filterable v-model="form.nationality" style="width: 100%;">
38 <el-option v-for="item in countrys" :key="item.id" :label="language==0?item.name:item.enName"
39 :value="item.id"/>
40 </el-select>
41 </el-form-item>
42 <el-form-item :label="language==0?'出生日期':'Date of Birth'" required prop="birth">
43 <el-date-picker
44 v-model="form.birth"
45 style="width: 100%;" placeholder="YYYY-MM-DD"
46 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
47 />
48 </el-form-item>
49 <el-form-item :label="language==0?'邮箱':'Email'" required prop="email">
50 <el-input v-model="form.email" type="email"/>
51 </el-form-item>
52 <el-form-item :label="language==0?'护照号':'Passport No.'" required prop="passportNo">
53 <el-input v-model="form.passportNo"/>
54 </el-form-item>
55 <el-form-item :label="language==0?'有效证件':'Passport Copy'" required prop="passportCopy">
56 <image-upload v-model="form.passportCopy" :limit="1" :is-show-tip="false"
57 :button-text="language==0?'上传':'Upload'"/>
58 </el-form-item>
59 <el-form-item :label="language==0?'抵达日期':'Date of Arrival'" required prop="arrival">
60 <el-date-picker
61 v-model="form.arrival" placeholder="YYYY-MM-DD"
62 style="width: 100%;"
63 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
64 />
65 </el-form-item>
66 <el-form-item :label="language==0?'出发日期':'Date of Departure'" required prop="departure">
67 <el-date-picker
68 v-model="form.departure"
69 style="width: 100%;" placeholder="YYYY-MM-DD"
70 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
71 />
72 </el-form-item>
73 <el-form-item :label="language==0?'备注':'Remark '">
74 <el-input type="textarea" v-model="form.remark" rows="3"/>
75 </el-form-item>
76 112
77 <div class="text-center"> 113 <div class="text-center">
78 <el-button type="primary" size="large" @click="submit" round class="btn-lineG"> 114 <el-button size="large" @click="setActive(1)" round plain type="primary">{{ language == 0 ? '上一步' : 'PREV' }}</el-button>
115 <el-button type="primary" v-if="!disChoose" size="large" @click="submit" round class="btn-lineG w200px">
79 {{ language == 0 ? '提交' : 'SUBMIT' }} 116 {{ language == 0 ? '提交' : 'SUBMIT' }}
80 </el-button> 117 </el-button>
118
81 </div> 119 </div>
82 </el-form> 120
121 </div>
122 </div>
83 </div> 123 </div>
84 </el-dialog> 124 </el-dialog>
85 125
...@@ -92,6 +132,7 @@ import {nextTick} from "@vue/runtime-core"; ...@@ -92,6 +132,7 @@ import {nextTick} from "@vue/runtime-core";
92 import {ElMessage, ElMessageBox} from "element-plus"; 132 import {ElMessage, ElMessageBox} from "element-plus";
93 import {addInvitation, countryList} from "@/apiPc/match"; 133 import {addInvitation, countryList} from "@/apiPc/match";
94 import ImageUpload from "@/components/ImageUpload"; 134 import ImageUpload from "@/components/ImageUpload";
135 import {masterClassList, getByCard, submitMasterApply, getMasterApply, delByCard} from "@/apiPc/common";
95 136
96 const {proxy} = getCurrentInstance() 137 const {proxy} = getCurrentInstance()
97 const language = useStorage('language', 0) 138 const language = useStorage('language', 0)
...@@ -100,8 +141,11 @@ const form = ref({ ...@@ -100,8 +141,11 @@ const form = ref({
100 }) 141 })
101 const show = ref(false) 142 const show = ref(false)
102 const showR = ref(false) 143 const showR = ref(false)
144 const disChoose = ref(false)
103 const title = ref('') 145 const title = ref('')
146 const activeStep = ref(0)
104 const countrys = ref([]) 147 const countrys = ref([])
148 const courseList = ref([])
105 const cptId = ref('') 149 const cptId = ref('')
106 const rules = ref( 150 const rules = ref(
107 { 151 {
...@@ -119,6 +163,7 @@ const open = (params) => { ...@@ -119,6 +163,7 @@ const open = (params) => {
119 show.value = true 163 show.value = true
120 title.value = params.title 164 title.value = params.title
121 cptId.value = params.cptId 165 cptId.value = params.cptId
166 getCourse()
122 } 167 }
123 defineExpose({open}) 168 defineExpose({open})
124 watch(show, (value) => { 169 watch(show, (value) => {
...@@ -134,15 +179,48 @@ watch(show, (value) => { ...@@ -134,15 +179,48 @@ watch(show, (value) => {
134 // proxy.$refs['dialogRef'].clearValidate() 179 // proxy.$refs['dialogRef'].clearValidate()
135 }) 180 })
136 }) 181 })
137 getCountryList() 182 function getCourse() {
138 183 masterClassList({cptId:'1777256058082189313'}).then(res=>{
139 function getCountryList() { 184 courseList.value = res.rows
140 countryList().then(res => {
141 countrys.value = res.data
142 }) 185 })
143 } 186 }
187 function setActive(n) {
188 activeStep.value = n
189 }
190 function courseChange(e){
191 console.log('已选',e)
192 }
193 function checkApplyCourse(n) {
194 getMasterApply({card:form.value.passportNo}).then(res=>{
195 if(res.data?.length>0){
196 form.value.courseId = []
197 for(var n of res.data){
198 form.value.courseId.push(n.itemId)
199 }
200 ElMessageBox.confirm(
201 language.value == 0 ? '您已提交过信息,是否更新?' : 'You have submitted the information, do you want to update?',
202 language.value == 0 ? '提示' : 'Tips', {
203 confirmButtonText: language.value == 0 ? '是' : 'Confirm',
204 cancelButtonText: language.value == 0 ? '否' : 'Cancel',
205 type: 'warning'
206 }).then(()=>{
207 //删除原记录
208 delByCard(form.value.passportNo).then(res=>{
209 form.value.courseId = []
210 disChoose.value = false
211 to2()
212 })
213 }).catch(()=>{
214 disChoose.value = true
215 to2()
216 })
217 } else {
218 to2()
219 }
220 })
144 221
145 const submit = () => { 222 }
223 function to2() {
146 proxy.$refs.iformRef.validate(valid => { 224 proxy.$refs.iformRef.validate(valid => {
147 if (form.value.email.indexOf('@') == -1) { 225 if (form.value.email.indexOf('@') == -1) {
148 if (language.value == 0) { 226 if (language.value == 0) {
...@@ -153,25 +231,58 @@ const submit = () => { ...@@ -153,25 +231,58 @@ const submit = () => {
153 return 231 return
154 } 232 }
155 if (valid) { 233 if (valid) {
156 ElMessageBox.confirm( 234 setActive(2)
157 language.value == 0 ? '请确认信息正确并提交吗?' : 'Please confirm that the information is correct and submit it',
158 language.value == 0 ? '提示' : 'Tips', {
159 confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
160 cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
161 type: 'warning'
162 }).then(() => {
163 form.value.cptId = cptId.value
164 if (Array.isArray(form.value.passportCopy)) {
165 form.value.passportCopy = form.value.passportCopy[0].url
166 }
167 addInvitation(form.value).then((res) => {
168 ElMessage.success(language.value == 0 ?'提交成功':'Successfully!')
169 showR.value = true
170 })
171 })
172 } 235 }
173 }) 236 })
174 } 237 }
238
239
240 function checkCard() {
241 getByCard({card:form.value.passportNo}).then(res=>{
242 if(res.data){
243 form.value = res.data
244 }
245 })
246 }
247 getCountryList()
248
249 function getCountryList() {
250 countryList().then(res => {
251 countrys.value = res.data
252 })
253 }
254
255 const submit = () => {
256 if (form.value.courseId.length == 0) {
257 if (language.value == 0) {
258 ElMessage.warning('请至少选择一门课程')
259 } else {
260 ElMessage.warning('Please select at least one course')
261 }
262 return
263 }
264 ElMessageBox.confirm(
265 language.value == 0 ? '确认提交吗?' : 'Are you sure to submit?',
266 language.value == 0 ? '提示' : 'Tips', {
267 confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
268 cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
269 type: 'warning'
270 }).then(() => {
271 // form.value.cptId = cptId.value
272 if (Array.isArray(form.value.passportCopy)) {
273 form.value.passportCopy = form.value.passportCopy[0].url
274 }
275 // form.value.courseId = form.value.courseId.toString()
276 form.value.itemIds = form.value.courseId.toString()
277 delete form.value.courseId
278 submitMasterApply(form.value).then((res) => {
279 ElMessage.success(language.value == 0 ?'提交成功':'Successfully!')
280 showR.value = true
281 }).catch(()=>{
282
283 })
284 })
285 }
175 const conti = () => { 286 const conti = () => {
176 showR.value = false 287 showR.value = false
177 form.value = { 288 form.value = {
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <index-Ch v-if="language ==0"/> 3 <index-Ch v-if="language ==0" @pop="openMaster"/>
4 <index-En v-else/> 4 <index-En v-else @pop="openMaster"/>
5 <div v-if="showgg" class="fixed_gg"> 5 <div v-if="showgg" class="fixed_gg">
6 <!--天气--> 6 <!--天气-->
7 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon> 7 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
59 </div> 59 </div>
60 </el-dialog> 60 </el-dialog>
61 </div> 61 </div>
62
63 <dialog-master-class ref="masterClassRef"/>
62 </div> 64 </div>
63 65
64 </template> 66 </template>
...@@ -67,10 +69,12 @@ ...@@ -67,10 +69,12 @@
67 import IndexCh from '/src/viewsPc/index' 69 import IndexCh from '/src/viewsPc/index'
68 import IndexEn from '/src/viewsPc/index_en' 70 import IndexEn from '/src/viewsPc/index_en'
69 import WeatherIcon from '@/viewsPc/components/weatherIcon' 71 import WeatherIcon from '@/viewsPc/components/weatherIcon'
70 72 import DialogMasterClass from '@/viewsPc/components/masterClass'
71 import {useStorage} from "@vueuse/core/index"; 73 import {useStorage} from "@vueuse/core/index";
72 import {ref} from "vue"; 74 import {ref} from "vue";
73 import {getWeather} from "@/apiPc/webSite"; 75 import {getWeather} from "@/apiPc/webSite";
76 import {getCurrentInstance} from "@vue/runtime-core";
77 const {proxy} = getCurrentInstance()
74 const showgg = ref(true) 78 const showgg = ref(true)
75 79
76 const language = useStorage('language', 0) 80 const language = useStorage('language', 0)
...@@ -91,7 +95,14 @@ function init(){ ...@@ -91,7 +95,14 @@ function init(){
91 const popWeather = () => { 95 const popWeather = () => {
92 weatherdialog.value = true 96 weatherdialog.value = true
93 } 97 }
94 98 const openMaster = (params) => {
99 console.log(params)
100 var obj = {
101 title:'大师课申请',
102 cptId:params.cptId
103 }
104 proxy.$refs['masterClassRef'].open(obj)
105 }
95 </script> 106 </script>
96 107
97 <style scoped lang="scss"> 108 <style scoped lang="scss">
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 </el-icon> 94 </el-icon>
95 </a> 95 </a>
96 96
97 <el-button>大师公益课报名</el-button> 97 <el-button class="zn-btn ml20" @click="popMaster">大师公益课报名</el-button>
98 </div> 98 </div>
99 </el-col> 99 </el-col>
100 <el-col :sm="24" :lg="14"> 100 <el-col :sm="24" :lg="14">
...@@ -361,7 +361,7 @@ import HomeQuick from '@/viewsPc/components/homeQuick' ...@@ -361,7 +361,7 @@ import HomeQuick from '@/viewsPc/components/homeQuick'
361 import HomeCalendar from '@/viewsPc/components/homeCalendar' 361 import HomeCalendar from '@/viewsPc/components/homeCalendar'
362 import {ref, nextTick, onMounted, watch} from 'vue' 362 import {ref, nextTick, onMounted, watch} from 'vue'
363 import {getCurrentInstance} from '@vue/runtime-core' 363 import {getCurrentInstance} from '@vue/runtime-core'
364 import {getHomePage, getNewsListById, getNewsList, getWeather} from '@/apiPc/webSite' 364 import {getHomePage, getNewsListById, getNewsList} from '@/apiPc/webSite'
365 import {useRouter} from 'vue-router' 365 import {useRouter} from 'vue-router'
366 import {rankList} from '@/assets/js/data' 366 import {rankList} from '@/assets/js/data'
367 import _ from 'lodash' 367 import _ from 'lodash'
...@@ -377,14 +377,7 @@ const navigationPic = ref({ ...@@ -377,14 +377,7 @@ const navigationPic = ref({
377 }) 377 })
378 const router = useRouter() 378 const router = useRouter()
379 const {proxy} = getCurrentInstance() 379 const {proxy} = getCurrentInstance()
380 const bannerVideo = ref(null) 380 const emit = defineEmits(['pop'])
381 const isPlay = ref(false)
382 const canPrev = ref(false)
383 const canNext = ref(false)
384 const activeRankName = ref(0)
385 const weatherObj = ref({
386 forecast:[]
387 })
388 const time = ref(0) 381 const time = ref(0)
389 const personList = ref([ 382 const personList = ref([
390 { name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' }, 383 { name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' },
...@@ -402,12 +395,10 @@ const news = ref([]) ...@@ -402,12 +395,10 @@ const news = ref([])
402 const notice = ref([]) 395 const notice = ref([])
403 const display = ref([]) 396 const display = ref([])
404 const scores = ref([]) 397 const scores = ref([])
405 const nowscores = ref([])
406 const livelist = ref([]) 398 const livelist = ref([])
407 const matchData = ref({}) 399 const matchData = ref({})
408 const maList = ref([]) 400 const maList = ref([])
409 const loading = ref(false) 401 const loading = ref(false)
410 const weatherdialog = ref(false)
411 const picList = ref([]) 402 const picList = ref([])
412 403
413 onMounted(() => { 404 onMounted(() => {
...@@ -493,9 +484,6 @@ const goMatch = (n) => { ...@@ -493,9 +484,6 @@ const goMatch = (n) => {
493 path: `/match/list/${n.id}` 484 path: `/match/list/${n.id}`
494 }) 485 })
495 } 486 }
496 const popWeather = () => {
497 weatherdialog.value = true
498 }
499 487
500 const goGuide = () => { 488 const goGuide = () => {
501 router.push({ 489 router.push({
...@@ -505,6 +493,13 @@ const goGuide = () => { ...@@ -505,6 +493,13 @@ const goGuide = () => {
505 } 493 }
506 }) 494 })
507 } 495 }
496 const popMaster = () => {
497 var params = {
498 cptId:matchData.value.id
499 }
500 emit('pop',params)
501 }
502
508 </script> 503 </script>
509 504
510 <style scoped lang="scss"> 505 <style scoped lang="scss">
......
...@@ -89,6 +89,10 @@ ...@@ -89,6 +89,10 @@
89 GUIDELINE 89 GUIDELINE
90 <el-icon><download /></el-icon> 90 <el-icon><download /></el-icon>
91 </a> 91 </a>
92 <a @click="popMaster">
93
94 </a>
95
92 </div> 96 </div>
93 </el-col> 97 </el-col>
94 <el-col :sm="24" :lg="14"> 98 <el-col :sm="24" :lg="14">
...@@ -385,6 +389,7 @@ const navigationPic = ref({ ...@@ -385,6 +389,7 @@ const navigationPic = ref({
385 }) 389 })
386 const router = useRouter() 390 const router = useRouter()
387 const { proxy } = getCurrentInstance() 391 const { proxy } = getCurrentInstance()
392 const emit = defineEmits(['pop'])
388 const time = ref(0) 393 const time = ref(0)
389 394
390 const personList = ref([ 395 const personList = ref([
...@@ -498,6 +503,12 @@ const goGuide = () => { ...@@ -498,6 +503,12 @@ const goGuide = () => {
498 } 503 }
499 }) 504 })
500 } 505 }
506 const popMaster = () => {
507 var params = {
508 cptId:matchData.value.id
509 }
510 emit('pop',params)
511 }
501 </script> 512 </script>
502 513
503 <style scoped lang="scss"> 514 <style scoped lang="scss">
......
...@@ -82,9 +82,9 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,9 +82,9 @@ 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: 'https://jijin.wtwuxicenter.com/stage-api', 87 // target: 'https://jijin.wtwuxicenter.com/stage-api',
87 target: 'https://jijin.wtwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
89 rewrite: (p) => p.replace(/^\/dev-api/, '') 89 rewrite: (p) => p.replace(/^\/dev-api/, '')
90 } 90 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!