Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
73dc0e6e by zhangmeng
Options

化妆

1 parent 85059f20
Expand all
Inline Side-by-side
Showing 6 changed files with 347 additions and 69 deletions
src/apiPc/booking.js
...@@ -207,3 +207,27 @@ export function delAddress(ids) { ...@@ -207,3 +207,27 @@ export function delAddress(ids) {
207 method: 'delete' 207 method: 'delete'
208 }) 208 })
209 } 209 }
210
211 export function getMakeUpList(data) {
212 return request({
213 url: `/ota/activityStudio/getStudioList`,
214 method: 'get',
215 params:data
216 })
217 }
218
219 export function makeUpDetail(data) {
220 return request({
221 url: `/ota/activityStudio/getComStudioVoById`,
222 method: 'get',
223 params:data
224 })
225 }
226
227 export function getMealConfList(data) {
228 return request({
229 url: `/ota/mealConfig/getMealConfList`,
230 method: 'get',
231 params:data
232 })
233 }
......
src/routerPc/en.js
...@@ -410,6 +410,12 @@ export const constantRoutes = [ ...@@ -410,6 +410,12 @@ export const constantRoutes = [
410 meta: { title: 'Makeup Appointment' } 410 meta: { title: 'Makeup Appointment' }
411 }, 411 },
412 { 412 {
413 path: 'makeUp/:cptId/:id/:orderId',
414 component: () => import('@/viewsPc/booking/makeUpOrder.vue'),
415 name: 'makeUpOrder',
416 meta: { title: 'Makeup Reservation' }
417 },
418 {
413 path: 'photography/:cptId', 419 path: 'photography/:cptId',
414 component: () => import('@/viewsPc/booking/photography'), 420 component: () => import('@/viewsPc/booking/photography'),
415 name: 'photography', 421 name: 'photography',
......
src/viewsPc/booking/component/makeUpCalendar.vue 0 → 100644
1 <template>
2 <div >
3 <el-calendar v-model="currentDate" :range="calendarRange">
4 <template #header="{data}">
5 <el-row style="width: 100%">
6 <el-col :span="7">
7 {{data}}
8 </el-col>
9 <el-col :span="10">
10 <el-row justify="center" align='middle' >
11 <div class="canBtn"><el-icon><ArrowLeftBold /></el-icon></div>
12 <div>
13 <el-date-picker
14 v-model="value2"
15 type="datetimerange"
16 range-separator="-"
17 start-placeholder="Start date"
18 end-placeholder="End date"
19 size="small"
20 />
21 </div>
22 <div class="canBtn"><el-icon><ArrowRightBold /></el-icon></div>
23 </el-row>
24 </el-col>
25 <el-col :span="7">
26 <div style="text-align: right;padding-right: 10px">
27 <el-date-picker
28 v-model="currentDate"
29 type="datetime"
30 placeholder="YYYY-MM-DD"
31 size="small"
32 @change="dateChange"
33 />
34 </div>
35 </el-col>
36 </el-row>
37 </template>
38 <template #date-cell="data">
39 <div :class="data.data.day==query.currentDate?'primaryDate date':'date'" @click="selectDate(data.data.day)">
40 {{ data.data.day.slice(8, 10) }}
41 </div>
42 </template>
43 </el-calendar>
44
45 <div class="calendarList">
46 <ul v-loading="loading">
47 <li v-for="n in schList" :key="n.id" @click="goMatch(n)">
48 <el-row style="width: 100%">
49 <div style="margin-right: 25px">
50 <el-image style="width: 90px;height: 115px" src="@/assets/dance/banner.png" fit="cover" />
51 </div>
52 <div style="flex: 1" >
53 <div class="hz-title">A套餐</div>
54 <div>
55 <el-row justify="space-between">
56 <el-row class="hz-p">
57 <div style="margin-right: 80px">项目: <span style="margin-right: 20px">发型x1</span> <span>化妆x1</span> </div>
58 <div style="margin-right: 80px">服务: 化妆x1 </div>
59 <div>剩余 <span class="sign">6</span>名额 </div>
60 </el-row>
61 <el-row>
62 <div class="zh-margin" style="font-size: 36px;color: #ff8124"><span style="font-size: 24px">￥ </span> 120</div>
63 <el-button class="btn-lineG w200px" round type="primary" size="large">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
64 </el-row>
65 </el-row>
66 </div>
67 </div>
68 </el-row>
69 </li>
70 </ul>
71 <el-empty v-if="schList.length== 0"
72 style="--el-empty-padding:0;--el-empty-description-margin-top:0"
73 :image="`/img/order_no.png`"
74 :image-size="200"/>
75 </div>
76 </div>
77 </template>
78
79 <script setup>
80 import {ref} from "vue";
81 import {dayjs} from "element-plus";
82 import {useRoute,useRouter} from 'vue-router'
83 import * as booking from "@/apiPc/booking"
84 import {useStorage} from "@vueuse/core/index";
85 const language = useStorage('language', 0)
86 const router = useRouter()
87 const route=useRoute()
88 const currentDate = ref(new Date())
89 const calendarRange = ref([dayjs('2024-07-17').toDate(), dayjs('2024-07-17').toDate()])
90 const schList = ref([])
91 const loading = ref(false)
92 const query = ref({
93 currentDate: dayjs(new Date()).format('YYYY-MM-DD') ,
94 // id:route.params.id
95 })
96 const value1=ref('')
97 const value2=ref('')
98
99
100 getScheduleList()
101 function getScheduleList() {
102 loading.value = true
103 // query.value.currentDate = dayjs(query.value.currentDate).format('YYYY-MM-DD')
104 booking.getMealConfList(query.value).then(res=>{
105 loading.value = false
106 schList.value = res.data
107 })
108 }
109 function selectDate(date) {
110 console.log(dayjs(date).format('YYYY-MM-DD'))
111 query.value.currentDate = dayjs(date).format('YYYY-MM-DD')
112 console.log(currentDate.value)
113 getScheduleList()
114 }
115
116 function dateChange(){
117 query.value.currentDate = dayjs(currentDate.value).format('YYYY-MM-DD')
118 getScheduleList()
119 }
120 function goMatch(n) {
121 router.push({
122 name: 'makeUpOrder',
123 params: {
124 orderId: n.cptId
125 },
126 query: {
127 matchId: n.cptId
128 }
129 })
130 }
131 </script>
132
133 <style scoped lang="scss">
134 .el-calendar {
135 --el-calendar-border: none;
136 --el-calendar-cell-width: 40px;
137 text-align: center;
138 --el-text-color-regular: #8E8D94;
139
140 :deep(.el-calendar__header) {
141 justify-content: center;
142 padding: 0 0 10px
143 }
144
145 :deep(.el-calendar__body) {
146 border: 1px solid #F0F0F0;
147 padding: 0
148 }
149
150 :deep(.el-calendar-table .el-calendar-day) {
151 padding: 1px;
152 }
153
154 :deep(.el-calendar-table td.is-selected) {
155 background: transparent;
156 }
157
158 :deep(.el-calendar__button-group) {
159 display: none;
160 }
161
162 :deep(.el-calendar-table thead th) {
163 padding: 5px 0 0
164 }
165
166 .primaryDate {
167 color: #fff;
168 background: linear-gradient(90deg, #8623FC, #453DEA);
169 }
170
171 .date {
172 margin: auto;
173 border-radius: 50%;
174 width: 30px;
175 height: 30px;
176 line-height: 30px;
177 font-weight: bold;
178 }
179 }
180
181 .calendarList {
182 border: 1px solid #F0F0F0;
183 padding: 12px 20px;
184 overflow: auto;
185 height: 625px;
186
187 ul {
188 li {cursor: pointer;
189 background: #F6F9FE;
190 margin: 7px 0 7px 20px;
191 position: relative;
192 padding: 13px;
193 border-radius: 10px;
194 font-weight: 500;
195 font-size: 15px;
196
197 label {
198 color: #453DEA;
199 margin-right: 15px;
200
201 &::before {
202 content: '';
203 background: #fff;
204 left: -17px;
205 top: 0px;
206 bottom: 0;
207 margin: auto;
208 border-radius: 50%;
209 width: 2px;
210 height: 2px;
211 position: absolute;
212 z-index: 1
213 }
214 }
215 }
216
217 li::before {
218 content: '';
219 background: linear-gradient(0deg, #8623FC, #453DEA);
220 border-radius: 50%;
221 width: 8px;
222 height: 8px;
223 position: absolute;
224 left: -20px;
225 top: 0;
226 bottom: 0;
227 margin: auto;
228 z-index: 1;
229 }
230
231 li::after {
232 content: '';
233 left: -16px;
234 width: 1px;
235 height: 100%;
236 background: #EBEBEB;
237 position: absolute;
238 top: 20px
239 }
240
241 //li:hover {
242 // color: #fff;
243 // background: linear-gradient(-90deg, #8623FC, #453DEA);
244 //
245 // label {
246 // color: #fff;
247 // }
248 //}
249 }
250 }
251
252 .hz-title{
253 font-size: 20px;
254 font-weight: 400;
255 color: #000;
256 margin-top:20px;
257 margin-bottom: 10px;
258 }
259
260 .zh-margin{
261 font-weight: bold;
262 font-size: 36px;
263 color: #FF8124;
264 margin-right: 30px;
265 }
266 .hz-p{
267 font-size: 16px;
268 color: #4C5359;
269 font-weight: 400;
270 }
271
272 :deep(.el-calendar__header) {
273 background: linear-gradient(90deg, #8623FC, #453DEA);
274 height: 50px;
275 line-height: 50px;
276 }
277
278 .canBtn{
279 color: #453DEA;
280 border-radius: 2px;
281 width: 22px;
282 height: 22px;
283 line-height: 26px;
284 text-align: center;
285 background-color: #fff;
286 margin: 0 16px 5px 16px;
287 cursor:pointer
288 }
289 </style>
src/viewsPc/booking/makeUp.vue
...@@ -13,65 +13,37 @@ ...@@ -13,65 +13,37 @@
13 </div> 13 </div>
14 <div class="box" v-loading="loading"> 14 <div class="box" v-loading="loading">
15 <el-row style="width: 100%" :gutter="20"> 15 <el-row style="width: 100%" :gutter="20">
16 <el-col :span="8" v-for="(h,index) in list" class="mb20" @click="goDetail(h)"> 16 <el-col :span="8" v-for="(h,index) in list" class="mb20" >
17 <el-card style="position: relative;"> 17 <el-card style="position: relative;">
18 <img class="w100 hz-img" :src="fillImgUrl(h.photos?.split(',')[0])"/> 18 <img class="w100 hz-img" :src="fillImgUrl(h.cover)"/>
19 <div class="yuyue"> 19 <div class="yuyue">
20 30 个时间段可预约 20 {{ h.counts }} {{ language==0?'个时间段可预约':"time slots can be reserved" }}
21 </div> 21 </div>
22 <div class="hz-text">MANGO美妆工作室</div> 22 <div class="hz-text">{{h.name}}</div>
23 <el-row style="width: 100%;margin-bottom: 10px" :gutter="5" justify='space-between'> 23 <div class="tagbox esp">
24 <div class="hz-tag tag1">专业团体</div> 24 <span v-for="(t,index) in h.label?.split('，')" v-show="index<4">{{t}}</span>
25 <div class="hz-tag tag2">金牌化妆师</div> 25 </div>
26 <div class="hz-tag tag3">大牌化妆品</div>
27 <div class="hz-tag tag4">连锁</div>
28 </el-row>
29 <div class="hz-row"> 26 <div class="hz-row">
30 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon> 27 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><OfficeBuilding /></el-icon>
31 成立 <span class="sign">6</span>年 | 28 {{ language==0?'成立':'Established for'}}
32 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon><span class="sign">12</span>名化妆师 29 <span class="sign">{{ h.ageLimit }}</span>{{language==0?'年':'years'}} |
30 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><UserFilled /></el-icon><span class="sign">{{ h.dresserLimit }}</span>{{language==0?'名化妆师':'makeup artists' }}
33 </div> 31 </div>
34 <div class="hz-row"> 32 <div class="hz-row">
35 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon> 33 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><PhoneFilled /></el-icon>
36 1535652837 34 {{ h.contact }}
37 </div> 35 </div>
38 <div class="hz-row"> 36 <div class="hz-row">
39 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon> 37 <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon>
40 {{h.address}} 38 {{h.remarks}}
41 </div> 39 </div>
42 <div style="text-align: center"> 40 <div style="text-align: center">
43 <el-button class="btn-lineG w200px" round type="primary" size="large">{{ language==0?'立即预约':'Select' }} ⇀</el-button> 41 <el-button class="btn-lineG w200px" round type="primary" size="large" @click="goDetail(h)">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
44 </div> 42 </div>
45 </el-card> 43 </el-card>
46 </el-col> 44 </el-col>
47 </el-row> 45 </el-row>
48 46
49 <!-- <el-card v-for="(h,index) in list" class="mb20" @click="goDetail(h)">-->
50 <!-- &lt;!&ndash; 酒店列表&ndash;&gt;-->
51 <!-- <el-row class="hotel" align="middle" :gutter="20">-->
52 <!-- <el-col :span="6">-->
53 <!-- <img class="w100" :src="fillImgUrl(h.photos?.split(',')[0])"/>-->
54 <!-- </el-col>-->
55 <!-- <el-col :span="10">-->
56 <!-- <h3 class="esp">{{h.name}}</h3>-->
57 <!-- <div class="starBox">-->
58 <!-- <img v-for="i in Number(h.starLevel||0)" src="@/assets/booking/star.png">-->
59 <!-- </div>-->
60 <!-- <div class="tagbox">-->
61 <!-- <span v-for="(t,index) in h.label?.split('，')" v-show="index<4">{{t}}</span>-->
62 <!-- <a v-show="h.label?.split('，').length>4">{{ language==0?'更多':'MORE' }} ></a>-->
63 <!-- </div>-->
64 <!-- <p class="esp addr">-->
65 <!-- <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon>-->
66 <!-- {{h.address}}-->
67 <!-- </p>-->
68 <!-- </el-col>-->
69 <!-- <el-col :span="8" class="text-right">-->
70 <!-- <div class="price">¥<span>{{ h.price }}</span><i v-if="language==0">起</i></div>-->
71 <!-- <el-button class="btn-lineG w200px" round type="primary" size="large">{{ language==0?'立即预约':'Select' }} ⇀</el-button>-->
72 <!-- </el-col>-->
73 <!-- </el-row>-->
74 <!-- </el-card>-->
75 <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" /> 47 <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" />
76 <div style="height: 50px"></div> 48 <div style="height: 50px"></div>
77 </div> 49 </div>
...@@ -84,6 +56,7 @@ import {onMounted} from "@vue/runtime-core" ...@@ -84,6 +56,7 @@ import {onMounted} from "@vue/runtime-core"
84 import * as booking from "@/apiPc/booking" 56 import * as booking from "@/apiPc/booking"
85 import {useRouter,useRoute} from "vue-router"; 57 import {useRouter,useRoute} from "vue-router";
86 import {useStorage} from "@vueuse/core/index"; 58 import {useStorage} from "@vueuse/core/index";
59 import {getMakeUpList} from "@/apiPc/booking";
87 const router = useRouter() 60 const router = useRouter()
88 const route = useRoute() 61 const route = useRoute()
89 const language= useStorage('language',0) 62 const language= useStorage('language',0)
...@@ -100,7 +73,7 @@ onMounted(()=>{ ...@@ -100,7 +73,7 @@ onMounted(()=>{
100 73
101 function getList() { 74 function getList() {
102 loading.value = true 75 loading.value = true
103 booking.getHotelList(query.value).then(res=>{ 76 booking.getMakeUpList(query.value).then(res=>{
104 list.value = res.rows 77 list.value = res.rows
105 loading.value = false 78 loading.value = false
106 }).catch(e=>{ 79 }).catch(e=>{
...@@ -112,26 +85,13 @@ function goDetail(item) { ...@@ -112,26 +85,13 @@ function goDetail(item) {
112 name:'makeUpDetail', 85 name:'makeUpDetail',
113 params:{ 86 params:{
114 id:item.id, 87 id:item.id,
115 },
116 query:{
117 id:item.id
118 } 88 }
119
120 }) 89 })
121 } 90 }
122 </script> 91 </script>
123 92
124 <style scoped lang="scss"> 93 <style scoped lang="scss">
125 .hotel{ 94
126 h3{margin: 0 0 20px;}
127 img.w100{object-fit: cover;aspect-ratio: 16/9}
128 .addr{font-size: 16px;color: #929AA0;font-weight: 400;}
129 .price{margin: 0 0 25px;
130 color: #FF8124;font-size: 18px;
131 span{font-size: 24px;margin: 0 8px;font-family: 'DINAlternate-Bold';font-weight: 600;}
132 i{font-style: normal;color: #929AA0;}
133 }
134 }
135 .banner{height: 140px;background-size: cover;text-align: center; 95 .banner{height: 140px;background-size: cover;text-align: center;
136 background: url("@/assets/booking/hz_bg.png") center;display: flex;align-items: center; 96 background: url("@/assets/booking/hz_bg.png") center;display: flex;align-items: center;
137 justify-content: center; 97 justify-content: center;
...@@ -143,15 +103,14 @@ function goDetail(item) { ...@@ -143,15 +103,14 @@ function goDetail(item) {
143 .no-border{border: none;background: #F5F7F9; 103 .no-border{border: none;background: #F5F7F9;
144 :deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;} 104 :deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;}
145 } 105 }
146 .starBox{ 106
147 img{display: inline-block;margin-right: 4px}
148 }
149 .hz-img{ 107 .hz-img{
150 height: 218px; 108 height: 218px;
151 width: 100%; 109 width: 100%;
152 border-radius: 2px; 110 border-radius: 2px;
153 border: 0; 111 border: 0;
154 margin-bottom: 20px; 112 margin-bottom: 20px;
113 object-fit: cover;
155 } 114 }
156 115
157 .yuyue{ 116 .yuyue{
...@@ -212,12 +171,12 @@ function goDetail(item) { ...@@ -212,12 +171,12 @@ function goDetail(item) {
212 //} 171 //}
213 172
214 173
215 //.tagbox{margin: 15px 0; 174 .tagbox{margin: 10px 0;
216 // a{color: #AFB5B9;font-size: 12px;} 175 a{color: #AFB5B9;font-size: 12px;}
217 // span{border-radius: 13px;font-size: 12px;padding: 4px 10px;margin-right:10px;font-weight: 400;} 176 span{border-radius: 13px;font-size: 12px;padding: 3px 10px;margin-right:10px;font-weight: 400;}
218 // span:nth-child(4n){background: rgba(50, 177, 108, 0.2);color: rgba(50, 177, 108, 1);} 177 span:nth-child(4n){background: rgba(50, 177, 108, 0.2);color: rgba(50, 177, 108, 1);}
219 // span:nth-child(4n+1){background:rgba(243, 152, 0, 0.2);color: rgba(243, 152, 0, 1);} 178 span:nth-child(4n+1){background:rgba(243, 152, 0, 0.2);color: rgba(243, 152, 0, 1);}
220 // span:nth-child(4n+2){background: rgba(0, 160, 233, 0.2);color: rgba(0, 160, 233, 1);} 179 span:nth-child(4n+2){background: rgba(0, 160, 233, 0.2);color: rgba(0, 160, 233, 1);}
221 // span:nth-child(4n+3){background: rgba(247, 64, 166, 0.2);color:rgba(247, 64, 166, 1);} 180 span:nth-child(4n+3){background: rgba(247, 64, 166, 0.2);color:rgba(247, 64, 166, 1);}
222 //} 181 }
223 </style> 182 </style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!