From ae6de05f03a62799707a8dea974c22a812949c04 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Mon, 1 Sep 2025 13:45:58 +0800 Subject: [PATCH] 1 --- app.json | 42 ++----- .../SubjectTreeChooserNodeItem.js | 32 ------ .../SubjectTreeChooserNodeItem.json | 14 --- .../SubjectTreeChooserNodeItem.wxml | 15 --- .../SubjectTreeChooserNodeItem.wxss | 1 - .../childrenPage.js | 43 ------- .../childrenPage.json | 8 -- .../childrenPage.wxml | 19 ---- .../childrenPage.wxss | 1 - component/editor/editor.js | 1 - component/editor/editor.wxml | 9 +- component/editor/editor.wxss | 2 + image/icon/cancel_icon.png | Bin 0 -> 1702 bytes image/index/index_block_04.png | Bin 3742 -> 0 bytes image/index/index_block_23.png | Bin 3726 -> 0 bytes image/index/index_block_26.png | Bin 2736 -> 0 bytes pages/index/index.js | 105 ++++++++--------- pages/index/index.wxml | 33 ++---- pages/index/index.wxss | 2 +- pages/noLoginIndex.wxml | 2 +- pages/noLoginIndex.wxss | 2 +- pages/paymentManager/toPay/toPay.js | 9 +- pages/paymentManager/toPay/toPay.wxml | 2 +- pages/phoneLogin.wxml | 37 +++--- pages/phoneLogin.wxss | 53 +++------ pages/user/login/login.wxml | 102 ++++------------- pages/user/login/login.wxss | 61 +++++++--- pages/user/region/region.wxml | 10 +- pages/user/region/region.wxss | 10 +- project.config.json | 23 ++-- project.private.config.json | 67 +---------- utils/API.js | 107 +----------------- utils/util.js | 2 +- 33 files changed, 196 insertions(+), 618 deletions(-) delete mode 100644 component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js delete mode 100644 component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json delete mode 100644 component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml delete mode 100644 component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss delete mode 100644 component/SubjectTreeChooserNodeItem/childrenPage.js delete mode 100644 component/SubjectTreeChooserNodeItem/childrenPage.json delete mode 100644 component/SubjectTreeChooserNodeItem/childrenPage.wxml delete mode 100644 component/SubjectTreeChooserNodeItem/childrenPage.wxss create mode 100644 image/icon/cancel_icon.png delete mode 100644 image/index/index_block_04.png delete mode 100644 image/index/index_block_23.png delete mode 100644 image/index/index_block_26.png diff --git a/app.json b/app.json index fb2c0aa..f9d9bcf 100644 --- a/app.json +++ b/app.json @@ -9,6 +9,8 @@ "pages/bankDraft/add/add", "pages/project/project", "pages/project/add/add", + "pages/finance/finance", + "pages/finance/voucher/voucher", "pages/pay/detail", "pages/pay/payee/payee", "pages/contractAssets/fixedAssets", @@ -21,6 +23,10 @@ "pages/bill/bill", "pages/statistics/statistics", "pages/user/region/region", + "pages/finance/index", + "pages/resources/resources", + "pages/resources/detail/detail", + "pages/resources/edit/edit", "pages/phoneLogin" ], "subPackages": [ @@ -138,40 +144,6 @@ "list/edit", "list/detail" ] - }, - { - "root": "pages/finance/", - "pages": [ - "index", - "finance", - "voucher/voucher", - "list_balance_ranking/list_balance_ranking", - "detailed_liabilities/detailed_liabilities", - "detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic" - ] - }, - { - "root": "pages/mainBody/", - "pages": [ - "list/list", - "detail/detail" - ] - }, - { - "root": "pages/resources/", - "pages": [ - "resources", - "edit/edit", - "detail/detail" - ] - }, - { - "root": "pages/discussions/", - "pages": [ - "list", - "form/form", - "detail/detail" - ] } ], "window": { @@ -179,7 +151,7 @@ "navigationStyle": "custom", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "中农融信", + "navigationBarTitleText": "农燊高科", "navigationBarTextStyle": "black" }, "sitemapLocation": "sitemap.json", diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js deleted file mode 100644 index eaec388..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js +++ /dev/null @@ -1,32 +0,0 @@ -// component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js -import * as UTIL from '../../utils/util.js'; -import * as API from '../../utils/API.js'; -const app = getApp() -Component({ - properties: { - type: Object, - popupVisible:false, - subjects: {}, - observer: function (newVal, oldVal) {} - }, - observers: { - 'subjects': function(val) { - // this.selectComponent('#tabs').resize(); - }, - 'popupVisible': function(val) { - } - }, - /** - * 页面的初始数据 - */ - data: { - }, - /** - * 组件的方法列表 - */ - methods: { - open(e){ - console.log(e); - }, - } -}) \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json deleted file mode 100644 index acc5399..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "component": true, - "usingComponents": { - "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", - "van-popup": "@vant/weapp/popup/index", - "van-datetime-picker": "@vant/weapp/datetime-picker/index", - "van-checkbox": "@vant/weapp/checkbox/index", - "van-tab": "@vant/weapp/tab/index", - "van-tabs": "@vant/weapp/tabs/index", - "van-collapse": "@vant/weapp/collapse/index", - "van-collapse-item": "@vant/weapp/collapse-item/index", - "van-checkbox-group": "@vant/weapp/checkbox-group/index" - } -} \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml deleted file mode 100644 index 846bc25..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss deleted file mode 100644 index cda0f15..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss +++ /dev/null @@ -1 +0,0 @@ -/* component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss */ \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.js b/component/SubjectTreeChooserNodeItem/childrenPage.js deleted file mode 100644 index 2fa77e7..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.js +++ /dev/null @@ -1,43 +0,0 @@ -// component/SubjectTreeChooserNodeItem/childrenPage.js -Component({ - - /** - * 组件的属性列表 - */ - properties: { - type: Object, - subjects: {}, - }, - observers: { - 'subjects': function(val) { - // console.log(val); // 打印innerText的当前值 - // this.selectComponent('#tabs').resize(); - } - }, - - /** - * 组件的初始数据 - */ - data: { - activeNames:'' - }, - - /** - * 组件的方法列表 - */ - methods: { - open(e){ - console.log(e); - }, - onChange(event) { - this.setData({ - activeNames: event.detail, - }); - }, - onItemClicked(e){ - console.log(e); - // this.triggerEvent('cancel',e) - this.triggerEvent('cancel', e, { bubbles: true, composed: true }) - } - } -}) \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.json b/component/SubjectTreeChooserNodeItem/childrenPage.json deleted file mode 100644 index 657e01c..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "component": true, - "usingComponents": { - "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", - "van-collapse": "@vant/weapp/collapse/index", - "van-collapse-item": "@vant/weapp/collapse-item/index" - } -} \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.wxml b/component/SubjectTreeChooserNodeItem/childrenPage.wxml deleted file mode 100644 index 6e07229..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.wxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {{ item.subjectId }} {{ item.subjectName }} - - - - - - - - \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.wxss b/component/SubjectTreeChooserNodeItem/childrenPage.wxss deleted file mode 100644 index accc09e..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.wxss +++ /dev/null @@ -1 +0,0 @@ -/* component/SubjectTreeChooserNodeItem/childrenPage.wxss */ \ No newline at end of file diff --git a/component/editor/editor.js b/component/editor/editor.js index 1cf3543..c3db795 100644 --- a/component/editor/editor.js +++ b/component/editor/editor.js @@ -24,7 +24,6 @@ Component({ }, ready() { const platform = wx.getSystemInfoSync().platform - console.log(platform); const isIOS = platform === 'ios' this.setData({ isIOS diff --git a/component/editor/editor.wxml b/component/editor/editor.wxml index 53d9c35..64395ba 100644 --- a/component/editor/editor.wxml +++ b/component/editor/editor.wxml @@ -1,4 +1,7 @@ - \ No newline at end of file diff --git a/component/editor/editor.wxss b/component/editor/editor.wxss index 86b26cc..0dff491 100644 --- a/component/editor/editor.wxss +++ b/component/editor/editor.wxss @@ -20,7 +20,9 @@ .toolbar { padding: 0 16rpx; + height: 200rpx; width: 100%; + position: fixed; left: 0; right: 100%; bottom: 0; diff --git a/image/icon/cancel_icon.png b/image/icon/cancel_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2020549cd8a9b175c7dc46f68083208af8a11381 GIT binary patch literal 1702 zcmV;X23h%uP)CsDJ{pbuB2Mf+q4I1OpRv{Q&XvA6+|1 zFrbMcftVOW!ao8AH6fS~)@}L+L_}T7h$zH>4*URNghgyO28@pZLUeqLkMkm7Koj*-zHyD((3~ze7}MOS4VF(=k=#Tu4-pDw(3oTcJK_h6@~yL|;x`$Ln2t1| zKx6q_AX>>lb~6qn&^@eTWTCsbx=seyFd;Fmkd)5=ahi-l13G@ig71_TRU9{<1G)+Q z*jzT?azyzU2o@SKU|JSog|pcAfnFS4gldj@M`IXjc#VwK3!Gj#+N0#q{L;dz)>ODD z3Hd{1laO!+PqDmIV43`$6URAF$lOrXH zh&LY= zbEiakqY{}h=ZL|v=(v{bH&7k_9GCy=-1YrsX-9FtDl;WfuLsvSJLmxfK4B{ z9189jA*0$ur=_h9>d%>;s5S|;?oj8`H$Q-&|=BqgR%J+B|}JJl%YKN3b1OzrkS zM6~vvTAfNY`S(Q2kT=t#vds;F98aq4`U%*>DLbsT>vBx2!*Tb$);V>}Wk{;TK*-yz zxYOlDoKQTe)++~K-)}SxF`r6V}w}mIURmUV{~0dBB_YAWMptsXcqg>?ksdc zb@^p_%5nK4BD9{ZEzo5#!$Mt?!gog(>)y*clLFCt+#2${MS$xv>}yJRaX5T(*kVmi zHf^)&V%!$;JQ4wHNNF*H0wPt5y0D*er+h+SP3}~UkDZ53^VwBgOl5tDDq-^QrJZDC zqr;o(S?&N0)d=}Ro;BQ5d^cNcL_`YukAR_h6SV?0Hbfs{&&idB*N)I)h`BRpVR?9uOl${(Y3!&9+vSgx!BI8`PYH<@79efP`iKpGuG9C@i9SxJ2kjxNO z`Qh^$K^)zsN5^SZ=y&b_pssxS1od-|)(UO6ddyIbe<|JDi?BvecIF?Z4D+*6E>p3VA@SDefi^~KXRZj&}} zgRxtc(}R$>9KICBeVoR}8aI$V4RM&G2uyU3@m=a_HQ|L@n)-l+gL!+Zz}VW;tGY|Unq50eF`=Vjz5n^bwO_VOz2j$ywCE}Tb=GZSx(8nFy<%i*2`bLjGH6+sYE5E3B?T620c%y z3cLU+IvMR@qYlL6d87P7!N{k2)`{t)px4Q0@=)iob5`V6Gzsy3PWun=6Cc7D(et$! wMB=rUdQxz|0<=HRLVr9{SanUWo!;dB1656CCWGnV^#A|>07*qoM6N<$f^tzO>;M1& literal 0 HcmV?d00001 diff --git a/image/index/index_block_04.png b/image/index/index_block_04.png deleted file mode 100644 index 45b8a4e95c6371fd3ba1b36f1c8aa67de84505c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3742 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 G&iw~ymXam_ diff --git a/image/index/index_block_23.png b/image/index/index_block_23.png deleted file mode 100644 index 611f4e34a4ca2f331d639180103c62bfb33ebbec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3726 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 diff --git a/image/index/index_block_26.png b/image/index/index_block_26.png deleted file mode 100644 index d8bd41b71469eeb060632379016a4531066aeaf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2736 zcmaJ@dpy&7A0H;SCWevQnW5xh`|ZZYlFQg)2$kHj%g;9KVjDw3=aovS-W8W-tW)-_50-n1^B|WO|>Bq2#iki z4pz<{%9pIUOgYZL@xIDwrHmRT3lYW2J06rFSs<4$q@ZS6uA`8A4h6NDz`!uXULcQ8 zOOt>hX#t_^w0Jg&gK}SsbW0&C2?U^wiA)hB2&Lo{3hE0lS-D<3Mx&5lL}c+4)K{az z7(qxckpx5%oQRHW0PliyCOH8_JO)Q}Kw>cf35{_<12{(vK*kWs1ZU*82c^^|;lz@I zy?wsvQtl`yo=hetqtSA?+)0je5=ppdfJ9PqV9{8tqf)|AnktkrQyhg->m>$nP|B9@ z#WKD~h+Jf3vP4NT3QB3|R~H0g2ID)iQ2H%U%8;Q`m|`^Ggh2}gi++8Pmdb*`|C;eb zX=!Mx7(@qyQc;qGt;|QP^%7VayMI=+D5$iC94O%{lfq2!7O|5ApioBlrl6EJP8>dm z91Gx`NjMzfNFV`NM?3)^>&W8ZlmiiTW?`@{0L#T?iRVXnEEY$k0we;J;0*u(mFkHn z;k=v)-p+sr4(Ej-E@A0Hsf;OPgG;*kO5NYE_1q&0>bWI_wQf_{kv0M{9gUa&G-HRh03OpD7z!4 z1|JH6EE}YIdxWM8Oh!cbn{PB(%S|pARByaX9qlVssbECpHugbJm_9kn&&}z1480T> zZNO;PI7cv@GU(Izb#1@N{>o@en+-rAv8U1WQq`r6HcvKrQl|~=)e&KNgOml0g&hqI zI9D8(%QTo@y>+f@aASr~VOgS<^cm>QbZyk2V}|S4-w}j+bbpYiX(whptr0=$JdY z&e~I(8}1wFYEISrSKLl7qa4k)S*|SztYmrm^R~h2h7-${-T(E)!qbC~PQQ<<&^y2B zjYI46t$StoNd3SMW@I?oGF4EGS6TS`42&LA*d3RBVra$V8wkZ+@}tmULejfb;~3rR z5&JSCnI8AFKHs`ON8_>GD{p@qcdtlVzpz}l;O9MQvj)rz%Cg{&38?iIqo2CQY;6Q3 zv)lFd6~?(;g9Yi1-yCUi)K}OsH^?!Tuiat3Gukhs{1`r0{EU%z@*vY~zp4HSw>h?2 zQPOmr)u9=#nmJ^~YrC!u6~7N3>3BY}M;-RjeP$TyP~P#*|Hi>xww~I7MT69nMGnpv}mU1(?Xzvtf(CAZlPT0jIllT-gC;E%I^ zSPw^;I6G9*;#OW)nKMl{R!zWt64cK+$Xcfkb8C~|4z;!(rDvsZG=5T>R`1e&*$ojw z+H*6`oc1jO=M8Uj=JMASMVG)-tuNtpBM%Z4khMGSS~bLs4w}cczZ!Wh_5e=2Mc59S zEg*fCckH^;y^50DX_3HSf67|_kT5l=P#bU!bNJm_pU^h{Q6(_O%20jQ{Ihume0j0& z#)i|=CS}?B?8?Cl#;3L$b>utTXm;Hbd|=1+ZW~PDv+?t>8D&Sbi^y5-uT&BWH2W3l z_`x1~f$f=z+mpYR#_lhEc(nA`v-jm%T4@pw-euM4ot6pK8xA_(6x%xld}N)j5Htff zuDR+l^*;3GNA1-;&}ud8HW)~?Uw5|-ULI_LpwznamM zFN|?3Ckf%Sq3OTMvbWV7nozB%N0e@F1ho8xFmfPo^T3|I#_XJF+-L*2K&q zEq6b3n}O=-{7wErkL=B>O*Xozjzi7Wu5u+)0qa^T9z-&2%VlW=b*@2GhWtd;3fkZm z7?XM}{8-AGyx8B#t;ZQibk;0v(^=3A=OE z^qWn=u7`h%Z%$Nck4_FU&(S*6+X&sb3Z&7-NsL$h)$v-gEr*&0)7#r8OKGq5F0cFL zPeCd_w-?KmW= zZf!*oRR%6R$dq?Id-P~HzLtM8W|HfK2ywj^sZ&(!)9^A8Jn3?QAj(JiZhq=vm~81Q zAFe$<-h94k*fjvYxxQ#iAVePY?>`3ZEV53hwDiopSUJ(G^REH@b=yYEq5uZ#PA9(MKm&ijQQn1`SW!S diff --git a/pages/index/index.js b/pages/index/index.js index 37b6806..2beed4d 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -91,17 +91,12 @@ Page({ // }) // }, onShow(){ - //获取滚动条高度 - // this.computeBarLocation(); - UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'payment_state', {method:'GET'}, { - success: (res) => { - this.setData({ - paymentStateOption:res.data - }) - } - }) //获取用户信息 this.getUserInfo() + //查询待办 + this.getTaskList(); + //查询已办 + this.getTaskDoneList(); //查询dept this.getTreeDept(); }, @@ -137,28 +132,36 @@ Page({ let data = { pageNum:1, pageSize:999, - // orderByColumn:"A.ID_", - // isAsc:"desc", + orderByColumn:"A.ID_", + isAsc:"desc", systemType:4, method:"GET", - deptId:JSON.parse(wx.getStorageSync('user')).deptId, // taskName:'相关人员审批' } UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'activity_business_type', {method:'GET'}, { success: (res) => { } }) - UTIL.httpRequest(API.A_myTodoList,data, { + UTIL.httpRequest(API.URL_GET_TASKLIST,data, { success: (res) => { if (res.code == API.SUCCESS_CODE) { let list = []; - for(let i = 0;i < res.total;i++){ - res.rows[i].createTime = res.rows[i].createTime.substr(0,10) - console.log(res.rows[i].createTime); - list.push(res.rows[i]) - } - this.setData({todoList:list,todoNum:res.rows.length}) + for(let i = 0;i < res.total;i++){ + if(res.rows[i].formData){ + if (res.rows[i].formData.activityBusinessType == '16' || res.rows[i].formData.activityBusinessType=='36') { + res.rows[i].formData.expenditureAmount = Number(res.rows[i].formData.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, "") + list.push(res.rows[i]) + } + } + } + this.setData({todoList:list,todoNum:list.length}) + } + }, fail: (res) => { + console.log(res); + }, + complete: (res) => { } }) }, @@ -166,36 +169,27 @@ Page({ let data = { pageNum:1, pageSize:999, - // orderByColumn:"A.ID_", - // isAsc:"desc", + orderByColumn:"A.ID_", + isAsc:"desc", systemType:4, method:"GET", - deptId:JSON.parse(wx.getStorageSync('user')).deptId, // taskName:'相关人员审批' } - UTIL.httpRequest(API.A_myDoneList,data, { + UTIL.httpRequest(API.URL_GET_TASKDONELIST,data, { success: (res) => { if (res.code == API.SUCCESS_CODE) { let list = []; - // for(let i = 0;i { - // return $1 + ","; }).replace(/\.$/, "") - // list.push(res.rows[i]) - // } - // } - // } - - for(let i = 0;i < res.total;i++){ - res.rows[i].data.expenditureAmount = Number(res.rows[i].data.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { - return $1 + ","; }).replace(/\.$/, "") - res.rows[i].auditTime = res.rows[i].auditTime.substr(0,10) - console.log(res.rows[i].createTime); - list.push(res.rows[i]) - } + for(let i = 0;i { + return $1 + ","; }).replace(/\.$/, "") + list.push(res.rows[i]) + } + } + } this.setData({doneList:list,doneNum:list.length}) } }, fail: (res) => { @@ -205,7 +199,7 @@ Page({ } }) }, - getTransferList:function(e){//已废弃 + getTransferList:function(e){ let data = { // pageNum:1, // pageSize:10, @@ -222,8 +216,7 @@ Page({ this.setData({yfqNum:a}) for(let i = 0;i { - return $1 + ","; }).replace(/\.$/, ""); - + return $1 + ","; }).replace(/\.$/, "") } this.setData({yfqList:res.rows}) } @@ -252,7 +245,6 @@ Page({ for(let i = 0;i< c.length;i++){ c[i].totalAmount = Number(c[i].totalAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "") - c[i].paymentStateText = UTIL.getTransform(res.rows[i].paymentState,this.data.paymentStateOption); } this.setData({yfqList:c}) } @@ -323,7 +315,6 @@ Page({ }, /* 计算bar 高度*/ computeBarLocation() { - console.log('aaaaaaaaaaaaa'); var that = this; let CustomMenuButton = wx.getMenuButtonBoundingClientRect(); let CustomWidows = wx.getSystemInfoSync(); @@ -334,12 +325,11 @@ Page({ query.select('.navList_main').boundingClientRect(); query.select('.child_function').boundingClientRect(); query.select('.work_plan').boundingClientRect(); - + query.exec((res) => { let wrokScrollHeight = CustomWidows.windowHeight; res.forEach((v)=>{ wrokScrollHeight = wrokScrollHeight - v.height; - console.log(v.height); }) wrokScrollHeight = wrokScrollHeight-CustomMenuButton.top-CustomMenuButton.bottom -15; that.setData({ @@ -358,16 +348,13 @@ Page({ this.setData({userInfoObj:res.user}) this.setData({region:res.user.deptName}) this.setData({item:JSON.stringify(res.user)}) - wx.setStorageSync('user', JSON.stringify(res.user)) this.getBookList() //查询已制单 this.getTransferList2(); + //查询已发起 + // this.getTransferList(); this.getTransferList1(); - //查询待办 - this.getTaskList(); - //查询已办 - this.getTaskDoneList(); } } }) @@ -380,9 +367,7 @@ Page({ this.setData({provinces:res.data}) if(res.data[0].children){ this.setData({citys:res.data[0].children}) - if(res.data[0].children[this.data.value[1]].children){ - this.setData({areas:res.data[0].children[this.data.value[1]].children}) - } + if(res.data[0].children[this.data.value[1]].children){this.setData({areas:res.data[0].children[this.data.value[1]].children})} } } @@ -486,9 +471,9 @@ Page({ cityCancel(e) { var id = this.data.provinces[0].id this.setData({ - // citys: this.data.lastCitys || this.data.userInfoObj.parentDeptName, //默认北京市辖区, - // areas: this.data.lastAreas || this.data.userInfoObj.deptName, - // value: [...this.data.regionValue], + citys: this.data.lastCitys || this.data.userInfoObj.parentDeptName, //默认北京市辖区, + areas: this.data.lastAreas || this.data.userInfoObj.deptName, + value: [...this.data.regionValue], visible: false }) }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 46a0501..9b0a065 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -96,14 +96,9 @@ - - - - - 四议表决 @@ -156,10 +151,6 @@ 票据使用 --> - - - 主体名录 - @@ -177,41 +168,41 @@ - + - {{item.auditName}} + {{item.formData.remark}} - {{item.createTime}} + {{item.formData.applyTime}} - {{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}} + {{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}} - ￥{{item.data.expenditureAmount}} + ￥{{item.formData.expenditureAmount}} - + - {{item.auditName}} + {{item.formData.remark}} - {{item.auditTime}} + {{item.formData.applyTime}} - {{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}} + {{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}} - ￥{{item.data.expenditureAmount}} + ￥{{item.formData.expenditureAmount}} @@ -233,7 +224,6 @@ --> - @@ -251,7 +241,6 @@ {{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}} - {{item.paymentStateText}} ￥{{item.expenditureAmount}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index ced75e4..8fe4ee3 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -288,7 +288,7 @@ .workflow .workflow_list .process_pay .describe{ font-size: 30rpx; - width: 320rpx; + width: 330rpx; color: #3c9370; display: flex; align-items: center; diff --git a/pages/noLoginIndex.wxml b/pages/noLoginIndex.wxml index e3d3ddf..e0446a6 100644 --- a/pages/noLoginIndex.wxml +++ b/pages/noLoginIndex.wxml @@ -1,2 +1,2 @@ - + diff --git a/pages/noLoginIndex.wxss b/pages/noLoginIndex.wxss index cd154ab..bfe7486 100644 --- a/pages/noLoginIndex.wxss +++ b/pages/noLoginIndex.wxss @@ -1,6 +1,6 @@ /* pages/noLoginIndex.wxss */ page{ - background-color: #F6F6F6!important; + background-color: #ffffff!important; height: 100vh; } .navList_main{ diff --git a/pages/paymentManager/toPay/toPay.js b/pages/paymentManager/toPay/toPay.js index 068a8c1..15f8053 100644 --- a/pages/paymentManager/toPay/toPay.js +++ b/pages/paymentManager/toPay/toPay.js @@ -111,13 +111,8 @@ Page({ confirmText: '确定', success: function (e) { //非建行 - // if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){ - // UTIL.showToastNoneIcon("请输入验证码！"); - // }else{ - // _this.setData({'showPopup':true}) - // } - if(_this.data.data.accountPassword==null||_this.data.data.accountPassword.length<1){ - UTIL.showToastNoneIcon("请输入支付口令！"); + if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){ + UTIL.showToastNoneIcon("请输入验证码！"); }else{ _this.setData({'showPopup':true}) } diff --git a/pages/paymentManager/toPay/toPay.wxml b/pages/paymentManager/toPay/toPay.wxml index 2cf65cd..f71fb1b 100644 --- a/pages/paymentManager/toPay/toPay.wxml +++ b/pages/paymentManager/toPay/toPay.wxml @@ -57,7 +57,7 @@ - + diff --git a/pages/phoneLogin.wxml b/pages/phoneLogin.wxml index da113c7..c93b4fd 100644 --- a/pages/phoneLogin.wxml +++ b/pages/phoneLogin.wxml @@ -1,44 +1,35 @@ - - - + - + - 账户密码登录 - + + -