From e594f9eddf73b098a416c830b14468d944bd171f Mon Sep 17 00:00:00 2001 From: his-uncles-father <59643002+his-uncles-father@users.noreply.github.com> Date: Thu, 16 Jan 2020 23:33:48 +0800 Subject: [PATCH] Revert "5555" This reverts commit 88a77b4bf3b137cad12861e50d845fce711372b5, reversing changes made to c85b72678a192d576ee8f7aecca10d9454dd10b8. --- app.json | 1 + images/login.png | Bin 4543 -> 5774 bytes pages/activites/activites.js | 139 --------------------------------- pages/activites/activites.wxml | 24 ------ pages/activites/activites.wxss | 33 -------- pages/index/index.wxss | 1 - project.config.json | 16 ++-- 7 files changed, 9 insertions(+), 205 deletions(-) delete mode 100644 pages/activites/activites.js delete mode 100644 pages/activites/activites.wxml delete mode 100644 pages/activites/activites.wxss diff --git a/app.json b/app.json index 8886fec..890c67c 100644 --- a/app.json +++ b/app.json @@ -29,6 +29,7 @@ "pages/viewComplaint/viewComplaint", "pages/payParkingFeeList/payParkingFeeList", "pages/payParkingFee/payParkingFee", + "pages/my/myHouseDetail" "pages/my/myHouseDetail", "pages/repair/repair2" ], diff --git a/images/login.png b/images/login.png index 607a52c90ec3cb5ecad3a227627564d6ab1311a9..111d6373b1ce8e023ee9d58290f6f8c67fb09384 100644 GIT binary patch delta 5527 zcmXBYWmptn8wPL;q?M9}rMpYISwIn_8%gO}N?2fIsii{{rDXx7rI+sRZV*HoX{5w= z_`m0O&9|9PbFOoq`)*;1<4JHyL=Xcw?y5$f7#J9;|2@z?Cm9TkryOcZ^15&5_cQzq zbqub0TG+CgnUV9#Sv7{Hgiwptk{qk9`Evb|voTR!70IyjaS!`&{g=an!_R_9#TWEHwBvR|wPqV~Oib6w`ivuyy6&ghUb8yPPijyEXlB z171`*hz@0n5l!$DOf0{Bu(Dbh^38& zqa)x0A1xn2b@@Zvzv+ukGXRSf==1reoD2WzmYnzx`ZsHAPEAQLjQXrPN##P1dL9t4*W*)G1C2OWmZiFB5Xv&@{w)8(2{20SxJuu)v#FL}UN^+m@ z-Me{X(;jbA^61sazUUWu>~i;TrKAODCj^?{fNv)wS$XdME}S#pYNsva&FjjtIo~5I z5iJstRkoM=5k5>xL1fqb|157i0`iiUzxZxteBdHN5Qd`b=Kh9_A)#I`3Fv;@qe~Z8 zyp;nbqz!m`JaZkD_ada#HMH0Mtjnrr$?z<#q@?;>WLI%IqWDRo>foO{0Re^v!1M=i zTCrEU9EGHMSJxBjscJ$!ab2!^-MxbPjriPZ0 z=QO;XN_sh*S|aWiO@-!qW%CUw%WqIvCxoauVA zcu{wBQfap^K%OWp;9xbb^sE-BM|rF4#>LU7^^6L5#hAv?&IZ%M#2>HGKbAR(Su&?U z$~`o1v~P9>(a@FZ7fm^y?JvY}wseH{dfC+rE!hosQWdwQ?k`v(a9E$jli5k(Rr2p% zc)$?p^lYLoJNgqP`6e%Yd?r=2Aj*NK7v-paC$0cZEh2r;`38_?L-iS&&to2=s>FC) zJ!5=x-|cNjLq!tr*MaThI!|l2uH~qvvnc}?vtdyZ#=K%BNqj!Hv58ygsRPAjN=159Bg8ZdBXO z-RAr210E;2E-x~!+hwtPzuL)VSsqt`5b>B6X0~5H?_F(rdo&k65)?3PQ&GF*L(a(7 zT56WplM50QbjLJsx9uk_5^}V^oD~y|i^Y3lu=EOqhIK8U%j{Di2!OWmAMzoy_@W_0 zs+uZ~1QS*d++1Y5WHK~2Au^^+C5h9jUtd=GDq7UiVr#r(O!Nu{wUNJ`$Fw`776ZsS8c*?!V@+ATKSjR{miU-Md2{i$+neAeLlMp_CVkU=@AJyX4IP}H z3_Owrs(S`$HW|pCuX*HPyJoF>zqGN zQT|1|K8)5cS}eY!UprY!hL}5u%2>H1XWGKPKw6_X zWI;lYz1LnaHD-FdIMX}6Lo5cqN&CwkbO^-Yo9utDbDD1a=BIVC_U@h+r5QBEWy#US z|0~7=+{aJTArLUh9*qNp5Qfs18zyr< zCu51H5-D`no%>d?)ZqCO1{!?x<)F4+Ia!(yZhqcq94nao#krU8%l3tQ1*2MGuBvf! zZ+sgi9QGLC*#jR0@ z`+Z)Z({JpX0CR3&2Ozu7TBqh3bin}78@OM+?&Vug`M_0|k<}a+mQTX1l%fji9ZJLG zixK5ks`Q;}*jw73Kvmv>$T***dRvh!ig)ig3PubvcrL@AtYWL6-%Y3xe2qYt^bk;o zHjm^Gp6P0y33KDq9lq=7j8qWHC)s)^!N3b>oW<-=P6<786)T2jR3Wq6#`=80?F1{8N7_{jS)3?R(Tx^sd!)ofH8xY~-LmpG=+E`;jAY^cjM_{v*l;lQ4P zlF8bJP1EYBzNMbwr@YO&Or3&tU$2W6$(!LQ6d`wOz8K~uWb2oIo%!wgf)@oXG=f&l zLZFQ!y}e*}=ELWHb=!?HEZ?l#=&hkwx_9gJc;J*qT4lt@xhBa%D|pgZAzasq=% zTvJpyzMg6Z3IkQ*VSfe(`ng#tV#g?G30n#7WhguZoMJQDhAr%3AS-VdH0gyiyC*Kp zo9@0kBD0}8PN)T1M!j;pwCdUap3P7LzFzV)1i<0PrfzfVvZmYmYQ(yUs(++;PD&i) zpcuhyoWnAI>eYr*HL7sE%hRdBr$qOa-Xwg19B_S&4)oYb{!!9;pETQI&(IaNx3fcP zMUsxFBKXZMZ$^8w`s5!Qd2v?uDjmG`_foy@E*-@dsg;lzrUUh)YV72vG_F%WApsJh zqZ3cuvHKeG##olviWI96ruO1IUw<_>YcSw;a;REMQ-f zXZgTxJ}4|Kme-P7jx_q(z>R@D(^Y7QB1QKX!M9kD4qvyc~jeg zEnk;5_floga;fxuj94c_X@2*bXV$7vz{c<2q*id$muOM)Pk4ivE&l=|n$Flm@C65Y zu*)&cB{dtu;>8X@iwPkn)++Eo7vw{b?x_RWzO}%<;0X@9w29XERq$e?t&T!8vkT*-uqA z{4RLWlctWmw6eDjMD)-4lAdpSNo0tIpItz3uCkw8>FP@~yy3dkytlD#fgNtqTRDO| z{KH`vktWxrtKKCe10b5BTv{JFqXQQ>l!C=D*%PctQL{ZNTR&}xKP$2R+LR2lzxNfR zB!sgdi8HJLnjgPyeTB|$<>-9ljyo!f#5$s~i3-C|Uw-;Lw5hDgua&KqF8`B)Pls8EX z8)&y(b!(0UB0nJ`rQycvqd%rgw`G5mSa%MuT|;?O27bXRKYL0O6SdXR-Q&J&-rh5F z*V!WS52Z7zc-X;@-@z?A()B7p5Wk;Kg;Ki+9MjzV#D8^4urPCthA4{#6>0nEY738DWCv^4JB8eD9BQ^??3{VzF8v&@1n z)Yy(Rv9pMkk*H(zE}a1J6_pK9O8o z74fRNji;SH##t?uONXyX#dW=OSW*OaESgrtIx{Vp2TrX~QwP|?e;+UYs&m>JjiVA@ z?gQEz9wknz?dE#R-m(kR32PBO)e8KRfzbPoTXV_ZM`ky~_#`o+*ZRz{jqDkP;ap{f zovkJ{fy)vU3bEIjlhI{1Bs|X25)_m`s_4UVau9Eko6d0L_g4%C3HU1wQ6(%M+PWh#2 zAZ4tMIjk%!3KK?6mD(S4K&S}@!eH#iw_5J)#L3yrQj7d^AS0B+J}%&GMLo`S=g|Xf zY~&%2q^sSp8$Xi=(ndU;P=o59{EvTv1H~f>3qm^U`0z1)Dl+OK^4%_f4|VmTsc$4j z7RR5YSTzee1!y|T^Il-GsVj48b8+^9C!uN3fwYN%n)9-ge$)r6JoGoD&+vcIQSAJ%J-44N{ieP7YYMI;FotWGNg?iTvSnwT! z6fnRTW!zb}XklfWnBOv>pP?!oodUJG(HaODU;d zJ=h1+mujm$d-`^h1WThXn;Oc=jL(Tgd`p|C@Ed3!{3IwmDgk8(Mc_U5JItP<%;;20 zPZ!tOVfB7rZ&u%#E3~cd@BY1MZ_oK~7Y)wf3iavY)|D9GteLGCQHZ*;2f=8b`ltn5 zNaE+m-dPFgs7`QecJPMY)Y~dHT8xZH$)4PBbM)1DU#!gCl_L8K^`2);;ay&4*xoia)gR3@3NLN3N|S-2;#NLnG_!>h$kt?OeN{ zZ1|+gF6wM-ce)MF{7}2Vc{m{}FRPs+y}v(4XNy!q8RfuBcQ_G#o(h`(rj-LAZyBy4 zjAOab2rixc*>r~2Sw~2fMkwl28K}id+2kb^KwH!CrKJeOl`=t3r4*vAO&CJaIctf> zPj`g;cMEqla`*|A(Kr2hWrr1VptbmZ3B>l2QCjuMxOE?~Yq4F|-_;F@U?K`FbBz;w zx}oTpnAj)~G2!CauvkD*?BzR9YY!F}^0t+gsi(-oe5fH>=(=5ZfN#0 z#DSl{yfSJ4l&oo|R`AAy`vkB$u{v4HdqG`>s1lklAxs+= z_6B8HvBa7fg&Cv>g!J+;nRS zy9SG=oUi|y&o%ZsH7Y5w+%d2oLs&Qa{9r*#^&7uKt9&Jj3Da_@vq6XBFPM`DEpS(vnAkPjHUpqzrGQ2u%lCQ@bk-2 zzH@nL&T+?}?D$U+t(mOL(7$_6x1xPtxtWWAJu8csvZ0rarI)RQbz;_cTnr2~WeufL I1q;Og06l~1(EtDd delta 4289 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 diff --git a/pages/activites/activites.js b/pages/activites/activites.js deleted file mode 100644 index 54d60ae..0000000 --- a/pages/activites/activites.js +++ /dev/null @@ -1,139 +0,0 @@ -// pages/activites/activites.js -const context = require("../../context/Java110Context.js"); -const constant = context.constant; -const util = context.util; -Page({ - - /** - * 页面的初始数据 - */ - data: { - activities:[] - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - let _that = this; - context.getOwner(function (_owner) { - let _communityId = ''; - if (_owner == null) { - _communityId = '7020181217000001' - } else { - _communityId = _owner.communityId; - } - _that.setData({ - communityId: _communityId - }); - - //查询小区文化 - _that._loadActivites(); - - - }); - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - }, - /** - * 加载活动 - * 第一次加载是可能没有小区 则直接下载固定小区 - * - */ - _loadActivites: function () { - let _that = this; - let _objData = { - page: 1, - row: 15, - communityId: this.data.communityId - }; - context.request({ - url: constant.url.listActivitiess, - header: context.getHeaders(), - method: "GET", - data: _objData, //动态数据 - success: function (res) { - console.log("请求返回信息：", res); - if (res.statusCode == 200) { - - let _activites = res.data.activitiess; - let _acts = []; - _activites.forEach(function (_item) { - _item.src = constant.url.filePath + "?fileId=" + _item.headerImg + "&communityId=" + _that.data.communityId + "&time=" + new Date(); - let _startTime = _item.startTime.replace(/\-/g, "/") - let _tmpStartTime = new Date(_startTime); - - _item.startTime = util.date.formatDate(_tmpStartTime); - _acts.push(_item); - }); - - - _that.setData({ - activities: _acts - }); - - return; - } - wx.showToast({ - title: "服务器异常了", - icon: 'none', - duration: 2000 - }) - }, - fail: function (e) { - wx.showToast({ - title: "服务器异常了", - icon: 'none', - duration: 2000 - }) - } - }); - }, -}) \ No newline at end of file diff --git a/pages/activites/activites.wxml b/pages/activites/activites.wxml deleted file mode 100644 index eed9371..0000000 --- a/pages/activites/activites.wxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - {{item.title}} - - - {{item.userName}} - - - - - - - - \ No newline at end of file diff --git a/pages/activites/activites.wxss b/pages/activites/activites.wxss deleted file mode 100644 index ce2de14..0000000 --- a/pages/activites/activites.wxss +++ /dev/null @@ -1,33 +0,0 @@ -/* .act{ - background-color: #fff; -} */ - -.act .act_item{ - background-color: #fff; - margin: 30rpx 0rpx; - padding: 30rpx 20rpx 15rpx 20rpx; -} - -.act .act_item .headImg{ - border-top-left-radius: 20rpx; - border-top-right-radius: 20rpx; - width: 100%; - height: 400rpx; -} - -.act .act_title{ - margin-top: 10rpx; - width: 100%; - overflow: hidden; -} - -.act .act_title van-col view{ - overflow: hidden; -} - -.act .act_title text{ - overflow: hidden; - font-size: 28rpx; - white-space:nowrap; - text-overflow: ellipsis; -} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index ca3791c..2aef59e 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -256,7 +256,6 @@ page { width: 200rpx; height: 150rpx; margin: 10rpx 20rpx 0rpx 20rpx; - border-radius: 10rpx; } .notices-info{ margin: 10rpx 0rpx 0rpx 20rpx; diff --git a/project.config.json b/project.config.json index 376bbf5..0c1e2a6 100644 --- a/project.config.json +++ b/project.config.json @@ -1,13 +1,13 @@ { "description": "项目配置文件。", - "packOptions": { - "ignore": [ - { - "type": "folder", - "value": "readme" - } - ] - }, + "packOptions": { + "ignore": [ + { + "type": "folder", + "value": "readme" + } + ] + }, "setting": { "urlCheck": false, "es6": true,