Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

@@ -412,6 +412,14 @@
         </el-col>
         </el-col>
       </el-row>
       </el-row>
     </div>
     </div>
+    
+    <!--    邀请函-->
+    <div v-if="matchData.leagueId==0" class="fixed_gg_l yaoQing" @click="applyInvitation">
+      <img v-if="language==0" src="@/assets/logo/Invitation_c.png">
+      <img v-else src="@/assets/logo/Invitation_e.png">
+    </div>
+    
+    <affix-invitation ref="dialogInvitationRef" />
   </div>
   </div>
 </template>
 </template>
 <script setup>
 <script setup>
@@ -430,6 +438,11 @@ import { dayjs } from 'element-plus'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import { getAboutUs, getppInfo, getZNList } from '@/apiPc/match'
 import { getAboutUs, getppInfo, getZNList } from '@/apiPc/match'
 
 
+import AffixInvitation from '/@/viewsPc/match/components/affix-invitation.vue'
+import { useStorage } from '@vueuse/core/index'
+
+const language = useStorage('language', 0)
+
 const modules = [Autoplay, Navigation]
 const modules = [Autoplay, Navigation]
 const navigationPic = ref({
 const navigationPic = ref({
   nextEl: '.picnext',
   nextEl: '.picnext',
@@ -605,6 +618,15 @@ const handlePickup = () => {
   emit('pickup', params)
   emit('pickup', params)
 }
 }
 
 
+function applyInvitation() {
+  var obj = {
+    title: language.value == 0 ? '邀请函申请' : 'Visa Invitation Letter ',
+    cptId: matchData.value.id
+  }
+  console.log(matchData.value.id)
+  proxy.$refs['dialogInvitationRef'].open(obj)
+}
+
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
@@ -1195,4 +1217,11 @@ const handlePickup = () => {
   width: 192px;
   width: 192px;
   text-align: center;
   text-align: center;
 }
 }
+
+.yaoQing {
+  width: 160px;
+  left: 5px;
+  top: 40%;
+  
+}
 </style>
 </style>

@@ -392,7 +392,13 @@
       </el-row>
       </el-row>
     </div>
     </div>
     
     
+    <!--    邀请函-->
+    <div v-if="matchData.leagueId==0" class="fixed_gg_l yaoQing" @click="applyInvitation">
+      <img v-if="language==0" src="@/assets/logo/Invitation_c.png">
+      <img v-else src="@/assets/logo/Invitation_e.png">
+    </div>
     
     
+    <affix-invitation ref="dialogInvitationRef" />
   </div>
   </div>
 </template>
 </template>
 <script setup>
 <script setup>
@@ -409,7 +415,10 @@ import 'swiper/css'
 import { dayjs, ElMessage } from 'element-plus'
 import { dayjs, ElMessage } from 'element-plus'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import { rankList } from '@/assets/js/data'
 import { rankList } from '@/assets/js/data'
+import AffixInvitation from '/@/viewsPc/match/components/affix-invitation.vue'
+import { useStorage } from '@vueuse/core/index'
 
 
+const language = useStorage('language', 0)
 const modules = [Autoplay, Navigation]
 const modules = [Autoplay, Navigation]
 const navigationPic = ref({
 const navigationPic = ref({
   nextEl: '.picnext',
   nextEl: '.picnext',
@@ -580,6 +589,15 @@ const handlePickup = () => {
   }
   }
   emit('pickup', params)
   emit('pickup', params)
 }
 }
+
+function applyInvitation() {
+  var obj = {
+    title: language.value == 0 ? '邀请函申请' : 'Visa Invitation Letter ',
+    cptId: matchData.value.id
+  }
+  console.log(matchData.value.id)
+  proxy.$refs['dialogInvitationRef'].open(obj)
+}
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
@@ -1321,4 +1339,11 @@ const handlePickup = () => {
     height: 60px;
     height: 60px;
   }
   }
 }
 }
+
+.yaoQing {
+  width: 160px;
+  left: 5px;
+  top: 40%;
+  
+}
 </style>
 </style>

@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         },
         '/dev-api': {
         '/dev-api': {
-          // target: 'http://192.168.1.118:8081/',
-          target: 'http://192.168.1.242:8081',
+          target: 'http://192.168.1.118:8081/',
+          // target: 'http://192.168.1.242:8081',
           // target: 'https://jijin.wtwuxicenter.com/stage-api',
           // target: 'https://jijin.wtwuxicenter.com/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api/',
           // target: 'https://wdsfwuxicenter.com/stage-api/',
           changeOrigin: true,
           changeOrigin: true,