From 77c856b899870647d7a0e5b77d6bd409f9cfadba Mon Sep 17 00:00:00 2001 From: liuminjian <517059477@qq.com> Date: Sun, 21 Mar 2021 16:16:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=A8=E5=86=8C=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/register/index.js | 31 ++++ src/assets/css/base.scss | 1 + src/assets/images/icon/QQ.png | Bin 929 -> 0 bytes src/assets/images/icon/QYWX.png | Bin 1321 -> 0 bytes src/assets/images/icon/compriseWx.svg | 21 --- src/assets/images/icon/qq.svg | 18 --- src/assets/images/icon/rlsb.svg | 1 + src/router/index.js | 20 ++- src/utils/request.js | 7 +- src/views/addressBook/index.vue | 1 - src/views/login.vue | 213 +++++++++++++++----------- src/views/register.vue | 191 +++++++++++++++++++++++ 12 files changed, 360 insertions(+), 144 deletions(-) create mode 100644 src/api/register/index.js delete mode 100644 src/assets/images/icon/QQ.png delete mode 100644 src/assets/images/icon/QYWX.png delete mode 100644 src/assets/images/icon/compriseWx.svg delete mode 100644 src/assets/images/icon/qq.svg create mode 100644 src/assets/images/icon/rlsb.svg create mode 100644 src/views/register.vue 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 d5b55fa4ba11e6ac09619a8ed16a33efe01ea639..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 929 zcmV;S177@zP)Px&TS-JgR9FecS4~J&Q4s#-`fsVpOG&LHNTQ??v@C+CMfiM>)uK(SXy>MAow-O` zw`*BDAzBzMN+D>~Lb6RzL`G4dNg@3{fBNzC&3*UYuD<&xyjKIybDWto-<&z;%*+)e zq|?t#`L{(JrFtI>c5!Srf@WPV1~VLHAb8I4ZcQZ~-fov4DvKkDQ|OsAO%^a{fHMZB zHcnsV0{KeABg?>*@h*8EwIg6ya;2~MHvZ|iDVg_Yf^{d`)#rmq!;Lb z?wZP@fawlew053MaLuWpXyiGNeq#1e`JOSRW$i%WD@0_P(#%+=JoRg>a6or1g2#mh zcLCK2W3bO33Er<9oqb~}IU6k&xS}|=M;$C1*mGcZ4wnjd=CvMP_=SPtyq+bE@lmswys@Q&v#b5JGAT+*gTQK}q$=gSGf%LsUm*Yji}-#agi zOAqD@uD=83`S@dr&)R|vQmsj(<^eF2M1u^EQ-d~396 zb@V1HzlN4eB8jOyZD|9kX)#Ju!OMwzxIRiNC+lR_Sj!3%3$Ce{*p_y$v^^4My0t3* zB4&T*AItV?fo9A&QcMRMuzNtkR9y3!<`Hx_x&G|}Fg^z?ajQK{P;CS)q16}Pfjb{! zBEV+VEyrAvqx7U1Vu2WN|1ajqBOe~?lFN$WC8A9!TxEsV?zPAy6WXS`AYKHN@n4%# zb-?LXGfoSwtb&naGvn`w)wp*AE|T``+Bz5ZIAlU?uKp$nbU>NvWm5`A^s?|b?>e{E zQP-*swY7TZuB{b!z-9VJy%!AAzyCP(JE8MpeV+dT-!>YpFMIT_00000NkvXXu0mjf D{++EE diff --git a/src/assets/images/icon/QYWX.png b/src/assets/images/icon/QYWX.png deleted file mode 100644 index dda4cd9c2cf97be0ccb2f8d09d2ee66530ddabce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1321 zcmV+^1=jkBP)Px(<4Ht8R9FecSA9%XWf=dRbH5b07er7XG%;k%5!#Z{wH3~4D<(>7Yh`22)rK(F zR@NVxrLgQ{S#BEI)|!?z{lnaBwz3uEX6D$8p&%lI85g*u;N|1OI7ECrO+P>=#H*N4MyP*W%AOVR+ zLJa0SkmS!`kv_noRpVNG+5p6^eP?LL>$MimdQ6i3f^03*vPLX`9j%23O6SPr*|Sz; zxIl8kVty8fAGjLM772iN9`H5Hzj9S2fiPK%!YwfkK%9B7ekNv5PcotKJ{#-{WVpuy zxZdkS-*7#0&~VEO--H4OS)pjf z0+bdep?pI!u62)N`!_B$IyIeMsG~m*OtxG;ib((!ZM76`JJi|m=Zi&l9DgNK?CztV z`{56U&qls4Uu4F&+cWWCmJLrH?822U0}zsY1V{5KC5Q~yc3UgStXg70^ZPld{Jsxg zT^x+mrt@VpOE~pvCLYUOh?ToLFg&hvAe^i+^3r9IUUf3uC(othhrfqstei28)3KBv zbHVFZP*uE02PO@(PD<_aWNwe;OSDSjTo3+sH+C}42>Z&>3vTS(XaGRS2$m86Dl8hb zCfi2l3*vI8S7SE*&@as%WTlvq=`a~EE30Ku)ihWVtTG12g2o}Gu}&RoqG;Gs>x7q% zM3<??tZDeFUqH?Y~+i}N_p1}!}txeKfZaDt- z)2Vpr5eMFRX0bk>0)>x&8i`n%pm_iE`~dcEO`~1R&I1QKVGAWOPTe}x zE1{ybjzAP^F|hf6eLWi%lZ2APP7I71WFZoeM|tDrM;$`xy8X9A(#l_I#oA>ybh{_e zNmg~zGei>V=?J)u(k71S(%NpM(GET=OV?(a8cn8@-1zPa>?ujZ=M=hX#%%5L!A-y~ z>{^ccHFk{}~zu?26P zzK!d|!&dvTX(Y6sU#f~z#P{#5qY>k*+bkMLSKE+QDpt8!!DcEpA5&)JBBM}*l&>cb zr(NF}37~6W0-UxVCbKggcs?B$+sAO0fNWT~P?YR~eVu5gvK=CkigWAY79(Cz^+XDV zlpSCHIf&zz2x~}+_6vi#u`dU`g8{sD!iAr%d14u-iqT{ka`(z5Qis0y!;Qxebm7UC;jmCY|2bS$}!g00000NkvXXu0mjf|Gagr 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 @@