diff --git a/README.md b/README.md
index d074cca..2b87b59 100644
--- a/README.md
+++ b/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 版本要求
`Vue CLI` 需要 Node.js 8.9 或更高版本 (推荐 8.11.0+)。你可以使用 [nvm](https://github.com/nvm-sh/nvm) 或
diff --git a/src/api/user.js b/src/api/user.js
index f850021..84aea30 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -4,7 +4,7 @@ import request from '@/utils/request'
// 登录
export function login(data) {
return request({
- url: `/auth/publicuser/wxcodetotoken`,
+ url: `/auth/loginH5/resiH5/loginFromH5ByWxCode`,
method: 'post',
message: '登录中...',
data
diff --git a/src/assets/css/index.less b/src/assets/css/index.less
index 6572567..7036c7d 100644
--- a/src/assets/css/index.less
+++ b/src/assets/css/index.less
@@ -1,4 +1,5 @@
+@import "../fonts/index.css";
html,
body #app {
color: @black;
@@ -10,8 +11,91 @@ body #app {
background-size: 100% auto;
}
-.flex {
+.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{
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 {
diff --git a/src/assets/fonts/index.css b/src/assets/fonts/index.css
new file mode 100644
index 0000000..6eaff51
--- /dev/null
+++ b/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;
+}
+
diff --git a/src/assets/fonts/pingfang-black.ttf b/src/assets/fonts/pingfang-black.ttf
new file mode 100644
index 0000000..d030018
Binary files /dev/null and b/src/assets/fonts/pingfang-black.ttf differ
diff --git a/src/assets/fonts/pingfang-bold.ttf b/src/assets/fonts/pingfang-bold.ttf
new file mode 100644
index 0000000..4f2319d
Binary files /dev/null and b/src/assets/fonts/pingfang-bold.ttf differ
diff --git a/src/assets/fonts/pingfang-ordinary.ttf b/src/assets/fonts/pingfang-ordinary.ttf
new file mode 100644
index 0000000..b31eb2a
Binary files /dev/null and b/src/assets/fonts/pingfang-ordinary.ttf differ
diff --git a/src/router/index.js b/src/router/index.js
index 668acea..a7930be 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,7 +5,7 @@ import { constantRouterMap } from './router.config.js'
import { checkWxmpRegister, login } from '@/api/user'
import { title } from '@/config'
-const whiteList = ['/login', '/register', '/errorPage']
+const whiteList = ['/login', '/register', '/errorPage','/']
const originalPush = Router.prototype.push
Router.prototype.push = function push(location, onResolve, onReject) {
if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
@@ -61,8 +61,12 @@ router.beforeEach((to, from, next) => {
} else {
store.commit('SET_APP_ID', localStorage.getItem('appId'))
}
- if (!localStorage.getItem('appId') && to.path !== '/errorPage') {
- next('/errorPage')
+ if ((!localStorage.getItem('appId') && to.path !== '/errorPage') || to.path === '/home') {
+ if(to.path === '/errorPage'){
+ next('/errorPage')
+ }else{
+ next('/home')
+ }
} else {
if (to.params.type) {
document.title = to.params.type === 'edit' ? '编辑' : '注册'
@@ -87,8 +91,8 @@ router.beforeEach((to, from, next) => {
})
})
} else {
- if (getQueryStringByName('code')) {
- login({ wxCode: getQueryStringByName('code') }).then(res => {
+ if (getQueryStringByName('code') && to.path!=='/') {
+ login({ wxCode: getQueryStringByName('code')}).then(res => {
localStorage.setItem('token', res.token)
let state = decodeURIComponent(getQueryStringByName('state'))
state = state.replace(/[\\\b\f\n\r\t]/g, '')
diff --git a/src/router/router.config.js b/src/router/router.config.js
index c64191e..f85d63c 100644
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@@ -5,6 +5,12 @@
export const constantRouterMap = [
{
path: '/',
+ name: 'home',
+ component: () => import('@/views/home'),
+ meta: { title: '首页', keepAlive: false }
+ },
+ {
+ path: '/mine',
name: 'mine',
component: () => import('@/views/mine'),
meta: { title: '我的', keepAlive: false }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
new file mode 100644
index 0000000..ddd7efe
--- /dev/null
+++ b/src/views/home/index.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 131c71f..0cde10d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,7 +1,6 @@
-