Browse Source

字体引入,全局类名添加,启动方式,路由鉴权修改

dev
mk 1 year ago
parent
commit
2de7b0f48b
  1. 10
      README.md
  2. 2
      src/api/user.js
  3. 84
      src/assets/css/index.less
  4. 17
      src/assets/fonts/index.css
  5. BIN
      src/assets/fonts/pingfang-black.ttf
  6. BIN
      src/assets/fonts/pingfang-bold.ttf
  7. BIN
      src/assets/fonts/pingfang-ordinary.ttf
  8. 10
      src/router/index.js
  9. 6
      src/router/router.config.js
  10. 26
      src/views/home/index.vue
  11. 1
      src/views/login/index.vue
  12. 4
      vue.config.js

10
README.md

@ -1,3 +1,13 @@
### 启动流程
...安装依赖就不讲了
把线上地址映射到本地 必须必须!!!!!!
不会的可以参考这个: https://blog.csdn.net/weixin_55846296/article/details/131451501
↓↓↓↓
然后跑起来之后你本地的域名就会变成epmet-cloud.elinkservice.cn
↓↓↓↓
在你小程序的公众号开发中输入以下网址就能够访问了
http://epmet-cloud.elinkservice.cn:80/?appId=wx1078fa1e99424de9&redirect=epmet-cloud.elinkservice.cn
### Node 版本要求 ### Node 版本要求
`Vue CLI` 需要 Node.js 8.9 或更高版本 (推荐 8.11.0+)。你可以使用 [nvm](https://github.com/nvm-sh/nvm) 或 `Vue CLI` 需要 Node.js 8.9 或更高版本 (推荐 8.11.0+)。你可以使用 [nvm](https://github.com/nvm-sh/nvm) 或

2
src/api/user.js

@ -4,7 +4,7 @@ import request from '@/utils/request'
// 登录 // 登录
export function login(data) { export function login(data) {
return request({ return request({
url: `/auth/publicuser/wxcodetotoken`, url: `/auth/loginH5/resiH5/loginFromH5ByWxCode`,
method: 'post', method: 'post',
message: '登录中...', message: '登录中...',
data data

84
src/assets/css/index.less

@ -1,4 +1,5 @@
@import "../fonts/index.css";
html, html,
body #app { body #app {
color: @black; color: @black;
@ -10,8 +11,91 @@ body #app {
background-size: 100% auto; background-size: 100% auto;
} }
.card{
background-color: #fff;
border-radius: 8px;
box-shadow: 0 1px 3px rgba(0,0,0,.3);
padding: 13px;
box-sizing: border-box;
width: auto;
}
.flex{ .flex{
display: flex; display: flex;
.flex1{
flex: 1;
}
&-y{
flex-direction: column;
}
&-center1{
justify-content: center;
}
&-center2{
align-items: center;
}
&-center3{
align-items: flex-start;
}
&-mean{
justify-content: space-around;
}
&-end{
justify-content: space-between;
}
&-fend{
justify-content: flex-end;
}
}
.m{
&-left12{
margin-left: 12px;
}
&-left18{
margin-left: 18px;
}
&-right12{
margin-right: 12px;
}
&-right7{
margin-right: 7px;
}
&-top12{
margin-top: 12px;
}
&-top5{
margin-top: 5px;
}
&-bottom{
margin-bottom: 5px;
}
}
.p-18{
padding: 0 18px;
}
.bto_btn{
position: fixed;
bottom: 5px;
left: 0;
background: #ffffff;
width: 100%;
padding: 6px 26px;
box-sizing: border-box;
text-align: right;
}
.required{
position: relative;
}
.required::after{
content: '*';
position: absolute;
left: -10px;
top: 0;
color: red;
} }
.mr10 { .mr10 {

17
src/assets/fonts/index.css

@ -0,0 +1,17 @@
@font-face {
font-family: 'pingfang-bold';
src: url('pingfang-bold.ttf');
src:url('pingfang-bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'pingfang-ordinary';
src: url('pingfang-ordinary.ttf');
src:url('pingfang-ordinary.ttf') format('truetype');
font-weight: normal;
font-style: normal;
font-display: swap;
}

BIN
src/assets/fonts/pingfang-black.ttf

Binary file not shown.

BIN
src/assets/fonts/pingfang-bold.ttf

Binary file not shown.

BIN
src/assets/fonts/pingfang-ordinary.ttf

Binary file not shown.

10
src/router/index.js

@ -5,7 +5,7 @@ import { constantRouterMap } from './router.config.js'
import { checkWxmpRegister, login } from '@/api/user' import { checkWxmpRegister, login } from '@/api/user'
import { title } from '@/config' import { title } from '@/config'
const whiteList = ['/login', '/register', '/errorPage'] const whiteList = ['/login', '/register', '/errorPage','/']
const originalPush = Router.prototype.push const originalPush = Router.prototype.push
Router.prototype.push = function push(location, onResolve, onReject) { Router.prototype.push = function push(location, onResolve, onReject) {
if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject) if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
@ -61,8 +61,12 @@ router.beforeEach((to, from, next) => {
} else { } else {
store.commit('SET_APP_ID', localStorage.getItem('appId')) store.commit('SET_APP_ID', localStorage.getItem('appId'))
} }
if (!localStorage.getItem('appId') && to.path !== '/errorPage') { if ((!localStorage.getItem('appId') && to.path !== '/errorPage') || to.path === '/home') {
if(to.path === '/errorPage'){
next('/errorPage') next('/errorPage')
}else{
next('/home')
}
} else { } else {
if (to.params.type) { if (to.params.type) {
document.title = to.params.type === 'edit' ? '编辑' : '注册' document.title = to.params.type === 'edit' ? '编辑' : '注册'
@ -87,7 +91,7 @@ router.beforeEach((to, from, next) => {
}) })
}) })
} else { } else {
if (getQueryStringByName('code')) { if (getQueryStringByName('code') && to.path!=='/') {
login({ wxCode: getQueryStringByName('code')}).then(res => { login({ wxCode: getQueryStringByName('code')}).then(res => {
localStorage.setItem('token', res.token) localStorage.setItem('token', res.token)
let state = decodeURIComponent(getQueryStringByName('state')) let state = decodeURIComponent(getQueryStringByName('state'))

6
src/router/router.config.js

@ -5,6 +5,12 @@
export const constantRouterMap = [ export const constantRouterMap = [
{ {
path: '/', path: '/',
name: 'home',
component: () => import('@/views/home'),
meta: { title: '首页', keepAlive: false }
},
{
path: '/mine',
name: 'mine', name: 'mine',
component: () => import('@/views/mine'), component: () => import('@/views/mine'),
meta: { title: '我的', keepAlive: false } meta: { title: '我的', keepAlive: false }

26
src/views/home/index.vue

@ -0,0 +1,26 @@
<template>
<div class=''></div>
</template>
<script>
export default {
//
data() {
return {};
},
//
created() {},
//
methods: {},
//
components:{},
//
computed:{},
//
watch: {},
}
</script>
<style lang='scss'>
</style>

1
src/views/login/index.vue

@ -1,7 +1,6 @@
<template> <template>
<div></div> <div></div>
</template> </template>
<script> <script>
import {wxId} from '@/config' import {wxId} from '@/config'

4
vue.config.js

@ -31,8 +31,8 @@ module.exports = defineConfig({
proxy: { proxy: {
//配置跨域 //配置跨域
'/api': { '/api': {
// target: `http://219.146.91.110:30801`, target: `http://219.146.91.110:30801`,
target: `http://127.0.0.1:8080`, // target: `http://127.0.0.1:8080`,
changeOrigin: true, changeOrigin: true,
ws: false, ws: false,
pathRewrite: { pathRewrite: {

Loading…
Cancel
Save