Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
83accaa0 by 杨炀
Options

no message

1 parent 1081a406
Inline Side-by-side
Showing 8 changed files with 35 additions and 16 deletions
src/viewsPc/booking/hotelDetail.vue
...@@ -124,7 +124,10 @@ ...@@ -124,7 +124,10 @@
124 <div>{{ language == 0 ? '在线付' : 'Online' }}</div> 124 <div>{{ language == 0 ? '在线付' : 'Online' }}</div>
125 </el-button> 125 </el-button>
126 <el-button v-else style="color: #fff" :disabled="!r.useCount && !hotTime" 126 <el-button v-else style="color: #fff" :disabled="!r.useCount && !hotTime"
127 :class="(r.useCount<=0 && hotTime)?'forbid btn-lineG w100':'btn-lineG w100'" round type="pri mary" @click="goOrder(r)">Select 127 :class="{'forbid':!(!hotTime[0] || r.useCount>0)}"
128 class="btn-lineG w100" round
129 type="primary" @click="goOrder(r)">
130 Select
128 </el-button> 131 </el-button>
129 <div v-if="r.useCount>0"> 132 <div v-if="r.useCount>0">
130 <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0"> 133 <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0">
......
src/viewsPc/components/homeQuick.vue
...@@ -78,6 +78,11 @@ const props = defineProps({ ...@@ -78,6 +78,11 @@ const props = defineProps({
78 type: String, 78 type: String,
79 required: true, 79 required: true,
80 default: '0' 80 default: '0'
81 },
82 cptName: {
83 type: String,
84 required: true,
85 default: ''
81 } 86 }
82 }) 87 })
83 const language = useStorage('language', 0) 88 const language = useStorage('language', 0)
...@@ -122,7 +127,8 @@ function popRemark(type) { ...@@ -122,7 +127,8 @@ function popRemark(type) {
122 const params = { 127 const params = {
123 matchId: props.matchId, 128 matchId: props.matchId,
124 title: language.value == 0 ? '预订说明' : 'Booking Instructions', 129 title: language.value == 0 ? '预订说明' : 'Booking Instructions',
125 type: type 130 type: type,
131 cptName: props.cptName
126 } 132 }
127 proxy.$refs['orderRemarkRef'].open(params) 133 proxy.$refs['orderRemarkRef'].open(params)
128 } 134 }
......
src/viewsPc/components/orderRemark.vue
1 <template> 1 <template>
2 <el-dialog :title="title" v-model="show" width="30%" @close="close"> 2 <el-dialog :title="title" v-model="show" width="30%" @close="close">
3 <div> 3 <div>
4 <div v-if="type==1" class="pd20" v-html="form.reserveDes"></div> 4 <h2 class="text-warning text-center" v-if="cptName">{{cptName}}</h2>
5 <div v-if="type==2" class="pd20" v-html="form.reserveDesCar"></div> 5
6 <div v-if="type==3" class="pd20" v-html="form.reserveDesFood"></div> 6 <div v-if="type==1" class="plr20" v-html="form.reserveDes"></div>
7 <div v-if="type==4" class="pd20" v-html="form.reserveDesMeal"></div> 7 <div v-if="type==2" class="plr20" v-html="form.reserveDesCar"></div>
8 <div v-if="type==5" class="pd20" v-html="form.reserveDesPhoto"></div> 8 <div v-if="type==3" class="plr20" v-html="form.reserveDesFood"></div>
9 <div v-if="type==0" class="pd20" v-html="form.reserveDesTitck"></div> 9 <div v-if="type==4" class="plr20" v-html="form.reserveDesMeal"></div>
10 <div v-if="type==5" class="plr20" v-html="form.reserveDesPhoto"></div>
11 <div v-if="type==0" class="plr20" v-html="form.reserveDesTitck"></div>
10 </div> 12 </div>
11 <template #footer> 13 <template #footer>
12 <div class="dialog-footer text-center"> 14 <div class="dialog-footer text-center">
...@@ -26,12 +28,14 @@ const language= useStorage('language',0) ...@@ -26,12 +28,14 @@ const language= useStorage('language',0)
26 import useUserStore from "@/store/modules/user"; 28 import useUserStore from "@/store/modules/user";
27 const user = useUserStore().user 29 const user = useUserStore().user
28 const title = ref('') 30 const title = ref('')
31 const cptName = ref('')
29 const show = ref(false) 32 const show = ref(false)
30 const form = ref({}) 33 const form = ref({})
31 let matchId = '' 34 let matchId = ''
32 let type = '' 35 let type = ''
33 const open = (params) => { 36 const open = (params) => {
34 title.value = params.title 37 title.value = params.title
38 cptName.value = params.cptName
35 matchId = params.matchId 39 matchId = params.matchId
36 type = params.type 40 type = params.type
37 show.value = true 41 show.value = true
......
src/viewsPc/index.vue
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 </div> 102 </div>
103 </el-col> 103 </el-col>
104 <el-col :sm="24" :lg="14"> 104 <el-col :sm="24" :lg="14">
105 <HomeQuick :match-id="matchData?.id"/> 105 <HomeQuick :match-id="matchData?.id" :cpt-name="matchData?.name"/>
106 </el-col> 106 </el-col>
107 </el-row> 107 </el-row>
108 </div> 108 </div>
......
src/viewsPc/index_en.vue
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </div> 103 </div>
104 </el-col> 104 </el-col>
105 <el-col :sm="24" :lg="14"> 105 <el-col :sm="24" :lg="14">
106 <HomeQuick :match-id="matchData?.id"/> 106 <HomeQuick :match-id="matchData?.id" :cpt-name="matchData?.name"/>
107 </el-col> 107 </el-col>
108 </el-row> 108 </el-row>
109 </div> 109 </div>
......
src/viewsPc/match/components/addCoach.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <el-input v-else v-model="form.wdsfMin" type="text"/> 19 <el-input v-else v-model="form.wdsfMin" type="text"/>
20 </el-form-item> 20 </el-form-item>
21 <el-form-item :label="language==0?'姓名':'Name'" prop="realName" required> 21 <el-form-item :label="language==0?'姓名':'Name'" prop="realName" required>
22 <el-input v-model="form.realName" :disabled="editgay"/> 22 <el-input v-model="form.realName" :disabled="editgay&&form.labelArr.indexOf('0')>-1"/>
23 </el-form-item> 23 </el-form-item>
24 <el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required> 24 <el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required>
25 <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay"> 25 <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay">
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <span class="tip">*请上传有效证件扫描件</span> 39 <span class="tip">*请上传有效证件扫描件</span>
40 </el-form-item> 40 </el-form-item>
41 <el-form-item :label="language==0?'性别':'Gender'" prop="sex"> 41 <el-form-item :label="language==0?'性别':'Gender'" prop="sex">
42 <el-radio-group v-model="form.sex" :disabled="editgay"> 42 <el-radio-group v-model="form.sex" :disabled="editgay&&form.labelArr.indexOf('0')>-1">
43 <el-radio value="0">{{ language==0?'女':'female' }}</el-radio> 43 <el-radio value="0">{{ language==0?'女':'female' }}</el-radio>
44 <el-radio value="1">{{ language==0?'男':'male' }}</el-radio> 44 <el-radio value="1">{{ language==0?'男':'male' }}</el-radio>
45 </el-radio-group> 45 </el-radio-group>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 <el-col :lg="12"> 48 <el-col :lg="12">
49 <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth" required> 49 <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth" required>
50 <el-date-picker 50 <el-date-picker
51 v-model="form.birth" :disabled="editgay" 51 v-model="form.birth" :disabled="editgay&&form.labelArr.indexOf('0')>-1"
52 style="width: 100%;" 52 style="width: 100%;"
53 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" 53 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
54 /> 54 />
......
src/viewsPc/match/components/quick-row.vue
...@@ -98,6 +98,11 @@ const props = defineProps({ ...@@ -98,6 +98,11 @@ const props = defineProps({
98 type: String, 98 type: String,
99 required: true, 99 required: true,
100 default: '0' 100 default: '0'
101 },
102 cptName: {
103 type: String,
104 required: true,
105 default: ''
101 } 106 }
102 }) 107 })
103 const form = ref() 108 const form = ref()
...@@ -136,7 +141,8 @@ function popRemark(type) { ...@@ -136,7 +141,8 @@ function popRemark(type) {
136 const params = { 141 const params = {
137 matchId: props.matchId, 142 matchId: props.matchId,
138 title: language.value == 0 ? '预订说明' : 'Booking Instructions', 143 title: language.value == 0 ? '预订说明' : 'Booking Instructions',
139 type: type 144 type: type,
145 cptName: props.cptName
140 } 146 }
141 proxy.$refs['orderRemarkRef'].open(params) 147 proxy.$refs['orderRemarkRef'].open(params)
142 148
......
vite.config.js
...@@ -84,8 +84,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -84,8 +84,8 @@ export default defineConfig(({ mode, command }) => {
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.118:8081/', 85 // target: 'http://192.168.1.118:8081/',
86 // target: 'http://192.168.1.131:8081/', 86 // target: 'http://192.168.1.131:8081/',
87 target: 'https://jijin.wtwuxicenter.com/stage-api', 87 // target: 'https://jijin.wtwuxicenter.com/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/', 88 target: 'https://wdsfwuxicenter.com/stage-api/',
89 changeOrigin: true, 89 changeOrigin: true,
90 rewrite: (p) => p.replace(/^\/dev-api/, '') 90 rewrite: (p) => p.replace(/^\/dev-api/, '')
91 }, 91 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!