diff --git a/src/api/register/index.js b/src/api/register/index.js new file mode 100644 index 00000000..f77c44e1 --- /dev/null +++ b/src/api/register/index.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +// 注册前校验 +export function registerCheck(memberName, idcard, mobile) { + const data = { + memberName, + idcard, + mobile + } + return request({ + url: '/register/check', + method: 'post', + data: data + }) +} +//注册 +export function registerOn(memberName, idcard, mobile, smsCode,uuid) { + const data = { + memberName, + idcard, + mobile, + smsCode, + uuid + } + return request({ + url: '/register/on', + method: 'post', + data: data + }) +} + diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss index fe508aa9..ca8a0c8b 100644 --- a/src/assets/css/base.scss +++ b/src/assets/css/base.scss @@ -44,6 +44,7 @@ figcaption { } } +* { touch-action: pan-y; } body { color: #323233; } diff --git a/src/assets/images/icon/QQ.png b/src/assets/images/icon/QQ.png deleted file mode 100644 index d5b55fa4..00000000 Binary files a/src/assets/images/icon/QQ.png and /dev/null differ diff --git a/src/assets/images/icon/QYWX.png b/src/assets/images/icon/QYWX.png deleted file mode 100644 index dda4cd9c..00000000 Binary files a/src/assets/images/icon/QYWX.png and /dev/null differ diff --git a/src/assets/images/icon/compriseWx.svg b/src/assets/images/icon/compriseWx.svg deleted file mode 100644 index 7e1b7e5f..00000000 --- a/src/assets/images/icon/compriseWx.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - 企业微信 - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/icon/qq.svg b/src/assets/images/icon/qq.svg deleted file mode 100644 index 01797a7f..00000000 --- a/src/assets/images/icon/qq.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - qq - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/icon/rlsb.svg b/src/assets/images/icon/rlsb.svg new file mode 100644 index 00000000..e9d5fd18 --- /dev/null +++ b/src/assets/images/icon/rlsb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d63ca104..50905384 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,7 +23,6 @@ export const constantRoutes = [ name: 'index', meta: { title: '主页', - index: 1, keepAlive: true }, component: (resolve) => require(['@/views/index'], resolve) @@ -37,12 +36,20 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/login'], resolve) }, + { + path: '/register', + name: 'register', + meta: { + title: '注册页', + hidden: true, + }, + component: (resolve) => require(['@/views/register'], resolve) + }, { path: '/document', name: 'document', meta: { title: '文档', - index: 2 }, component: (resolve) => require(['@/views/document'], resolve) }, @@ -50,8 +57,7 @@ export const constantRoutes = [ path: '/workbench', name: 'workbench', meta: { - title: '工作台', - index: 3 + title: '工作台' }, component: (resolve) => require(['@/views/workbench'], resolve) }, @@ -59,8 +65,7 @@ export const constantRoutes = [ path: '/addressBook', name: 'addressBook', meta: { - title: '通讯录', - index: 4 + title: '通讯录' }, component: (resolve) => require(['@/views/addressBook'], resolve) }, @@ -68,8 +73,7 @@ export const constantRoutes = [ path: '/mynsgk', name: 'mynsgk', meta: { - title: '我的', - index: 5 + title: '我的' }, component: (resolve) => require(['@/views/mynsgk'], resolve) } diff --git a/src/utils/request.js b/src/utils/request.js index 09025257..12e7f844 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -74,10 +74,11 @@ service.interceptors.response.use(res => { }) }) } else if (code === 500) { - Notify({ type: 'warning', message: msg }); + Dialog.alert({ type: 'warning', message: msg }); + return Promise.reject(new Error(msg)) } else if (code !== 200) { - Notify({ type: 'warning', message: msg }); + Dialog.alert({ type: 'warning', message: msg }); return Promise.reject('error') } else { return res.data @@ -101,7 +102,7 @@ service.interceptors.response.use(res => { // type: 'error', // duration: 5 * 1000 // }) - Notify({ type: 'warning', message: message }); + Dialog.alert({ type: 'warning', message: message }); return Promise.reject(error) } ) diff --git a/src/views/addressBook/index.vue b/src/views/addressBook/index.vue index 71fb1a93..986268f6 100644 --- a/src/views/addressBook/index.vue +++ b/src/views/addressBook/index.vue @@ -52,7 +52,6 @@ export default { getList(){ this.loading = true; ListPhones(this.queryParams).then(response => { - console.log(response) response.rows.forEach(element => { this.phonesList.push(element); }) diff --git a/src/views/login.vue b/src/views/login.vue index ff0b1b59..0bffc523 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,96 +1,97 @@