Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
ee263aea by zhangmeng
Options

Merge branch 'order' into dev-order

2 parents d2718611 71087b02
Expand all
Inline Side-by-side
Showing 15 changed files with 214 additions and 57 deletions
src/apiPc/common.js
......@@ -47,6 +47,7 @@ export function newbilllist(query) {
params: query
})
}
export function vistorRegister(data) {
return request({
url: `/pcSimpleRegister`,
......@@ -68,3 +69,41 @@ export function upgradeTeam(data) {
data: data
})
}
export function submitMasterApply(data) {
return request({
url: `/league/courseUser`,
method: 'post',
data: data
})
}
export function masterClassList(query) {
return request({
// url: `/league/courseItem/list`,
url: `/league/courseItem/getCoursrItemByCourseId`,
method: 'get',
params: query
})
}
export function getByCard(query) {
return request({
url: `/league/courseUser/getByCard`,
method: 'get',
params: query
})
}
export function getMasterApply(query) {
return request({
url: `/league/courseUser/getCourseByUser`,
method: 'get',
params: query
})
}
export function delByCard(card) {
return request({
url: `/league/courseUser/delByCard?card=${card}`,
method: 'delete'
})
}
......
src/assets/js/data.js
......@@ -286,7 +286,7 @@ export const rankList = [
tong: '0'
},
{
index: '2',
index: '1',
code: 'md',
name: 'Alexey Glukhov - Anastasia Glazunova',
gj: '摩尔多瓦共和国',
......@@ -296,7 +296,7 @@ export const rankList = [
tong: '0'
},
{
index: '3',
index: '1',
code: 'de',
name: 'Marius-Andrei Balan - Khrystyna Moshenska',
gj: '德国',
......
src/routerPc/en.js
......@@ -440,12 +440,24 @@ export const constantRoutes = [
meta: { title: 'pay' }
},
{
path: 'payticket',
component: () => import('@/viewsPc/booking/payticket'),
name: 'payticket',
meta: { title: '票务' }
},
{
path: 'payOk',
component: () => import('@/viewsPc/booking/payOk'),
name: 'bookingPayOk',
meta: { title: 'payOk' }
},
{
path: 'payticketOk',
component: () => import('@/viewsPc/booking/payticketOk'),
name: 'payticketOk',
meta: { title: '票务-paypal' }
},
{
path: 'invoice',
component: () => import('@/viewsPc/booking/invoicing'),
name: 'invoice',
......
src/viewsPc/booking/car.vue
......@@ -47,8 +47,8 @@
<h3 class="name flex">{{ r.carType }}
<div class="tagbox">
<span class="tag">{{r.carColor}}</span>
<span class="tag" v-show="r.checkOut==1">可送车</span>
<span class="tag" v-show="r.checkIn==1">可接车</span>
<span class="tag" v-show="r.checkOut==1">{{ language==0?'可送车':'drop-off' }}</span>
<span class="tag" v-show="r.checkIn==1">{{ language==0?'可接车':'pick-up' }}</span>
</div>
</h3>
<div class="text-gray mt20">
......
src/viewsPc/booking/dinnerDetail.vue
......@@ -3,10 +3,8 @@
<div class="box">
<el-card class="mt30" v-loading="loading">
<el-row v-if="form" class="hotel" align="middle" :gutter="20">
<!-- <el-col :span="6">-->
<!-- <img class="w100" :src="fillImgUrl(form.photos?.split(',')[0])"/>-->
<!-- </el-col>-->
<el-col :span="16">
<el-col :lg="16" :sm="24">
<h3 class="esp flex">{{ form?.name }}
</h3>
......@@ -18,25 +16,18 @@
{{ form?.addName }}
</p>
</el-col>
<el-col :lg="8" :sm="24">
<el-carousel height="120px">
<el-carousel-item v-for="item in form.photos?.split(',')" :key="item">
<el-image class="w100 h100" fit="contain" :src="fillImgUrl(item)"/>
</el-carousel-item>
</el-carousel>
</el-col>
</el-row>
<el-empty v-else :image="`/img/order_no.png`" :image-size="228" description=""/>
</el-card>
<div class="mt30">
<el-row :gutter="20">
<el-col :span="10">
<div class="imgbox hotelImg">
<el-image :src="fillImgUrl(form?.photos?.split(',')[0])" fit="cover" :preview-src-list="form?.photos?.split(',')"/>
</div>
</el-col>
<el-col :span="14">
<el-row class="h100" :gutter="20">
<el-col :span="8" v-for="(p,index) in form?.photos?.split(',').slice(1,7)" style="height: calc(50% - 10px)">
<div class="imgbox hotelImg"><el-image :src="fillImgUrl(p)" fit="cover" :preview-src-list="form?.photos?.split(',')"/></div>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
<el-card class="mt30 mb60">
......@@ -57,8 +48,8 @@
<h3 class="name">{{ r.name }}<span class="text-primary">({{ r.categoryName }})</span></h3>
<el-row :gutter="10">
<el-col :span="24">
<p>{{ language==0?'配送时间':'Delivery time' }}：{{ r.psStart }}~{{ r.psEnd }}</p>
<p>{{ language==0?'配送地址':'Delivery address' }}：{{ r.address }}</p>
<p>{{ language == 0 ? '配送时间' : 'Delivery time' }}：{{ r.psStart }}~{{ r.psEnd }}</p>
<p>{{ language == 0 ? '配送地址' : 'Delivery address' }}：{{ r.address }}</p>
</el-col>
</el-row>
</el-col>
......@@ -83,9 +74,9 @@
</template>
<script setup>
import {useRouter,useRoute} from "vue-router";
import {useRouter, useRoute} from "vue-router";
import {ref, onMounted} from "vue";
import { getMenuById} from "@/apiPc/booking"
import {getMenuById} from "@/apiPc/booking"
import {useStorage} from "@vueuse/core/index";
import useUserStore from "@/store/modules/user";
import {fillImgUrl} from "@/utils/ruoyi";
......@@ -118,7 +109,7 @@ function getData() {
var arr = []
m.photosList = []
arr = m.photos?.split(',')
for (var a of arr){
for (var a of arr) {
m.photosList.push(fillImgUrl(a))
}
m.num = 0
......@@ -135,7 +126,7 @@ function getData() {
function goOrder(n) {
if (!user) {
useUserStore().setReLogin()
useUserStore().setVisitor()
return
}
router.push({
......
src/viewsPc/booking/foodOrder.vue
......@@ -113,6 +113,7 @@ const canOrderNum = ref(0)
const form = ref({
num: 1,
phone: user.phonenumber||'',
total:0
})
const rzRange = ref([])
const rzUserArr = ref([])
......@@ -126,11 +127,7 @@ onMounted(() => {
food.value = JSON.parse(decodeURIComponent(route.query.food))
form.value = food.value
restaurant.value = JSON.parse(decodeURIComponent(route.query.restaurant))
if(language.value == 0){
form.value.total = food.value.foodPrice
} else {
form.value.total = food.value.foodPriceEn
}
form.value.total = 0
console.log(food.value,restaurant.value)
initDays()
const today = dayjs()
......
src/viewsPc/booking/payticketOk.vue 0 → 100644
<template>
<div>
<div class="box">
<el-card class="mb60 mt30" v-loading="loading">
<div class="text-center mt30">
<el-icon color="#32B16C" size="80">
<SuccessFilled/>
</el-icon>
<p class="text-success mb20">{{ language == 0 ? '支付成功' : 'successfully!' }}</p>
<el-button type="primary" class="btn-lineG mb60" @click="goBillDetail" round>
{{ language == 0 ? '返回订单详情' : 'Return order details' }}
</el-button>
</div>
</el-card>
</div>
</div>
</template>
<script setup>
import {ref} from "vue";
import {useRoute, useRouter} from "vue-router";
import {onMounted} from "@vue/runtime-core";
import {callbackPalPay} from "@/apiPc/booking";
import {useStorage} from "@vueuse/core/index";
const route = useRoute()
const router = useRouter()
const language= useStorage('language',0)
const orderId = ref(route.query.orderId)
const type = ref('')
const loading = ref(false)
onMounted(() => {
var code = decodeURIComponent(orderId.value)
console.log(code)
loading.value = true
callbackPalPay(code).then(res => {
loading.value = false
type.value = res.data.orderType
})
})
function goBillDetail() {
router.push({
name: 'bookingPay',
query: {
orderId: route.query.orderId,
orderType: type.value
}
})
}
</script>
<style scoped lang="scss">
</style>
src/viewsPc/center/index.vue
......@@ -143,6 +143,13 @@ const menus3 = ref([
picUrl1: '/img/nav_29.png',
picUrl2: '/img/nav_29_dwn.png',
isActive: false
},
{
name: language.value==0?'票务预订':'Ticket Reservation',
routeName: 'seat_order',
picUrl1: '/img/c7.png',
picUrl2: '/img/c7.png',
isActive: false
}
])
const menusPersonal = ref([
......@@ -174,6 +181,13 @@ const menusPersonal = ref([
picUrl2: '/img/nav_29_dwn.png',
isActive: false
},
{
name: language.value==0?'票务预订':'Ticket Reservation',
routeName: 'seat_order',
picUrl1: '/img/c7.png',
picUrl2: '/img/c7.png',
isActive: false
},
{
name: language.value==0?'系统消息':'System messages',
routeName: 'mySms',
......
src/viewsPc/home.vue
<template>
<div>
<index-Ch v-if="language ==0"/>
<index-En v-else/>
<index-Ch v-if="language ==0" @pop="openMaster"/>
<index-En v-else @pop="openMaster"/>
<div v-if="showgg" class="fixed_gg">
<!--天气-->
<el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
......@@ -59,6 +59,8 @@
</div>
</el-dialog>
</div>
<dialog-master-class ref="masterClassRef"/>
</div>
</template>
......@@ -67,10 +69,12 @@
import IndexCh from '/src/viewsPc/index'
import IndexEn from '/src/viewsPc/index_en'
import WeatherIcon from '@/viewsPc/components/weatherIcon'
import DialogMasterClass from '@/viewsPc/components/masterClass'
import {useStorage} from "@vueuse/core/index";
import {ref} from "vue";
import {getWeather} from "@/apiPc/webSite";
import {getCurrentInstance} from "@vue/runtime-core";
const {proxy} = getCurrentInstance()
const showgg = ref(true)
const language = useStorage('language', 0)
......@@ -91,7 +95,14 @@ function init(){
const popWeather = () => {
weatherdialog.value = true
}
const openMaster = (params) => {
console.log(params)
var obj = {
title:'大师课申请',
cptId:params.cptId
}
proxy.$refs['masterClassRef'].open(obj)
}
</script>
<style scoped lang="scss">
......
src/viewsPc/index.vue
......@@ -93,6 +93,8 @@
<download/>
</el-icon>
</a>
<!-- <el-button type="primary" @click="popMaster">青少年公益课</el-button>-->
<a class="zn-btn ml20 btn-q" @click="popMaster">青少年公益课</a>
</div>
</el-col>
<el-col :sm="24" :lg="14">
......@@ -359,7 +361,7 @@ import HomeQuick from '@/viewsPc/components/homeQuick'
import HomeCalendar from '@/viewsPc/components/homeCalendar'
import {ref, nextTick, onMounted, watch} from 'vue'
import {getCurrentInstance} from '@vue/runtime-core'
import {getHomePage, getNewsListById, getNewsList, getWeather} from '@/apiPc/webSite'
import {getHomePage, getNewsListById, getNewsList} from '@/apiPc/webSite'
import {useRouter} from 'vue-router'
import {rankList} from '@/assets/js/data'
import _ from 'lodash'
......@@ -375,14 +377,7 @@ const navigationPic = ref({
})
const router = useRouter()
const {proxy} = getCurrentInstance()
const bannerVideo = ref(null)
const isPlay = ref(false)
const canPrev = ref(false)
const canNext = ref(false)
const activeRankName = ref(0)
const weatherObj = ref({
forecast:[]
})
const emit = defineEmits(['pop'])
const time = ref(0)
const personList = ref([
{ name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' },
......@@ -400,12 +395,10 @@ const news = ref([])
const notice = ref([])
const display = ref([])
const scores = ref([])
const nowscores = ref([])
const livelist = ref([])
const matchData = ref({})
const maList = ref([])
const loading = ref(false)
const weatherdialog = ref(false)
const picList = ref([])
onMounted(() => {
......@@ -491,9 +484,6 @@ const goMatch = (n) => {
path: `/match/list/${n.id}`
})
}
const popWeather = () => {
weatherdialog.value = true
}
const goGuide = () => {
router.push({
......@@ -503,6 +493,13 @@ const goGuide = () => {
}
})
}
const popMaster = () => {
var params = {
cptId:matchData.value.id
}
emit('pop',params)
}
</script>
<style scoped lang="scss">
......@@ -945,4 +942,32 @@ const goGuide = () => {
}
}
}
:deep(.btn-q) {
//background: #FFFFFF;
//font-size: 18px;
//color: #453DEA;
//border-radius: 23px;
//padding: 10px 20px;
//display: inline-flex;
//align-items: center;
padding: 20px 40px;
font-size: 20px;
align-items: center;
overflow: hidden;
background: url(/src/assets/dance/time_bg.png) no-repeat center !important;
background-size: 100% 100%;
bottom: 40%;
display: flex;
flex-wrap: nowrap;
color: #fff !important;
box-sizing: inherit;
}
.btn-q:hover{
box-shadow: 0 0 20px #453DEA;
border-radius: 100px;
background: linear-gradient(-90deg, #8623FC, #453DEA) !important;
}
</style>
......
src/viewsPc/index_en.vue
......@@ -85,10 +85,15 @@
<el-col :sm="24" :lg="10">
<div class="bgbg">
<h1 style="color: #fff">{{matchData?.name}}</h1>
<a class="zn-btn" @click="goGuide">
GUIDELINE
<el-icon><download /></el-icon>
</a>
<div>
<a class="zn-btn" @click="goGuide">
GUIDELINE
<el-icon><download /></el-icon>
</a>
<a class="zn-btn ml20" @click="popMaster">Junior &Youth Camp <el-icon><Edit /></el-icon>
</a>
</div>
</div>
</el-col>
<el-col :sm="24" :lg="14">
......@@ -385,6 +390,7 @@ const navigationPic = ref({
})
const router = useRouter()
const { proxy } = getCurrentInstance()
const emit = defineEmits(['pop'])
const time = ref(0)
const personList = ref([
......@@ -498,6 +504,12 @@ const goGuide = () => {
}
})
}
const popMaster = () => {
var params = {
cptId:matchData.value.id
}
emit('pop',params)
}
</script>
<style scoped lang="scss">
......@@ -516,7 +528,7 @@ const goGuide = () => {
p{margin: 0;height: 40px;line-height: 20px;display: flex;align-items: center;}
}
border-radius: 15px;
.zn-btn{background: #FFFFFF;
.zn-btn{background: #FFFFFF;text-transform: uppercase;
font-size: 18px; width: fit-content;
color: #453DEA;
border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
......
vite.config.js
......@@ -83,7 +83,6 @@ export default defineConfig(({ mode, command }) => {
},
'/dev-api': {
// target: 'http://192.168.1.118:8081/',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!