From b777d3ee4db80f25501d89d9cf098aaa10de18f7 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 5 Jul 2024 09:14:53 +0800 Subject: [PATCH] cv --- .../baiduAI/AppDialogue/AppDialogue.vue | 85 ++++--- src/project/wuxi/AppMine/AppMine.vue | 136 +++++++---- src/project/wuxi/AppMine/addFamily.vue | 85 +++++++ src/project/wuxi/AppMine/me.png | Bin 993 -> 1547 bytes src/project/wuxi/AppMine/me_selected.png | Bin 1035 -> 1488 bytes src/project/wuxi/AppMine/myFamily.vue | 217 +++++++----------- src/project/wuxi/AppMine/myHarvestQR.vue | 125 ++++++++++ src/project/wuxi/AppMine/transferIntrgral.vue | 131 +++++++++++ src/project/wuxi/AppMine/userInfo.vue | 123 +++++----- 9 files changed, 649 insertions(+), 253 deletions(-) create mode 100644 src/project/wuxi/AppMine/addFamily.vue create mode 100644 src/project/wuxi/AppMine/myHarvestQR.vue create mode 100644 src/project/wuxi/AppMine/transferIntrgral.vue diff --git a/src/project/baiduAI/AppDialogue/AppDialogue.vue b/src/project/baiduAI/AppDialogue/AppDialogue.vue index 4828a8e..65ec5bb 100644 --- a/src/project/baiduAI/AppDialogue/AppDialogue.vue +++ b/src/project/baiduAI/AppDialogue/AppDialogue.vue @@ -1,37 +1,40 @@ @@ -95,7 +100,13 @@ export default { ], current: 1, pages: 2, - areaId: '' + areaId: '', + statusBarHeight: uni.getSystemInfoSync().statusBarHeight, + typeList: [ + {dictValue: '1', dictName: '文本助理'}, + {dictValue: '2', dictName: '日常助理'} + ], + type: '' } }, computed: { @@ -292,6 +303,9 @@ export default { }) } }, + confirmType(val) { + this.type = val[0].value; + }, }, } @@ -305,13 +319,30 @@ page { height: 100vh; background-color: #fff; position: relative; + .top-select { + line-height: 64px; + background: #026AF2; + border-radius: 32px; + position: fixed; + left: 28px; + text-align: center; + padding: 0 24px; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 28px; + color: #FFF; + z-index: 9; + u-icon { + margin-left: 8px; + } + } .service-content { width: 100%; height: 420px; background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png"); background-size: 100vw; background-repeat: no-repeat; - padding-top: 20px; + padding-top: 84px; box-sizing: border-box; .text-content { margin: 0 0 0 32px; diff --git a/src/project/wuxi/AppMine/AppMine.vue b/src/project/wuxi/AppMine/AppMine.vue index 92a8bfc..35b60f9 100644 --- a/src/project/wuxi/AppMine/AppMine.vue +++ b/src/project/wuxi/AppMine/AppMine.vue @@ -24,12 +24,12 @@ -
+
- + + :label="approveLabel" label-color="#E7F2FF" label-pos="left" @click="approve"/>
@@ -39,11 +39,17 @@
- {{ item.label }} + {{ item.label }}
+
@@ -59,31 +65,57 @@ export default { name: "AppMine", appName: "我的", customNavigation: true, + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', computed: { ...mapState(['user', 'token']), - - isApprove: v => v.user?.status == 2, + isApprove() { + return this.user?.status == 2; + }, approveLabel() { - return this.user?.status == 2 ? "已认证" : - this.user?.status == 1 ? "审核中" : - this.user?.status == -1 ? "审核驳回" : "前往认证" + return this.user?.areaId? "已认证" : "前往认证" }, listGroup() { return [ - // [ - // { - // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png", - // label: "我的家庭", - // path: "./myFamily", - // type: 'idNumber' - // }, - // { - // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png", - // label: "我的家乡", - // path: "/mods/AppHometown/AppHometown", - // type: 'token' - // } - // ], + [ + // { + // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png", + // label: "我的家乡", + // path: "/mods/AppHometown/AppHometown", + // type: 'token' + // }, + // { + // icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-wdjt.png", + // label: "我的家庭", + // path: "./myFamily", + // type: 'token' + // }, + { + icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-wdjf.png", + label: "我的积分", + path: "./myIntegral", + type: 'token' + }, + // { + // icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-wdewm.png", + // label: "我的二维码", + // path: "./myHarvestQR", + // type: 'token' + // }, + // { + // icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-sys.png", + // label: "扫一扫", + // path: "./myHarvestQR", + // type: 'scan' + // }, + { + icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-fxxcx.png", + label: "分享小程序", + path: "./myHarvestQR", + type: 'share', + share: true + }, + ], // [ // { // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejifen.png", @@ -114,8 +146,7 @@ export default { this.$refs.login.show(); } else if (!this.isApprove) { if (this.user.status == 0) { - // this.$linkTo('/mods/AppAuth/AppAuth'); - this.$linkTo('./userInfo') + this.$linkTo('/mods/AppAuth/AppAuth'); } else { this.$linkTo('/mods/AppAuth/authSuccess') } @@ -129,16 +160,24 @@ export default { } if (type == 'idNumber') { if (this.user.status == 0) { - // if (!this.user.phone) { - // this.$linkTo('/pages/phone/bingPhoneNumber?from=auth') - // } else { - // this.$linkTo('/mods/AppAuth/AppAuth') - // } - this.$linkTo('./userInfo') + if (!this.user.phone) { + this.$linkTo('/pages/phone/bingPhoneNumber?from=auth') + } else { + this.$linkTo('/mods/AppAuth/AppAuth') + } } else { this.$linkTo(url) } } + if (type == 'scan') { + this.scan() + } + if (type == 'share') { + + } + if (type == 'null') { + this.$u.toast('内容建设中...') + } } else { this.$refs.login.show() } @@ -153,7 +192,7 @@ export default { }, getAuth() { this.$nextTick(() => { - this.token && this.getUserInfo() + this.token && this.getUserInfo('qujing') }) }, onLogout() { @@ -171,13 +210,24 @@ export default { } }) }, + scan() { + uni.scanCode({ + success: (res) => { + var info = JSON.parse(res.result) + uni.navigateTo({url: `./addFamily?avatarUrl=${info.avatarUrl || ''}&nickName=${info.nickName}&openId=${info.openId}`}) + } + }); + } }, - onShow() { + onLoad() { this.getAuth(); + uni.$on('auth',()=> { + this.getAuth(); + }) }, onShareAppMessage() { return { - title: '欢迎使用数字巫溪治理服务一体化平台~', + title: '欢迎使用数字乡村治理服务一体化平台~', path: `/pages/AppModules/AppModules` } }, @@ -200,8 +250,8 @@ export default { .header-info { width: 100%; height: 100%; - background: url("https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-my-nav-bg.png") no-repeat no-repeat; - background-size: 100% 100%; + background: url('https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-top-bg.png') no-repeat; + background: 100% auto; box-sizing: border-box; padding: 240px 0 0 48px; @@ -273,7 +323,7 @@ export default { .approve { position: absolute; left: 50%; - top: 384px; + top: 400px; transform: translateX(-50%); width: 686px; height: 112px; @@ -316,7 +366,7 @@ export default { &:last-child { .desc { - border-bottom: none !important; + // border-bottom: none !important; } } @@ -342,7 +392,7 @@ export default { color: #666666; display: flex; align-items: center; - border-bottom: 1px solid #EEEEEE; + box-sizing: border-box; & > span { width: 100%; @@ -356,6 +406,11 @@ export default { border: none; } } + + .solid { + border-bottom: 1px solid #EEE; + } + .no-border { border-bottom: none; @@ -367,7 +422,6 @@ export default { } } } - .logout { width: 100%; height: 96px; @@ -380,7 +434,7 @@ export default { border-radius: 16px; font-size: 34px; font-weight: 500; - color: #2D7DFF; + color: #4181FF; } } } diff --git a/src/project/wuxi/AppMine/addFamily.vue b/src/project/wuxi/AppMine/addFamily.vue new file mode 100644 index 0000000..1026e40 --- /dev/null +++ b/src/project/wuxi/AppMine/addFamily.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/project/wuxi/AppMine/me.png b/src/project/wuxi/AppMine/me.png index 03b531e43c595fe513714a8a21f4a46145487440..9298b9b4bbfdda8feb498f12d5729a9f28a9b236 100644 GIT binary patch delta 1517 zcmV%U2Kz87=GUKwHuZn|1uJxg)-K`*oG!5%!Gjr z>Ww#Q(nU=4Mx%i%4Urgcj5o$$h+aW7dZUS$H4$&TQAvf7I8YPa4}*1#juuST_y?@A ztv#VK7SE$z3!^68jVt+VoF&c=*cUZ$QFW9KqHX|6OpVINYwz8 z@=6gEE(52}c97tQ!So0OZ)Ayk><|+81(Gg+_#2k=ZSVFiV=Ao7*=j&k1wdI+Sv~gM zSkSU^uY>t%0Dmh1sF*L7ZT@x*M4#ny)?49+Iub@kr64K>V61oQ%y6G%9072bR$Rrm z&Cc>nVcXzqdZXw2!B@qRHCZn8~A>xl_d=VXaP`( z@&=4Kn z4I4s*u{Usf^mB$(iB?SmE0e_HSnu}Er|Oc#3x9o}QOjtSwCUk~#QIZ~<_R;5HV8Wpt|>LZbeJ&smFvp9N66gHNAW-F3!Vup3I zDHS!Tog5t9lBZSpQ3z_inO5OR5Phv^m7P7EXU!RH47)}|0nta~iu7^}z+9xP^m9Dr z_kYOwLm={668krA4qhyLe5t(?6BFJ{CSy-)KA$h!*48#}ENu3kJD1py6F3Cs`K<8n zzc=Jh72e~dBRc|MLPlA6Wc=bDFdYQo*B4BappU$a58K<iSKI+$ZZh~vx{ zA;G^>)^pvC4NrCjOS+Q?T~f;3APNImQA&;=9QBgtKq%x->2O_?f-DQ5(3K~TZ9?6yL&P?qly<~9$~kQWb-*I%!XK_& z@h!VLmj=Q2p8&wf+*sAr^1zxknPM-L2XJj}T33!zTz^?J*2M$B%#D>ztAE`AXm}4a zJb?de2-z*Vc4ai5e{PdFnM~gHXC^nLzrb*n#0$MZmr(OrH!@c>w4ef}Z}(a21A)L_ zi&i1Kb?UeM==sFQ3_PnFnd>hxid&Y;`fq?L+TBaQC!L#u&pB#jrd^-CkPOMJJPz2+ ztd=aCQ!nT{DJeW+_m+);xMriLM4=bP#!~G$EBgj9J;uzcsr_q(X4B-cmFn<6FJ! z+>$_sKo`M5>rm)mg#_};?~6CkXWz+t=ib|BF&8fH-5=*W-*?V?H}}3QEX>P10{?de z5S6@30miGzWPkEWsZ`pJm>W6lECA%MgZvwK%0+q$PB?;y+Ys?S*sW_Nb<=~h>-G9W zJRWb+t0hmM9BqjaMAfydGr-7`0IE|E@NNuIZ`o$TN`QIh_ZUT8yu{gjoUYis6IRhP zFRU-}RFyNBqC#mvodGVDytZ?`K*G+CXW-;CZ6FG>H|d5 z>ILM{6z{-G)IKt@0i1*50f}?3&H%n5tb_C>oPXwxgCDrQ0D)I=g_tw-ec17f#ChTX z^8lC|l}e??cH9zMz$EGbUKhZ7An^fXyAbmUWWFIw8?n| zvw!GEHtLy7W)&iShWSf{b+QkUe~yba`Et1&fNnGzfp**m1BgIA!~DBpHsV$S%K4f6 zUnw^wBBB5&pDdG-?acb8aS;W~jGd#Sxd6uiI-Ack;2c6n0P%MKxZhDP+Tz=;`+`4m z2`$qep^u>!f2ULAA_~Bt4UfT9+=I+e$2g(k66#VEz;84#EW&CVRZL+hs-I5!+$IN` h??rwn%u%8v@C#|rG=q`hUb_GQ002ovPDHLkV1mverr-bo diff --git a/src/project/wuxi/AppMine/me_selected.png b/src/project/wuxi/AppMine/me_selected.png index dff9fcad51a427fe6d821489f29d35b1be45360f..caec4d0f1546a48fafd7540eb654592507136314 100644 GIT binary patch delta 1458 zcmV;j1x@;k2+#|VFnva%n{ zEbR7l)ic#oy*snaFxB&Mm`ERIs;d9L_g=lK_htwk{!n}Mi+^38q+Rc6Ex1IKi2QcD|5D^N73im`l z9w8-<3ejDF+*%Syf0M{>;?cK$gzv)f>^Tq#lDSP#GzVZTd6ZQ5w&}qld#?-dEPxyU z6Z6a0PCm;M@PAoGt9Ry)^i9C7(I`XX0M>fmj{H_pau7hj6>j32t)OK6WD}c^@hsdF zc{HL9-1 zl25Hgji`FUmjfkpl<(1Vq47im;gk}<XXS`M_x`Uz~wlT17H;oQOY0N7V~FXWGj$P-P*e$@?4 zL|>_obAL~!aiO~h%&Mc}^B;v%5ZTb8@JY1VFrqX1j_k&ocd065jsP|@Y?E&0`~?6v zw*>&WsC8~Fj?lboHu}E+Sl@MS2rUJlHN2TvoL~}t&9PFL0ynG2^7(Q0nYHbb?#!U5=SlAk2WTwyaumuWQ`RW^du;y|l zP=Eb1*%4q#e6XvqKGJ#%fSX|KE|_6YpN=A&DuFmWBQt%zkBwUK{UG#0Vt@SWGanE4 zXMafpQ3qg|)y3N^=A{r5vqdX4111m91=2J@OuzeD|1;l}xr(9+<1ra8=w2wUh?s8? zEq4mbAi!B@F+HTEbwEs>KCMWdaP`J@0DsD@KD9p5e#z>Pc`LlKX+>aY@1%HCD<%l-xmjqv6c~9 z`!SfeeZcd)_($Y zWtr8l8|chH-^$8%%k&jQ+PxQTy&)?Bx}YQV3C8+ot5s<=0lb}4j|=!AfC{$zR(E$A z;ZX<~=%HZZt=#UwM_?v}5yHVY^ZO=eCG-PO3J?WImY{!72l~Hu1hB>XWd0REdTgvZ zWvduq0eYaHy8e7S_iDyN#sCx*ihsAik$-P;N*4Ssa0&nujttPO9>~34t=O+FY*;ev z&%Opwm#w_&THg$413 zS-D_cT)gYVA9E)4Pf%u>0?{fW{gc|?`$aV?*1k&YneFG0wv`&WvS6>g&Ymz{r~q;f z#KlXC*mLNj4&(^-_Ds2-#I}8sd+G9;E21|E^Ezl<5faWMjSgfklGf)}5}(X}xcXA9 zZne`D!Tc_OzpnY=x>0Fv^DAzP|B6ukKNn>yxEC~TuWj+D`u}$M59(xgUOp3@SpWb4 M07*qoM6N<$f-E(g zNDw8lvGWhG5iB$ocW2>gak(VVZ`R$z%k8_{ncZ9r-ooAP&c6BP`{uo!on4~d*2}>E zodJ`k{KU>D;HO8o0kon;-F9A z({MR4XQ#|2Jr|Q_1PEqd#%KU44%9QinP&o6=ZTU40-LsvE@)>$C4krbdW}A+G9Q&? zET;jFj%w}+RrdTFR=Vb+h=(>{1w|mV#NLZ%fJRh!rhf`MF}Jdch@ORRVX zf;!)}R7%P7cuojoOMS%x{D+h@O3d*ZY_R~`xMMN-$cHJg#R9_iK+dkShXz|Lpfio` zjt~n#*-G5MxFl+@#R9mibP-5wS73_;a7&z+r~^QQEf&E2e9#g*Xz0w0$=FhFv4G%7 zS&#;bF@L@weF`(CSO7cm%Lwj;Dj%n^0n5i!fT;xdT_avbP&GCcF`Ha`3}9(GQ3g^8 zU`OuXv2L#?5y8HUp?w!%9>7Sp?dn%bmd@GZml0(030IO%>EJOumVJ_BK8%xi20|d- z@0!mlllN?P9qzg}NPqdITc-4PLgE~YXJBI1=BxpEOBoIT zfFJmK03na!3JHi`1;!LQ(EUD9LnUJ=zdU1#afpXwVhaefj)1w)xoK~x4zRZnw}LhP z9@oC^&5)nbUnO7cA-u302gxijPJ;YklYejmjG|;VVhPxq^{Bw9+61%FR>0{6d!SyW z$A8YOr^>n&jAvtTn6A9OVZOIs{bO+o$SvA^VBa|)X&CjTK15rk{ zRVs8JJ2m;`JI%-wbIs?1v++uq7BK#Dl#jEOz_Jm4;)n{6h7E<`ybH%EAS{zE$FACg zk{uP(Eg)+2KWOU-*y%~>&A?92fb%(k24d|SD$zkL!31@`H6(L!Y|bTwrt6)DJ#-U&hO-ChmI~&;TwL*-0{9yZ9FGCunZKM|2-{`Hvf
-
-
-
-
家庭地址
-
- -

{{ info.resident.currentAreaName || '' }}{{ info.resident.currentAddress || '' }}

+
+
+
+ +
-
-
家庭成员
-
- - -
- - -
+
+
+ +
+
+
转积分
+
+ +

如果绑定错误，请联系网格员解绑！

diff --git a/src/project/wuxi/AppMine/myHarvestQR.vue b/src/project/wuxi/AppMine/myHarvestQR.vue new file mode 100644 index 0000000..44a3a33 --- /dev/null +++ b/src/project/wuxi/AppMine/myHarvestQR.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/src/project/wuxi/AppMine/transferIntrgral.vue b/src/project/wuxi/AppMine/transferIntrgral.vue new file mode 100644 index 0000000..2601932 --- /dev/null +++ b/src/project/wuxi/AppMine/transferIntrgral.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/project/wuxi/AppMine/userInfo.vue b/src/project/wuxi/AppMine/userInfo.vue index 6f3e219..bab7640 100644 --- a/src/project/wuxi/AppMine/userInfo.vue +++ b/src/project/wuxi/AppMine/userInfo.vue @@ -4,11 +4,14 @@

头像

-