Merge branch 'vue-i18n' of https://github.com/zouzhibin/vue-admin-perfect into ghpages

 Conflicts:
	src/main.ts
This commit is contained in:
zouzhibing 2023-02-01 11:34:03 +08:00
commit 0349543c95
5 changed files with 9790 additions and 207 deletions

9668
package-lock.json generated

File diff suppressed because it is too large Load Diff

BIN
src/assets/image/we.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

View File

@ -29,6 +29,7 @@ registerElIcons(app)
app.component('svg-icon',SvgIcon) app.component('svg-icon',SvgIcon)
app.component('PageWrapLayout',PageWrapLayout) app.component('PageWrapLayout',PageWrapLayout)
app.use(I18n) app.use(I18n)
app.use(pinia) app.use(pinia)
app.use(router) app.use(router)

View File

@ -3,11 +3,15 @@
<div class="app-container-inner"> <div class="app-container-inner">
<div style="margin-bottom: 20px">欢迎大家加微信哈共同讨论学习</div> <div style="margin-bottom: 20px">欢迎大家加微信哈共同讨论学习</div>
<el-image <el-image
src="http://182.61.5.190:8889/we.png" :src="weLogo"
:preview-src-list="['http://182.61.5.190:8889/we.png']" :preview-src-list="[weLogo]"
style="max-width: 200px" style="max-width: 200px"
:data-resid="Date.now()" :data-resid="Date.now()"
/> />
</div> </div>
</div> </div>
</template> </template>
<script lang="ts" setup>
import weLogo from '@/assets/image/we.png'
</script>

View File

@ -5,8 +5,8 @@
<el-card class="box-card" style="height: 100%"> <el-card class="box-card" style="height: 100%">
<el-image <el-image
class="wechat" class="wechat"
src="http://182.61.5.190:8889/we.png" :src="weLogo"
:preview-src-list="['http://182.61.5.190:8889/we.png']" :preview-src-list="[weLogo]"
style="max-width: 200px" style="max-width: 200px"
:data-resid="Date.now()" :data-resid="Date.now()"
/> />
@ -17,31 +17,31 @@
<div class="name"></div> <div class="name"></div>
<div class="description"></div> <div class="description"></div>
<div class="list"> <div class="list">
<div><span class="label">{{ $t("home.nickName") }}</span>{{ $t("home.Wolf") }}</div> <div>昵称小狼</div>
<div><span class="label">{{ $t("home.job") }}</span>{{ $t("home.web") }}</div> <div>职业前端</div>
<div><span class="label">{{ $t("home.company") }}</span>小公司</div> <div>公司小公司</div>
<div><span class="label">{{ $t("home.age") }}</span>~~</div> <div>年龄~~</div>
<div><span class="label">{{ $t("home.sex") }}</span>{{ $t("home.male") }}</div> <div>性别</div>
<div><span class="label">{{ $t("home.currentAddress") }}</span>中国-浙江-杭州</div> <div>现住址中国-浙江-杭州</div>
<div><span class="label">{{ $t("home.mail") }}</span>1135957121@qq.com</div> <div>邮箱1135957121@qq.com</div>
<div><span class="label">{{ $t("home.WeChat") }}</span> 微信19550102670(欢迎加微信入群)</div> <div>微信19550102670(欢迎加微信入群)</div>
<div><span class="label">{{ $t("home.technologyStack") }}</span>JavaScriptHTMLCSSVueNodeReact</div> <div>技术栈JavaScriptHTMLCSSVueNodeReact</div>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<div style="margin-bottom: 15px"><h5>{{ $t("home.PersonalityLabel") }}</h5></div> <div style="margin-bottom: 15px"><h5>个性标签</h5></div>
<div> <div>
<el-tag style="margin-right: 10px">{{ $t("home.trouble") }}</el-tag> <el-tag style="margin-right: 10px">怕麻烦</el-tag>
<el-tag style="margin-right: 10px">{{ $t("home.fitness") }}</el-tag> <el-tag style="margin-right: 10px">健身运动</el-tag>
<el-tag style="margin-right: 10px">{{ $t("home.sleep") }}</el-tag> <el-tag style="margin-right: 10px">睡觉</el-tag>
<el-tag style="margin-right: 10px">{{ $t("home.Marvel") }}</el-tag> <el-tag style="margin-right: 10px">漫威</el-tag>
<el-tag>向往</el-tag> <el-tag>向往</el-tag>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<div style="margin-bottom: 15px"><h5>{{ $t("home.favoriteSentence") }}</h5></div> <div style="margin-bottom: 15px"><h5>最喜欢的一句话</h5></div>
<div>---------- {{ $t("home.happy") }}</div> <div>---------- 开心最重要</div>
<el-divider></el-divider> <el-divider></el-divider>
<div style="margin-bottom: 15px" <div style="margin-bottom: 15px"
><h5>{{ $t("home.impression") }}~~</h5></div ><h5>如果对你有帮助的话可以麻烦点一颗 StarForkWatch! 你的鼓励是我继续优化的动力~~</h5></div
> >
</div> </div>
</el-card> </el-card>
@ -58,8 +58,7 @@
<div <div
class="h2" class="h2"
style="color: #2d8cf0" style="color: #2d8cf0"
> ><count-to
<count-to
:start-val="0" :start-val="0"
:end-val="5268" :end-val="5268"
:duration="2000" :duration="2000"
@ -81,8 +80,7 @@
<div <div
class="h2" class="h2"
style="color: #64d572" style="color: #64d572"
> ><count-to
<count-to
:start-val="0" :start-val="0"
:end-val="9599" :end-val="9599"
:duration="2000" :duration="2000"
@ -163,7 +161,9 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { User } from '@element-plus/icons-vue' import { User } from '@element-plus/icons-vue'
import { ref } from 'vue'
import AvatarLogo from '@/assets/image/avatar.png' import AvatarLogo from '@/assets/image/avatar.png'
import weLogo from '@/assets/image/we.png'
import CountTo from '@/components/CountTo/index.vue' import CountTo from '@/components/CountTo/index.vue'
import BarCharts from '@/views/echarts/simple/components/bar.vue' import BarCharts from '@/views/echarts/simple/components/bar.vue'
@ -173,5 +173,5 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "./index.scss"; @import "./index";
</style> </style>