Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
25cffd01 by 杨炀
Options

"element-plus": "2.6.1"

1 parent 2ac29ce7
Inline Side-by-side
Showing 59 changed files with 193 additions and 153 deletions
package.json
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 "crypto-js": "^4.1.1", 20 "crypto-js": "^4.1.1",
21 "echarts": "5.4.0", 21 "echarts": "5.4.0",
22 "echarts-wordcloud": "^2.1.0", 22 "echarts-wordcloud": "^2.1.0",
23 "element-plus": "2.2.27", 23 "element-plus": "2.6.1",
24 "file-saver": "2.0.5", 24 "file-saver": "2.0.5",
25 "flag-icon-css": "^4.1.7", 25 "flag-icon-css": "^4.1.7",
26 "fuse.js": "6.6.2", 26 "fuse.js": "6.6.2",
......
src/App.vue
...@@ -91,7 +91,7 @@ li.el-select-dropdown__item { ...@@ -91,7 +91,7 @@ li.el-select-dropdown__item {
91 } 91 }
92 92
93 :root { 93 :root {
94 --el-menu-active-color: var(--el-color-primary); 94 --el-color-primary: #453DEA;
95 } 95 }
96 96
97 .el-popper .el-menu { 97 .el-popper .el-menu {
...@@ -110,7 +110,7 @@ li.el-select-dropdown__item { ...@@ -110,7 +110,7 @@ li.el-select-dropdown__item {
110 font-size: 18px; 110 font-size: 18px;
111 } 111 }
112 .el-popper .el-menu--horizontal .el-menu .el-sub-menu.is-active>.el-sub-menu__title { 112 .el-popper .el-menu--horizontal .el-menu .el-sub-menu.is-active>.el-sub-menu__title {
113 color: #fff; 113
114 } 114 }
115 115
116 .el-popper .el-menu--horizontal .el-menu .el-menu-item.is-active { 116 .el-popper .el-menu--horizontal .el-menu .el-menu-item.is-active {
......
src/assets/styles/ruoyi.scss
...@@ -158,7 +158,7 @@ img{display: block;} ...@@ -158,7 +158,7 @@ img{display: block;}
158 /** 表格更多操作下拉样式 */ 158 /** 表格更多操作下拉样式 */
159 .el-table .el-dropdown-link { 159 .el-table .el-dropdown-link {
160 cursor: pointer; 160 cursor: pointer;
161 color: #409EFF; 161 color: var(--el-color-primary);
162 margin-left: 10px; 162 margin-left: 10px;
163 } 163 }
164 164
......
src/components/FileImport/index.vue
...@@ -62,6 +62,7 @@ import { getToken } from '@/utils/auth' ...@@ -62,6 +62,7 @@ import { getToken } from '@/utils/auth'
62 import _ from 'lodash' 62 import _ from 'lodash'
63 import { computed } from 'vue' 63 import { computed } from 'vue'
64 import cache from "@/plugins/cache"; 64 import cache from "@/plugins/cache";
65 import {useStorage} from "@vueuse/core/index";
65 66
66 const props = defineProps({ 67 const props = defineProps({
67 modelValue: [String, Object, Array], 68 modelValue: [String, Object, Array],
...@@ -115,7 +116,8 @@ const fileOriginalName = ref('') ...@@ -115,7 +116,8 @@ const fileOriginalName = ref('')
115 const uploadList = ref([]) 116 const uploadList = ref([])
116 // const baseUrl = import.meta.env.VITE_APP_BASE_API; 117 // const baseUrl = import.meta.env.VITE_APP_BASE_API;
117 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址 118 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址
118 const language = cache.local.get('language') || 0 119 const language = useStorage('language', 0)
120
119 const headers = ref({ 121 const headers = ref({
120 Authorization: 'Bearer ' + getToken(), 122 Authorization: 'Bearer ' + getToken(),
121 ['Content-Language'] : language==0? 'zh_CN':'en_US' , 123 ['Content-Language'] : language==0? 'zh_CN':'en_US' ,
......
src/components/FileUpload/index.vue
...@@ -67,7 +67,9 @@ import { getToken } from '@/utils/auth' ...@@ -67,7 +67,9 @@ import { getToken } from '@/utils/auth'
67 import { computed } from 'vue' 67 import { computed } from 'vue'
68 import _ from 'lodash' 68 import _ from 'lodash'
69 import cache from "@/plugins/cache"; 69 import cache from "@/plugins/cache";
70 const language = ref(cache.local.get('language') || 0) 70 import {useStorage} from "@vueuse/core/index";
71 const language = useStorage('language', 0)
72
71 const props = defineProps({ 73 const props = defineProps({
72 modelValue: [String, Object, Array], 74 modelValue: [String, Object, Array],
73 // 数量限制 75 // 数量限制
......
src/layout/components/Settings/index.vue
...@@ -95,7 +95,7 @@ const showSettings = ref(false); ...@@ -95,7 +95,7 @@ const showSettings = ref(false);
95 const theme = ref(settingsStore.theme); 95 const theme = ref(settingsStore.theme);
96 const sideTheme = ref(settingsStore.sideTheme); 96 const sideTheme = ref(settingsStore.sideTheme);
97 const storeSettings = computed(() => settingsStore); 97 const storeSettings = computed(() => settingsStore);
98 const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]); 98 const predefineColors = ref(["#453DEA", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
99 99
100 /** 是否需要topnav */ 100 /** 是否需要topnav */
101 const topNav = computed({ 101 const topNav = computed({
......
src/layoutPc/components/AppBottom.vue
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 </template> 47 </template>
48 48
49 <script setup> 49 <script setup>
50 import { ref } from 'vue' 50 import {useStorage} from "@vueuse/core/index";
51 import cache from '@/plugins/cache' 51
52 const language = useStorage('language', 0)
52 53
53 const language = ref(cache.local.get('language') || 0)
54 </script> 54 </script>
55 55
56 <style lang="scss" scoped> 56 <style lang="scss" scoped>
......
src/layoutPc/components/AppHeader.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <img class="logo" src="/img/logoArr.png"> 5 <img class="logo" src="/img/logoArr.png">
6 </router-link> 6 </router-link>
7 7
8 <div class="home-menu forPc" style="margin: 0 20px"> 8 <div class="home-menu forPc">
9 <el-menu v-if="language==0" 9 <el-menu v-if="language==0"
10 router :default-active="activeIndex" :mode="mode" :ellipsis="true" 10 router :default-active="activeIndex" :mode="mode" :ellipsis="true"
11 popper-effect="dark" @select="handleSelect" 11 popper-effect="dark" @select="handleSelect"
...@@ -153,8 +153,7 @@ const registerVisible = ref(false) ...@@ -153,8 +153,7 @@ const registerVisible = ref(false)
153 const loginForm = ref({}) 153 const loginForm = ref({})
154 const drawer = ref(false) 154 const drawer = ref(false)
155 const mode = ref('horizontal') 155 const mode = ref('horizontal')
156 const language = ref(cache.local.get('language') || 0) 156 const language = useStorage('language', 0)
157 const language2 = useStorage('language', 0)
158 157
159 158
160 onMounted(() => { 159 onMounted(() => {
...@@ -162,10 +161,6 @@ onMounted(() => { ...@@ -162,10 +161,6 @@ onMounted(() => {
162 if (useUserStore().user) { 161 if (useUserStore().user) {
163 isLogin.value = true 162 isLogin.value = true
164 } 163 }
165 // if (window.location.href.indexOf('en') > -1) {
166 // cache.local.set('language', 1)
167 // // location.reload()
168 // }
169 if (route.fullPath.indexOf('news') > -1) { 164 if (route.fullPath.indexOf('news') > -1) {
170 activeIndex.value = '/news' 165 activeIndex.value = '/news'
171 } else if (route.fullPath.indexOf('notice') > -1) { 166 } else if (route.fullPath.indexOf('notice') > -1) {
...@@ -185,8 +180,7 @@ onMounted(() => { ...@@ -185,8 +180,7 @@ onMounted(() => {
185 }) 180 })
186 function changeLanguage(n) { 181 function changeLanguage(n) {
187 proxy.$modal.loading() 182 proxy.$modal.loading()
188 language2.value = n 183 language.value = n
189 // cache.local.set('language', n)
190 } 184 }
191 function showDrawer() { 185 function showDrawer() {
192 drawer.value = true 186 drawer.value = true
...@@ -238,8 +232,8 @@ function getCode() { ...@@ -238,8 +232,8 @@ function getCode() {
238 </script> 232 </script>
239 233
240 <style scoped lang="scss"> 234 <style scoped lang="scss">
241 .home-menu .enMenu{ 235 .home-menu{width: 60vw;
242 //.el-menu-item{margin: 0 3px!important;} 236 :deep(.el-menu--horizontal.el-menu){border: none;}
243 } 237 }
244 .loginBtn {color: #fff;margin-right: 15px;border: none; 238 .loginBtn {color: #fff;margin-right: 15px;border: none;
245 background: linear-gradient(-90deg, #8623FC, #453DEA);box-shadow:0 0 10px #fff; 239 background: linear-gradient(-90deg, #8623FC, #453DEA);box-shadow:0 0 10px #fff;
...@@ -254,11 +248,9 @@ function getCode() { ...@@ -254,11 +248,9 @@ function getCode() {
254 color:#fff; 248 color:#fff;
255 } 249 }
256 250
257
258 } 251 }
259 252
260 253
261
262 .topNav { 254 .topNav {
263 box-shadow: 0px 0px 13px rgba(113,113,113); 255 box-shadow: 0px 0px 13px rgba(113,113,113);
264 display: flex; 256 display: flex;
...@@ -316,7 +308,7 @@ function getCode() { ...@@ -316,7 +308,7 @@ function getCode() {
316 308
317 :deep(.el-input){height: 100%} 309 :deep(.el-input){height: 100%}
318 :deep(.el-form-item){height: 40px;} 310 :deep(.el-form-item){height: 40px;}
319 .home-menu .el-menu--horizontal > .el-menu-item{margin: 0 5px; font-size: 18px;} 311 //.home-menu .el-menu--horizontal > .el-menu-item{margin: 0 5px; font-size: 18px;}
320 .home-menu .el-sub-menu{font-size: 16px;} 312 .home-menu .el-sub-menu{font-size: 16px;}
321 .weiMenu.el-menu{ 313 .weiMenu.el-menu{
322 border: none; 314 border: none;
...@@ -361,6 +353,5 @@ function getCode() { ...@@ -361,6 +353,5 @@ function getCode() {
361 .ropenbtn{display: block} 353 .ropenbtn{display: block}
362 354
363 } 355 }
364
365 </style> 356 </style>
366 357
......
src/layoutPc/components/AppTop.vue
...@@ -105,18 +105,13 @@ const registerVisible = ref(false) ...@@ -105,18 +105,13 @@ const registerVisible = ref(false)
105 const loginForm = ref({}) 105 const loginForm = ref({})
106 const drawer = ref(false) 106 const drawer = ref(false)
107 const mode = ref('horizontal') 107 const mode = ref('horizontal')
108 const language = ref(cache.local.get('language') || 0) 108 const language = useStorage('language', 0)
109 const language2 = useStorage('language', 0)
110 109
111 onMounted(() => { 110 onMounted(() => {
112 console.log(window.location.href) 111 console.log(window.location.href)
113 if (useUserStore().user) { 112 if (useUserStore().user) {
114 isLogin.value = true 113 isLogin.value = true
115 } 114 }
116 // if (window.location.href.indexOf('en') > -1) {
117 // cache.local.set('language', 1)
118 // // location.reload()
119 // }
120 if (route.fullPath.indexOf('news') > -1) { 115 if (route.fullPath.indexOf('news') > -1) {
121 activeIndex.value = '/news' 116 activeIndex.value = '/news'
122 } else if (route.fullPath.indexOf('notice') > -1) { 117 } else if (route.fullPath.indexOf('notice') > -1) {
...@@ -134,8 +129,7 @@ onMounted(() => { ...@@ -134,8 +129,7 @@ onMounted(() => {
134 }) 129 })
135 function changeLanguage(n) { 130 function changeLanguage(n) {
136 proxy.$modal.loading() 131 proxy.$modal.loading()
137 language2.value = n 132 language.value = n
138 // cache.local.set('language', n)
139 } 133 }
140 function showDrawer() { 134 function showDrawer() {
141 drawer.value = true 135 drawer.value = true
......
src/main.js
...@@ -59,8 +59,8 @@ import localeCn from 'element-plus/es/locale/lang/zh-cn' // 中文语言 ...@@ -59,8 +59,8 @@ import localeCn from 'element-plus/es/locale/lang/zh-cn' // 中文语言
59 import localeEn from 'element-plus/es/locale/lang/en' 59 import localeEn from 'element-plus/es/locale/lang/en'
60 60
61 61
62 62 import {useStorage} from "@vueuse/core/index";
63 const language = cache.local.get('language') || 0 63 const language= useStorage('language',0)
64 const app = createApp(App) 64 const app = createApp(App)
65 65
66 // 全局方法挂载 66 // 全局方法挂载
...@@ -97,7 +97,7 @@ app.component('Editor', Editor) ...@@ -97,7 +97,7 @@ app.component('Editor', Editor)
97 app.component('Draggable', draggable) 97 app.component('Draggable', draggable)
98 app.component('WePay', wePay) 98 app.component('WePay', wePay)
99 99
100 if (language == 0) { 100 if (language.value == 0) {
101 app.use(routerCn) 101 app.use(routerCn)
102 app.use(ElementPlus, { 102 app.use(ElementPlus, {
103 locale: localeCn, 103 locale: localeCn,
......
src/store/modules/settings.js
...@@ -10,7 +10,7 @@ const useSettingsStore = defineStore( ...@@ -10,7 +10,7 @@ const useSettingsStore = defineStore(
10 { 10 {
11 state: () => ({ 11 state: () => ({
12 title: '', 12 title: '',
13 theme: storageSetting.theme || '#409EFF', 13 theme: storageSetting.theme || '#453DEA',
14 sideTheme: storageSetting.sideTheme || sideTheme, 14 sideTheme: storageSetting.sideTheme || sideTheme,
15 showSettings: showSettings, 15 showSettings: showSettings,
16 topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, 16 topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
......
src/utils/request.js
...@@ -14,15 +14,16 @@ import { saveAs } from 'file-saver' ...@@ -14,15 +14,16 @@ import { saveAs } from 'file-saver'
14 import useUserStore from '@/store/modules/user' 14 import useUserStore from '@/store/modules/user'
15 import { sendNotification } from '@/assets/lib/extend' 15 import { sendNotification } from '@/assets/lib/extend'
16 import _ from 'lodash' 16 import _ from 'lodash'
17 const language = cache.local.get('language') || 0 17 // const language = cache.local.get('language') || 0
18 18 import {useStorage} from "@vueuse/core/index";
19 const language= useStorage('language',0)
19 let downloadLoadingInstance 20 let downloadLoadingInstance
20 // 是否显示重新登录 21 // 是否显示重新登录
21 export const isRelogin = { show: false } 22 export const isRelogin = { show: false }
22 23
23 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' 24 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
24 // 对应国际化资源文件后缀 25 // 对应国际化资源文件后缀
25 axios.defaults.headers['Content-Language'] = (language==0? 'zh_CN':'en_US' ) 26 axios.defaults.headers['Content-Language'] = (language.value==0? 'zh_CN':'en_US' )
26 // 创建axios实例 27 // 创建axios实例
27 const service = axios.create({ 28 const service = axios.create({
28 // axios中请求配置有baseURL选项，表示请求URL公共部分 29 // axios中请求配置有baseURL选项，表示请求URL公共部分
......
src/views/member/memberPay/addMemberPay.vue
...@@ -354,11 +354,6 @@ function handleDelete(row) { ...@@ -354,11 +354,6 @@ function handleDelete(row) {
354 border: 1px solid #920f20; 354 border: 1px solid #920f20;
355 } 355 }
356 356
357 // :deep(.el-button--info){
358 // background-color: #409eff;
359 // border: 1px solid #409eff;
360 // }
361
362 .idCode{ 357 .idCode{
363 :deep(.el-upload--picture-card){ 358 :deep(.el-upload--picture-card){
364 width: 380px; 359 width: 380px;
......
src/views/member/mobilize/transferMember.vue
...@@ -315,10 +315,6 @@ function backFN(row) { ...@@ -315,10 +315,6 @@ function backFN(row) {
315 border: 1px solid #920f20; 315 border: 1px solid #920f20;
316 } 316 }
317 317
318 // :deep(.el-button--info){
319 // background-color: #409eff;
320 // border: 1px solid #409eff;
321 // }
322 318
323 .idCode { 319 .idCode {
324 :deep(.el-upload--picture-card) { 320 :deep(.el-upload--picture-card) {
......
src/viewsPc/booking/car.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="box"> 3 <div class="box">
4 4 <el-card class="mt30"></el-card>
5 </div> 5 </div>
6 6
7 </div> 7 </div>
......
src/viewsPc/booking/dinner.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="box"> 3 <div class="box">
4 <el-card class="mt30"></el-card>
4 5
5 </div> 6 </div>
6 7
......
src/viewsPc/booking/hotel.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="box"> 3 <div class="box">
4 <el-card class="mt30"></el-card>
4 5
5 </div> 6 </div>
6 7
......
src/viewsPc/booking/makeUp.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="box"> 3 <div class="box">
4 <el-card class="mt30"></el-card>
4 5
5 </div> 6 </div>
6 7
......
src/viewsPc/booking/photography.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="box"> 3 <div class="box">
4 <el-card class="mt30"></el-card>
4 5
5 </div> 6 </div>
6 7
......
src/viewsPc/center/myCertification.vue
...@@ -94,8 +94,8 @@ import {ElMessage, ElMessageBox} from 'element-plus' ...@@ -94,8 +94,8 @@ import {ElMessage, ElMessageBox} from 'element-plus'
94 import FileUpload from "@/components/FileUpload"; 94 import FileUpload from "@/components/FileUpload";
95 import * as match from "@/apiPc/match"; 95 import * as match from "@/apiPc/match";
96 import cache from "@/plugins/cache"; 96 import cache from "@/plugins/cache";
97 const language = ref(cache.local.get('language') || 0) 97 import {useStorage} from "@vueuse/core/index";
98 98 const language= useStorage('language',0)
99 const form = ref({}) 99 const form = ref({})
100 const regionsList = ref([]) 100 const regionsList = ref([])
101 const countryList = ref([]) 101 const countryList = ref([])
......
src/viewsPc/center/myInfo.vue
...@@ -101,10 +101,10 @@ import {ElMessage, ElMessageBox} from 'element-plus' ...@@ -101,10 +101,10 @@ import {ElMessage, ElMessageBox} from 'element-plus'
101 import {nationList} from '@/assets/js/data' 101 import {nationList} from '@/assets/js/data'
102 import {getGroupInfo} from "@/apiPc/match"; 102 import {getGroupInfo} from "@/apiPc/match";
103 import TeamInfo from "@/viewsPc/center/teamInfo"; 103 import TeamInfo from "@/viewsPc/center/teamInfo";
104 import cache from "@/plugins/cache";
105 import useUserStore from "@/store/modules/user"; 104 import useUserStore from "@/store/modules/user";
105 import {useStorage} from "@vueuse/core/index";
106 106
107 const language = ref(cache.local.get('language') || 0) 107 const language= useStorage('language',0)
108 const router = useRouter() 108 const router = useRouter()
109 const {proxy} = getCurrentInstance() 109 const {proxy} = getCurrentInstance()
110 const props = defineProps({ 110 const props = defineProps({
......
src/viewsPc/center/myMember.vue
...@@ -9,14 +9,21 @@ ...@@ -9,14 +9,21 @@
9 <el-form-item :label="language==0?'姓名':'Name'"> 9 <el-form-item :label="language==0?'姓名':'Name'">
10 <el-input v-model="query.realName" style="width: 120px;" clearable/> 10 <el-input v-model="query.realName" style="width: 120px;" clearable/>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item :label="language==0?'证件类型':'ID Type'"> 12 <el-form-item :label="language==0?'证件类型':'ID Type'" >
13 <el-input v-model="query.idcType" style="width: 120px;" clearable/> 13 <el-select v-model="query.idcType" style="width: 100px;" clearable>
14 <el-option
15 v-for="item in certificates"
16 :key="item.value"
17 :label="item.label"
18 :value="item.value"
19 />
20 </el-select>
14 </el-form-item> 21 </el-form-item>
15 <el-form-item :label="language==0?'证件号码':'ID NO.'"> 22 <el-form-item :label="language==0?'证件号码':'ID NO.'">
16 <el-input v-model="query.idcode" style="width: 120px;" clearable/> 23 <el-input v-model="query.idcode" style="width: 120px;" clearable/>
17 </el-form-item> 24 </el-form-item>
18 <el-form-item :label="language==0?'会员角色':'Role'"> 25 <el-form-item :label="language==0?'会员角色':'Role'">
19 <el-select v-model="labelArr" multiple> 26 <el-select v-model="labelArr" multiple style="width: 100px;">
20 <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/> 27 <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/>
21 </el-select> 28 </el-select>
22 </el-form-item> 29 </el-form-item>
...@@ -59,9 +66,9 @@ import * as match from '@/apiPc/match' ...@@ -59,9 +66,9 @@ import * as match from '@/apiPc/match'
59 import {ElMessage, ElMessageBox} from 'element-plus' 66 import {ElMessage, ElMessageBox} from 'element-plus'
60 import {getGroupPersonList, getPerPersonList} from "@/apiPc/match"; 67 import {getGroupPersonList, getPerPersonList} from "@/apiPc/match";
61 import PersonTable from "@/viewsPc/match/components/personTable"; 68 import PersonTable from "@/viewsPc/match/components/personTable";
62 import cache from "@/plugins/cache";
63 import useUserStore from "@/store/modules/user"; 69 import useUserStore from "@/store/modules/user";
64 const language = ref(cache.local.get('language') || 0) 70 import {useStorage} from "@vueuse/core/index";
71 const language= useStorage('language',0)
65 const tableData = ref([]) 72 const tableData = ref([])
66 const labelArr = ref([]) 73 const labelArr = ref([])
67 const labels = ref([ 74 const labels = ref([
...@@ -73,6 +80,20 @@ const labels = ref([ ...@@ -73,6 +80,20 @@ const labels = ref([
73 {value: '6', label: '官员', enlabel: 'Official'}, 80 {value: '6', label: '官员', enlabel: 'Official'},
74 {value: '3', label: '其他', enlabel: 'Other'} 81 {value: '3', label: '其他', enlabel: 'Other'}
75 ]) 82 ])
83 const certificates = ref([
84 {
85 value: '0',
86 label: language.value == 0 ? '居民身份证' : 'Resident ID card'
87 },
88 {
89 value: '1',
90 label: language.value == 0 ? '护照' : 'Passport'
91 },
92 {
93 value: '2',
94 label: language.value == 0 ? '其他' : 'Other'
95 }
96 ])
76 const query = ref({ 97 const query = ref({
77 pageNum: 1, pageSize: 10 98 pageNum: 1, pageSize: 10
78 }) 99 })
......
src/viewsPc/center/myPassword.vue
...@@ -34,8 +34,8 @@ import {updateUserPwd} from '@/api/system/user' ...@@ -34,8 +34,8 @@ import {updateUserPwd} from '@/api/system/user'
34 import useUserStore from '@/store/modules/user' 34 import useUserStore from '@/store/modules/user'
35 import {reactive, ref, getCurrentInstance} from 'vue' 35 import {reactive, ref, getCurrentInstance} from 'vue'
36 import {validPassword} from '@/utils/validate' 36 import {validPassword} from '@/utils/validate'
37 import cache from "@/plugins/cache"; 37 import {useStorage} from "@vueuse/core/index";
38 const language = ref(cache.local.get('language') || 0) 38 const language = useStorage('language', 0)
39 39
40 const show = ref(false) 40 const show = ref(false)
41 const {proxy} = getCurrentInstance() 41 const {proxy} = getCurrentInstance()
......
src/viewsPc/center/myReservation.vue
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
10 </template> 10 </template>
11 11
12 <script setup> 12 <script setup>
13 import cache from "@/plugins/cache";
14 import {onMounted} from "@vue/runtime-core"; 13 import {onMounted} from "@vue/runtime-core";
15 const language = ref(cache.local.get('language') || 0) 14 import {useStorage} from "@vueuse/core/index";
15 const language= useStorage('language',0)
16 const list = ref([]) 16 const list = ref([])
17 </script> 17 </script>
18 18
......
src/viewsPc/center/mySms.vue
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
17 </template> 17 </template>
18 18
19 <script setup> 19 <script setup>
20 import cache from "@/plugins/cache";
21 import {onMounted} from "@vue/runtime-core"; 20 import {onMounted} from "@vue/runtime-core";
22 const language = ref(cache.local.get('language') || 0) 21 import {useStorage} from "@vueuse/core/index";
22 const language= useStorage('language',0)
23 const list = ref([]) 23 const list = ref([])
24 onMounted(()=>{ 24 onMounted(()=>{
25 getList() 25 getList()
......
src/viewsPc/guide/index.vue
...@@ -197,7 +197,7 @@ h4.leftboderTT{text-indent: 0; ...@@ -197,7 +197,7 @@ h4.leftboderTT{text-indent: 0;
197 :deep(.el-tabs--left .el-tabs__nav-wrap.is-left::after) { 197 :deep(.el-tabs--left .el-tabs__nav-wrap.is-left::after) {
198 display: none; 198 display: none;
199 } 199 }
200 200 :deep(.el-tabs__nav){float: none;}
201 :deep(.el-tabs__item.is-active) { 201 :deep(.el-tabs__item.is-active) {
202 font-size: 15px;background: #fff; 202 font-size: 15px;background: #fff;
203 } 203 }
......
src/viewsPc/login.vue
...@@ -170,11 +170,12 @@ import {forgetPassword, getCodeImg} from '@/api/login' ...@@ -170,11 +170,12 @@ import {forgetPassword, getCodeImg} from '@/api/login'
170 import * as match from '@/apiPc/match' 170 import * as match from '@/apiPc/match'
171 import Cookies from 'js-cookie' 171 import Cookies from 'js-cookie'
172 import useUserStore from '@/store/modules/user' 172 import useUserStore from '@/store/modules/user'
173 const language = ref(cache.local.get('language') || 0) 173 const language= useStorage('language',0)
174 import { useRouter } from 'vue-router' 174 import { useRouter } from 'vue-router'
175 import { getCurrentInstance, ref, watch } from 'vue' 175 import { getCurrentInstance, ref, watch } from 'vue'
176 import { ElMessage,ElMessageBox} from 'element-plus' 176 import { ElMessage,ElMessageBox} from 'element-plus'
177 import cache from "@/plugins/cache"; 177 import cache from "@/plugins/cache";
178 import {useStorage} from "@vueuse/core/index";
178 const emit = defineEmits(['submitForm']) 179 const emit = defineEmits(['submitForm'])
179 const userStore = useUserStore() 180 const userStore = useUserStore()
180 const router = useRouter() 181 const router = useRouter()
......
src/viewsPc/match/chooseCoach.vue
...@@ -180,7 +180,8 @@ const route = useRoute() ...@@ -180,7 +180,8 @@ const route = useRoute()
180 import {ElMessage} from 'element-plus' 180 import {ElMessage} from 'element-plus'
181 import {useRoute, useRouter} from 'vue-router' 181 import {useRoute, useRouter} from 'vue-router'
182 import useUserStore from "@/store/modules/user"; 182 import useUserStore from "@/store/modules/user";
183 const language = ref(cache.local.get('language') || 0) 183 import {useStorage} from "@vueuse/core/index";
184 const language= useStorage('language',0)
184 185
185 const data = reactive({ 186 const data = reactive({
186 loading:false, 187 loading:false,
......
src/viewsPc/match/chooseProject.vue
...@@ -210,8 +210,9 @@ import SingleSignStep from "@/viewsPc/match/components/singleSignStep"; ...@@ -210,8 +210,9 @@ import SingleSignStep from "@/viewsPc/match/components/singleSignStep";
210 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row"; 210 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row";
211 import useUserStore from "@/store/modules/user"; 211 import useUserStore from "@/store/modules/user";
212 import {getPerPersonList} from "@/apiPc/match"; 212 import {getPerPersonList} from "@/apiPc/match";
213 import {useStorage} from "@vueuse/core/index";
213 214
214 const language = ref(cache.local.get('language') || 0) 215 const language= useStorage('language',0)
215 216
216 const data = reactive({ 217 const data = reactive({
217 coachForm: {}, activeStep: 2, 218 coachForm: {}, activeStep: 2,
......
src/viewsPc/match/chooseSportsman.vue
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
20 @change="queryAthletes" 20 @change="queryAthletes"
21 clearable/> 21 clearable/>
22 </div> 22 </div>
23 <div class="noPicChooseForm"> 23 <div class="noPicChooseForm" id="chooseArr">
24 <el-checkbox-group v-model="choosedchoosed" @change="changechoosed"> 24 <el-checkbox-group v-model="choosedchoosed" @change="changechoosed">
25 <el-button ref="addBtnRef" plain @click="chooseSportman">+{{ language == 0 ? '选择' : 'add' }}</el-button> 25 <el-button id="addRef" plain @click="chooseSportman">+{{ language == 0 ? '选择' : 'add' }}</el-button>
26 <el-checkbox v-for="c in choosedListBak" :label="c.id" border> 26 <el-checkbox v-for="c in choosedListBak" :value="c.id" border>
27 <p class="name">{{ c.realName }} 27 <p class="name">{{ c.realName }}
28 <!-- ({{ c.sexStr }})--> 28 <!-- ({{ c.sexStr }})-->
29 <img v-if="c.sex=='0'" src="@/assets/img/female.png"/> 29 <img v-if="c.sex=='0'" src="@/assets/img/female.png"/>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <div class="chooseForm"> 50 <div class="chooseForm">
51 <el-checkbox-group v-model="choosedchoosed" @change="changechoosed"> 51 <el-checkbox-group v-model="choosedchoosed" @change="changechoosed">
52 <!-- v-show="choosedchoosed.indexOf(c.id) !== -1"--> 52 <!-- v-show="choosedchoosed.indexOf(c.id) !== -1"-->
53 <el-checkbox v-for="c in choosed2Listbak" :label="c.id" checked> 53 <el-checkbox v-for="c in choosed2Listbak" :value="c.id" checked>
54 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 54 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
55 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 55 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
56 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 56 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
...@@ -78,9 +78,9 @@ ...@@ -78,9 +78,9 @@
78 clearable/> 78 clearable/>
79 </div> 79 </div>
80 </div> 80 </div>
81 <div v-loading="loadingProject" style="height: 60vh"> 81 <div v-loading="loadingProject" id="projectbox" style="height: 60vh">
82 <el-checkbox-group v-model="projectIds"> 82 <el-checkbox-group v-model="projectIds">
83 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id"> 83 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id">
84 <div class="flexBetween w100"> 84 <div class="flexBetween w100">
85 <div class="l"> 85 <div class="l">
86 {{ c.code }}:{{ c.name }} 86 {{ c.code }}:{{ c.name }}
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 <el-row class="mt20"> 99 <el-row class="mt20">
100 <el-col :span="24"> 100 <el-col :span="24">
101 <div class="text-center"> 101 <div class="text-center">
102 <el-button type="primary" class="btn-lineG w200px" 102 <el-button type="primary" class="btn-lineG w200px" id="signUpBtn"
103 :disabled="projectIds.length==0||choosedchoosed.length==0" round @click="signUp"> 103 :disabled="projectIds.length==0||choosedchoosed.length==0" round @click="signUp">
104 {{ language == 0 ? '确定' : 'Confirm' }} 104 {{ language == 0 ? '确定' : 'Confirm' }}
105 </el-button> 105 </el-button>
...@@ -159,7 +159,12 @@ ...@@ -159,7 +159,12 @@
159 </el-dialog> 159 </el-dialog>
160 <dialogExtraForm ref="popExtraForm" @submitForm="getSignInfoList"/> 160 <dialogExtraForm ref="popExtraForm" @submitForm="getSignInfoList"/>
161 161
162 <!-- <el-tour v-model="openTour"></el-tour>--> 162 <el-tour v-model="openTour" :current="tourCurrent">
163 <el-tour-step target="#addRef" title="第一步" description="点击选择运动员" :next-button-props="nextButtonProps"/>
164 <el-tour-step v-if="choosedList.length>0" target="#chooseArr" title="第二步" description="勾选报项运动员"/>
165 <el-tour-step v-if="projectList.length>0" target="#projectbox" title="第三步" description="选择报名项目"/>
166 <el-tour-step v-if="projectIds.length>0" target="#signUpBtn" title="第四步" description="点击报项"/>
167 </el-tour>
163 </div> 168 </div>
164 </template> 169 </template>
165 170
...@@ -172,7 +177,6 @@ import dialogAllSportsmanList from './components/allSportsmanList' ...@@ -172,7 +177,6 @@ import dialogAllSportsmanList from './components/allSportsmanList'
172 import dialogImport from './components/import' 177 import dialogImport from './components/import'
173 import dialogExtraForm from './components/extraForm' 178 import dialogExtraForm from './components/extraForm'
174 import {Search, Switch} from "@element-plus/icons-vue"; 179 import {Search, Switch} from "@element-plus/icons-vue";
175
176 const {proxy} = getCurrentInstance() 180 const {proxy} = getCurrentInstance()
177 const router = useRouter() 181 const router = useRouter()
178 const route = useRoute() 182 const route = useRoute()
...@@ -184,11 +188,11 @@ import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row" ...@@ -184,11 +188,11 @@ import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row"
184 import SignInfoTable from "@/viewsPc/match/components/signInfo-table" 188 import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
185 import ZuTable from '@/viewsPc/match/components/zu-table' 189 import ZuTable from '@/viewsPc/match/components/zu-table'
186 import {signgetSignInfoConflict} from "@/apiPc/match"; 190 import {signgetSignInfoConflict} from "@/apiPc/match";
187 191 import {useStorage} from "@vueuse/core/index";
188 const language = ref(cache.local.get('language') || 0) 192 const language= useStorage('language',0)
189
190 const data = reactive({ 193 const data = reactive({
191 coachForm: {}, activeStep: 2, 194 coachForm: {}, activeStep: 2,
195 tourCurrent:0,
192 tableData: [], 196 tableData: [],
193 signInfoList: [], 197 signInfoList: [],
194 zuTableList: [], 198 zuTableList: [],
...@@ -218,13 +222,14 @@ const data = reactive({ ...@@ -218,13 +222,14 @@ const data = reactive({
218 choosed2List: [], 222 choosed2List: [],
219 choosed2Listbak: [], 223 choosed2Listbak: [],
220 projectQuery: {}, tableType: 1, 224 projectQuery: {}, tableType: 1,
221 openTour:true 225 openTour:false
222 }) 226 })
223 const { 227 const {
224 activeTeam, names, tableData, signInfoList, zuTableList, choosedList,choosedListBak, 228 activeTeam, names, tableData, signInfoList, zuTableList, choosedList,choosedListBak,
225 extraform, groupId, signType, coachOrLeaderFlag, showResult, noPhotoCanSign, projectIds, choosedchoosed, activeStep, projectList, choosed2List,choosed2Listbak, loadingProject, 229 extraform, groupId, signType, coachOrLeaderFlag, showResult, noPhotoCanSign, projectIds, choosedchoosed, activeStep, projectList, choosed2List,choosed2Listbak, loadingProject,
226 projectQuery, tableType, athletesQuery, zuQuery,openTour 230 projectQuery, tableType, athletesQuery, zuQuery,openTour,tourCurrent
227 } = toRefs(data) 231 } = toRefs(data)
232 const nextButtonProps = ref({})
228 const matchId = ref(route.query.matchId) 233 const matchId = ref(route.query.matchId)
229 let signInfoType = null 234 let signInfoType = null
230 onMounted(() => { 235 onMounted(() => {
...@@ -232,6 +237,7 @@ onMounted(() => { ...@@ -232,6 +237,7 @@ onMounted(() => {
232 getSignInfoList() 237 getSignInfoList()
233 getMatch(matchId.value) 238 getMatch(matchId.value)
234 getMySignInfo() 239 getMySignInfo()
240 // openTour.value = true
235 }) 241 })
236 242
237 let chargeFlag 243 let chargeFlag
...@@ -268,7 +274,6 @@ function getSignInfoList() { ...@@ -268,7 +274,6 @@ function getSignInfoList() {
268 }) 274 })
269 } 275 }
270 276
271
272 function submitForm() { 277 function submitForm() {
273 if (signInfoType == '1') { 278 if (signInfoType == '1') {
274 ElMessageBox.confirm(language.value == 0 ? '已报项，前往我的报项' : 'Reported items, go to my submission', 279 ElMessageBox.confirm(language.value == 0 ? '已报项，前往我的报项' : 'Reported items, go to my submission',
...@@ -369,6 +374,9 @@ function getProjectList() { ...@@ -369,6 +374,9 @@ function getProjectList() {
369 match.getProjectPageByPerIds(obj).then(res => { 374 match.getProjectPageByPerIds(obj).then(res => {
370 projectList.value = res.rows 375 projectList.value = res.rows
371 loadingProject.value = false 376 loadingProject.value = false
377 if(choosed2Listbak.value.length>0 && projectList.value.length>0){
378 tourCurrent.value = 2
379 }
372 }).catch(err => { 380 }).catch(err => {
373 loadingProject.value = false 381 loadingProject.value = false
374 ElMessage.error(err.msg) 382 ElMessage.error(err.msg)
...@@ -401,7 +409,11 @@ function getChoosed(list) { ...@@ -401,7 +409,11 @@ function getChoosed(list) {
401 console.log(list) 409 console.log(list)
402 choosedList.value = list 410 choosedList.value = list
403 choosedListBak.value = list 411 choosedListBak.value = list
404 console.log('选好了', choosedchoosed.value) 412 if(list.length>0){
413 // openTour.value = false
414 tourCurrent.value = 1
415 }
416 // console.log('选好了', choosedchoosed.value)
405 } 417 }
406 418
407 function addCoach() { 419 function addCoach() {
...@@ -741,7 +753,7 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -741,7 +753,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
741 753
742 .noPicChooseForm { 754 .noPicChooseForm {
743 overflow: auto; 755 overflow: auto;
744 height: 70vh; 756 //height: 70vh;
745 757
746 .el-checkbox-group { 758 .el-checkbox-group {
747 display: flex; 759 display: flex;
......
src/viewsPc/match/commitDone.vue
...@@ -50,8 +50,8 @@ import useUserStore from "@/store/modules/user" ...@@ -50,8 +50,8 @@ import useUserStore from "@/store/modules/user"
50 import {ref} from "vue" 50 import {ref} from "vue"
51 import cache from "@/plugins/cache" 51 import cache from "@/plugins/cache"
52 import {useRouter} from "vue-router"; 52 import {useRouter} from "vue-router";
53 53 import {useStorage} from "@vueuse/core/index";
54 const language = ref(cache.local.get('language') || 0) 54 const language= useStorage('language',0)
55 const user = useUserStore().user 55 const user = useUserStore().user
56 56
57 const goHome = () => { 57 const goHome = () => {
......
src/viewsPc/match/components/addAccompany.vue
...@@ -71,8 +71,9 @@ import {ElMessage} from 'element-plus' ...@@ -71,8 +71,9 @@ import {ElMessage} from 'element-plus'
71 import {nationList} from '@/assets/js/data' 71 import {nationList} from '@/assets/js/data'
72 import _ from 'lodash' 72 import _ from 'lodash'
73 import cache from "@/plugins/cache"; 73 import cache from "@/plugins/cache";
74 import {useStorage} from "@vueuse/core/index";
74 75
75 const language = ref(cache.local.get('language') || 0) 76 const language= useStorage('language',0)
76 const certificates = ref([ 77 const certificates = ref([
77 { 78 {
78 value: '0', 79 value: '0',
......
src/viewsPc/match/components/addCoach.vue
...@@ -100,10 +100,9 @@ import {reactive, ref, toRefs, watch} from 'vue' ...@@ -100,10 +100,9 @@ import {reactive, ref, toRefs, watch} from 'vue'
100 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core' 100 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
101 import * as match from '@/apiPc/match' 101 import * as match from '@/apiPc/match'
102 import {ElMessage} from 'element-plus' 102 import {ElMessage} from 'element-plus'
103 import {nationList} from '@/assets/js/data'
104 import _ from 'lodash' 103 import _ from 'lodash'
105 import cache from "@/plugins/cache"; 104 import {useStorage} from "@vueuse/core/index";
106 const language = ref(cache.local.get('language') || 0) 105 const language= useStorage('language',0)
107 const certificates = ref([ 106 const certificates = ref([
108 { 107 {
109 value: '0', 108 value: '0',
......
src/viewsPc/match/components/addWdsf.vue
...@@ -88,10 +88,10 @@ import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core' ...@@ -88,10 +88,10 @@ import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
88 import * as match from '@/apiPc/match' 88 import * as match from '@/apiPc/match'
89 import {ElMessage} from 'element-plus' 89 import {ElMessage} from 'element-plus'
90 import _ from 'lodash' 90 import _ from 'lodash'
91 import cache from "@/plugins/cache";
92 import Vcode from "vue3-puzzle-vcode" 91 import Vcode from "vue3-puzzle-vcode"
93 import {checkWdsf} from "@/apiPc/match"; 92 import {checkWdsf} from "@/apiPc/match";
94 const language = ref(cache.local.get('language') || 0) 93 import {useStorage} from "@vueuse/core/index";
94 const language= useStorage('language',0)
95 const certificates = ref([ 95 const certificates = ref([
96 { 96 {
97 value: '0', 97 value: '0',
......
src/viewsPc/match/components/allSportsmanList.vue
...@@ -14,7 +14,14 @@ ...@@ -14,7 +14,14 @@
14 <el-input v-model="query.realName" style="width: 120px;" clearable/> 14 <el-input v-model="query.realName" style="width: 120px;" clearable/>
15 </el-form-item> 15 </el-form-item>
16 <el-form-item :label="language==0?'证件类型':'ID Type'"> 16 <el-form-item :label="language==0?'证件类型':'ID Type'">
17 <el-input v-model="query.idcType" style="width: 120px;" clearable/> 17 <el-select v-model="query.idcType" style="width: 100px;" clearable>
18 <el-option
19 v-for="item in certificates"
20 :key="item.value"
21 :label="item.label"
22 :value="item.value"
23 />
24 </el-select>
18 </el-form-item> 25 </el-form-item>
19 <el-form-item :label="language==0?'证件号码':'ID NO.'"> 26 <el-form-item :label="language==0?'证件号码':'ID NO.'">
20 <el-input v-model="query.idcode" style="width: 120px;" clearable/> 27 <el-input v-model="query.idcode" style="width: 120px;" clearable/>
...@@ -88,11 +95,9 @@ import {reactive, ref, toRefs, watch} from 'vue' ...@@ -88,11 +95,9 @@ import {reactive, ref, toRefs, watch} from 'vue'
88 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core' 95 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
89 import * as match from '@/apiPc/match' 96 import * as match from '@/apiPc/match'
90 import addCoach from '../components/addCoach' 97 import addCoach from '../components/addCoach'
91 import {getGroupPersonList} from "@/apiPc/match";
92 import Import from '../components/import' 98 import Import from '../components/import'
93 import cache from "@/plugins/cache"; 99 import {useStorage} from "@vueuse/core/index";
94 100 const language= useStorage('language',0)
95 const language = ref(cache.local.get('language') || 0)
96 101
97 const {proxy} = getCurrentInstance() 102 const {proxy} = getCurrentInstance()
98 const emit = defineEmits([ 'transfer']) 103 const emit = defineEmits([ 'transfer'])
...@@ -108,6 +113,20 @@ const data = reactive({ ...@@ -108,6 +113,20 @@ const data = reactive({
108 total: 0 113 total: 0
109 }) 114 })
110 const {query, tableData, show, title, loading, noPhotoCanSign,total} = toRefs(data) 115 const {query, tableData, show, title, loading, noPhotoCanSign,total} = toRefs(data)
116 const certificates = ref([
117 {
118 value: '0',
119 label: language.value == 0 ? '居民身份证' : 'Resident ID card'
120 },
121 {
122 value: '1',
123 label: language.value == 0 ? '护照' : 'Passport'
124 },
125 {
126 value: '2',
127 label: language.value == 0 ? '其他' : 'Other'
128 }
129 ])
111 let matchId 130 let matchId
112 let groupId 131 let groupId
113 let choosedList = [] 132 let choosedList = []
......
src/viewsPc/match/components/coachInfo-row.vue
...@@ -56,10 +56,10 @@ const props = defineProps({ ...@@ -56,10 +56,10 @@ const props = defineProps({
56 }) 56 })
57 const names = ref({}) 57 const names = ref({})
58 const loading = ref(true) 58 const loading = ref(true)
59 import cache from "@/plugins/cache" 59 import {useStorage} from "@vueuse/core/index";
60 const user = useUserStore().user 60 const user = useUserStore().user
61 const group = useUserStore().group || {} 61 const group = useUserStore().group || {}
62 const language = ref(cache.local.get('language') || 0) 62 const language= useStorage('language',0)
63 onMounted(() => { 63 onMounted(() => {
64 if (user.utype == '2') { 64 if (user.utype == '2') {
65 tuandui() 65 tuandui()
......
src/viewsPc/match/components/extraForm.vue
...@@ -61,8 +61,8 @@ const { proxy } = getCurrentInstance() ...@@ -61,8 +61,8 @@ const { proxy } = getCurrentInstance()
61 const emit = defineEmits(['submitForm']) 61 const emit = defineEmits(['submitForm'])
62 const uploadUrl = ref('/upload/upLoadToFileServer') 62 const uploadUrl = ref('/upload/upLoadToFileServer')
63 const route = useRoute() 63 const route = useRoute()
64 import cache from "@/plugins/cache" 64 import {useStorage} from "@vueuse/core/index";
65 const language = ref(cache.local.get('language') || 0) 65 const language= useStorage('language',0)
66 66
67 const data = reactive({ 67 const data = reactive({
68 form: {}, 68 form: {},
......
src/viewsPc/match/components/groupInfo-row.vue
...@@ -26,11 +26,10 @@ ...@@ -26,11 +26,10 @@
26 26
27 <script setup> 27 <script setup>
28 import useUserStore from "@/store/modules/user"; 28 import useUserStore from "@/store/modules/user";
29 import cache from "@/plugins/cache";
30 import {getGroup} from "@/api/match/CompetitionProject";
31 import * as match from "@/apiPc/match"; 29 import * as match from "@/apiPc/match";
30 import {useStorage} from "@vueuse/core/index";
32 31
33 const language = ref(cache.local.get('language') || 0) 32 const language= useStorage('language',0)
34 const props = defineProps({ 33 const props = defineProps({
35 groupId: { 34 groupId: {
36 type: Object, 35 type: Object,
......
src/viewsPc/match/components/import.vue
...@@ -27,8 +27,8 @@ import { ElMessage, ElMessageBox } from 'element-plus' ...@@ -27,8 +27,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
27 const { proxy } = getCurrentInstance() 27 const { proxy } = getCurrentInstance()
28 import useUserStore from '@/store/modules/user' 28 import useUserStore from '@/store/modules/user'
29 const emit = defineEmits(['submitForm']) 29 const emit = defineEmits(['submitForm'])
30 import cache from "@/plugins/cache" 30 import {useStorage} from "@vueuse/core/index";
31 const language = ref(cache.local.get('language') || 0) 31 const language= useStorage('language',0)
32 const action = ref('') 32 const action = ref('')
33 const accept = ref('.xlsx') 33 const accept = ref('.xlsx')
34 const title = ref('') 34 const title = ref('')
......
src/viewsPc/match/components/matchInfo-projectList.vue
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
26 <td>{{ p.danceType }}</td> 26 <td>{{ p.danceType }}</td>
27 <td>{{ p.danceTypeDetailStr }}</td> 27 <td>{{ p.danceTypeDetailStr }}</td>
28 <td>{{ p.playTypeStr }}</td> 28 <td>{{ p.playTypeStr }}</td>
29 <td>{{ p.birthPeriod }}</td> 29 <td>
30 <div>{{ p.birthPeriod }}</div>
31 <div>{{p.birthPeriodSecond}}</div>
32 </td>
30 <td>{{ language==0?'¥':'€' }}{{ p.serviceFee }}</td> 33 <td>{{ language==0?'¥':'€' }}{{ p.serviceFee }}</td>
31 </tr> 34 </tr>
32 </table> 35 </table>
......
src/viewsPc/match/components/matchNews.vue
...@@ -36,11 +36,10 @@ ...@@ -36,11 +36,10 @@
36 36
37 <script setup> 37 <script setup>
38 import {onMounted, ref} from "vue"; 38 import {onMounted, ref} from "vue";
39 import cache from '@/plugins/cache'
40 import {getMatchNewslistByCode} from "@/apiPc/match";
41 import {useRouter} from "vue-router"; 39 import {useRouter} from "vue-router";
42 import {getNewsListById, getnoteListcptid} from "@/apiPc/webSite"; 40 import {getNewsListById, getnoteListcptid} from "@/apiPc/webSite";
43 const language = ref(cache.local.get('language') || 0) 41 import {useStorage} from "@vueuse/core/index";
42 const language= useStorage('language',0)
44 const router = useRouter() 43 const router = useRouter()
45 const props = defineProps({ 44 const props = defineProps({
46 matchId: { 45 matchId: {
......
src/viewsPc/match/components/personTable.vue
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
50 50
51 <script setup> 51 <script setup>
52 import {ref} from "vue"; 52 import {ref} from "vue";
53 import cache from "@/plugins/cache"; 53 import {useStorage} from "@vueuse/core/index";
54 const language = ref(cache.local.get('language') || 0) 54 const language= useStorage('language',0)
55 const emit = defineEmits(['edit', 'delete']) 55 const emit = defineEmits(['edit', 'delete'])
56 let title = '' 56 let title = ''
57 const props = defineProps({ 57 const props = defineProps({
......
src/viewsPc/match/components/quick-row.vue
...@@ -107,15 +107,15 @@ function goBooking(n) { ...@@ -107,15 +107,15 @@ function goBooking(n) {
107 //车辆 107 //车辆
108 router.push({path: `/booking/car/${props.matchId}`}) 108 router.push({path: `/booking/car/${props.matchId}`})
109 break; 109 break;
110 case 4: 110 case 3:
111 //餐饮 111 //餐饮
112 router.push({path: `/booking/dining/${props.matchId}`}) 112 router.push({path: `/booking/dining/${props.matchId}`})
113 break; 113 break;
114 case 5: 114 case 4:
115 //化妆 115 //化妆
116 router.push({path: `/booking/makeup/${props.matchId}`}) 116 router.push({path: `/booking/makeup/${props.matchId}`})
117 break; 117 break;
118 case 6: 118 case 5:
119 //拍照 119 //拍照
120 router.push({path: `/booking/photography/${props.matchId}`}) 120 router.push({path: `/booking/photography/${props.matchId}`})
121 break; 121 break;
......
src/viewsPc/match/components/signInfo-table.vue
...@@ -116,8 +116,8 @@ const props = defineProps({ ...@@ -116,8 +116,8 @@ const props = defineProps({
116 default: '0' 116 default: '0'
117 } 117 }
118 }) 118 })
119 import cache from "@/plugins/cache"; 119 import {useStorage} from "@vueuse/core/index";
120 const language = ref(cache.local.get('language') || 0) 120 const language= useStorage('language',0)
121 const extraTableHead = ref([]) 121 const extraTableHead = ref([])
122 const loading = ref(true) 122 const loading = ref(true)
123 const sumText = ref('保险费') 123 const sumText = ref('保险费')
......
src/viewsPc/match/components/singleSignStep.vue
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
7 </template> 7 </template>
8 8
9 <script setup> 9 <script setup>
10 import cache from "@/plugins/cache"; 10 import {useStorage} from "@vueuse/core/index";
11 const language = ref(cache.local.get('language') || 0) 11 const language= useStorage('language',0)
12 const props = defineProps({ 12 const props = defineProps({
13 activeStep: { 13 activeStep: {
14 type: Number, 14 type: Number,
......
src/viewsPc/match/components/substation-list.vue
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
52 import {ref} from "vue"; 52 import {ref} from "vue";
53 import {onMounted} from "@vue/runtime-core"; 53 import {onMounted} from "@vue/runtime-core";
54 import {dayjs} from "element-plus" 54 import {dayjs} from "element-plus"
55 import cache from "@/plugins/cache" 55 import {useStorage} from "@vueuse/core/index";
56 const language = ref(cache.local.get('language') || 0) 56 const language= useStorage('language',0)
57 57
58 const router = useRouter() 58 const router = useRouter()
59 const time = ref(0) 59 const time = ref(0)
......
src/viewsPc/match/components/teamSignStep.vue
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
8 </template> 8 </template>
9 9
10 <script setup> 10 <script setup>
11 import cache from "@/plugins/cache"; 11 import {useStorage} from "@vueuse/core/index";
12 const language = ref(cache.local.get('language') || 0) 12 const language= useStorage('language',0)
13 const props = defineProps({ 13 const props = defineProps({
14 activeStep: { 14 activeStep: {
15 type: Number, 15 type: Number,
......
src/viewsPc/match/components/zu-table.vue
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
43 </template> 43 </template>
44 44
45 <script setup> 45 <script setup>
46 import {useStorage} from "@vueuse/core/index";
47
46 const emit = defineEmits(['delete']) 48 const emit = defineEmits(['delete'])
47 const props = defineProps({ 49 const props = defineProps({
48 list: { 50 list: {
...@@ -65,8 +67,7 @@ const props = defineProps({ ...@@ -65,8 +67,7 @@ const props = defineProps({
65 default: 0 67 default: 0
66 } 68 }
67 }) 69 })
68 import cache from "@/plugins/cache"; 70 const language= useStorage('language',0)
69 const language = ref(cache.local.get('language') || 0)
70 const remove = (id) => { 71 const remove = (id) => {
71 emit('delete', id) 72 emit('delete', id)
72 } 73 }
......
src/viewsPc/match/detail.vue
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 <p class="ppl"><label class="bm1">比赛时间：</label>{{ matchData.beginTime?.slice(0, 10) }} 至 23 <p class="ppl"><label class="bm1">比赛时间：</label>{{ matchData.beginTime?.slice(0, 10) }} 至
24 {{ matchData.endTime?.slice(0, 10) }}</p> 24 {{ matchData.endTime?.slice(0, 10) }}</p>
25 <p class="ppl"><label class="bm2">赛事级别：</label>{{ matchData.level }}</p> 25 <p class="ppl"><label class="bm2">赛事级别：</label>{{ matchData.level }}</p>
26 <p class="ppl"><label class="bm3">地&ensp;&ensp;&ensp;&ensp;点：</label>{{ matchData.address }}</p> 26 <p class="ppl" v-if="matchData.address"><label class="bm3">地&ensp;&ensp;&ensp;&ensp;点：</label>{{ matchData.address }}</p>
27 <p class="ppl"><label class="bm4">报名截止：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p> 27 <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">报名截止：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p>
28 </el-col> 28 </el-col>
29 <el-col :lg="8" :md="12" :xl="8" v-if="matchData.type=='0'"> 29 <el-col :lg="8" :md="12" :xl="8" v-if="matchData.type=='0'">
30 <p class="countDownTitle"><span>报名截止倒计时</span></p> 30 <p class="countDownTitle"><span>报名截止倒计时</span></p>
......
src/viewsPc/match/pay.vue
...@@ -325,16 +325,15 @@ const payType = ref('2') ...@@ -325,16 +325,15 @@ const payType = ref('2')
325 const orderId = ref(route.query.orderId) 325 const orderId = ref(route.query.orderId)
326 const matchId = ref() 326 const matchId = ref()
327 const groupId = ref() 327 const groupId = ref()
328 import cache from "@/plugins/cache";
329 import GroupInfoRow from "@/viewsPc/match/components/groupInfo-row"; 328 import GroupInfoRow from "@/viewsPc/match/components/groupInfo-row";
330 import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row"; 329 import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row";
331 import SignInfoTable from "@/viewsPc/match/components/signInfo-table" 330 import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
332 import ZuTable from "@/viewsPc/match/components/zu-table"; 331 import ZuTable from "@/viewsPc/match/components/zu-table";
333 import useUserStore from "@/store/modules/user"; 332 import useUserStore from "@/store/modules/user";
334 import FileUpload from "@/components/FileUpload"; 333 import FileUpload from "@/components/FileUpload";
335 import {upReceipt} from "@/apiPc/match"; 334 import {useStorage} from "@vueuse/core/index";
336 const isLogin = ref(false) 335 const isLogin = ref(false)
337 const language = ref(cache.local.get('language') || 0) 336 const language= useStorage('language',0)
338 const signInfoList = ref([]) 337 const signInfoList = ref([])
339 const zuTableList = ref([]) 338 const zuTableList = ref([])
340 const totalFee = ref('') 339 const totalFee = ref('')
......
src/viewsPc/match/payOk.vue
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
19 19
20 <script setup> 20 <script setup>
21 import {ref} from "vue"; 21 import {ref} from "vue";
22 import cache from "@/plugins/cache";
23 import {useRoute, useRouter} from "vue-router"; 22 import {useRoute, useRouter} from "vue-router";
24 import {onMounted} from "@vue/runtime-core"; 23 import {onMounted} from "@vue/runtime-core";
25 import {callbackPalPay} from "@/apiPc/match"; 24 import {callbackPalPay} from "@/apiPc/match";
25 import {useStorage} from "@vueuse/core/index";
26 26
27 const route = useRoute() 27 const route = useRoute()
28 const router = useRouter() 28 const router = useRouter()
29 const language = ref(cache.local.get('language') || 0) 29 const language= useStorage('language',0)
30 const orderId = ref(route.query.orderId) 30 const orderId = ref(route.query.orderId)
31 31
32 onMounted(() => { 32 onMounted(() => {
......
src/viewsPc/match/signPreview.vue
...@@ -108,13 +108,13 @@ import {useRoute, useRouter} from "vue-router"; ...@@ -108,13 +108,13 @@ import {useRoute, useRouter} from "vue-router";
108 import useUserStore from "@/store/modules/user"; 108 import useUserStore from "@/store/modules/user";
109 import ZuTable from "@/viewsPc/match/components/zu-table"; 109 import ZuTable from "@/viewsPc/match/components/zu-table";
110 import {ElMessageBox} from "element-plus"; 110 import {ElMessageBox} from "element-plus";
111 import {exportCn} from "@/apiPc/match";
112 import SingleSignStep from "@/viewsPc/match/components/singleSignStep"; 111 import SingleSignStep from "@/viewsPc/match/components/singleSignStep";
112 import {useStorage} from "@vueuse/core/index";
113 const route = useRoute() 113 const route = useRoute()
114 const router = useRouter() 114 const router = useRouter()
115 const activeStep = ref(3) 115 const activeStep = ref(3)
116 const groupInfo = useUserStore().group || {} 116 const groupInfo = useUserStore().group || {}
117 const language = ref(cache.local.get('language') || 0) 117 const language= useStorage('language',0)
118 const groupId = ref(route.query.groupId || 0) 118 const groupId = ref(route.query.groupId || 0)
119 const form = ref({}) 119 const form = ref({})
120 const matchId = ref(route.query.matchId) 120 const matchId = ref(route.query.matchId)
......
src/viewsPc/match/teamSign.vue
...@@ -93,8 +93,7 @@ import { toRefs } from '@vueuse/shared' ...@@ -93,8 +93,7 @@ import { toRefs } from '@vueuse/shared'
93 import TeamSignStep from './components/teamSignStep' 93 import TeamSignStep from './components/teamSignStep'
94 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row"; 94 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row";
95 95
96 import cache from "@/plugins/cache" 96 const language= useStorage('language',0)
97 const language = ref(cache.local.get('language') || 0)
98 97
99 const { proxy } = getCurrentInstance() 98 const { proxy } = getCurrentInstance()
100 const router = useRouter() 99 const router = useRouter()
...@@ -102,7 +101,7 @@ const route = useRoute() ...@@ -102,7 +101,7 @@ const route = useRoute()
102 import * as match from '@/apiPc/match' 101 import * as match from '@/apiPc/match'
103 import { ElMessage } from 'element-plus' 102 import { ElMessage } from 'element-plus'
104 import _ from 'lodash' 103 import _ from 'lodash'
105 import {saveMyGroupForCpt} from "@/apiPc/match"; 104 import {useStorage} from "@vueuse/core/index";
106 105
107 const data = reactive({ 106 const data = reactive({
108 isRanks: false, 107 isRanks: false,
......
src/viewsPc/register/components/personal-step.vue
...@@ -12,8 +12,10 @@ ...@@ -12,8 +12,10 @@
12 <script setup> 12 <script setup>
13 import {ref} from "vue"; 13 import {ref} from "vue";
14 import cache from "@/plugins/cache"; 14 import cache from "@/plugins/cache";
15 import {useStorage} from "@vueuse/core/index";
16
17 const language = useStorage('language', 0)
15 18
16 const language = ref(cache.local.get('language') || 0)
17 const props = defineProps({ 19 const props = defineProps({
18 activeStep: { 20 activeStep: {
19 type: Number, 21 type: Number,
......
src/viewsPc/register/personal.vue
...@@ -144,14 +144,14 @@ import Step3 from "./team/step3" ...@@ -144,14 +144,14 @@ import Step3 from "./team/step3"
144 import Vcode from "vue3-puzzle-vcode" 144 import Vcode from "vue3-puzzle-vcode"
145 import {ElMessage} from 'element-plus' 145 import {ElMessage} from 'element-plus'
146 import CountDown from '@chenfengyuan/vue-countdown' 146 import CountDown from '@chenfengyuan/vue-countdown'
147 import cache from '@/plugins/cache'
148 import {checkWdsf, getCaptchaSms, loginSingle, registerSingle} from "@/apiPc/match"; 147 import {checkWdsf, getCaptchaSms, loginSingle, registerSingle} from "@/apiPc/match";
149 import {setToken} from "@/utils/auth"; 148 import {setToken} from "@/utils/auth";
150 import PersonalStep from "@/viewsPc/register/components/personal-step"; 149 import PersonalStep from "@/viewsPc/register/components/personal-step";
151 import FileUpload from "@/components/FileUpload"; 150 import FileUpload from "@/components/FileUpload";
152 import {useRouter, useRoute} from "vue-router"; 151 import {useRouter, useRoute} from "vue-router";
152 import {useStorage} from "@vueuse/core/index";
153 153
154 const language = ref(cache.local.get('language') || 0) 154 const language= useStorage('language',0)
155 const router = useRouter() 155 const router = useRouter()
156 const route = useRoute() 156 const route = useRoute()
157 const {proxy} = getCurrentInstance() 157 const {proxy} = getCurrentInstance()
......
src/viewsPc/register/team/step1.vue
...@@ -48,9 +48,9 @@ import Vcode from "vue3-puzzle-vcode" ...@@ -48,9 +48,9 @@ import Vcode from "vue3-puzzle-vcode"
48 import { ElMessage } from 'element-plus' 48 import { ElMessage } from 'element-plus'
49 import CountDown from '@chenfengyuan/vue-countdown' 49 import CountDown from '@chenfengyuan/vue-countdown'
50 import {getCaptchaSms,checkRegisterCode} from "@/apiPc/match"; 50 import {getCaptchaSms,checkRegisterCode} from "@/apiPc/match";
51 import cache from '@/plugins/cache'
52 import {onMounted} from "@vue/runtime-core"; 51 import {onMounted} from "@vue/runtime-core";
53 const language = ref(cache.local.get('language') || 0) 52 import {useStorage} from "@vueuse/core/index";
53 const language= useStorage('language',0)
54 54
55 const data = reactive({ 55 const data = reactive({
56 isShow:false, 56 isShow:false,
......
src/viewsPc/register/team/step2.vue
...@@ -111,11 +111,11 @@ import {onMounted, toRefs, reactive} from "vue" ...@@ -111,11 +111,11 @@ import {onMounted, toRefs, reactive} from "vue"
111 import * as match from "@/apiPc/match"; 111 import * as match from "@/apiPc/match";
112 import {ElMessage} from "element-plus"; 112 import {ElMessage} from "element-plus";
113 import {setToken} from "@/utils/auth"; 113 import {setToken} from "@/utils/auth";
114 import cache from "@/plugins/cache"; 114 import {useStorage} from "@vueuse/core/index";
115 115
116 const {proxy} = getCurrentInstance() 116 const {proxy} = getCurrentInstance()
117 const emit = defineEmits(['submit', 'prev']) 117 const emit = defineEmits(['submit', 'prev'])
118 const language = ref(cache.local.get('language') || 0) 118 const language= useStorage('language',0)
119 const props = defineProps({ 119 const props = defineProps({
120 accont: { 120 accont: {
121 type: String, 121 type: String,
......
src/viewsPc/register/team/step3.vue
...@@ -23,9 +23,9 @@ import Vcode from "vue3-puzzle-vcode" ...@@ -23,9 +23,9 @@ import Vcode from "vue3-puzzle-vcode"
23 import {ElMessage} from 'element-plus' 23 import {ElMessage} from 'element-plus'
24 import CountDown from '@chenfengyuan/vue-countdown' 24 import CountDown from '@chenfengyuan/vue-countdown'
25 import {getCaptchaSms, checkRegisterCode} from "@/apiPc/match" 25 import {getCaptchaSms, checkRegisterCode} from "@/apiPc/match"
26 import cache from '@/plugins/cache'
27 import {useRouter} from "vue-router"; 26 import {useRouter} from "vue-router";
28 const language = ref(cache.local.get('language') || 0) 27 import {useStorage} from "@vueuse/core/index";
28 const language= useStorage('language',0)
29 const props = defineProps({ 29 const props = defineProps({
30 accont:{ 30 accont:{
31 type:String, 31 type:String,
......
src/viewsPc/register/team/team.vue
...@@ -20,14 +20,12 @@ ...@@ -20,14 +20,12 @@
20 </template> 20 </template>
21 21
22 <script setup> 22 <script setup>
23 import {reactive} from "@vue/runtime-core";
24 import Step1 from "./step1"; 23 import Step1 from "./step1";
25 import Step2 from "./step2"; 24 import Step2 from "./step2";
26 import Step3 from "./step3"; 25 import Step3 from "./step3";
27 import * as match from "@/apiPc/match" 26 import {onMounted,toRefs,reactive} from "vue"
28 import {onMounted,toRefs} from "vue" 27 import {useStorage} from "@vueuse/core/index";
29 import cache from '@/plugins/cache' 28 const language= useStorage('language',0)
30 const language = ref(cache.local.get('language') || 0)
31 29
32 const data = reactive({ 30 const data = reactive({
33 isShow:false, 31 isShow:false,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!