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

game/src/api.js

@@ -204,7 +204,7 @@ export async function addScore(score, description) {
     data: {
       score: scoreEncrypted,
       type: '玩游戏',
-      userId: store.state.userInfo.id,
+      // userId: store.state.userInfo.id,
       description,
     },
     headers: {

game/src/views/FindPassword.vue

@@ -75,7 +75,7 @@
           <img
             v-if="isShowVerifiCode"
             class=""
-            src="https://sit-cnzhengquan.4dage.com/api/show/getRandCode"
+            :src="`${$env.VUE_APP_DEPLOY_ORIGIN}/api/show/getRandCode`"
             alt=""
             draggable="false"
           >
@@ -101,7 +101,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted, nextTick } from "vue"
+import { ref, computed, watch, onMounted, nextTick, inject } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useStore } from "vuex"
 import { showDialog } from 'vant'
@@ -116,6 +116,8 @@ const {
   windowSizeWhenDesignForRef,
 } = useSizeAdapt(390, 752)
 
+const $env = inject('$env')
+
 const account = ref('')
 const phone = ref('')
 const password = ref('')

game/src/views/LoginView.vue

@@ -75,7 +75,7 @@
           <img
             v-if="isShowVerifiCode"
             class=""
-            src="https://sit-cnzhengquan.4dage.com/api/show/getRandCode"
+            :src="`${$env.VUE_APP_DEPLOY_ORIGIN}/api/show/getRandCode`"
             alt=""
             draggable="false"
           >
@@ -119,7 +119,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted, nextTick } from "vue"
+import { ref, computed, watch, onMounted, nextTick, inject } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useStore } from "vuex"
 import { showDialog } from 'vant'
@@ -129,6 +129,8 @@ const route = useRoute()
 const router = useRouter()
 const store = useStore()
 
+const $env = inject('$env')
+
 const {
   windowSizeInCssForRef,
   windowSizeWhenDesignForRef,

game/src/views/SignUp.vue

@@ -113,7 +113,7 @@
           <img
             v-if="isShowVerifiCode"
             class=""
-            src="https://sit-cnzhengquan.4dage.com/api/show/getRandCode"
+            :src="`${$env.VUE_APP_DEPLOY_ORIGIN}/api/show/getRandCode`"
             alt=""
             draggable="false"
           >
@@ -137,7 +137,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted, nextTick } from "vue"
+import { ref, computed, watch, onMounted, nextTick, inject } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useStore } from "vuex"
 import { showDialog } from 'vant'
@@ -147,6 +147,8 @@ const route = useRoute()
 const router = useRouter()
 const store = useStore()
 
+const $env = inject('$env')
+
 const {
   windowSizeInCssForRef,
   windowSizeWhenDesignForRef,
@@ -246,7 +248,7 @@ function submit() {
     return
   }
 
-  signUp(accountTrimed.value, phoneTrimed.value, passwordTrimed.value, passwordRepeatTrimed.value, verifiCodeTrimed.value).then(() => {
+  signUp(accountTrimed.value, phoneTrimed.value, passwordTrimed.value, verifiCodeTrimed.value).then(() => {
     showDialog({
       message: '注册成功',
       theme: 'round-button',