From d5ac6bba2a6743f768ddff03a0d4b76ce29858c5 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 29 May 2024 18:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83,=E9=A6=96=E9=A1=B5=E5=8A=A0?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home.js | 6 +- src/api/user.js | 6 +- src/assets/images/icons/about.png | Bin 0 -> 3153 bytes src/assets/images/icons/activity.png | Bin 0 -> 2126 bytes src/assets/images/icons/privacy.png | Bin 0 -> 2337 bytes src/assets/images/icons/satisfaction.png | Bin 0 -> 2858 bytes src/components/registerDialog/index.vue | 45 ++++++++++++++ src/plugins/vant.js | 2 + src/router/index.js | 3 +- src/router/router.config.js | 6 ++ src/store/modules/app.js | 13 +++-- src/views/home/index.less | 5 ++ src/views/home/index.vue | 71 ++++++++++++++++------- src/views/houseQR/index.vue | 26 +++++++++ src/views/mine/index.vue | 24 ++++++-- src/views/register/index.vue | 24 ++++---- src/views/selectAgency/index.vue | 5 +- 17 files changed, 186 insertions(+), 50 deletions(-) create mode 100644 src/assets/images/icons/about.png create mode 100644 src/assets/images/icons/activity.png create mode 100644 src/assets/images/icons/privacy.png create mode 100644 src/assets/images/icons/satisfaction.png create mode 100644 src/components/registerDialog/index.vue create mode 100644 src/views/houseQR/index.vue diff --git a/src/api/home.js b/src/api/home.js index ee3615b..cbe3ce2 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -2,10 +2,10 @@ import request from '@/utils/request' // 【社区服务】活动列表+轮播图 -export function communityActivity(params) { +export function communityActivity(data) { return request({ url: `/actual/base/communityActivity/page`, - method: 'get', - params + method: 'post', + data }) } diff --git a/src/api/user.js b/src/api/user.js index 964c13e..d2b6c3c 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -19,12 +19,12 @@ export function checkWxmpRegister(params) { }) } // 获取用户信息 -export function getUserWechatByUserId(params) { +export function getUserWechatByUserId(id) { return request({ - url: `/auth/loginH5/resiH5/getUserInfoByToken`, + url: `epmetuser/user/getH5LoginUserInfo/${id}`, method: 'get', message: '获取用户信息中...', - params + }) } diff --git a/src/assets/images/icons/about.png b/src/assets/images/icons/about.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3081ddf5e73498184f5eb80e8ceb054f3f1a50 GIT binary patch literal 3153 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 Ef}W%iga7~l literal 0 HcmV?d00001 diff --git a/src/assets/images/icons/privacy.png b/src/assets/images/icons/privacy.png new file mode 100644 index 0000000000000000000000000000000000000000..c136163bf2060bc275440ace3e116a7181c06a6f GIT binary patch literal 2337 zcmV++3EuXJP)Px-+et)0R9Hu?mbj`_7l|J-)mwWZ}$Y zCiA^}&;8%C-Tyg?+KU3(1EYcGfpfs8z)_&Ew(3QBP35P+aA24T&|gm$umjiv907Dq z4yrD|2w2-=SB5Mu6S&-3?@zK;wb$s{^zu0K=dt1U3Q(fP3W}BswHEM*#x1 znctcsGfqDPb^~JlGU5-g6EGBb4UibKiUUYCLG1$m_n_Nbeh>6m_a#pPy$2W5E{yiFc70kD(S;1aOae17~f3ojId}E*20lpd$sK zs#0QpZ6?_R0ZQ!}QX6nd=kzd}jn!xxXvG&wG4X|`lw^BlA_;Y}Di*8>z`CBS?iwB* z898v|gkKC9`}>*U4I=^^62T>s;dU{u`_t<1{Q24z6N6d+ItH{-KI=YwfQ=is4ZC*j z+ZmpWo^CBgp<#9DJ!mx3W-lNlv=O?*!BSQ>Db0$)05W^FB2OtLMcj}&4H~r1zjdp2 z7EC;$>(qaQg-X-T;ka2azJHfrUcPj`RYiV_Y}$g@tzYq2!u@?=3!$TWK5|9`QJ%r_Q2Hhc0Ai{y^O7 zMO?}_Yy8%_ZD-bPKaAULtzKoXl%09JXk@R>@GGN@}Sii-+p z-tyi+M(k;PcA7!kPoUUV0Oi4R=i0Ba|G1YtE7?#9tB<~JBkU_z)am`XbUOLBE^LETi zhK-w!v*c|OfKnj^&RGxRF0nHCi6 zW?a8taX#&Yv1ah7XeRt_E{}#cp&&nx9e-cVnq_m*+D-iikFo7gI>8~~R=0ZVpD(p9 zoIj|?4-mqG3JeUH;BXYK_Xj9sQ{KZOhm+-Qh5}$Yhrt>a}#q!N=hwr~V%&f^n^o{GeWr%N`uzJi|{1JTzkJCkk#$%$D z_Eb@2v;(Eq2LwRk=5@{`b0$d*{G97PF{cMX>u%#b>TE) z`U;sbM0)Cpd4@5sJd4v|*gz%@9YA`R`%<13 z>8!+h^6bfT^s=Y(I%ajVdYmYwNEBw}RpoT%b0jH&cAZ|P-Xo2zXO#J0TpJiz$ZrSt z;OsXtwlSo)ISeSZzM^Z&Vj**qc~XyL%5Xt;N;Y5bj*d)cC(0=7)s}$3B4$q-PV)YL zdiTnNVqAHOD)YlUPYf+EH)VRT2|KuK7HySsktemABWUBnuab!6LhHbyS<&pgpS2S6 zU4d)W1t{w!_otW}b39o#$TPY);eAb70pd@48%| zo7X!v0VpvhQ!AMRiU^|Z5?xIHj@grk^5dm+?;5dK zPtPnUtupghW&9@l|KOPgN_HEMIq-$B8m)DjfK18I&$-;hD^;3gC>yvOx7o1z12+9_ z1%>xHzl>94Y9_>_QmHCHQPS6Zh9XUk!m}gnDZ72GQ#X>Wo- zTCZl88UwC1NlAGlyE0&_15h>#I7ys0EYnqC$1*GYt5|mI^mkvpl9{z3?d0L6xjB+s zK9TvKuw?0dt1Q(8=v6FJ)IXaw(n&y=OdOQlwsH%OIenb*R+{Pn7>3T{0b3e)wo100000NkvXX Hu0mjf+8|La literal 0 HcmV?d00001 diff --git a/src/assets/images/icons/satisfaction.png b/src/assets/images/icons/satisfaction.png new file mode 100644 index 0000000000000000000000000000000000000000..0b41172167268806234bb035ade7486948c1d780 GIT binary patch literal 2858 zcmV+_3)S?AP)Px<VH~4(MHYBU}6Zj5hZcaq%=?2El&(Lf3b|PY7!@=yci24%aUI3i|R556FEUGR7j@C40n=&&q2LSR? zhSeHGo7pr*$6~SF0Q9o~(}Xiluh-j4l9j~(x)7+4*&JL^QBlw+K!2dwbYkmK5NQ^8 zY%CI43&3c?Mdz}`?eY0WD~dXaEj9?&*l0AmrZK0GKQn7N5r#2PMr{2q8jbEbmz$e< z*6nupa=F~=Bw0=e;{`>L=9iU~o%rc_%FN7K4#F@1C5BD|P_c2(cE+k1pYI+7pl0XE=5)xa#{<8eJ2@kZ3 zhRaOFp}r^+%?UTci_{Pxfp3aLBKrmndN9T9SN`O7r;b+?H9$ntnS!gQ6n48|k5#lcEfa*ZXBpu|wk)*k zcroTKdmF9Vw1If;oq0K!KJGpN@c0=6964@s&`4;Z1N#bsS~6)r(b+C$3q&%yUe*(L zjT{SarVo~RjsWvZ6G2@^=vZ-S&@gmCv}cP?kUV5XMOO1>P#tdDmN0it9?UQ0AORu6 zK=7=Q{p6sCJMkmHofm*$gmnG<0X&KK{{&zq2NfM5(>gN`nkHbLrbwO_4}Ow=FlZzZ zDk~`onx=8uBoT=qNiwpUUw{^^+CY|NJKh>C{`E1qW9t^o7%yn%=$X^Zpxf>anz|V( zFFg`8jHUq;bke?acZ?c09f9V}f9}b;3If4cvI6WY*o%n|4Mk~5@o}fqJztc%CRdW~ zJ^KbNEfFd^T3kmnr{O`i7?x?GOZQ)4+KVgDqIGMVjKva16$Q{V1CjCw;*}AYMiOO5 zj$qNOrw|Dri_5AyGZu-w3?OmJT70t9t$HsfsOgE&k%L7+UDqK=qBZ&D#VpzuLYrVm zTyjM(I9x8f2Fo%~9j~%EuV6PUYfRlfH;mM6Oj-)dyfV*qR)TMn4cBe;J@C zb*HE#jnRn6&eD=2m^W=KzTWUL+$pITeAh#`W!U}5ZkKI`fMM2!g7_Gh8;FF^6p18D7Ix<4MrTfVaMGTF{I|SbZ@Q$Y zs|dK}e=2{k3BIRMfNeW<50YLRibcz8qL%8?(!PK#(+1qT?{DzbUtU3GRv6eg@XKTc>U$)&F$ZOSz?;z8>Xqx zm7LDu67zIG(izs|Mgfi-HzUYeZRlX(?qH(kM4e#$-h(DmQc`i{wF7YT@9#lsTAB@9 z(=>eY?rJQV`)5e9geRsfK;Ij0wn_fGy}OaS`QONH-vw7*(-*2DBR?+}%U*g8+j2HS zmX)NUD1Wsqb1GD|E1BloU`l7URx}DQ=U`<}Pa+g93kMBdj8f`6X!k&D+5DB6)dKF6 z6q}$W8K|wP!Mm%MV&&plaJf=2`GsZZ*{3h6Vlgb9GZh;?eg_w3cfcPXpMunM4_=)& z6?t3M3o%;*NUPa0W>-~J75e@DE+F|sA~XZjTMYr07!nPPmzNg_9#mw63=_e|#I*33 zP%c8cpDbs!wF$hxb_JF%oC&APg{Nn|hTeUyLn2Xwf4;s1Z@e}SH8sa^QO9mjRR{JL z1bWDfbwm^ZV~yyGSAcLkfMYsgU{yH0-zI7xq-#x+ zTjC=`@@)G21I(ZH7);B;s3&J&;NUyqbU6?SNAUjIl~}uS5n_>Y`=c_veheHu97Bgc z@EzFv^(}q66$6m{{;Z)S;bmraNQ8wH2n6OcXe1cbhGE?uk4Hm!M`LYecs|t)>ey7t zFDs0~J$o>D^c^@>a>yps>_h;Qs5?*5FOa|6ywTbZ~Mm(zjVeI%hjk=`l7AhmpNb8=|Vsv z#;HeeHkSj~wS5QXP91~82Mf`u+ZA|p(i~iT`4vzU#TF5UZip!+oKDpsLSdpNK4#RA z>o*n^6?KyobrG1aB2a`SjHw8R-w`&YjLgg)DrgAQft(!DJm z4u^{*`P8DuZZBoqQ{QgOK}Dq8ZrD3^y9~G8`v~{Ewy)-JDneRmBuNQbMs6ZmyW-)& zL%u$6Apa_-%l(WbNj*W7v@Bj}Xth(TtE)~k#~aus$+Uqac^Akk(-H};uCC6CMZ(vRMAu7_ z)LIBui}AK)Xw%~H_(5T&;jQHN`&%<9{Uq>J473ASt}jr(&|&--b6qLpx*mokfzHW5 zXG7Qh7F#;R*q2C5ZFL5m1b9`4(^o$jh%)$1%P + +
+

温馨提示

+

请您先进行手号注册。

+
+ + + + + + \ No newline at end of file diff --git a/src/plugins/vant.js b/src/plugins/vant.js index 45cebf6..b45ecb4 100644 --- a/src/plugins/vant.js +++ b/src/plugins/vant.js @@ -26,6 +26,7 @@ import { Search, Swipe, SwipeItem, + NoticeBar } from 'vant' Vue.use(Button) @@ -53,3 +54,4 @@ Vue.use(Button) .use(Search) .use(Swipe) .use(SwipeItem) + .use(NoticeBar) \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index cdfe201..e06c157 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,9 +87,10 @@ router.beforeEach((to, from, next) => { } }) } else { - if (getQueryStringByName('code') && !whiteList.includes(to.path)) { + if (getQueryStringByName('code')) { login({ wxCode: getQueryStringByName('code'),appId:'wx1078fa1e99424de9'}).then(res => { localStorage.setItem('token', res.token) + localStorage.setItem('userId', res.userH5DTO.id) let state = decodeURIComponent(getQueryStringByName('state')) state = state.replace(/[\\\b\f\n\r\t]/g, '') state = state.replace(/(\s*?{\s*?|\s*?,\s*?)(['"])?([a-zA-Z0-9]+)(['"])?:/g, '$1"$3":') diff --git a/src/router/router.config.js b/src/router/router.config.js index 3c38984..fd7bf41 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -79,4 +79,10 @@ export const constantRouterMap = [ component: () => import('@/views/selectAgency'), meta: { title: '选择所在社区', keepAlive: false } } + ,{ + path: '/houseQR', + name: 'houseQR', + component: () => import('@/views/houseQR'), + meta: { title: '电子门牌', keepAlive: false } + } ] diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 387b48b..f5f709c 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -2,11 +2,15 @@ import {checkWxmpRegister, getUserWechatByUserId} from '@/api/user' const state = { userInfo: {}, - appId: '' + appId: '', + realNameFlag:null, + agencyId:null } const mutations = { SET_USER_INFO(state, userInfo) { - state.userInfo = userInfo + state.userInfo = userInfo; + state.agencyId = userInfo.agencyId; + state.realNameFlag = userInfo.realName; }, SET_APP_ID(state, appId) { state.appId = appId @@ -19,9 +23,8 @@ const actions = { if (Object.keys(state.userInfo).length) { resolve(state.userInfo) } - getUserWechatByUserId({ - token: localStorage.getItem('token') - }) + console.log(state.userInfo); + getUserWechatByUserId(localStorage.getItem('userId')) .then(res => { commit('SET_USER_INFO', res) resolve(res) diff --git a/src/views/home/index.less b/src/views/home/index.less index c727845..2244433 100644 --- a/src/views/home/index.less +++ b/src/views/home/index.less @@ -65,3 +65,8 @@ border-bottom: none; } } + +.tip{ + // background-image: url('@/assets/dialog_bg.png'); + // background-size: 100% 100%; +} \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 55bb04e..24834f1 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -5,13 +5,15 @@
- 社区 + {{ this.$store.state.app.userInfo.agencyName || '--' }}
+ style="width: 170px;" + @search="$router.push({ path: '/search', query: { searchKey: searchKey } })" /> + @click="$router.push({ path: '/mine', query: { searchKey: searchKey } })" class="img_20 " + alt="">
@@ -24,16 +26,17 @@
- +
- 这个vant真的好好好用强烈推!!!!!!!! + +
05-06 更多
-
+
我有诉求
居民点单 社区接单
@@ -43,8 +46,8 @@
-
+
{{ item.title }}
@@ -66,7 +69,8 @@ 报名人数： {{ item.resiNum }}/{{ item.total }}人
- 报名 + 报名
@@ -93,10 +97,12 @@ + + + \ No newline at end of file diff --git a/src/views/mine/index.vue b/src/views/mine/index.vue index 92c8c21..b5acbfd 100644 --- a/src/views/mine/index.vue +++ b/src/views/mine/index.vue @@ -11,7 +11,7 @@
{{ userInfo.realName ? userInfo.realName : userInfo.nickname }}
- {{ userInfo.gridName }} + {{ userInfo.agencyName }}
@@ -21,7 +21,6 @@ -
@@ -29,12 +28,27 @@ - + + + + + + +
+
+
+
+ + - + diff --git a/src/views/register/index.vue b/src/views/register/index.vue index 03450d6..297244e 100644 --- a/src/views/register/index.vue +++ b/src/views/register/index.vue @@ -15,7 +15,7 @@
- + @@ -32,7 +32,7 @@