Просмотр исходного кода

Merge branch 'dev' into dev_YWQ

dev_YWQ
HolyKnightIX 2 лет назад
Родитель
Сommit
4d9580008c
4 измененных файлов: 7 добавлений и 11 удалений
  1. +1
    -7
      package.json
  2. +2
    -1
      src/layout/components/Navbar.vue
  3. +2
    -1
      src/views/createVideo/index.vue
  4. +2
    -2
      src/views/myAccount/index.vue

+ 1
- 7
package.json Просмотреть файл

@@ -6,13 +6,7 @@
"scripts": { "scripts": {
"dev": "vite serve --mode development", "dev": "vite serve --mode development",
"build:dev": "vite build --mode development &&vue-tsc --noEmit", "build:dev": "vite build --mode development &&vue-tsc --noEmit",
"build:prod": "vite build --mode production &&vue-tsc --noEmit",
"prepare": "husky install",
"lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ",
"lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"",
"lint:stylelint": "stylelint \"**/*.{css,scss,vue}\" --fix",
"lint:lint-staged": "lint-staged",
"commit": "git-cz"
"build:prod": "vite build --mode production &&vue-tsc --noEmit"
}, },
"config": { "config": {
"commitizen": { "commitizen": {


+ 2
- 1
src/layout/components/Navbar.vue Просмотреть файл

@@ -80,11 +80,12 @@ import { useAppStore } from "@/store/modules/app";
import { useTagsViewStore } from "@/store/modules/tagsView"; import { useTagsViewStore } from "@/store/modules/tagsView";
import { useUserStore } from "@/store/modules/user"; import { useUserStore } from "@/store/modules/user";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import LangSelect from "@/components/LangSelect/index.vue";

const { locale } = useI18n(); const { locale } = useI18n();


// 当前语言状态与国际化组件 // 当前语言状态与国际化组件
const lanChange = ref(locale); const lanChange = ref(locale);
import LangSelect from "@/components/LangSelect/index.vue";


const appStore = useAppStore(); const appStore = useAppStore();
const tagsViewStore = useTagsViewStore(); const tagsViewStore = useTagsViewStore();


+ 2
- 1
src/views/createVideo/index.vue Просмотреть файл

@@ -141,6 +141,7 @@
</template> </template>
<script setup> <script setup>
import { ref } from "vue"; import { ref } from "vue";
import { getCurrentInstance } from "vue";
// 标题 // 标题
let title = ref(""); let title = ref("");
// 上传图片 // 上传图片
@@ -150,7 +151,7 @@ function changeFile(e) {
} }


// $t在script中的使用 // $t在script中的使用
import { getCurrentInstance } from "vue";
const { const {
appContext: { appContext: {
config: { globalProperties }, config: { globalProperties },


+ 2
- 2
src/views/myAccount/index.vue Просмотреть файл

@@ -95,11 +95,11 @@


<script setup> <script setup>
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router";
const { locale } = useI18n(); const { locale } = useI18n();


const currentLan = ref(locale); const currentLan = ref(locale);


import { useRouter } from "vue-router";
const router = useRouter(); const router = useRouter();
function routerTo(url) { function routerTo(url) {
router.push(url); router.push(url);
@@ -147,7 +147,7 @@ function routerTo(url) {


.password { .password {
display: inline-block; display: inline-block;
float: right;
// float: right;
padding: 2px 8px; padding: 2px 8px;
border: 1px solid #000; border: 1px solid #000;
border-radius: 5px; border-radius: 5px;


Загрузка…
Отмена
Сохранить