Merge branch 'master' of http://192.168.0.115:3000/chenzimin2/ZGZQBWG

game/.env.dev

@@ -1,4 +1,4 @@
 VUE_APP_CLI_MODE=dev
 NODE_ENV=development
 PUBLIC_PATH=/
-VUE_APP_API_PREFIX=http://192.168.20.61:8063
+VUE_APP_API_PREFIX=https://sit-cnzhengquan.4dage.com/

game/.env.mytest

@@ -1,4 +1,4 @@
 VUE_APP_CLI_MODE=test
 NODE_ENV=production
 PUBLIC_PATH=./
-VUE_APP_API_PREFIX=https://wlgbwg.4dage.com
+VUE_APP_API_PREFIX=https://sit-cnzhengquan.4dage.com/

game/src/api.js

@@ -121,9 +121,9 @@ export async function changePassword(newPassword, oldPassword) {
   const pwdNewEncrypted = encodeStr(Base64.encode(newPassword))
   const pwdOldEncrypted = encodeStr(Base64.encode(oldPassword))
   const res = await axios({
-    method: 'get',
+    method: 'post',
     url: `${process.env.VUE_APP_API_PREFIX}/api/cms/game/update/pass`,
-    params: {
+    data: {
       newPassword: pwdNewEncrypted,
       oldPassword: pwdOldEncrypted,
     },

game/src/router/index.js

@@ -1,5 +1,6 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
 import HomeView from '../views/HomeView.vue'
+import RedirectView from '../views/RedirectView.vue'
 import SignUp from '../views/SignUp.vue'
 import LoginView from '../views/LoginView.vue'
 import FindPassword from '../views/FindPassword.vue'
@@ -19,6 +20,11 @@ const routes = [
     component: HomeView,
   },
   {
+    path: '/redirect-view',
+    name: 'RedirectView',
+    component: RedirectView,
+  },
+  {
     path: '/sign-up',
     name: 'SignUp',
     component: SignUp,
@@ -75,11 +81,11 @@ const router = createRouter({
   routes
 })
 
-router.beforeEach((to, from) => {
-  // 生产环境下强制每次都从首页进入
-  if (process.env.NODE_ENV === 'production' && !from.name && to.name !== 'HomeView') {
-    return '/'
-  }
-})
+// router.beforeEach((to, from) => {
+//   // 生产环境下强制每次都从首页进入
+//   if (process.env.NODE_ENV === 'production' && !from.name && to.name !== 'HomeView') {
+//     return '/'
+//   }
+// })
 
 export default router

game/src/views/GameByUnity.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="game-by-unity">
     <iframe
+      allow="fullscreen"
       :src="gameUrl"
       frameborder="0"
     />

game/src/views/HomeView.vue

@@ -254,7 +254,8 @@ onUnmounted(() => {
   height: 100%;
   overflow: auto;
   >.for-visitor{
-    margin-top: calc(18 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    margin-top: calc(15 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    margin-bottom: calc(18 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     width: 100%;
     display: flex;
     justify-content: space-between;
@@ -262,7 +263,7 @@ onUnmounted(() => {
     padding-left: calc(16 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     padding-right: calc(16 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     >button{
-      width: calc(170 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      width: calc(165 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
       position: relative;
       >img{
         width: 100%;
@@ -270,7 +271,7 @@ onUnmounted(() => {
       }
       >span{
         position: absolute;
-        left: calc(100 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+        left: calc(95 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
         top: calc(32 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
         font-size: calc(24 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
         font-family: Source Han Sans SC, Source Han Sans SC;
@@ -282,6 +283,7 @@ onUnmounted(() => {
   }
   >.after-login{
     margin-top: calc(25 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    margin-bottom: calc(15 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     display: flex;
     align-items: center;
     padding-left: calc(12 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));

game/src/views/LoginView.vue

@@ -82,6 +82,7 @@ import { ref, computed, watch, onMounted } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useStore } from "vuex"
 import { showDialog } from 'vant'
+import { login } from '@/api.js'
 
 const route = useRoute()
 const router = useRouter()
@@ -130,7 +131,7 @@ function submit() {
     return
   }
 
-  api.login(accountTrimed.value, passwordTrimed.value).then(() => {
+  login(accountTrimed.value, passwordTrimed.value).then(() => {
     router.replace({
       name: 'HomeView'
     })

game/src/views/RedirectView.vue

@@ -0,0 +1,75 @@
+<template>
+  <div class="redirect-view" />
+</template>
+
+<script setup>
+import { ref, computed, watch, onMounted } from "vue"
+import { useRoute, useRouter } from "vue-router"
+import { useStore } from "vuex"
+
+const route = useRoute()
+const router = useRouter()
+const store = useStore()
+
+console.log('sdfdsdf', route.query)
+switch (route.query.gameIdx) {
+case '0':
+  router.replace({
+    name: 'PlantTree',
+  })
+  break
+case '1':
+  router.replace({
+    name: 'ExamPaper1',
+  })
+  break
+case '2':
+  router.replace({
+    name: 'PairUp',
+  })
+  break
+case '3':
+  router.replace({
+    name: 'GameByUnity',
+    query: {
+      gameName: '',
+    }
+  })
+  break
+case '4':
+  router.replace({
+    name: 'GameByUnity',
+    query: {
+      gameName: 'DisasterRelief',
+    }
+  })
+  break
+case '5':
+  router.replace({
+    name: 'GameByUnity',
+    query: {
+      gameName: '',
+    }
+  })
+  break
+case '6':
+  router.replace({
+    name: 'GameByUnity',
+    query: {
+      gameName: '',
+    }
+  })
+  break
+default:
+  break
+}
+
+
+
+</script>
+
+<style lang="less" scoped>
+.redirect-view{
+
+}
+</style>