首页 发现 帮助
注册 登录
tangning
/
App_cros
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

修改线上版本

tangning 6 月之前
父节点
a23e252b7e
当前提交
bd6a63c393
共有 9 个文件被更改，包括 33 次插入 和 24 次删除
合并视图 显示文件统计
  1. 11 3
      index.html
  2. 6 4
      src/App.vue
  3. 1 1
      src/axios/index.js
  4. 2 0
      src/locales/en.js
  5. 3 1
      src/locales/zh.js
  6. 2 2
      src/router.js
  7. 2 2
      src/view/from.vue
  8. 3 9
      src/view/login.vue
  9. 3 2
      vite.config.ts

+ 11 - 3
index.html
查看文件 

@@ -1,9 +1,17 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
 <head>
 
 <head>
 
-  <meta charset="UTF-8">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Vite App</title>
 
+  <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
 
+  <meta charset=UTF-8>
 
+  <meta http-equiv=Cache-Control content="max-age=7200">
 
+  <meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1">
 
+  <meta content="telephone=no" name=format-detection>
 
+  <meta name=description content=实景三维空间采集相机四维看看（4DKanKan）。技术核心三要素：易操作；自动化；高精度。主要应用领域为数字文博、数字地产、数字电商、数字餐饮、数字家居等。>
 
+  <link rel="shortcut icon" href=//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico>
 
+  <link rel=icon type=image/png href=//4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png sizes=192x192>
 
+  <link rel=apple-touch-icon sizes=180x180 href=//4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png>
 
+  <link rel=stylesheet href=//at.alicdn.com/t/font_941679_6htxkis28k4.css>
 
+  <title>四维看看</title>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
   <div id="app"></div>
 
   <div id="app"></div>

+ 6 - 4
src/App.vue
查看文件 

@@ -15,7 +15,9 @@ import { useRouter, useRoute } from "vue-router";
 
 import { useI18n } from "vue-i18n";
 
 import { useI18n } from "vue-i18n";
 
 const { t, locale } = useI18n();
 
 const { t, locale } = useI18n();
 
 function getUrlParams(url) {
 
 function getUrlParams(url) {
 
+  if(!url) return {}
 
   // 通过 ? 分割获取后面的参数字符串
 
   // 通过 ? 分割获取后面的参数字符串
 
+  console.log("getUrlParams", url);
 
   let urlStr = url.split("?")[1];
 
   let urlStr = url.split("?")[1];
 
   // 创建空对象存储参数
 
   // 创建空对象存储参数
 
   let obj = {};
 
   let obj = {};
 
@@ -29,16 +31,16 @@ function getUrlParams(url) {
 
   return obj;
 
   return obj;
 
 }
 
 }
 
 import { useStore } from "../src/store/user";
 
 import { useStore } from "../src/store/user";
 
-const router = getUrlParams(window.location.href);
 
+const router = getUrlParams(window.location.search);
 
 const route = useRoute();
 
 const route = useRoute();
 
-console.log("useRoute", router.rtkSnCode);
 
+console.log("useRoute", router);
 
 const userState = useStore();
 
 const userState = useStore();
 
 router.rtkSnCode && userState.setRtkSnCode(router.rtkSnCode);
 
 router.rtkSnCode && userState.setRtkSnCode(router.rtkSnCode);
 
 // 切换
 
 // 切换
 
-handleLang(route.lang || 'zh')
 
+handleLang(router.lang || 'zh')
 
 function handleLang(val) {
 
 function handleLang(val) {
 
+  console.log("handleLang", val);
 
   locale.value = val;
 
   locale.value = val;
 
-  localStorage.setItem("language", val);
 
 }
 
 }
 
 // console.log("route",unref(route).query,  route.query);
 
 // console.log("route",unref(route).query,  route.query);
 
 </script>
 
 </script>

+ 1 - 1
src/axios/index.js
查看文件 

@@ -4,7 +4,7 @@ import { showLoadingToast, closeToast  } from "vant";
 
 
 
 //创建一个新的请求实例instance,instance.的用法和axios.的用法一致，可以使用instance({})、instance.get（）、instance.post()
 
 //创建一个新的请求实例instance,instance.的用法和axios.的用法一致，可以使用instance({})、instance.get（）、instance.post()
 
 const instace = axios.create({
 
 const instace = axios.create({
 
-  baseURL: '/ucenter', //默认配置(这里不要用process.env,个人百度这个在vite中被废弃掉了,属性名必须以VITE_API_开头,否则 import.meta.env检测不到)
 
+  baseURL: '/', //默认配置(这里不要用process.env,个人百度这个在vite中被废弃掉了,属性名必须以VITE_API_开头,否则 import.meta.env检测不到)
 
   timeout: 5000, //超时时间
 
   timeout: 5000, //超时时间
 
 });
 
 });

+ 2 - 0
src/locales/en.js
查看文件 

@@ -5,6 +5,8 @@ export default {
 
     account: "4DAGE Account",
 
     account: "4DAGE Account",
 
     password: "Account Password",
 
     password: "Account Password",
 
     loginBut: "Submit",
 
     loginBut: "Submit",
 
+    columns1: "Chinese clothing",
 
+    columns2: "UWO",
 
   },
 
   },
 
   enter: '请输入',
 
   enter: '请输入',
 
   from:{
 
   from:{

+ 3 - 1
src/locales/zh.js
查看文件 

@@ -6,7 +6,9 @@ export default {
 
     password: "账号密码",
 
     password: "账号密码",
 
     loginBut: "确定",
 
     loginBut: "确定",
 
     forget: "忘记密码",
 
     forget: "忘记密码",
 
-    register: "注册账号"
 
+    register: "注册账号",
 
+    columns1: "中国服",
 
+    columns2: "国际服",
 
   },
 
   },
 
   from: {
 
   from: {
 
     name: '修改CROS账号',
 
     name: '修改CROS账号',

+ 2 - 2
src/router.js
查看文件 

@@ -1,4 +1,4 @@
 
-import { createRouter, createWebHistory } from "vue-router"
 
+import { createRouter, createWebHashHistory } from "vue-router"
 
 const routes = [
 
 const routes = [
 
   {
 
   {
 
     path: '/',
 
     path: '/',
 
@@ -16,7 +16,7 @@ const routes = [
 
   }
 
   }
 
 ]
 
 ]
 
 const router = createRouter({
 
 const router = createRouter({
 
-  history: createWebHistory(),
 
+  history: createWebHashHistory(),
 
   routes
 
   routes
 
 })
 
 })

+ 2 - 2
src/view/from.vue
查看文件 

@@ -1,6 +1,6 @@
 
 <template>
 
 <template>
 
   <div class="login">
 
   <div class="login">
 
-    <van-nav-bar style="background: #252828" title="修改CROS账号" />
 
+    <van-nav-bar style="background: #252828" :title="t('from.name')" />
 
     <lang/>
 
     <lang/>
 
     <van-form @submit="onSubmit">
 
     <van-form @submit="onSubmit">
 
       <div class="fromContent">
 
       <div class="fromContent">
 
@@ -108,7 +108,7 @@
 
       </div>
 
       </div>
 
       <div style="margin: 16px">
 
       <div style="margin: 16px">
 
         <van-button round block type="primary" native-type="submit">
 
         <van-button round block type="primary" native-type="submit">
 
-          提交
 
+          {{ t("login.loginBut") }}
 
         </van-button>
 
         </van-button>
 
       </div>
 
       </div>
 
     </van-form>
 
     </van-form>

+ 3 - 9
src/view/login.vue
查看文件 

@@ -81,6 +81,7 @@
 
 
 
 <script setup>
 
 <script setup>
 
 import { showToast } from "vant";
 
 import { showToast } from "vant";
 
+import lang from "./changelang.vue";
 
 import { ref, reactive } from "vue";
 
 import { ref, reactive } from "vue";
 
 import { useI18n } from "vue-i18n";
 
 import { useI18n } from "vue-i18n";
 
 import { useStore } from "../store/user";
 
 import { useStore } from "../store/user";
 
@@ -96,13 +97,6 @@ const form = ref({
 
   account: "",
 
   account: "",
 
   password: "",
 
   password: "",
 
 });
 
 });
 
-const zlLengedTxtOne = ref(t("aa.name"));
 
-const zlLengedTxtTwo = ref(t("aa.bb"));
 
-// 可以通过locale切换语言包
 
-locale.value = "zh"; // 切换为中文
 
-
 
-console.log("zlLengedTxtOne", zlLengedTxtOne.value); // 中文显示姓名,英文显示name
 
-console.log("zlLengedTxtTwo", zlLengedTxtTwo.value); // 中文显示你好,英文显示hello
 
 const submit = () => {
 
 const submit = () => {
 
   let params = {
 
   let params = {
 
     phoneNum: form.value.account,
 
     phoneNum: form.value.account,
 
@@ -125,8 +119,8 @@ const submit = () => {
 
 const showPicker = ref(false);
 
 const showPicker = ref(false);
 
 const pickerValue = ref([]);
 
 const pickerValue = ref([]);
 
 const columns = [
 
 const columns = [
 
-  { text: "中国服", value: "中国服" },
 
-  { text: "国际服", value: "国际服" },
 
+  { text: t(`login.columns1`), value: "中国服" },
 
+  { text: t(`login.columns2`), value: "国际服" },
 
 ];
 
 ];
 
 
 
 const onConfirm = ({ selectedValues }) => {
 
 const onConfirm = ({ selectedValues }) => {

+ 3 - 2
vite.config.ts
查看文件 

@@ -6,6 +6,7 @@ import { VantResolver } from "@vant/auto-import-resolver";
 
 import { fileURLToPath, URL } from "node:url";
 
 import { fileURLToPath, URL } from "node:url";
 
 
 
 export default defineConfig({
 
 export default defineConfig({
 
+  base: './',
 
   plugins: [
 
   plugins: [
 
     vue(),
 
     vue(),
 
     AutoImport({
 
     AutoImport({
 
@@ -30,14 +31,14 @@ export default defineConfig({
 
         target: "https://v4-uat.4dkankan.com",
 
         target: "https://v4-uat.4dkankan.com",
 
         changeOrigin: true, //必须要开启跨域
 
         changeOrigin: true, //必须要开启跨域
 
         //pathRewrite重写请求的路径,实际请求的路径没有代理标识douyu,需要把斗鱼重置为空字符串
 
         //pathRewrite重写请求的路径,实际请求的路径没有代理标识douyu,需要把斗鱼重置为空字符串
 
-        rewrite: (path) => path.replace(/\/ucenter/, ""), // 路径重写
 
+        // rewrite: (path) => path.replace(/\/ucenter/, ""), // 路径重写
 
       },
 
       },
 
       "/service": {
 
       "/service": {
 
         //target是代理的目标路径
 
         //target是代理的目标路径
 
         target: "https://v4-uat.4dkankan.com",
 
         target: "https://v4-uat.4dkankan.com",
 
         changeOrigin: true, //必须要开启跨域
 
         changeOrigin: true, //必须要开启跨域
 
         //pathRewrite重写请求的路径,实际请求的路径没有代理标识douyu,需要把斗鱼重置为空字符串
 
         //pathRewrite重写请求的路径,实际请求的路径没有代理标识douyu,需要把斗鱼重置为空字符串
 
-        rewrite: (path) => path.replace(/\/service/, ""), // 路径重写
 
+        // rewrite: (path) => path.replace(/\/service/, ""), // 路径重写
 
       },
 
       },
 
     },
 
     },
 
   },
 
   },