Skip to content

杨炀 / dance-pc

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

Merge branch 'order' into dev

2 parents 08d0b03c a586c361
Expand all
Inline Side-by-side
Showing 25 changed files with 1878 additions and 133 deletions
.gitignore
......@@ -18,6 +18,7 @@ selenium-debug.log
*.njsproj
*.sln
*.local
*.zip
package-lock.json
yarn.lock
......
src/App.vue
......@@ -278,4 +278,40 @@ li.el-select-dropdown__item {
@media (max-width: 800px) {
.box{width: 96%}
}
.hz-tag{
border-radius: 13px;
height: 25px;
line-height: 25px;
font-size: 12px;
font-weight: 400;
padding: 0 15px;
}
.tag1{
background: rgba(50, 177, 108, 0.2);
color:rgba(50, 177, 108, 1);
}
.tag2{
background-color: rgba(243, 152, 0, 0.2);
color: #F39800;
}
.tag3{
background-color: rgba(0, 160, 233, 0.2);
color: #00A0E9;
}
.tag4{
background-color: rgba(247, 64, 166, 0.2);
color: #F740A6;
}
.hz-row{
font-size: 14px;
font-weight: 400;
color: #929AA0;
margin-bottom: 16px;
}
.sign{
color: #493CEB;
}
</style>
......
src/apiPc/booking.js
......@@ -207,3 +207,116 @@ export function delAddress(ids) {
method: 'delete'
})
}
export function getMakeUpList(data) {
return request({
url: `/ota/activityStudio/getStudioList`,
method: 'get',
params:data
})
}
export function makeUpDetail(data) {
return request({
url: `/ota/activityStudio/getComStudioVoById`,
method: 'get',
params:data
})
}
export function getActivityMealVoListByStudioId(data) {
return request({
url: `/ota/activityMeal/getActivityMealVoListByStudioId`,
method: 'get',
params:data
})
}
export function getMealConfList(data) {
return request({
url: `/ota/mealConfig/getMealConfList`,
method: 'get',
params:data
})
}
export function submitOrderMeal(data) {
return request({
url: `/ota/norder/submitOrderMeal`,
method: 'post',
data
})
}
export function getMealOrderInfo(data) {
return request({
url: `/ota/orderMeal/getMealOrderInfo`,
method: 'get',
params:data
})
}
export function getMealOrderInfoByLogex(data) {
return request({
url: `/ota/orderMeal/getMealOrderInfoByLogex`,
method: 'get',
params:data
})
}
export function getShootList(data) {
return request({
url: `/ota/activityShoot/getShootList`,
method: 'get',
params:data
})
}
export function getComShootVoById(data) {
return request({
url: `/ota/activityShoot/getComShootVoById`,
method: 'get',
params:data
})
}
export function getActivityPhotoVoListByShootId(data) {
return request({
url: `/ota/activityPhoto/getActivityPhotoVoListByShootId`,
method: 'get',
params:data
})
}
export function getPhotoConfList(data) {
return request({
url: `/ota/photoConfig/getPhotoConfList`,
method: 'get',
params:data
})
}
export function submitOrderPhoto(data) {
return request({
url: `/ota/norder/submitOrderPhoto`,
method: 'post',
data
})
}
export function getPhotoOrderInfo(data) {
return request({
url: `/ota/orderPhoto/getPhotoOrderInfo`,
method: 'get',
params:data
})
}
export function getPhotoOrderInfoByLogex(data) {
return request({
url: `/ota/orderPhoto/getPhotoOrderInfoByLogex`,
method: 'get',
params:data
})
}
......
src/assets/booking/hz_bg.png
src/assets/booking/hz_bg.png

118 KB | W: | H:

src/assets/booking/hz_bg.png

118 KB | W: | H:

src/assets/booking/hz_bg.png
src/assets/booking/hz_bg.png
src/assets/booking/hz_bg.png
src/assets/booking/hz_bg.png
  • 2-up
  • Swipe
  • Onion skin
src/permissionPc.js
......@@ -10,7 +10,6 @@ NProgress.configure({ showSpinner: false })
router.beforeEach((to, from, next) => {
NProgress.start()
debugger
if (getToken()) {
// 判断当前用户是否已拉取完user_info信息
if (!useUserStore().user) {
......
src/routerPc/en.js
......@@ -404,18 +404,36 @@ export const constantRoutes = [
meta: { title: 'Makeup Appointment' }
},
{
path: 'makeUp/:cptId/:studioId',
component: () => import('@/viewsPc/booking/studioDetail'),
name: 'studioDetail',
path: 'makeUp/:cptId/:id',
component: () => import('@/viewsPc/booking/makeUpDetail'),
name: 'makeUpDetail',
meta: { title: 'Makeup Appointment' }
},
{
path: 'makeUp/:cptId/:id/:lasId',
component: () => import('@/viewsPc/booking/makeUpOrder.vue'),
name: 'makeUpOrder',
meta: { title: 'Makeup Reservation' }
},
{
path: 'photography/:cptId',
component: () => import('@/viewsPc/booking/photography'),
name: 'photography',
meta: { title: 'Photography Appointment' }
},
{
path: 'photography/:cptId/:id',
component: () => import('@/viewsPc/booking/photographyDetail'),
name: 'photographyDetail',
meta: { title: 'Photography Reservation' }
},
{
path: 'photography/:cptId/:id/:lasId',
component: () => import('@/viewsPc/booking/photographyOrder.vue'),
name: 'photographyOrder',
meta: { title: 'Photography Appointment' }
},
{
path: 'pay',
component: () => import('@/viewsPc/booking/pay'),
name: 'bookingPay',
......@@ -432,12 +450,6 @@ export const constantRoutes = [
component: () => import('@/viewsPc/booking/invoicing'),
name: 'invoice',
meta: { title: '我的发票' }
},
{
path: 'addInvoice/:id',
component: () => import('@/viewsPc/booking/addInvoice'),
name: 'addInvoice',
meta: { title: '编辑发票' }
}
]
},
......
src/viewsPc/booking/component/makeUpCalendar.vue 0 → 100644
<template>
<div >
<el-calendar v-model="currentDate" :range="calendarRange">
<template #header="{date}">
<el-row style="width: 100%">
<el-col :span="7">
</el-col>
<el-col :span="10">
<el-row justify="center" align='middle' >
<!-- <div class="canBtn"><el-icon><ArrowLeftBold /></el-icon></div>-->
<div class="cTitle">
<!-- <el-date-picker-->
<!-- v-model="value2"-->
<!-- type="daterange"-->
<!-- range-separator="-"-->
<!-- start-placeholder="Start date"-->
<!-- end-placeholder="End date"-->
<!-- format="YYYY-MM-DD"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- size="small"-->
<!-- @change="changee"-->
<!-- />-->
<!-- <el-input readonly :value="date" type="text" size="small" style="width: 280px"></el-input>-->
{{date}}
</div>
<!-- <div class="canBtn"><el-icon><ArrowRightBold /></el-icon></div>-->
</el-row>
</el-col>
<el-col :span="7">
<div style="text-align: right;padding-right: 10px">
<el-date-picker
v-model="currentDate1"
type="date"
placeholder="YYYY-MM-DD"
format="YYYY-MM-DD"
size="small"
@change="dateChange"
:disabled-date="disabledDate"
/>
</div>
</el-col>
</el-row>
</template>
<template #date-cell="data">
<div :class="data.data.day==query.currentDate?'primaryDate date':'date'" @click="selectDate(data.data.day)">
{{ data.data.day.slice(8, 10) }}
</div>
</template>
</el-calendar>
<div class="calendarList">
<ul v-loading="loading">
<li v-for="n in schList" :key="n.id" >
<el-row style="width: 100%">
<div style="margin-right: 25px">
<el-image style="width: 90px;height: 115px" :src="fillImgUrl(n.photos?.split(',')[0]) " fit="cover" />
</div>
<div style="flex: 1" >
<div class="hz-title">{{ n.name }}</div>
<div>
<el-row justify="space-between">
<el-row class="hz-p" style="flex: 1">
<el-col :span="8">
<div >{{ language==0?'套餐说明':'Package Description' }}: <span style="margin-right: 20px">{{n.introduction}}</span></div>
</el-col>
<el-col :span="8">
<div>{{ language==0?'剩余':'' }}<span class="sign">{{ n.num-n.counts }}</span>{{language==0?'名额':'Places Remaining' }} </div>
</el-col>
<el-col :span="8">
<div >{{n.goHome==1?language==0?'上门化妆':'Door-to-door makeup':''}}</div>
</el-col>
</el-row>
<el-row>
<div class="zh-margin" style="font-size: 36px;color: #ff8124"><span style="font-size: 24px">{{ language==0?'¥':'€'}} </span> {{language==0?n.mealPrice:n.mealPriceEn}}</div>
<el-button :disabled="n.num-n.counts<=0||Date.now()>dayjs(currentDate).subtract(-1,'day').valueOf()" class="btn-lineG w200px" round type="primary" size="large" @click="goMatch(n)">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
</el-row>
</el-row>
</div>
</div>
</el-row>
</li>
</ul>
<el-empty v-if="schList.length== 0"
style="--el-empty-padding:0;--el-empty-description-margin-top:0"
:image="`/img/order_no.png`"
:image-size="200"/>
</div>
</div>
</template>
<script setup>
import {ref} from "vue";
import {dayjs} from "element-plus";
import {useRoute,useRouter} from 'vue-router'
import * as booking from "@/apiPc/booking"
import {useStorage} from "@vueuse/core/index";
import useUserStore from "/@/store/modules/user";
const user = useUserStore().user
const language = useStorage('language', 0)
const router = useRouter()
const route=useRoute()
const currentDate = ref(new Date())
const currentDate1 = ref(new Date())
const calendarRange = ref([dayjs(currentDate.value).toDate(),(dayjs(currentDate.value).toDate())])
const schList = ref([])
const loading = ref(false)
const query = ref({
lasId:route.params.id,
})
const value2=ref('')
getScheduleList()
function getScheduleList() {
loading.value = true
query.value.currentDate = dayjs(currentDate.value).format('YYYY-MM-DD')
booking.getActivityMealVoListByStudioId(query.value).then(res=>{
loading.value = false
schList.value = res.data
})
}
function selectDate(date) {
currentDate1.value= currentDate.value=dayjs(date).toDate()
console.log(date)
getScheduleList()
}
function dateChange(){
currentDate.value=currentDate1.value
calendarRange.value=[dayjs(currentDate.value).toDate(),(dayjs(currentDate.value).toDate())]
getScheduleList()
}
function goMatch(n) {
if (!user) {
useUserStore().setVisitor()
return
}
router.push({
name: 'makeUpOrder',
params: {
lasId: n.id
},
query: {
date: dayjs(currentDate.value).format('YYYY-MM-DD')
}
})
}
// function disabledDate(e){
// return e.getTime()<=Date.now()
// console.log(e)
// }
</script>
<style scoped lang="scss">
.el-calendar {
--el-calendar-border: none;
--el-calendar-cell-width: 40px;
text-align: center;
--el-text-color-regular: #8E8D94;
:deep(.el-calendar__header) {
justify-content: center;
padding: 0 0 10px
}
:deep(.el-calendar__body) {
border: 1px solid #F0F0F0;
padding: 0
}
:deep(.el-calendar-table .el-calendar-day) {
padding: 1px;
}
:deep(.el-calendar-table td.is-selected) {
background: transparent;
}
:deep(.el-calendar__button-group) {
display: none;
}
:deep(.el-calendar-table thead th) {
padding: 5px 0 0
}
.primaryDate {
color: #fff;
background: linear-gradient(90deg, #8623FC, #453DEA);
}
.date {
margin: auto;
border-radius: 50%;
width: 30px;
height: 30px;
line-height: 30px;
font-weight: bold;
}
}
.calendarList {
border: 1px solid #F0F0F0;
padding: 12px 20px;
overflow: auto;
height: 625px;
ul {
li {cursor: pointer;
background: #F6F9FE;
margin: 7px 0 7px 20px;
position: relative;
padding: 13px;
border-radius: 10px;
font-weight: 500;
font-size: 15px;
label {
color: #453DEA;
margin-right: 15px;
&::before {
content: '';
background: #fff;
left: -17px;
top: 0px;
bottom: 0;
margin: auto;
border-radius: 50%;
width: 2px;
height: 2px;
position: absolute;
z-index: 1
}
}
}
li::before {
content: '';
background: linear-gradient(0deg, #8623FC, #453DEA);
border-radius: 50%;
width: 8px;
height: 8px;
position: absolute;
left: -20px;
top: 0;
bottom: 0;
margin: auto;
z-index: 1;
}
li::after {
content: '';
left: -16px;
width: 1px;
height: 100%;
background: #EBEBEB;
position: absolute;
top: 20px
}
//li:hover {
// color: #fff;
// background: linear-gradient(-90deg, #8623FC, #453DEA);
//
// label {
// color: #fff;
// }
//}
}
}
.hz-title{
font-size: 20px;
font-weight: 400;
color: #000;
margin-top:20px;
margin-bottom: 10px;
}
.zh-margin{
font-weight: bold;
font-size: 36px;
color: #FF8124;
margin-right: 30px;
}
.hz-p{
font-size: 16px;
color: #4C5359;
font-weight: 400;
}
:deep(.el-calendar__header) {
background: linear-gradient(90deg, #8623FC, #453DEA);
height: 50px;
line-height: 50px;
}
.canBtn{
color: #453DEA;
border-radius: 2px;
width: 22px;
height: 22px;
line-height: 26px;
text-align: center;
background-color: #fff;
margin: 0 16px -2px 16px;
cursor:pointer
}
.cTitle{
color: #fff;
font-size: 20px;
font-weight: 500;
}
</style>
src/viewsPc/booking/component/photoGraphyCalendar.vue 0 → 100644
<template>
<div >
<el-calendar v-model="currentDate" :range="calendarRange">
<template #header="{date}">
<el-row style="width: 100%">
<el-col :span="7">
</el-col>
<el-col :span="10">
<el-row justify="center" align='middle' class="cTitle">
<!-- <div class="canBtn"><el-icon><ArrowLeftBold /></el-icon></div>-->
<!-- <div>-->
<!--&lt;!&ndash; <el-date-picker&ndash;&gt;-->
<!--&lt;!&ndash; v-model="value2"&ndash;&gt;-->
<!--&lt;!&ndash; type="daterange"&ndash;&gt;-->
<!--&lt;!&ndash; range-separator="-"&ndash;&gt;-->
<!--&lt;!&ndash; start-placeholder="Start date"&ndash;&gt;-->
<!--&lt;!&ndash; end-placeholder="End date"&ndash;&gt;-->
<!--&lt;!&ndash; format="YYYY-MM-DD"&ndash;&gt;-->
<!--&lt;!&ndash; value-format="YYYY-MM-DD"&ndash;&gt;-->
<!--&lt;!&ndash; size="small"&ndash;&gt;-->
<!--&lt;!&ndash; @change="changee"&ndash;&gt;-->
<!--&lt;!&ndash; />&ndash;&gt;-->
<!-- <el-input readonly v-model="value2" type="text" size="small" style="width: 280px"></el-input>-->
<!-- </div>-->
<!-- <div class="canBtn"><el-icon><ArrowRightBold /></el-icon></div>-->
{{date}}
</el-row>
</el-col>
<el-col :span="7">
<div style="text-align: right;padding-right: 10px">
<el-date-picker
v-model="currentDate1"
type="date"
placeholder="YYYY-MM-DD"
format="YYYY-MM-DD"
size="small"
@change="dateChange"
/>
</div>
</el-col>
</el-row>
</template>
<template #date-cell="data">
<div :class="data.data.day==query.currentDate?'primaryDate date':'date'" @click="selectDate(data.data.day)">
{{ data.data.day.slice(8, 10) }}
</div>
</template>
</el-calendar>
<div class="calendarList">
<ul v-loading="loading">
<li v-for="n in schList" :key="n.id" @click="goMatch(n)">
<el-row style="width: 100%">
<div style="margin-right: 25px">
<el-image style="width: 90px;height: 115px" :src="fillImgUrl(n.photos?.split(',')[0]) " fit="cover" />
</div>
<div style="flex: 1" >
<div class="hz-title">{{ n.name }}</div>
<div>
<el-row justify="space-between">
<el-row class="hz-p" style="flex: 1">
<el-col :span="8">
<div >{{ language==0?'套餐说明':'Package Description' }}: <span style="margin-right: 20px">{{n.introduction}}</span></div>
</el-col>
<el-col :span="8">
<div>{{ language==0?'剩余':'' }}<span class="sign">{{ n.num-n.counts }}</span>{{language==0?'名额':'Places Remaining' }} </div>
</el-col>
<el-col :span="8">
<div >{{n.goHome==1?language==0?'上门拍照':'Door-to-door photo':''}}</div>
</el-col>
</el-row>
<el-row>
<div class="zh-margin" style="font-size: 36px;color: #ff8124"><span style="font-size: 24px">{{ language==0?'¥':'€'}} </span> {{language==0?n.photoPrice:n.photoPriceEn}}</div>
<el-button :disabled="n.num-n.counts<=0||Date.now()>dayjs(currentDate).subtract(-1,'day').valueOf()" class="btn-lineG w200px" round type="primary" size="large" @click="goMatch(n)">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
</el-row>
</el-row>
</div>
</div>
</el-row>
</li>
</ul>
<el-empty v-if="schList.length== 0"
style="--el-empty-padding:0;--el-empty-description-margin-top:0"
:image="`/img/order_no.png`"
:image-size="200"/>
</div>
</div>
</template>
<script setup>
import {ref} from "vue";
import {dayjs} from "element-plus";
import {useRoute,useRouter} from 'vue-router'
import * as booking from "@/apiPc/booking"
import {useStorage} from "@vueuse/core/index";
import useUserStore from "/@/store/modules/user";
import {getActivityPhotoVoListByShootId} from "@/apiPc/booking";
const user = useUserStore().user
const language = useStorage('language', 0)
const router = useRouter()
const route=useRoute()
const currentDate = ref(new Date())
const currentDate1 = ref(new Date())
const calendarRange = ref([dayjs(currentDate.value).toDate(),(dayjs(currentDate.value).toDate())])
const schList = ref([])
const loading = ref(false)
const query = ref({
lasId:route.params.id,
})
const value2=ref('')
getScheduleList()
function getScheduleList() {
loading.value = true
query.value.currentDate = dayjs(currentDate.value).format('YYYY-MM-DD')
booking.getActivityPhotoVoListByShootId(query.value).then(res=>{
loading.value = false
schList.value = res.data
})
}
function selectDate(date) {
currentDate1.value= currentDate.value=dayjs(date).toDate()
console.log(date)
getScheduleList()
}
function dateChange(){
currentDate.value=currentDate1.value
calendarRange.value=[dayjs(currentDate.value).toDate(),(dayjs(currentDate.value).toDate())]
getScheduleList()
console.log(currentDate.value)
console.log(currentDate1.value)
}
function goMatch(n) {
if (!user) {
useUserStore().setVisitor()
return
}
router.push({
name: 'photographyOrder',
params: {
lasId: n.id
},
query: {
date: dayjs(currentDate.value).format('YYYY-MM-DD')
}
})
}
function changee(){
console.log(value2.value)
}
</script>
<style scoped lang="scss">
.el-calendar {
--el-calendar-border: none;
--el-calendar-cell-width: 40px;
text-align: center;
--el-text-color-regular: #8E8D94;
:deep(.el-calendar__header) {
justify-content: center;
padding: 0 0 10px
}
:deep(.el-calendar__body) {
border: 1px solid #F0F0F0;
padding: 0
}
:deep(.el-calendar-table .el-calendar-day) {
padding: 1px;
}
:deep(.el-calendar-table td.is-selected) {
background: transparent;
}
:deep(.el-calendar__button-group) {
display: none;
}
:deep(.el-calendar-table thead th) {
padding: 5px 0 0
}
.primaryDate {
color: #fff;
background: linear-gradient(90deg, #8623FC, #453DEA);
}
.date {
margin: auto;
border-radius: 50%;
width: 30px;
height: 30px;
line-height: 30px;
font-weight: bold;
}
}
.calendarList {
border: 1px solid #F0F0F0;
padding: 12px 20px;
overflow: auto;
height: 625px;
ul {
li {cursor: pointer;
background: #F6F9FE;
margin: 7px 0 7px 20px;
position: relative;
padding: 13px;
border-radius: 10px;
font-weight: 500;
font-size: 15px;
label {
color: #453DEA;
margin-right: 15px;
&::before {
content: '';
background: #fff;
left: -17px;
top: 0px;
bottom: 0;
margin: auto;
border-radius: 50%;
width: 2px;
height: 2px;
position: absolute;
z-index: 1
}
}
}
li::before {
content: '';
background: linear-gradient(0deg, #8623FC, #453DEA);
border-radius: 50%;
width: 8px;
height: 8px;
position: absolute;
left: -20px;
top: 0;
bottom: 0;
margin: auto;
z-index: 1;
}
li::after {
content: '';
left: -16px;
width: 1px;
height: 100%;
background: #EBEBEB;
position: absolute;
top: 20px
}
//li:hover {
// color: #fff;
// background: linear-gradient(-90deg, #8623FC, #453DEA);
//
// label {
// color: #fff;
// }
//}
}
}
.hz-title{
font-size: 20px;
font-weight: 400;
color: #000;
margin-top:20px;
margin-bottom: 10px;
}
.zh-margin{
font-weight: bold;
font-size: 36px;
color: #FF8124;
margin-right: 30px;
}
.hz-p{
font-size: 16px;
color: #4C5359;
font-weight: 400;
}
:deep(.el-calendar__header) {
background: linear-gradient(90deg, #8623FC, #453DEA);
height: 50px;
line-height: 50px;
}
.canBtn{
color: #453DEA;
border-radius: 2px;
width: 22px;
height: 22px;
line-height: 26px;
text-align: center;
background-color: #fff;
margin: 0 16px -2px 16px;
cursor:pointer
}
.cTitle{
color: #fff;
font-size: 20px;
font-weight: 500;
}
</style>
src/viewsPc/booking/makeUp.vue
<template>
<div>
<div class="banner">
<img src="@/assets/booking/hz_text.png">
</div>
<div class="box">
<div class="searchBar">
<el-input :placeholder="language==0?'请输入关键字搜索':'Search'" v-model="query.name" class="no-border">
</el-input>
<el-button size="large" type="primary" class="btn-lineG" icon="search" @click="getList">
{{ language==0?'搜索':'Search' }}</el-button>
<div>
<div class="banner">
<img v-if="language==0" src="@/assets/booking/hz_text_c.png">
<img v-else src="@/assets/booking/hz_text_e.png">
</div>
</div>
<div class="box" v-loading="loading">
<el-row :gutter="20" class="mb20">
<el-col :lg="8" :md="8" :sm="12" :xs="24" v-for="(n,index) in list" :key="index">
<el-card class="mb20 mitem">
<div class="imgbox"><img/>
<span>30 个时间段可预约</span>
</div>
<div class="info">
<h3>Mango美妆工作室</h3>
<div class="tagbox">
<span>专业团队</span>
<span>大牌化妆品</span>
<span>金牌化妆师</span>
<span>连锁</span>
<div class="box">
<div class="searchBar">
<el-input :placeholder="language==0?'请输入关键字搜索':'Search'" v-model="query.name" class="no-border">
</el-input>
<el-button size="large" type="primary" class="btn-lineG" icon="search" @click="getList">
{{ language==0?'搜索':'Search' }}</el-button>
</div>
</div>
<div class="box" v-loading="loading">
<el-row style="width: 100%" :gutter="20">
<el-col :span="8" v-for="(h,index) in list" class="mb20" >
<el-card style="position: relative;">
<img class="w100 hz-img" :src="fillImgUrl(h.cover)"/>
<div class="yuyue">
{{ h.counts }} {{ language==0?'个时间段可预约':"time slots can be reserved" }}
</div>
<div class="hz-text">{{h.name}}</div>
<div class="tagbox esp">
<span v-for="(t,index) in h.label?.split('，')" v-show="index<4">{{t}}</span>
</div>
<div class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><OfficeBuilding /></el-icon>
{{ language==0?'成立':'Established for'}}
<span class="sign">{{ h.ageLimit }}</span>{{language==0?'年':'years'}} |
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><UserFilled /></el-icon><span class="sign">{{ h.dresserLimit }}</span>{{language==0?'名化妆师':'makeup artists' }}
</div>
<p class="esp">
<span>
<el-icon><OfficeBuilding /></el-icon>
成立<i class="text-primary">6</i>年
</span>
<span>
<el-icon><User /></el-icon>
<i class="text-primary">12</i>名化妆师
</span>
</p>
<p class="esp"><el-icon><Iphone /></el-icon>
800-820-8820
</p>
<p class="esp"><el-icon><Location /></el-icon>
江苏无锡梁溪区南长街5D-601
</p>
<div class="text-center mt20">
<el-button @click="goDetail(n)" round type="primary" class="btn-lineG fs18 w50" size="large">
立即预约 &ensp; <el-icon class="rotate90_180"> <sort-down/></el-icon>
</el-button>
<div class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><PhoneFilled /></el-icon>
{{ h.contact }}
</div>
</div>
</el-card>
</el-col>
</el-row>
<div class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon>
{{h.remarks}}
</div>
<div style="text-align: center">
<el-button :disabled="h.counts<=0" class="btn-lineG w200px" round type="primary" size="large" @click="goDetail(h)">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
</div>
</el-card>
</el-col>
</el-row>
</div>
<el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" />
<div style="height: 50px"></div>
</div>
</div>
</div>
</template>
<script setup>
import {getStudioList} from "@/apiPc/booking"
import {onMounted} from "@vue/runtime-core"
import {useRoute, useRouter} from "vue-router"
import * as booking from "@/apiPc/booking"
import {useRouter,useRoute} from "vue-router";
import {useStorage} from "@vueuse/core/index";
const language= useStorage('language',0)
import {getMakeUpList} from "@/apiPc/booking";
const router = useRouter()
const route = useRoute()
const list = ref([{id:'0'},{id:'1'},{id:'2'},{id:'3'}])
const loading = ref(false)
const language= useStorage('language',0)
const query = ref({
name:''
})
const cptId = ref('')
const list = ref([])
const loading = ref(false)
onMounted(()=>{
query.value.activityId = route.params.cptId
// getList()
getList()
})
function getList() {
loading.value = true
getStudioList(query.value).then(res=>{
booking.getMakeUpList(query.value).then(res=>{
list.value = res.rows
loading.value = false
}).catch(err=>{
}).catch(e=>{
loading.value = false
})
}
function goDetail(n) {
function goDetail(item) {
router.push({
name:'studioDetail',
name:'makeUpDetail',
params:{
studioId: n.id
id:item.id,
}
})
}
</script>
<style scoped lang="scss">
.banner{height: 140px;background-size: cover;text-align: center;
background: url("@/assets/booking/hz_bg.png") center;display: flex;align-items: center;
justify-content: center;
img{display: block;margin:-30px auto 0;width: auto;}
img{display: block;margin:-30px auto 0;width: auto;}
}
.searchBar{position: relative;top: -30px;
background: #FFFFFF;display: flex;padding: 20px;
border-radius: 10px;}
.no-border{border: none;background: #F5F7F9;
:deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;}
:deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;}
}
.hz-img{
height: 218px;
width: 100%;
border-radius: 2px;
border: 0;
margin-bottom: 20px;
object-fit: cover;
}
.yuyue{
height: 30px;
padding-right: 10px;
background: #000000;
border-radius: 20px 0px 0px 2px;
padding-left: 15px;
opacity: 0.45;
color: #fff;
font-size: 14px;
line-height: 30px;
position: absolute;
top: 207px;
right:21px;
}
.hz-text{
font-size: 20px;
font-weight: 500;
color: #000;
margin-bottom: 8px;
}
.tagbox{margin: 15px 0;
//.hz-tag{
// border-radius: 13px;
// height: 25px;
// line-height: 25px;
// font-size: 12px;
// font-weight: 400;
// padding: 0 15px;
//}
//.tag1{
// background: rgba(50, 177, 108, 0.2);
// color:rgba(50, 177, 108, 1);
//}
//.tag2{
// background-color: rgba(243, 152, 0, 0.2);
// color: #F39800;
//}
//.tag3{
// background-color: rgba(0, 160, 233, 0.2);
// color: #00A0E9;
//}
//.tag4{
// background-color: rgba(247, 64, 166, 0.2);
// color: #F740A6;
//}
//
//.hz-row{
// font-size: 14px;
// font-weight: 400;
// color: #929AA0;
// margin-bottom: 16px;
// .sign{
// color: #493CEB;
// }
//}
.tagbox{margin: 10px 0;
a{color: #AFB5B9;font-size: 12px;}
span{border-radius: 13px;font-size: 12px;padding: 4px 10px;margin-right:10px;font-weight: 400;}
span{border-radius: 13px;font-size: 12px;padding: 3px 10px;margin-right:10px;font-weight: 400;}
span:nth-child(4n){background: rgba(50, 177, 108, 0.2);color: rgba(50, 177, 108, 1);}
span:nth-child(4n+1){background:rgba(243, 152, 0, 0.2);color: rgba(243, 152, 0, 1);}
span:nth-child(4n+2){background: rgba(0, 160, 233, 0.2);color: rgba(0, 160, 233, 1);}
span:nth-child(4n+3){background: rgba(247, 64, 166, 0.2);color:rgba(247, 64, 166, 1);}
}
.mitem{
.imgbox{aspect-ratio: 16/9;background: rgba(129, 122, 234, 0.7);
position: relative;
span{position: absolute;color: #fff;font-weight: 400;bottom: 0;right: 0;
font-size: 14px;background: rgba(0,0,0,0.45);
border-radius: 16px 0 0 0;padding:4px 14px;
}
}
.info{
p{font-weight: 400;margin: 7px 0;
font-size: 14px;
color: #929AA0;
i{font-style: normal;}
}
span{margin-right: 10px;
i.text-primary{padding: 0 4px;}
}
.el-icon{position: relative;top:2px;margin-right: 4px;}
}
}
</style>
......
src/viewsPc/booking/makeUpDetail.vue 0 → 100644
<template>
<div>
<div class="box">
<el-card>
<el-row>
<div class="zh-title">{{ form.name }}</div>
<div class="tagbox esp">
<span v-for="(t,index) in form.label?.split('，')" v-show="index<4">{{t}}</span>
</div>
</el-row>
<el-row class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<OfficeBuilding/>
</el-icon>
{{ language==0?'成立':'Established for'}} <span class="sign">{{form.ageLimit}}</span>{{language==0?'年':'years'}} &nbsp;&nbsp;&nbsp;&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<UserFilled/>
</el-icon>
<span class="sign"> {{ form.dresserLimit }}</span>{{language==0?'名化妆师':'makeup artists' }}&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<PhoneFilled/>
</el-icon>
<span style="padding-top: 2px">
{{ form.contact }}
</span>
&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<LocationFilled/>
</el-icon>
{{form.remarks}}
</el-row>
</el-card>
<div class="mt30">
<el-row :gutter="20">
<el-col :span="10">
<div class="imgbox hotelImg">
<el-image :src="form?.photosList?.[0]" fit="cover" :preview-src-list="form?.photosList"/>
</div>
</el-col>
<el-col :span="14">
<el-row class="h100" :gutter="20">
<el-col :span="8" class="oddmb" v-for="(p,index) in form?.photosList?.slice(1,7)">
<div class="imgbox hotelImg"><el-image :src="p" fit="cover"/></div>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
<br>
<el-card :body-style="{'padding':'20px 20px'}">
<MakeUpCalendar/>
</el-card>
</div>
</div>
</template>
<script setup >
import {useRouter} from "vue-router";
import {ref, reactive, onMounted} from "vue";
import {useRoute} from "vue-router";
import * as booking from "@/apiPc/booking"
import {useStorage} from "@vueuse/core/index";
import useUserStore from "@/store/modules/user";
import MakeUpCalendar from "@/viewsPc/booking/component/makeUpCalendar.vue";
import {fillImgUrl} from "/@/utils/ruoyi";
const user = useUserStore().user
const language = useStorage('language', 0)
const router = useRouter()
const route = useRoute()
const form = ref({})
const query = ref({
activityId: route.params.cptId,
id:route.params.id
})
const loading = ref(false)
onMounted(() => {
getData()
})
function getData() {
loading.value = true
booking.makeUpDetail(query.value).then(res => {
loading.value = false
form.value = res.data
form.value.photosList=[]
form.value.photos?.split(',')?.forEach(v=>{
form.value.photosList.push(fillImgUrl(v))
})
console.log(res)
}).catch(err => {
console.log(err)
})
}
</script>
<style scoped lang="scss">
.room {
background: #FAFBFD;
margin: 20px 0 0;
padding: 20px;
border: 1px solid #E5E5E5;
.name {
font-size: 20px;
margin: 0 0 10px;
}
.roomImg {
aspect-ratio: 16/9;
border-radius: 10px;
overflow: hidden;
img {
width: 100%;
object-fit: cover;
object-position: center;
height: 100%;
}
}
.price {
color: #FF8124;
font-size: 24px;
span {
font-size: 36px;
font-family: "DIN Alternate"
}
}
.bg-lineg {
margin: auto;
border-radius: 10px;
text-align: center;
padding: 7px 2px 2px;
font-size: 24px;
width: 66px;
cursor: pointer;
div {
background: #fff;
font-size: 13px;
border-radius: 20px;
padding: 0 10px;
color: #453DEA;
font-weight: 500;
}
}
}
.zh-title {
font-size: 24px;
font-weight: 500;
margin-right: 25px;
}
.hotel {
h3 {
margin: 0 0 20px;
}
img.w100 {
object-fit: cover;
aspect-ratio: 16/9
}
.addr {
font-size: 16px;
color: #929AA0;
font-weight: 400;
}
.price {
margin: 0 0 25px;
color: #FF8124;
font-size: 18px;
span {
font-size: 24px;
margin: 0 8px;
font-family: 'DINAlternate-Bold';
font-weight: 600;
}
i {
font-style: normal;
color: #929AA0;
}
}
}
.tagbox {
margin: 15px 0;
a {
color: #AFB5B9;
font-size: 12px;
}
span {
border-radius: 13px;
font-size: 12px;
padding: 4px 10px;
margin-right: 10px;
font-weight: 400;
}
span:nth-child(4n) {
background: rgba(50, 177, 108, 0.2);
color: rgba(50, 177, 108, 1);
}
span:nth-child(4n+1) {
background: rgba(243, 152, 0, 0.2);
color: rgba(243, 152, 0, 1);
}
span:nth-child(4n+2) {
background: rgba(0, 160, 233, 0.2);
color: rgba(0, 160, 233, 1);
}
span:nth-child(4n+3) {
background: rgba(247, 64, 166, 0.2);
color: rgba(247, 64, 166, 1);
}
}
.sign {
padding-top: 2px;
}
.img-header {
height: 270px;
}
.card {
padding: 10px;
width: 100%;
height: 100%;
position: relative;
img{object-fit: cover}
}
.img-hover{
position: absolute;
top: 0;
left: 0;
background-color: rgb(0,0,0,.5);
color: #fff;
font-size: 18px;
font-weight: 400;
width: 100%;
height: 100%;
line-height: 115px;
text-align: center;
border-radius: 10px;
}
.hotelImg{border-radius: 10px;overflow: hidden;aspect-ratio: 16/9;
img{object-fit: cover;object-position: center;width: 100%;height: 100%;
}
}
.oddmb:nth-child(2){margin-bottom: 20px;}
</style>
src/viewsPc/booking/pay.vue
......@@ -27,7 +27,6 @@
</el-row>
</div>
</div>
<div v-if="type == 'car'">
<div class="leftboderTT">{{ language == 0 ? '路线信息' : 'Car Information' }}</div>
<div class="border-info mt20">
......@@ -53,7 +52,42 @@
</el-row>
</div>
</div>
<div v-if="type == 'makeUp'">
<div class="leftboderTT">{{ language == 0 ? '化妆信息' : 'Hotel Information' }}</div>
<div class="border-info mt20">
<h3>{{ formInfo.studioName }}</h3>
<el-row>
<el-col>
{{ language == 0 ?'地址':'Address' }}：
<span >{{ formInfo.remarks }} </span>
</el-col>
<el-col>
{{ language == 0 ?'套餐':'Package' }}：{{ formInfo.mealName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '￥'+formInfo.mealPrice:'€'+ formInfo.mealPriceEn}}</span>
</el-col>
<el-col>
{{ language == 0 ?'套餐说明':'Package Description' }}：{{ formInfo.introduction}}
</el-col>
</el-row>
</div>
</div>
<div v-if="type == 'photography'">
<div class="leftboderTT">{{ language == 0 ? '拍摄信息' : 'Shooting Information' }}</div>
<div class="border-info mt20">
<h3>{{ formInfo.shootName }}</h3>
<el-row>
<el-col>
{{ language == 0 ?'地址':'Address' }}：
<span >{{ formInfo.remarks }} </span>
</el-col>
<el-col>
{{ language == 0 ?'套餐':'Package' }}：{{ formInfo.photoName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '￥'+formInfo.photoPrice:'€'+ formInfo.photoPriceEn}}</span>
</el-col>
<el-col>
{{ language == 0 ?'套餐说明':'Package Description' }}：{{ formInfo.introduction}}
</el-col>
</el-row>
</div>
</div>
<div class="leftboderTT">{{ language == 0 ? '预订信息' : 'Booking information' }}</div>
......@@ -127,6 +161,37 @@
<el-col :lg="8" :md="12" :sm="12" :xs="24">{{ language==0?'联系方式':'Contact Phone' }}：{{ form.phone }}</el-col>
<el-col :span="24" >{{ language==0?'备注':'Remarks' }}：{{ form.remarks || '-' }}</el-col>
</el-row>
<el-row v-if="type == 'makeUp'">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div class="mb10">{{ language==0?'化妆时间':'Makeup time' }}：
<!-- {{ dayjs(form.dcStart).format('YYYY-MM-DD') +'&nbsp;' }} ~ {{dayjs(form.dcStart).format('YYYY-MM-DD') +'&nbsp;'}}-->
{{ dayjs(form.dcStart).format('YYYY-MM-DD') +'&nbsp;'+ form.nameStart }} ~ {{dayjs(form.dcStart).format('YYYY-MM-DD') +'&nbsp;'+form.nameEnd}}
</div>
</el-col>
<el-col :lg="12" :md="12" :sm="12" :xs="24">
<div class="mb10">{{ language==0?'预约数':'Number of appointments' }}：{{ form.num }} </div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div class="mb10">{{ language==0?'联系人':'Contact Person' }}：{{ form.contacts }}</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">{{ language==0?'联系方式':'Contact Phone' }}：{{ form.phone }}</el-col>
<el-col :span="24" >{{ language==0?'备注':'Remarks' }}：{{ form.remarks }}</el-col>
</el-row>
<el-row v-if="type == 'photography'">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div class="mb10">{{ language==0?'拍摄时间':'Makeup time' }}：
{{ dayjs(form.dcStart).format('YYYY-MM-DD') +'&nbsp;'+ form.nameStart }} ~ {{dayjs(form.dcStart).format('YYYY-MM-DD') +'&nbsp;'+form.nameEnd}}
</div>
</el-col>
<el-col :lg="12" :md="12" :sm="12" :xs="24">
<div class="mb10">{{ language==0?'预约数':'Number of appointments' }}：{{ form.num }} </div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div class="mb10">{{ language==0?'联系人':'Contact Person' }}：{{ form.contacts }}</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">{{ language==0?'联系方式':'Contact Phone' }}：{{ form.phone }}</el-col>
<el-col :span="24" >{{ language==0?'备注':'Remarks' }}：{{ form.remarks }}</el-col>
</el-row>
</div>
<el-row justify="space-between" align="middle">
......@@ -169,7 +234,7 @@
<div class="leftboderTT">{{ language == 0 ? '选择支付方式' : 'Choose payment method' }}</div>
<div class="mt20">
<el-radio-group v-model="payType">
<el-radio-group v-model="payType" >
<el-radio value="2" v-if="language==0" border>
<!-- 微信-->
<svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1"
......@@ -298,7 +363,14 @@ import useUserStore from "@/store/modules/user";
import FileUpload from "@/components/FileUpload";
import {useStorage} from "@vueuse/core/index";
import {ElMessage} from "element-plus";
import {cancelOrder, cancelOrder2, getCarBilldetailbyId, getFoodBilldetailbyId} from "@/apiPc/booking";
import {
cancelOrder,
cancelOrder2,
getCarBilldetailbyId,
getFoodBilldetailbyId,
getMealOrderInfoByLogex, getPhotoOrderInfo, getPhotoOrderInfoByLogex
} from "@/apiPc/booking";
import dayjs from 'dayjs'
import {delPerson} from "@/api/exam/person";
const isLogin = ref(false)
......@@ -306,13 +378,12 @@ const language = useStorage('language', 0)
const totalFee = ref('')
const wePayCodeUrl = ref('')
const form = ref({})
const formInfo=ref({})
const type = ref('')
const errorBox = ref(false)
const hideconfirmbtn = ref(false)
const user = useUserStore().user
console.log(route.query.orderId)
// 1763462073870237698
if (useUserStore().user) {
isLogin.value = true
}
......@@ -336,8 +407,15 @@ onMounted(() => {
case '2':
type.value = 'food'
break
case '3':
type.value = 'makeUp'
break
case '4':
type.value = 'photography'
break
}
}
getData()
})
......@@ -384,6 +462,16 @@ function getData() {
errorBox.value = true
})
}
if(type.value=='makeUp') {
MakeUpOrder()
// MakeUpIno()
}
if(type.value=='photography') {
photographyOrder()
// photographyInfo()
}
console.log(payType.value)
}
function goHome() {
......@@ -411,16 +499,40 @@ let handle;
function startforGetData() {
handle = setTimeout(() => {
getData().then( res => {
if (form.value.payDate) {
if (handle) {
clearTimeout(handle)
handle = null
if (type.value=='photography'){
photographyOrder().then(res=>{
if (form.value.payDate) {
if (handle) {
clearTimeout(handle)
handle = null
}
} else {
startforGetData()
}
} else {
startforGetData()
}
})
})
}else if(type.value=='makeUp'){
MakeUpOrder().then(res=>{
if (form.value.payDate) {
if (handle) {
clearTimeout(handle)
handle = null
}
} else {
startforGetData()
}
})
}else{
getData().then( res => {
if (form.value.payDate) {
if (handle) {
clearTimeout(handle)
handle = null
}
} else {
startforGetData()
}
})
}
}, 2000)
}
......@@ -428,6 +540,52 @@ function showLogin() {
useUserStore().setReLogin()
}
function MakeUpOrder(){
return booking.getMealOrderInfo({orderId: orderId.value}).then(res => {
form.value=res.data
totalFee.value=language.value==0?form.value.total:form.value.totalEn
MakeUpIno()
console.log(res)
}).catch(err => {
console.log(err)
errorBox.value = true
})
}
function MakeUpIno(){
booking.getMealOrderInfoByLogex({asmId: form.value.asmId}).then(res=>{
formInfo.value=res.data
console.log(res)
})
.catch((e) => {
console.log(e)
errorBox.value = true
})
}
function photographyOrder(){
return booking.getPhotoOrderInfo({orderId: orderId.value}).then(res => {
form.value=res.data
totalFee.value=language.value==0?form.value.total:form.value.totalEn
photographyInfo()
}).catch(err => {
console.log(err)
errorBox.value = true
})
}
function photographyInfo(){
booking.getPhotoOrderInfoByLogex({aspId: form.value.aspId}).then(res=>{
formInfo.value=res.data
})
// .catch((e) => {
// console.log(e)
// errorBox.value = true
// })
}
const cancel = () => {
//取消订单
proxy.$modal.confirm(language.value == 0 ? '确定取消订单吗 ?' :`Are you sure to cancel the order?`).then(() => {
......@@ -451,6 +609,8 @@ const unsubscribe = () => {
})
})
}
</script>
<style scoped lang="scss">
......@@ -606,4 +766,8 @@ const unsubscribe = () => {
font-size: 16px;
margin-top: 10px
}
.price{
color:orange;
}
</style>
......
src/viewsPc/booking/photography.vue
<template>
<div>
<div class="box">
<el-card class="mt30"></el-card>
<div>
<div class="banner">
<img v-if="language==0" src="@/assets/booking/pz_text1.png">
<img v-else src="@/assets/booking/pz_text2.png">
</div>
<div class="box">
<div class="searchBar">
<el-input :placeholder="language==0?'请输入关键字搜索':'Search'" v-model="query.name" class="no-border">
</el-input>
<el-button size="large" type="primary" class="btn-lineG" icon="search" @click="getList">
{{ language==0?'搜索':'Search' }}</el-button>
</div>
</div>
<div class="box" v-loading="loading">
<el-row style="width: 100%" :gutter="20">
<el-col :span="8" v-for="(h,index) in list" class="mb20" >
<el-card style="position: relative;">
<img class="w100 hz-img" :src="fillImgUrl(h.cover)"/>
<div class="yuyue">
{{ h.counts }} {{ language==0?'个时间段可预约':"time slots can be reserved" }}
</div>
<div class="hz-text">{{h.name}}</div>
<div class="tagbox esp">
<span v-for="(t,index) in h.label?.split('，')" v-show="index<4">{{t}}</span>
</div>
<div class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><OfficeBuilding /></el-icon>
{{ language==0?'成立':'Established for'}}
<span class="sign">{{ h.ageLimit }}</span>{{language==0?'年':'years'}} |
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><UserFilled /></el-icon><span class="sign">{{ h.dresserLimit }}</span>{{language==0?'名摄影师':'Photographers' }}
</div>
<div class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><PhoneFilled /></el-icon>
{{ h.contact }}
</div>
<div class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon>
{{h.remarks}}
</div>
<div style="text-align: center">
<el-button :disabled="h.counts<=0" class="btn-lineG w200px" round type="primary" size="large" @click="goDetail(h)">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
</div>
</el-card>
</el-col>
</el-row>
</div>
<el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" />
<div style="height: 50px"></div>
</div>
</div>
</div>
</template>
<script setup>
import {onMounted} from "@vue/runtime-core"
import * as booking from "@/apiPc/booking"
import {useRouter,useRoute} from "vue-router";
import {useStorage} from "@vueuse/core/index";
import {getMakeUpList, getShootList} from "@/apiPc/booking";
const router = useRouter()
const route = useRoute()
const language= useStorage('language',0)
const query = ref({
name:''
})
const cptId = ref('')
const list = ref([])
const loading = ref(false)
onMounted(()=>{
query.value.activityId = route.params.cptId
getList()
})
function getList() {
loading.value = true
booking.getShootList(query.value).then(res=>{
list.value = res.rows
loading.value = false
}).catch(e=>{
loading.value = false
})
}
function goDetail(item) {
router.push({
name:'photographyDetail',
params:{
id:item.id,
}
})
}
</script>
<style scoped>
<style scoped lang="scss">
.banner{height: 140px;background-size: cover;text-align: center;
background: url("@/assets/booking/pz_bg.png") center;display: flex;align-items: center;
justify-content: center;
img{display: block;margin:-30px auto 0;width: auto;}
}
.searchBar{position: relative;top: -30px;
background: #FFFFFF;display: flex;padding: 20px;
border-radius: 10px;}
.no-border{border: none;background: #F5F7F9;
:deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;}
}
.hz-img{
height: 218px;
width: 100%;
border-radius: 2px;
border: 0;
margin-bottom: 20px;
object-fit: cover;
}
.yuyue{
height: 30px;
padding-right: 10px;
background: #000000;
border-radius: 20px 0px 0px 2px;
padding-left: 15px;
opacity: 0.45;
color: #fff;
font-size: 14px;
line-height: 30px;
position: absolute;
top: 207px;
right:21px;
}
.hz-text{
font-size: 20px;
font-weight: 500;
color: #000;
margin-bottom: 8px;
}
//.hz-tag{
// border-radius: 13px;
// height: 25px;
// line-height: 25px;
// font-size: 12px;
// font-weight: 400;
// padding: 0 15px;
//}
//.tag1{
// background: rgba(50, 177, 108, 0.2);
// color:rgba(50, 177, 108, 1);
//}
//.tag2{
// background-color: rgba(243, 152, 0, 0.2);
// color: #F39800;
//}
//.tag3{
// background-color: rgba(0, 160, 233, 0.2);
// color: #00A0E9;
//}
//.tag4{
// background-color: rgba(247, 64, 166, 0.2);
// color: #F740A6;
//}
//
//.hz-row{
// font-size: 14px;
// font-weight: 400;
// color: #929AA0;
// margin-bottom: 16px;
// .sign{
// color: #493CEB;
// }
//}
.tagbox{margin: 10px 0;
a{color: #AFB5B9;font-size: 12px;}
span{border-radius: 13px;font-size: 12px;padding: 3px 10px;margin-right:10px;font-weight: 400;}
span:nth-child(4n){background: rgba(50, 177, 108, 0.2);color: rgba(50, 177, 108, 1);}
span:nth-child(4n+1){background:rgba(243, 152, 0, 0.2);color: rgba(243, 152, 0, 1);}
span:nth-child(4n+2){background: rgba(0, 160, 233, 0.2);color: rgba(0, 160, 233, 1);}
span:nth-child(4n+3){background: rgba(247, 64, 166, 0.2);color:rgba(247, 64, 166, 1);}
}
</style>
......
src/viewsPc/booking/photographyDetail.vue 0 → 100644
<template>
<div>
<div class="box">
<el-card>
<el-row>
<div class="zh-title">{{ form.name }}</div>
<div class="tagbox esp">
<span v-for="(t,index) in form.label?.split('，')" v-show="index<4">{{t}}</span>
</div>
</el-row>
<el-row class="hz-row">
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<OfficeBuilding/>
</el-icon>
{{ language==0?'成立':'Established for'}} <span class="sign">{{form.ageLimit}}</span>{{language==0?'年':'years'}} &nbsp;&nbsp;&nbsp;&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<UserFilled/>
</el-icon>
<span class="sign"> {{ form.dresserLimit }}</span>{{language==0?'名摄影师':'Photographers' }}&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<PhoneFilled/>
</el-icon>
<span style="padding-top: 2px">
{{ form.contact }}
</span>
&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;
<el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
<LocationFilled/>
</el-icon>
{{form.remarks}}
</el-row>
</el-card>
<div class="mt30">
<el-row :gutter="20">
<el-col :span="10">
<div class="imgbox hotelImg">
<el-image :src="form?.photosList?.[0]" fit="cover" :preview-src-list="form?.photosList"/>
</div>
</el-col>
<el-col :span="14">
<el-row class="h100" :gutter="20">
<el-col :span="8" class="oddmb" v-for="(p,index) in form?.photosList?.slice(1,7)">
<div class="imgbox hotelImg"><el-image :src="p" fit="cover"/></div>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
<br>
<el-card :body-style="{'padding':'20px 20px'}">
<PhotoGraphyCalendar/>
</el-card>
</div>
</div>
</template>
<script setup >
import {useRouter} from "vue-router";
import {ref, reactive, onMounted} from "vue";
import {useRoute} from "vue-router";
import * as booking from "@/apiPc/booking"
import {useStorage} from "@vueuse/core/index";
import useUserStore from "@/store/modules/user";
import PhotoGraphyCalendar from "@/viewsPc/booking/component/photoGraphyCalendar.vue";
import {fillImgUrl} from "/@/utils/ruoyi";
const user = useUserStore().user
const language = useStorage('language', 0)
const router = useRouter()
const route = useRoute()
const form = ref({})
const query = ref({
activityId: route.params.cptId,
id:route.params.id
})
const loading = ref(false)
const map = ref(null)
onMounted(() => {
getData()
})
function getData() {
loading.value = true
booking.getComShootVoById(query.value).then(res => {
loading.value = false
form.value = res.data
form.value.photosList=[]
form.value.photos.split(',').forEach(v=>{
form.value.photosList.push(fillImgUrl(v))
})
}).catch(err => {
console.log(err)
})
}
</script>
<style scoped lang="scss">
.room {
background: #FAFBFD;
margin: 20px 0 0;
padding: 20px;
border: 1px solid #E5E5E5;
.name {
font-size: 20px;
margin: 0 0 10px;
}
.roomImg {
aspect-ratio: 16/9;
border-radius: 10px;
overflow: hidden;
img {
width: 100%;
object-fit: cover;
object-position: center;
height: 100%;
}
}
.price {
color: #FF8124;
font-size: 24px;
span {
font-size: 36px;
font-family: "DIN Alternate"
}
}
.bg-lineg {
margin: auto;
border-radius: 10px;
text-align: center;
padding: 7px 2px 2px;
font-size: 24px;
width: 66px;
cursor: pointer;
div {
background: #fff;
font-size: 13px;
border-radius: 20px;
padding: 0 10px;
color: #453DEA;
font-weight: 500;
}
}
}
.zh-title {
font-size: 24px;
font-weight: 500;
margin-right: 25px;
}
.hotel {
h3 {
margin: 0 0 20px;
}
img.w100 {
object-fit: cover;
aspect-ratio: 16/9
}
.addr {
font-size: 16px;
color: #929AA0;
font-weight: 400;
}
.price {
margin: 0 0 25px;
color: #FF8124;
font-size: 18px;
span {
font-size: 24px;
margin: 0 8px;
font-family: 'DINAlternate-Bold';
font-weight: 600;
}
i {
font-style: normal;
color: #929AA0;
}
}
}
.tagbox {
margin: 15px 0;
a {
color: #AFB5B9;
font-size: 12px;
}
span {
border-radius: 13px;
font-size: 12px;
padding: 4px 10px;
margin-right: 10px;
font-weight: 400;
}
span:nth-child(4n) {
background: rgba(50, 177, 108, 0.2);
color: rgba(50, 177, 108, 1);
}
span:nth-child(4n+1) {
background: rgba(243, 152, 0, 0.2);
color: rgba(243, 152, 0, 1);
}
span:nth-child(4n+2) {
background: rgba(0, 160, 233, 0.2);
color: rgba(0, 160, 233, 1);
}
span:nth-child(4n+3) {
background: rgba(247, 64, 166, 0.2);
color: rgba(247, 64, 166, 1);
}
}
.mapBox {
position: relative;
overflow: hidden;
height: 200px;
#map {
position: relative;
left: -70px;
width: calc(100% + 160px);
}
}
.sign {
padding-top: 2px;
}
.img-header {
height: 270px;
}
.card {
padding: 10px;
width: 100%;
height: 100%;
position: relative;
img{object-fit: cover}
}
.img-hover{
position: absolute;
top: 0;
left: 0;
background-color: rgb(0,0,0,.5);
color: #fff;
font-size: 18px;
font-weight: 400;
width: 100%;
height: 100%;
line-height: 115px;
text-align: center;
border-radius: 10px;
//display: none;
}
.hotelImg{border-radius: 10px;overflow: hidden;aspect-ratio: 16/9;
img{object-fit: cover;object-position: center;width: 100%;height: 100%;
}
}
.oddmb:nth-child(2){margin-bottom: 20px;}
</style>
src/viewsPc/center/myReservation.vue
......@@ -15,6 +15,8 @@
<label class="blueTag" v-if="b.orderType == 0"> {{ language==0?'酒店':'HOTEL' }} </label>
<label class="purpleTag" v-if="b.orderType == 1"> {{ language==0?'车辆':'TRANSPORTATION' }} </label>
<label class="orangeTag" v-if="b.orderType == 2"> {{ language==0?'餐饮':'DINING' }} </label>
<label class="orangeTag" v-if="b.orderType == 3"> {{ language==0?'化妆':'MakeUp' }} </label>
<label class="orangeTag" v-if="b.orderType == 4"> {{ language==0?'拍摄':'Shooting ' }} </label>
<span>{{ language==0?'订单编号：':'No.' }} {{ b.id }}</span>
</div>
......@@ -35,7 +37,6 @@
<h3 class="name">{{b.name}}</h3>
<p v-if="language==0">{{b.messageObj?.roomStayDate}}</p>
<p v-else>{{b.messageObj?.roomStayDate.replace('共',' total ').replace('晚',' days')}}</p>
<p>{{b.messageObj?.roomInfo}}</p>
</div>
......@@ -57,6 +58,12 @@
<p>{{language==0?'配送日期':'Delivery Date'}}：{{b.extJsonObj.dcEnd }} ~ {{b.extJsonObj.dcEnd}}</p>
</div>
<div v-if="b.orderType==3 ||b.orderType == 4">
<h3 class="name">{{b.name}}</h3>
<p >
{{dayjs(b.deliveryTime).format('YYYY-MM-DD')+' '+b.extJsonObj.timePeriod?.split('-')[0]+'-'+dayjs(b.deliveryTime).format('YYYY-MM-DD')+' '+b.extJsonObj.timePeriod?.split('-')[1] }}
</p>
</div>
</el-col>
<el-col :lg="6">
<div v-if="b.orderType == 0">
......@@ -67,6 +74,9 @@
</div>
<div v-if="b.orderType == 2">
</div>
<div v-if="b.orderType == 3||b.orderType == 4">
<p>{{ b.extJsonObj.packageName }}</p>
</div>
</el-col>
<el-col :lg="4" class="text-center">
<span class="text-warning"> {{ language==0?'¥':'€' }}
......@@ -76,8 +86,7 @@
<el-col :lg="4" >
<div class="text-right mb20 text-danger">
<el-countdown value-style="color:#E60012;font-size:16px;" v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" format="mm:ss"
:value="b.countdown" @finish="finish(b)"/>
<el-countdown value-style="color:#E60012;font-size:16px;" v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" format="mm:ss" :value="b.countdown" @finish="finish(b)"/>
</div>
<div class="text-right">
......@@ -102,6 +111,7 @@ import {onMounted} from "@vue/runtime-core";
import {useStorage} from "@vueuse/core/index";
import {newbilllist} from "@/apiPc/common";
import useUserStore from "@/store/modules/user";
import dayjs from 'dayjs'
const router = useRouter()
const language= useStorage('language',0)
const list = ref([])
......@@ -118,13 +128,14 @@ function getList() {
newbilllist({createById:user.userId}).then(res=>{
list.value = res.rows
for (var b of list.value) {
b.messageObj = JSON.parse(b.message)
b.messageObj = JSON.parse(b.message) || {}
b.extJsonObj = JSON.parse(b.extJson) || {}
if(b.surplus&&b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')){
b.countdown = Date.now() + Number((b.surplus.split(',')[0]*60 + b.surplus.split(',')[1])*10)
console.log(b.countdown)
}
}
console.log(list.value)
})
}
function goDetail(b) {
......
src/viewsPc/components/homeQuick.vue
......@@ -101,7 +101,7 @@ function popRemark(type){
building()
return
}
if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || type=='0' || type=='4' || type=='5'){
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)){
building()
return
}
......@@ -137,8 +137,6 @@ function goBooking(n) {
break;
case 5:
//拍照
building()
router.push({path: `/booking/photography/${props.matchId}`})
break;
}
......
src/viewsPc/match/chooseProject.vue
......@@ -38,7 +38,10 @@
<div class="text-center mt20">
<el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
</div>
<div class="tip">
<span v-if="language==0">*如果您参加个人项目，或给其它组合/选手进行报名，请点击切换按钮重新选择人员</span>
<span v-else>*If you are participating in an individual event, or if you are signing up for another group/competitor, please click the Switch button to re-select the team.</span>
</div>
</div>
</div>
</el-col>
......
src/viewsPc/match/components/quick-row.vue
......@@ -77,7 +77,6 @@
</el-col>
</el-row>
</div>
<order-remark ref="orderRemarkRef" @submit="goBooking"/>
</template>
......@@ -119,16 +118,19 @@ function popRemark(type){
building()
return
}
if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || type=='0' || type=='4' || type=='5'){
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)){
building()
return
}
const params = {
matchId: props.matchId,
title: language.value == 0 ?'预订说明':'Booking Instructions',
type: type
}
proxy.$refs['orderRemarkRef'].open(params)
}
function goBooking(n) {
switch (n) {
......@@ -151,12 +153,10 @@ function goBooking(n) {
break;
case 4:
//化妆
building()
router.push({path: `/booking/makeup/${props.matchId}`})
break;
case 5:
//拍照
building()
router.push({path: `/booking/photography/${props.matchId}`})
break;
}
......
src/viewsPc/match/teamSign.vue
......@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col :lg="10">
<el-form-item :label="language==0?'代表国家/地区':'Representing'">
<el-form-item :label="language==0?'代表国家/地区':'Representing'" required>
<el-select filterable v-model="form.countryId" @change="changeCountryId"
:disabled="form.type!='4'">
<!-- <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id"/>-->
......
src/viewsPc/match/teamSign_Cn.vue
......@@ -26,7 +26,7 @@
<el-form-item :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">
<el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>
</el-form-item>
<el-form-item :label="language==0?'团体名称':'Team Name'" prop="name">
<el-form-item :label="language==0?'团体名称':'Team Name'" prop="name" required>
<el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />
</el-form-item>
<el-form-item :label="language==0?'所属国家/地区':'Country'" required>
......
vite.config.js
......@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.131:8081/',
target: 'http://192.168.1.118:8081/',
// target: 'https://dance.itechtop.cn/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api',
changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!