From 7648ace52466ca408391120df431394198944c58 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Wed, 20 Mar 2024 11:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=81=9A=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=92=8C=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 18 ++- app.wxss | 10 +- assets/images/logo-l.png | Bin 0 -> 8565 bytes assets/images/logo.jpg | Bin 0 -> 23591 bytes components/select/index.js | 53 +++++-- components/select/index.wxml | 10 +- components/select/index.wxss | 6 + components/topbar/index.js | 24 +++ components/topbar/index.json | 6 + components/topbar/index.wxml | 5 + components/topbar/index.wxss | 12 ++ pages/handleLogin/index.js | 138 ++++++++++++++++++ pages/handleLogin/index.json | 9 ++ pages/handleLogin/index.wxml | 25 ++++ pages/handleLogin/index.wxss | 5 + pages/home/index.wxml | 2 +- pages/index/index.js | 4 +- pages/invoiceList/index.js | 66 +++++++++ pages/invoiceList/index.json | 4 + pages/invoiceList/index.wxml | 2 + pages/invoiceList/index.wxss | 1 + pages/login/index.js | 80 +++++++--- pages/login/index.json | 9 +- pages/login/index.wxml | 33 +++-- pages/login/index.wxss | 33 +++-- .../member/components/approveMember/index.js | 64 ++++++++ .../components/approveMember/index.json | 4 + .../components/approveMember/index.wxml | 8 + .../components/approveMember/index.wxss | 21 +++ pages/member/components/memberManage/index.js | 65 +++++++++ .../member/components/memberManage/index.json | 4 + .../member/components/memberManage/index.wxml | 8 + .../member/components/memberManage/index.wxss | 21 +++ pages/member/index.js | 70 +++++++++ pages/member/index.json | 8 + pages/member/index.wxml | 9 ++ pages/member/index.wxss | 1 + pages/meterList/index.js | 23 ++- pages/meterList/index.json | 3 +- pages/meterList/index.wxml | 30 ++-- pages/meterList/index.wxss | 28 +++- pages/my/index.js | 10 ++ pages/my/index.wxml | 11 +- pages/qrCode/index.js | 66 +++++++++ pages/qrCode/index.json | 3 + pages/qrCode/index.wxml | 5 + pages/qrCode/index.wxss | 13 ++ pages/recharge/index.js | 23 +-- pages/recharge/index.json | 9 +- pages/recharge/index.wxml | 98 +++++++++---- pages/recharge/index.wxss | 18 +++ pages/rechargeRecord/index.js | 33 ++--- pages/rechargeRecord/index.json | 3 +- pages/rechargeRecord/index.wxml | 37 ++--- service/meter.js | 2 +- service/park.js | 4 +- service/tenement.js | 2 +- utils/index.js | 20 ++- utils/request.js | 11 +- 59 files changed, 1091 insertions(+), 199 deletions(-) create mode 100644 assets/images/logo-l.png create mode 100644 assets/images/logo.jpg create mode 100644 components/topbar/index.js create mode 100644 components/topbar/index.json create mode 100644 components/topbar/index.wxml create mode 100644 components/topbar/index.wxss create mode 100644 pages/handleLogin/index.js create mode 100644 pages/handleLogin/index.json create mode 100644 pages/handleLogin/index.wxml create mode 100644 pages/handleLogin/index.wxss create mode 100644 pages/invoiceList/index.js create mode 100644 pages/invoiceList/index.json create mode 100644 pages/invoiceList/index.wxml create mode 100644 pages/invoiceList/index.wxss create mode 100644 pages/member/components/approveMember/index.js create mode 100644 pages/member/components/approveMember/index.json create mode 100644 pages/member/components/approveMember/index.wxml create mode 100644 pages/member/components/approveMember/index.wxss create mode 100644 pages/member/components/memberManage/index.js create mode 100644 pages/member/components/memberManage/index.json create mode 100644 pages/member/components/memberManage/index.wxml create mode 100644 pages/member/components/memberManage/index.wxss create mode 100644 pages/member/index.js create mode 100644 pages/member/index.json create mode 100644 pages/member/index.wxml create mode 100644 pages/member/index.wxss create mode 100644 pages/qrCode/index.js create mode 100644 pages/qrCode/index.json create mode 100644 pages/qrCode/index.wxml create mode 100644 pages/qrCode/index.wxss diff --git a/app.json b/app.json index 870b1af..4e4188f 100644 --- a/app.json +++ b/app.json @@ -1,13 +1,17 @@ { "pages": [ - "pages/login/index", - "pages/my/index", - "pages/recharge/index", + "pages/invoiceList/index", "pages/rechargeRecord/index", - "pages/questions/index", "pages/meterList/index", + "pages/recharge/index", + "pages/login/index", + "pages/handleLogin/index", + "pages/member/index", + "pages/my/index", + "pages/questions/index", "pages/home/index", - "pages/index/index" + "pages/index/index", + "pages/qrCode/index" ], "tabBar": { "list": [ @@ -27,8 +31,6 @@ "navigationBarBackgroundColor": "#ffffff" }, "sitemapLocation": "sitemap.json", - "rendererOptions": { - - }, + "rendererOptions": {}, "navigationStyle": "custom" } \ No newline at end of file diff --git a/app.wxss b/app.wxss index 662e113..3250829 100644 --- a/app.wxss +++ b/app.wxss @@ -17,5 +17,13 @@ page { page { font-size: 36rpx; - background-color: #f0f0f0; + /* background-color: #f0f0f0; */ +} + +.primaryTextBtn { + color: #1989fa; +} + +.dangerTextBtn { + color: #ee0a24; } \ No newline at end of file diff --git a/assets/images/logo-l.png b/assets/images/logo-l.png new file mode 100644 index 0000000000000000000000000000000000000000..65ac591bb4ef9222da2a0f040695c31309d6f6f3 GIT binary patch literal 8565 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 literal 0 HcmV?d00001 diff --git a/assets/images/logo.jpg b/assets/images/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..302f7e3630f93dd58af60943776a469c77fc14be GIT binary patch literal 23591 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

AV{BI^UzM%HOIYBq5; zLpCqAQ*2pmwQOVTFm@4keRc%$_Qx1QQ^BfO3S~))NV%w#>>+r6~ zUFo}C?E1(F;}qvK)HiadG4+)|;^o{)VkyC5ej=PY+wu0f6< zuOc5PpDjP2z@~6e;e^6dg=Ix)MTBCyVy6L- zT1!F;sg0EL20L~;ce@96U+nellk5i$Ngl!;dUcrju#r2G9x0{4pq+8>W-A4kCyl`iB_i!&e zN_o`b=!2tM9#$Ti9&4Vao;N)|BlHoeh)-Szysmo9AhnUn$SH4a?_}?3A8ns2J~O^> z-xS|DKYhO&eoOu){u%!30agLI0mMLuz@i|Uprb)gg4u!tg6l#ALLx)jL-&TB3H=zR z8Fnq~Gs+B=gNC5p(3Kbta5B}5mBgOLj)d!kr-y%yI2=(H$r>3P*&HPubuMZu+9>*7 z3`Gng=2h&T*!b9yW4g!g#zEpd<6hxJaHnt+$BmEQkEe?dh;KO|ePd%_Pfzim zI(};GwDIZuGfZbtXL`==Kb!Fv#b17ZwVqQtcl{h8!7JhIdHM4x=eH6OiEl3`Tu8e> zyy$(gHAyw;_9d!I!I!!(!!O@YW=)Px9=l?3rQ)j4)r707*W9l)rYNUmq|&8gQ$MDe zr&V4Ty?*KX)(zhqUFmx1MK}3wp1Zkz%j?$r+XrqJX7Fd6&)B%*cc=HR@!g6{@ywJg zs;uy=$?U_~4foXV<>lHeqX&t#wFKHu{^{l%^qNmX=Jr>cn6(ba1&LtoC-_|%NOa(^{Y>sZ@aXH(Z&Z&v^2 zwbAR^2Hl40H`;HWH)=LMd8_{Rag%COMYBqCd5cO*d8=w`MVne%c}Le{=W9<>`C7(xOGxMzT zHy0!q9xWbNZ2s){d148*L|jf>;aSODRbG9yX1(^|OVF3i^@OiHU+?49@eLae8&jJR zThv==+fv(431);rVi0%(|EJjw(u82gYzGwu1qCGq6(uDVEfx6C(@;^-&@<4{(bLf} zurQF_x7SYK?>+?l#xXK5aC=~?w zX0`(gh5Z@}-UI!`YzGtqBbn`>qK1JU6b*sGSSbKX&~AsW4HdfwXt#qy@$y~jT{~to zMwB=`KZ~MHEQ#qW+a+g~BG9i?3?!~(m8o*sdtqwdkJ5;rq^0BLId#?0DErajjzf~W zm&aB}raO?>)7N&)cl-(y>fH6bCyjkGcxlap&i>H} zHy%8F+dsRpW99=!NeP-Bp`d}mg2?w;NtQ-*DQ!TGslwtfE8Z>n%u&-mBBHm;))Td) zB&w``f-~7pEE7@siW>c1Wz^s#m;Dvcs0lZZxT@i92`|hcwdJg`T1lynv6WL-vmgD= zve7RlM}D<9@*B_phULFm2C{|e^6c)yoa|lCZ?e8SC%7?^BOv!WsXLcbDup_nMjqp(f%18XYf)ZZPP(H>bBe`ZThC_j4IbEud|Miub5xI zuWhqA9k5_e?f#V^{yl1`cA+1I1{)BPxIebY2Evc32V#6|b< z(tRxrCrb%5<3SeJgKI-W4{tq6b+9eqe3uu6ymb1I&ES>uJSGNC<4bVuxENRS_l{AH z(eerTv%%H8xYwfaqd3sI0T+I6%4`0Gvkv`r8)4vYJVAR6QH)(fT|>2lZU-tOQv`*}KBokyT-mzdGndSvs zLj*qOSr<%ZG8w;+U~-QedzeD7a`a__O9FpF&W9r_mM~WU^+Vz zNZ}I4Z?MFBF84VewvuGJLVK~+jy`vG{_`D)btS>C50m;3gw2pI`}*wfS{Y`|t52*p zb-=$UM$78<@81T2EX~S~%2rE)}MR9Ld=83YWQ@q!xEDD#O6xNlDJb zqu0bnY{jkNH)I-#z)^Q`ar)fOFGtK{l3b5O>r$MMG^*oEF9;Rgec`WqcT0kepi1@C zyXo#}Z^iC*)SX;^MHlFW`0^yKK2Da$VD>{yqURNVg$w9N24PVb)EVn+Q_!FLiib5V*4#V*A zc;l?7YogCf={+7|*E(%AtWG@uO^?){U&1}Sk~q`-X}=~r#a?g> zDp(bv(l`%o}HUIH$E1VCl!!m_tfPu*#BS70X?(H4>wtEjh}Wl zoc7y@l@XCnD51G`D`{oFZLZ|xTJfncy|W#hf<$2N*c@7~kz5Tk(wK9ZzlYxK63<)4O z)NadNc_$Mr@}%O-r1SLbPnO(BVW=-ezTY++!75G+G^y96X zL0n_bD~)m=!h(C3ToQWENMF(T6v5nLFCiMVIg$FN?Mg;p#&E;fx=zMhfhXk8ZBZH= zG`+Iy>0iClL@>{BXR;FM#|<})tjiZ%IljqzfCyaVyhQ}$i@^-ao6#)`q1&)Q)?VJ7 zjs=du-P5?0%Qxa#rk_UcSF#8l8`8@p0(I&8UQa&@jxo|%Ug9gC`T!azQJ=qe>OI!Y zB6ajO=CKhG5Eq-o@hBFYo_@w9m}9%BC3ocQP`}G04sWy;fmgz~s zwHlZ-H1~VqN-JE?w%iNFjcNqzSg8#duU{q<%|sbF&SV@U7}e$Bj|J8il(n|3FgL8p z+UbNi^ogv)J~$C{`^2hzh``klaKe(dKMAkgYphy81csV6?kz2NX=x%Rw!x82x9d)q z@^a?FaB7ZQlw93C3*$E*g$F_>Q#5Fe)4bi6Up(I?Y*m2PbzmFgk+6)dqV%TmMf{Nu zpoxt*7u=ip?XZvZ{|}M1u{DLmpZXtdPGH7u$OJZgo4N<%{N#I|W}-1#<7-ujd`P zkQS`{nsztSk@FlVBx|bh7b1YS$pEd?ze%4s_;Ibrd?i4;&C6p$=@)! z#N6!0Z1wK>@UeR{vyFZsGaLSMZdH<97pDd%N>l}KE(z+(X$_YUj;_YN{nT5bj~4N# z&k`&O5w}CoXQu@|UVPd6ZB%O~b&C{=n#@@s@S!pjuA2_DEyNmF#+x}`8N?IwK_un* z=1}z%fBAt8qx>B9C0$KdA+S>%8pUxh7sP{|LL$dzLCfm@cBgm`4p-4qU0P>jZK5nZ z4=*cxxC|QGShmOzgFP#n*K&=tT0Lf!hFVYd5xjES(~Y;aJAd!z@=o2dwA;tu=q3_@ zH!ricQ;a-oi|3j@2zbQan>nU&RonmnNR=nvb;vK zp1VBGvLTVC9E55NQO?hP8vpbvoGpXeZb>9Y{*|G8{S6+GK#%PXeJQgf=^Zn)@!Zg zej8hZZvaPAc5rHX+kF|S_!Si;&_N)$Ge0@)b(8vEsqvCkTeapH1-$cHi?clCin-N} zqwwXh>Rx1JgM)7WM$s~2Ydv|of3hg^!^4GCtk}a>ghB7)NmTBoO$0OKDVLo36vvjj z_G8R=8~n)!_=@)vSo%GDDZ2U}>iqZ;hs$1Wr`{R&jU)p3SKlhH4&5q9IU0GkW6KJh z4uCVKq&A#b#oZj^$-T-G*xVxedYfl1SFDFu8k4qQYReOswE5KnW+JmjnZh=zAAH_d zKG`R6X=^HGLK`bLLS^P8#Xn!}E1K}4y2<^~S&Gw7qAhG{b@nuU&9LnM;CBT1&b;DE zbbs7kdgIwWS(KL#7BAL!zhLeQ%(~KTWYa`X-62#1P7n@6No*5=W8eS-8n}B9CCBm< z{OreSFK@-N%gM%B;a!?G>Z=|iWjb63P^)#NA`;+Ge!y_H|{{kG1X1Ot20Ff2Kg+8`>fU)0uDxoq-g$;k}&x3VK+ z^*Xka&Q`f6oos(7lT}`Rre8Dd;{}A?z->ur!ge3EANM;*0>LYa(Dv3@7r9sbA?jXW z(8bNwH9lNb2Z5)G?trCzaTX+&%e9yCDg$#0?O*FYlODq4SF?0|^%gZL)r?ltWI+jN`GT&1CA|JGnJZd9$@1)ydS+%mF&7}C(OLetTG;_<$Wm|cKszVx>Xq~3^&?Gi@ zn~funuRY5JO-_+kv6KbV{o!RfZ8@{@=jLU(&flHY;<1`5z13BG(jqF%C`=($7@xHQ zTOK>Sd~L>a_mt_i>h_`o199iXbec1k;C)S5d!sD8&p2Ae!f)0tThb|+b**WOFUctn zT$c&9n``2^n;Sn@yLIIpW7_gTs!`t;A#XveU6)YO*#cf=Yf`#v1J)3oMOI}Za6IG- zk5j|o!lUi74)Cj_DQDhZEgyTmKssH<89E1la_t3=j;rWs++0E3*`V`I39;Ec(9&Xt zY(!J{abdi%l<85xA4Ya1Wy#Uc@D$qmOu$F~R2%C&35t<1tR(l6bQ#f3TRduzKj z;A4#7AD8tgU$yi*di4B71PmvR1Z^#?h!-XW+>@J5SG_O8i>mZk6d#25GJlCWdK}Y# zySq_4Yg%ybc3^XBeOijQiue9xD_cv8uJQzdCcGV9Z&^!oJ?-NdOLmHL?8$I#gXFyJ zjEThUqW-s2I#V%y+v!-XlN%+VdBm7F`&H8FwTCSK-Uk=vuiabAu1LLful~_nTSqU* zwfH&R`oue;k_!TRri$L=Kl4uBe7p9fVkq4by$O!siGjH1g5!@H2vsgT>(2>Ar6y~L zL7d9?m4UVprJ68aePy4-%O-TCmwQiEHt|b=r%sV~dml&-*muqw$^=gyk2Dm?-7-k@ zyNNPEi3&4ck9}>(lpm=(%UD;va+r=`D>kDwwS`i#0j3E))J^ND?Kh+)>;o3S;sF8CLPXiMFGQWpWI_20Ib$UAa^*R`%q zWGFN=94ax*hMq%JQ#37K_8r#!8hVapZ0h}3(;9UOIJ;R%V$bta<~MbV*c%e5{SYZ?|LtGoqDr$IPtA<(n6Ek2Sq*I9Rxjw z5pbG5;zk5+;@&-^Yk4?Sl_fO%E|J@#DE_YO@MqIY8vM7J8cs!AAB_&ab#JC0`M}xl iOMCx-L|=j!UA6YpjM&1VM+&c@nUca`-ruHteg6wFk~ZuB literal 0 HcmV?d00001 diff --git a/components/select/index.js b/components/select/index.js index d6f0eaf..ccb6b40 100644 --- a/components/select/index.js +++ b/components/select/index.js @@ -1,3 +1,8 @@ +import { getParkList } from "../../service/park"; +import { getTenementList } from "../../service/tenement"; +import request from '../../utils/request' + +const { OK } = request // components/select/index.js Component({ @@ -5,7 +10,11 @@ Component({ * 组件的属性列表 */ properties: { - + label: String, + type: Number, + park: String, + parkName: String, + required: Boolean }, /** @@ -13,19 +22,39 @@ Component({ */ data: { list: [], - visible: false + visible: false, }, /** * 组件的方法列表 */ methods: { - onInput(e) { - console.log('e', e) - this.setData({ - visible: true, - list: [e.detail, e.detail, e.detail] - }) + async onInput(e) { + console.log('this.type', this.data.type) + // this.setData({ + // visible: true, + // list: [e.detail, e.detail, e.detail] + // }) + switch(this.data.type) { + case 0: + const { data = [], code, message } = await getParkList({ keyword: e.detail }); + this.setData({ + list: data, + visible: true, + }) + break; + case 1: + const park = this.data.park; + if (!park) { + return; + } + const { data: tenementData = [], code: tenementCode, message: tenementMessage } = await getTenementList({ park, keyword: e.detail }); + this.setData({ + list: tenementData, + visible: true, + }) + break; + } }, close() { this.setData({ @@ -35,11 +64,11 @@ Component({ }, onChoose(e) { const { data = {} } = e.currentTarget.dataset; - console.log('data', data) this.setData({ - visible: false + visible: false, + value: data.name }) - this.triggerEvent("choose", data) - } + this.triggerEvent("choose", {type: this.data.type, data}) + }, } }) \ No newline at end of file diff --git a/components/select/index.wxml b/components/select/index.wxml index ee56a19..2bc4cb5 100644 --- a/components/select/index.wxml +++ b/components/select/index.wxml @@ -2,16 +2,16 @@ - - {{item}} + + {{item.name}} diff --git a/components/select/index.wxss b/components/select/index.wxss index e9da6dd..619dc8c 100644 --- a/components/select/index.wxss +++ b/components/select/index.wxss @@ -8,7 +8,13 @@ background-color: #fff; padding: 20rpx; + margin-left: 32rpx; + margin-right: 32rpx; width: 100%; + border: 1rpx solid #ccc; + border-radius: 5rpx; + box-sizing: border-box; + width: calc(100% - 64rpx); } .option { diff --git a/components/topbar/index.js b/components/topbar/index.js new file mode 100644 index 0000000..b97205c --- /dev/null +++ b/components/topbar/index.js @@ -0,0 +1,24 @@ +// components/topbar/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/components/topbar/index.json b/components/topbar/index.json new file mode 100644 index 0000000..6279c88 --- /dev/null +++ b/components/topbar/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "van-image": "@vant/weapp/image/index" + } +} \ No newline at end of file diff --git a/components/topbar/index.wxml b/components/topbar/index.wxml new file mode 100644 index 0000000..e9e1eb2 --- /dev/null +++ b/components/topbar/index.wxml @@ -0,0 +1,5 @@ + + + + 华昌宝能用电管理服务 + \ No newline at end of file diff --git a/components/topbar/index.wxss b/components/topbar/index.wxss new file mode 100644 index 0000000..849af90 --- /dev/null +++ b/components/topbar/index.wxss @@ -0,0 +1,12 @@ +/* components/topbar/index.wxss */ + +.wrapper { + padding: 12rpx 32rpx; + display: flex; + align-items: center; +} + +.content { + margin-left: 50rpx; +} + diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js new file mode 100644 index 0000000..9c6d8dd --- /dev/null +++ b/pages/handleLogin/index.js @@ -0,0 +1,138 @@ +import { userValidate } from "../../service/user"; +import { alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index"; +import request from "../../utils/request" +const { OK } = request; +// pages/handleLogin/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + phone: "", + name: "", + parkName: "", + park: "", + tenementName: "", + tenement: "" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + onChangeName(e) { + this.setData({ + name: e.detail + }) + }, + onChangePhone(e) { + this.setData({ + phone: e.detail + }) + }, + onChoosePark(e) { + const { data } = e.detail; + this.setData({ + park: data.id, + parkName: data.name + }) + }, + onChooseTenement(e) { + const { data } = e.detail; + this.setData({ + tenement: data.id, + tenementName: data.name + }) + }, + handleSubmit() { + const { park, tenement, name, phone } = this.data; + if (!park) { + alertInfo("请选择园区") + return + } + if (!tenement) { + alertInfo("请选择商户") + return + } + if (!phone) { + alertInfo("请输入联系人手机号") + return + } + if (!name) { + alertInfo("请输入你的昵称") + return + } + loadingFunc(async () => { + const wxLoginCode = await wxLogin() + const { code, message, data } = await userValidate({ park, tenement, phone, name, code: wxLoginCode }) + // if (code !== OK) { + // alertInfo(message) + // return + // } + const { exist, user } = data; + if (!exist) { + alertInfo("绑定失败，请检查信息") + return + } + alertSuccess("绑定成功") + const { token, ...currentUser } = user; + wx.setStorageSync('user', currentUser) + wx.setStorageSync('token', token) + wx.switchTab({ + url: '/pages/home/index', + }) + }) + + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/handleLogin/index.json b/pages/handleLogin/index.json new file mode 100644 index 0000000..aaa2aed --- /dev/null +++ b/pages/handleLogin/index.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "topbar": "/components/topbar/index", + "select": "/components/select/index", + "van-button": "@vant/weapp/button/index", + "van-field": "@vant/weapp/field/index" + }, + "navigationBarTitleText": "手动绑定" +} \ No newline at end of file diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml new file mode 100644 index 0000000..068a0a4 --- /dev/null +++ b/pages/handleLogin/index.wxml @@ -0,0 +1,25 @@ + + + + + + + + 提交 + + \ No newline at end of file diff --git a/pages/handleLogin/index.wxss b/pages/handleLogin/index.wxss new file mode 100644 index 0000000..494f347 --- /dev/null +++ b/pages/handleLogin/index.wxss @@ -0,0 +1,5 @@ +/* pages/handleLogin/index.wxss */ +.submit { + margin-top: 40rpx; + padding: 0 32rpx; +} \ No newline at end of file diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 41efdcd..f6831f9 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -1,2 +1,2 @@ -111111111111111 \ No newline at end of file +首页 \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 64fd394..164e5a1 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -9,13 +9,13 @@ Page({ staffC: {firstName: 'Gideon', lastName: 'Lin'} }, onLoad() { - console.log('---', this.renderer) + }, onShow() { }, test: throttle(function() { - console.log('test', this.data.motto) + }, 500), payment: function() { wx.requestPayment({ diff --git a/pages/invoiceList/index.js b/pages/invoiceList/index.js new file mode 100644 index 0000000..ad249cd --- /dev/null +++ b/pages/invoiceList/index.js @@ -0,0 +1,66 @@ +// pages/invoiceList/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/invoiceList/index.json b/pages/invoiceList/index.json new file mode 100644 index 0000000..e6368d1 --- /dev/null +++ b/pages/invoiceList/index.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "开票信息" +} \ No newline at end of file diff --git a/pages/invoiceList/index.wxml b/pages/invoiceList/index.wxml new file mode 100644 index 0000000..41d0dcf --- /dev/null +++ b/pages/invoiceList/index.wxml @@ -0,0 +1,2 @@ + +pages/invoiceList/index.wxml \ No newline at end of file diff --git a/pages/invoiceList/index.wxss b/pages/invoiceList/index.wxss new file mode 100644 index 0000000..c164c96 --- /dev/null +++ b/pages/invoiceList/index.wxss @@ -0,0 +1 @@ +/* pages/invoiceList/index.wxss */ \ No newline at end of file diff --git a/pages/login/index.js b/pages/login/index.js index 4db4151..3a85a81 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,6 +1,9 @@ -import { login } from "../../service/user" -import { alertError, alertInfo, loadingFunc, wxLogin } from "../../utils/index" -import { OK } from "../../utils/request" +import { login } from "../../service/user"; +import { alertError, alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index"; +import request from "../../utils/request"; +import Dialog from '@vant/weapp/dialog/dialog'; +const { OK } = request; + // pages/login/index.js Page({ @@ -8,14 +11,22 @@ Page({ * 页面的初始数据 */ data: { - input: "" + input: "", + disabled: false, + show: false, }, /** * 生命周期函数--监听页面加载 */ - onLoad(options) { - + onLoad() { + const user = wx.getStorageSync('user') + if (!user || !user.id) { + return; + } + wx.switchTab({ + url: '/pages/home/index', + }) }, /** @@ -27,40 +38,67 @@ Page({ onClose() { // wx.exitMiniProgram() }, - // onConfirm() { - // this.handleLogin() - // }, + onConfirm() { + // this.handleLogin() + }, async handleLogin(phoneCode) { loadingFunc(async () => { const wxLoginCode = await wxLogin() - const { code, message, data } = await login({ code: wxLoginCode, phoneCode }) + const result = await login({ code: wxLoginCode, phoneCode }) + const { code, message, data } = result; if (code !== OK) { alertError(message) return } - console.log('data', data) + if (!data?.id) { + this.noPermission() + return; + } + alertSuccess("登录成功") + const { token, ...user } = data + wx.setStorageSync('user', user) + wx.setStorageSync('token', data?.token) }) }, getPhoneNumber(e) { const { errno, code: phoneCode } = e.detail; - console.log('errno', errno, 'phoneCode', phoneCode) switch(errno) { case 103: alertInfo("已拒绝"); - setTimeout(() => { - wx.exitMiniProgram() - }, 100) + return; - break; case 1400001: alertInfo("服务达到上限") - setTimeout(() => { - wx.exitMiniProgram() - }, 100) return; - break; + default: + this.handleLogin(phoneCode) + return; } - this.handleLogin(phoneCode) + }, + onChangeAgree(e) { + this.setData({ + agree: e.detail + }) + }, + beforeClose(e) { + return false; + }, + noPermission() { + Dialog.confirm({ + title: '提示', + message: '当前手机号不是用电管理联系账号', + confirmButtonText: '手动绑定', + cancelButtonText: '取消', + }) + .then(() => { + // on confirm + wx.navigateTo({ + url: '/pages/handleLogin/index', + }) + }) + .catch(() => { + // on cancel + }); }, /** * 生命周期函数--监听页面显示 diff --git a/pages/login/index.json b/pages/login/index.json index 7eed04c..a299ebe 100644 --- a/pages/login/index.json +++ b/pages/login/index.json @@ -1,6 +1,11 @@ { "usingComponents": { "van-dialog": "@vant/weapp/dialog/index", - "select": "/components/select/index" - } + "select": "/components/select/index", + "topbar": "/components/topbar/index", + "van-image": "@vant/weapp/image/index", + "van-button": "@vant/weapp/button/index", + "van-checkbox": "@vant/weapp/checkbox/index" + }, + "navigationBarTitleText": "" } \ No newline at end of file diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 4db36f3..b37232a 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,19 +1,20 @@ - + - - + + + 手机号快速登录 + + + + + + 使用本系统，代表您已阅读并同意 《用电管理服务条款》、《用电管理登录政策》《隐私政策》。 - - - \ No newline at end of file + + + + + diff --git a/pages/login/index.wxss b/pages/login/index.wxss index 392a9f0..6188ac4 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -1,15 +1,7 @@ /* pages/login/index.wxss */ -.content { - /* width: 600rpx; - height: 500rpx; + +page { background-color: #fff; - position: fixed; - left: 0; - right: 0; - top: 0; - bottom: 0; - margin: auto; - padding: 20rpx 24rpx; */ } .confirmWrapper { @@ -18,4 +10,25 @@ .agreementText { color: rgb(211, 155, 52); +} + +.logo { + display: flex; + justify-content: center; + margin-top: 15vh; + margin-bottom: 15vh; +} + +.content { + margin-left: 32rpx; + margin-right: 32rpx; +} + +.agreement { + margin-top: 32rpx; + display: flex; +} + +.checkbox { + margin-top: 6rpx; } \ No newline at end of file diff --git a/pages/member/components/approveMember/index.js b/pages/member/components/approveMember/index.js new file mode 100644 index 0000000..36594a3 --- /dev/null +++ b/pages/member/components/approveMember/index.js @@ -0,0 +1,64 @@ +import { approveUser, getApproveList } from "../../../../service/user" +import { alertInfo, alertSuccess, wxModal } from "../../../../utils/index"; +import request from "../../../../utils/request" + +const { OK } = request; + +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + list: [] + }, + lifetimes: { + attached: function() { + // this.setData({ + // list: [] + // }) + this.init(); + } + }, + /** + * 组件的方法列表 + */ + methods: { + async init() { + const result = await getApproveList() + this.setData({ + list: result.data + }) + }, + async agree(e) { + const { user } = e.currentTarget.dataset; + console.log('user', user) + await wxModal({ content: `同意${user.nickName}的申请？` }) + const { code, message } = await approveUser({ userId: user.id, type: 1 }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("已同意") + this.init() + }, + async disAgree(e) { + const { user } = e.currentTarget.dataset; + await wxModal({ content: `拒绝${user.nickName}的申请？` }) + const { code, message } = await approveUser({ userId: user.id, type: 0 }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("已拒绝") + this.init() + } + } +}) \ No newline at end of file diff --git a/pages/member/components/approveMember/index.json b/pages/member/components/approveMember/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/member/components/approveMember/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/member/components/approveMember/index.wxml b/pages/member/components/approveMember/index.wxml new file mode 100644 index 0000000..9ee6ea0 --- /dev/null +++ b/pages/member/components/approveMember/index.wxml @@ -0,0 +1,8 @@ + + + {{ item.nickName }} + + 同意 + 拒绝 + + \ No newline at end of file diff --git a/pages/member/components/approveMember/index.wxss b/pages/member/components/approveMember/index.wxss new file mode 100644 index 0000000..4f2195c --- /dev/null +++ b/pages/member/components/approveMember/index.wxss @@ -0,0 +1,21 @@ +/* pages/member/components/approveMember/index.wxss */ +.item { + display: flex; + align-items: center; + padding-top: 24rpx; + padding-bottom: 24rpx; + margin-left: 32rpx; + margin-right: 32rpx; +} + +.nickName { + flex: 1; +} + +.operate { + display: flex; +} + +.disAgree { + margin-left: 24rpx; +} \ No newline at end of file diff --git a/pages/member/components/memberManage/index.js b/pages/member/components/memberManage/index.js new file mode 100644 index 0000000..a81e3f0 --- /dev/null +++ b/pages/member/components/memberManage/index.js @@ -0,0 +1,65 @@ +import { approveUser, getApproveList } from "../../../../service/user" +import { alertInfo, alertSuccess, wxModal } from "../../../../utils/index"; +import request from "../../../../utils/request" + +const { OK } = request; + +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + list: [] + }, + lifetimes: { + attached: function() { + // this.setData({ + // list: [] + // }) + this.init(); + } + }, + /** + * 组件的方法列表 + */ + methods: { + async init() { + const result = await getApproveList() + this.setData({ + list: result.data + }) + }, + async setAdmin(e) { + const { user } = e.currentTarget.dataset; + console.log('user', user) + await wxModal({ content: `你的管理员身份将转交给${user.nickName}` }) + const { code, message } = await approveUser({ userId: user.id, type: 2 }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("转交成功") + wx.clearStorageSync() + wx.exitMiniProgram() + }, + async disAgree(e) { + const { user } = e.currentTarget.dataset; + await wxModal({ content: `拒绝${user.nickName}的申请？` }) + const { code, message } = await approveUser({ userId: user.id, type: 0 }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("已拒绝") + this.init() + } + } +}) \ No newline at end of file diff --git a/pages/member/components/memberManage/index.json b/pages/member/components/memberManage/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/member/components/memberManage/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/member/components/memberManage/index.wxml b/pages/member/components/memberManage/index.wxml new file mode 100644 index 0000000..f0537b6 --- /dev/null +++ b/pages/member/components/memberManage/index.wxml @@ -0,0 +1,8 @@ + + + {{ item.nickName }} + + 设为管理员 + 移除 + + \ No newline at end of file diff --git a/pages/member/components/memberManage/index.wxss b/pages/member/components/memberManage/index.wxss new file mode 100644 index 0000000..0bbb5e6 --- /dev/null +++ b/pages/member/components/memberManage/index.wxss @@ -0,0 +1,21 @@ + +.item { + display: flex; + align-items: center; + padding-top: 24rpx; + padding-bottom: 24rpx; + margin-left: 32rpx; + margin-right: 32rpx; +} + +.nickName { + flex: 1; +} + +.operate { + display: flex; +} + +.disAgree { + margin-left: 24rpx; +} \ No newline at end of file diff --git a/pages/member/index.js b/pages/member/index.js new file mode 100644 index 0000000..473d55e --- /dev/null +++ b/pages/member/index.js @@ -0,0 +1,70 @@ +// pages/member/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + active: 0 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + onChangeTab(e) { + this.setData({ + active: e.detail.index + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/member/index.json b/pages/member/index.json new file mode 100644 index 0000000..8f621e3 --- /dev/null +++ b/pages/member/index.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "approve-member": "./components/approveMember/index", + "member-manage": "./components/memberManage/index" + } +} \ No newline at end of file diff --git a/pages/member/index.wxml b/pages/member/index.wxml new file mode 100644 index 0000000..45d4281 --- /dev/null +++ b/pages/member/index.wxml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/pages/member/index.wxss b/pages/member/index.wxss new file mode 100644 index 0000000..7e8182f --- /dev/null +++ b/pages/member/index.wxss @@ -0,0 +1 @@ +/* pages/member/index.wxss */ \ No newline at end of file diff --git a/pages/meterList/index.js b/pages/meterList/index.js index 586929a..0b4acb9 100644 --- a/pages/meterList/index.js +++ b/pages/meterList/index.js @@ -1,3 +1,5 @@ +import { getMeterList } from "../../service/meter"; + // pages/meterList/index.js Page({ @@ -5,11 +7,7 @@ Page({ * 页面的初始数据 */ data: { - codes: [ - { code: "2331242324", money: 510 }, - { code: "4234234134", money: 10 }, - { code: "2354245345", money: 50 }, - { code: "5365457642", money: 150 }, + list: [ ] }, @@ -18,9 +16,20 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + this.getList(); + }, + async getList() { + const { code, message, data = [] } = await getMeterList() + this.setData({ + list: data + }) + }, + jumpToRecharge(e) { + const { code, tenement } = e.currentTarget.dataset; + wx.navigateTo({ + url: `/pages/recharge/index?code=${code}&tenement=${tenement}`, + }) }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/meterList/index.json b/pages/meterList/index.json index e8ab38c..f4c5ccd 100644 --- a/pages/meterList/index.json +++ b/pages/meterList/index.json @@ -2,5 +2,6 @@ "usingComponents": { "navigator": "/components/navigator/index", "scrollPageWrapper": "/components/scrollPageWrapper/index" - } + }, + "navigationBarTitleText": "表计列表" } \ No newline at end of file diff --git a/pages/meterList/index.wxml b/pages/meterList/index.wxml index 0b890a4..36d7487 100644 --- a/pages/meterList/index.wxml +++ b/pages/meterList/index.wxml @@ -1,12 +1,24 @@ - - - - - - {{ item.code }} - {{ item.money }} + + + {{ item.tenement.name }} : + + + 表{{ ele.code }}：余额为 + {{ ele.money }} + 充值 - + + 表计地址： {{ ele.address }} + + - \ No newline at end of file + + + + diff --git a/pages/meterList/index.wxss b/pages/meterList/index.wxss index 9a4e4ed..3cfcde7 100644 --- a/pages/meterList/index.wxss +++ b/pages/meterList/index.wxss @@ -1,20 +1,40 @@ /* pages/meterList/index.wxss */ -.content { +/* .content { flex: 1; padding: 16rpx 24rpx 20rpx; box-sizing: border-box; display: flex; overflow: hidden; -} +} */ .listItem { - display: flex; + /* display: flex; align-items: center; - justify-content: space-between; + justify-content: space-between; */ margin: 12rpx 0; } .money { font-size: 36rpx; font-weight: 600; + margin-left: 20rpx; + flex: 1; +} + +.content { + display: flex; + align-items: center; + margin-left: 30rpx; + margin-right: 20rpx; +} + +.address { + margin-left: 30rpx; + margin-right: 20rpx; +} + +.tenementName { + font-size: 42rpx; + font-weight: 600; + margin-bottom: 20rpx; } \ No newline at end of file diff --git a/pages/my/index.js b/pages/my/index.js index d10e116..54dcde4 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -26,6 +26,16 @@ Page({ url: '/pages/questions/index', }) }, + jumpToMember() { + wx.navigateTo({ + url: '/pages/member/index', + }) + }, + jumpToQrCode() { + wx.navigateTo({ + url: '/pages/qrCode/index', + }) + }, /** * 生命周期函数--监听页面显示 */ diff --git a/pages/my/index.wxml b/pages/my/index.wxml index 3dadaad..5fdebc6 100644 --- a/pages/my/index.wxml +++ b/pages/my/index.wxml @@ -3,9 +3,10 @@ - + + + + + \ No newline at end of file diff --git a/pages/qrCode/index.js b/pages/qrCode/index.js new file mode 100644 index 0000000..4cc34a5 --- /dev/null +++ b/pages/qrCode/index.js @@ -0,0 +1,66 @@ +// pages/qrCode/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/qrCode/index.json b/pages/qrCode/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/qrCode/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/qrCode/index.wxml b/pages/qrCode/index.wxml new file mode 100644 index 0000000..3fc1157 --- /dev/null +++ b/pages/qrCode/index.wxml @@ -0,0 +1,5 @@ + + + 扫码二维码，管理员同意后可进入 + + \ No newline at end of file diff --git a/pages/qrCode/index.wxss b/pages/qrCode/index.wxss new file mode 100644 index 0000000..a543372 --- /dev/null +++ b/pages/qrCode/index.wxss @@ -0,0 +1,13 @@ +/* pages/qrCode/index.wxss */ +.wrapper { + width: 100vw; + height: 100vh; + display: flex; + justify-content: center; + align-items: center; +} + +.text { + text-align: center; + margin-bottom: 10vh; +} \ No newline at end of file diff --git a/pages/recharge/index.js b/pages/recharge/index.js index 48b4e44..4f21762 100644 --- a/pages/recharge/index.js +++ b/pages/recharge/index.js @@ -1,3 +1,4 @@ +import { getMeterDetail } from "../../service/meter"; import { getGlobalData, showModal } from "../../utils/index"; // pages/recharge/index.js @@ -7,22 +8,29 @@ Page({ * 页面的初始数据 */ data: { - code: "", money: 0, moneyIndex: -1, primaryColor: getGlobalData().primaryColor, - codes: ['105465640', '46845132', '1645468'], defaultMoneyArray: [100, 200, 500, 1000, 2000], customFlag: false, + detail: {} }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + const { tenement, code } = options + console.log('options', options) + this.init({ tenement, code }) + }, + async init(options) { + const { code, message, data = {}} = await getMeterDetail(options) + console.log('data', data) + this.setData({ + detail: data + }) }, - /** * 生命周期函数--监听页面初次渲染完成 */ @@ -38,7 +46,6 @@ Page({ }, chooseMoney(e) { const { money, index } = e.currentTarget.dataset; - console.log('index', index, typeof index) this.setData({ money, moneyIndex: Number(index), @@ -59,19 +66,17 @@ Page({ }) }, onChangeCustomMoney(e) { - console.log('onChangeCustomMoney', e) const money = e.detail.value; this.setData({ money: money, }) }, async recharge() { - const { code, money } = this.data; - const confirmResult = await showModal({ title: "充值确认", content: `确认充值表号为${code}的表计${money}元吗？` }); + const { detail = {}, money } = this.data; + const confirmResult = await showModal({ title: "充值确认", content: `确认充值表号为${detail?.meter?.code}的表计${money}元吗？` }); if (!confirmResult) { return; } - console.log('确认') }, /** * 生命周期函数--监听页面隐藏 diff --git a/pages/recharge/index.json b/pages/recharge/index.json index 01852ca..6618c57 100644 --- a/pages/recharge/index.json +++ b/pages/recharge/index.json @@ -1,5 +1,10 @@ { "usingComponents": { - "navigator": "/components/navigator/index" - } + "navigator": "/components/navigator/index", + "van-grid": "@vant/weapp/grid/index", + "van-grid-item": "@vant/weapp/grid-item/index", + "van-row": "@vant/weapp/row/index", + "van-col": "@vant/weapp/col/index" + }, + "navigationBarTitleText": "充值" } \ No newline at end of file diff --git a/pages/recharge/index.wxml b/pages/recharge/index.wxml index 27b1611..dc7674e 100644 --- a/pages/recharge/index.wxml +++ b/pages/recharge/index.wxml @@ -1,42 +1,76 @@ - + - - - - 电费账单 - 2024年02月 - - - - 商户编号 - T00062102047096834 - + + + + 充值表号： + {{ detail.meter.code }} + + + 表计地址： + {{ detail.meter.address }} + + + + 剩余金额： + {{ detail.money }} + + + 公司名称： + {{ detail.tenement.name }} + + + - {{item}} + {{item}} 自定义 - + + + - - --> + + \ No newline at end of file diff --git a/pages/recharge/index.wxss b/pages/recharge/index.wxss index 4541da2..a62e17e 100644 --- a/pages/recharge/index.wxss +++ b/pages/recharge/index.wxss @@ -41,4 +41,22 @@ .customInput { padding: 16rpx 24rpx; +} + +.gridTitle { + margin-bottom: 24rpx; +} + +.colBottom { + margin-top: 40rpx; +} + +.title { + font-weight: 600; + font-size: 40rpx; + margin-bottom: 20rpx; +} + +.content { + font-size: 32rpx; } \ No newline at end of file diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js index 4661bc6..f869b2d 100644 --- a/pages/rechargeRecord/index.js +++ b/pages/rechargeRecord/index.js @@ -1,3 +1,4 @@ +import { getRechargeList } from "../../service/recharge"; import { getYears } from "../../utils/index"; // pages/rechargeRecord/index.js @@ -11,22 +12,7 @@ Page({ month: new Date().getMonth() + 1, years: getYears(), list: [ - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" }, - { code: '165146513', money: 100, time: "2024-02-20 18:56:15" }, - { code: '466541651', money: 200, time: "2024-02-28 18:56:15" } + ] }, @@ -45,17 +31,26 @@ Page({ }, onChangeYear(e) { const { years } = this.data; + const currentYear = years[Number(e.detail.value)] this.setData({ - year: years[Number(e.detail.value)] + year: currentYear }) + this.init(currentYear) }, /** * 生命周期函数--监听页面显示 */ onShow() { - + const currentYear = this.data.year; + this.init(currentYear) + }, + async init(year) { + const { code, message, data } = await getRechargeList(year); + console.log('data', data) + this.setData({ + list: data + }) }, - /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/rechargeRecord/index.json b/pages/rechargeRecord/index.json index e8ab38c..04f64e5 100644 --- a/pages/rechargeRecord/index.json +++ b/pages/rechargeRecord/index.json @@ -2,5 +2,6 @@ "usingComponents": { "navigator": "/components/navigator/index", "scrollPageWrapper": "/components/scrollPageWrapper/index" - } + }, + "navigationBarTitleText": "充值记录" } \ No newline at end of file diff --git a/pages/rechargeRecord/index.wxml b/pages/rechargeRecord/index.wxml index 10a4f38..52f57f2 100644 --- a/pages/rechargeRecord/index.wxml +++ b/pages/rechargeRecord/index.wxml @@ -1,25 +1,20 @@ - - - - - - - - {{ year }}年 - - - + + + + + {{ year }}年 + - - - - 表号：{{ item.code }} - {{ item.time }} - - {{ item.money }} - + + + + + + 表号：{{ item.meter.code }} + {{ item.time }} + {{ item.money }} - - \ No newline at end of file + + diff --git a/service/meter.js b/service/meter.js index 929ac22..c0a8f0c 100644 --- a/service/meter.js +++ b/service/meter.js @@ -7,6 +7,6 @@ export const getMeterList = async function() { } // 获取表计详情 -export const getMeterDetail = async function() { +export const getMeterDetail = async function({ tenement, code }) { return await GET(`/wx/getMeterDetail/${tenement}/${code}`); } \ No newline at end of file diff --git a/service/park.js b/service/park.js index 4d268ff..55c475e 100644 --- a/service/park.js +++ b/service/park.js @@ -2,6 +2,6 @@ import apis from '../utils/request'; const { GET, POST, PUT, DELETE } = apis // 获取园区列表 -export const getParkList = async function() { - return await GET(`/wx/getParkList`); +export const getParkList = async function({ keyword }) { + return await GET(`/wx/getParkList?keyword=${keyword}`); } \ No newline at end of file diff --git a/service/tenement.js b/service/tenement.js index 0f9576c..302ceff 100644 --- a/service/tenement.js +++ b/service/tenement.js @@ -2,6 +2,6 @@ import apis from '../utils/request'; const { GET, POST, PUT, DELETE } = apis // 获取园区id模糊搜索商户列表 -export const getParkList = async function({ park, keyword }) { +export const getTenementList = async function({ park, keyword }) { return await GET(`/wx/getTenementList?park=${park}&keyword=${keyword}`); } \ No newline at end of file diff --git a/utils/index.js b/utils/index.js index 3f29f82..f922b5d 100644 --- a/utils/index.js +++ b/utils/index.js @@ -43,7 +43,8 @@ export function getConfigByEnv() { switch (envVersion) { // 开发版 case 'develop': - api = "http://localhost:8000" + // api = "http://localhost:8000" + api = "http://127.0.0.1:4523/m1/4143821-0-default" break; // 体验版 case 'trial': @@ -195,4 +196,21 @@ export const wxLogin = () => { } }) }) +} + +export const wxModal = (data) => { + const { title = '提示', content } = data; + return new Promise((resolve, reject) => { + wx.showModal({ + title, + content, + success (res) { + if (res.confirm) { + resolve() + } else if (res.cancel) { + reject() + } + } + }) + }) } \ No newline at end of file diff --git a/utils/request.js b/utils/request.js index 24f1dd9..6c88ee9 100644 --- a/utils/request.js +++ b/utils/request.js @@ -85,19 +85,18 @@ const parseResponse = function (response) { wx.redirectTo({ url: '/pages/login/index', }) - return { code: 1, message: '未登录状态' } + return { code: 401, message: '未登录状态' } } if (statusCode === 404) { - return { code: 1, message: "服务故障" } + return { code: 404, message: "服务故障" } } - if (500 <= statusCode < 600) { - return { code: 1, message: "服务错误" } + if (500 <= statusCode && statusCode < 600) { + return { code: 500, message: "服务错误" } } - if (response.data.code !== 0) { + if (response.data.code !== 200) { } - return response.data; }