Browse Source

Merge branch 'master' of http://face3d.4dage.com:7005/renyicun/WuxiCharityMuseum

任一存 1 year ago
parent
commit
fbc302aa48
7 changed files with 31 additions and 5 deletions
  1. BIN
      public/videos/xszc.mp4
  2. BIN
      public/videos/ysdt.mp4
  3. 1 1
      src/App.vue
  4. 11 0
      src/api.js
  5. 15 1
      src/components/LoginForm.vue
  6. 1 0
      src/views/HomeView.vue
  7. 3 3
      src/views/MuseumView.vue

BIN
public/videos/xszc.mp4


BIN
public/videos/ysdt.mp4


+ 1 - 1
src/App.vue

@@ -28,7 +28,7 @@
               name: 'HomeView'
             })"
           >
-            要素地图
+            慈善地图
           </button>
           <button
             :class="{

+ 11 - 0
src/api.js

@@ -211,3 +211,14 @@ export function redeemApi(data) {
     return res.data
   })
 }
+export function validateNickName (name) {
+  return axios({
+    method: 'post',
+    url: `${process.env.VUE_APP_DEPLOY_ORIGIN}/api/show/saveNickname/${name}`,
+    headers: {
+      token: store.state.token,
+    },
+  }).then((res) => {
+    return res.data
+  })
+}

+ 15 - 1
src/components/LoginForm.vue

@@ -57,6 +57,8 @@
 import { ref, computed, watch, onMounted, inject } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useStore } from "vuex"
+import { validateNickName } from '@/api'
+import { ElMessage } from 'element-plus'
 
 const route = useRoute()
 const router = useRouter()
@@ -67,7 +69,19 @@ const emit = defineEmits(['login-done'])
 const nickName = ref('')
 nickName.value = `云城居民${utils.getRandomString(2)}`
 
-function onClickAsVisitor() {
+async function onClickAsVisitor() {
+  const reg = /[\u4e00-\u9fa5a-zA-Z]/g
+  const matches = nickName.value.match(reg)
+  if (matches) {
+    const data = await validateNickName(matches.join(""))
+    if (data.code === -1) {
+      ElMessage({
+        message: data.msg,
+        type: 'error',
+      })
+      return
+    }
+  }
   store.commit('setLoginStatus', store.getters.loginStatusEnum.visitor)
   store.commit('setUserInfo', {
     userName: nickName.value,

+ 1 - 0
src/views/HomeView.vue

@@ -172,6 +172,7 @@
       draggable="false"
     >
     <button
+      v-if="!$isTablet"
       class="arrow-down"
       @click="router.push({
         name: 'CityOfXishan',

+ 3 - 3
src/views/MuseumView.vue

@@ -2,7 +2,7 @@
   <IframeWrap
     v-if="showIframe"
     class="iframe-wrap"
-    url="https://sit-locbigsecen.4dage.com/wxScene/index.html?m=wxcs_SG-igv7wQAyyyG"
+    url="https://www.4dkankan.com/spg.html?m=SG-fwjuL9mtG2A"
     :need-back-btn="false"
   />
 
@@ -17,12 +17,12 @@
       <p>内容建设中 敬请期待...</p>
     </div>
 
-    <!-- <div
+    <div
       class="museum-start__btn"
       @click="showIframe = true"
     >
       开始漫游
-    </div> -->
+    </div>
   </div>
 </template>