From 8362ea89fd98fd7d3740afa817fa33d2185cec60 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Fri, 13 Sep 2024 10:06:26 +0800
Subject: [PATCH] fix bug

---
 pages/fundDetails.vue                    |   2 +-
 pages/index.vue                          |   5 ++++-
 pages/taskDetails.vue                    |  14 ++++++++++++--
 pages/work/index.vue                     |   8 +++++++-
 static/images/fundrecord/paystatus-2.png | Bin 0 -> 1108 bytes
 static/images/fundrecord/paystatus-3.png | Bin 0 -> 940 bytes
 6 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 static/images/fundrecord/paystatus-2.png
 create mode 100644 static/images/fundrecord/paystatus-3.png

diff --git a/pages/fundDetails.vue b/pages/fundDetails.vue
index 290fda3..90a607a 100644
--- a/pages/fundDetails.vue
+++ b/pages/fundDetails.vue
@@ -126,10 +126,10 @@
     onLoad: function(options) {
         this.queryParams.id = options.id;
         this.getInfo();
-
     },
 
 	 methods: {
+
        getInfo() {
          var that = this;
          getFxDetails(this.queryParams).then(response => {
diff --git a/pages/index.vue b/pages/index.vue
index ff8c1a1..0dd271e 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -150,7 +150,7 @@
 			statusBarHeight: 0,
 			queryParams: {
 				pageNum: 1,
-				pageSize: 3,
+				pageSize: 10,
 				dateStatus: 0,
 				taskName: null,
 				taskDate: null,
@@ -197,6 +197,9 @@
 		this.getList();
     },
 	 methods:{
+		 reload(){
+			 this.refresh();
+		 },
 		  openSelect(){
 			  // 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
 			  this.$refs.popup.open('bottom')
diff --git a/pages/taskDetails.vue b/pages/taskDetails.vue
index 8be2688..9e0ecfb 100644
--- a/pages/taskDetails.vue
+++ b/pages/taskDetails.vue
@@ -112,9 +112,19 @@
     onLoad: function(options) {
         this.queryParams.id = options.id;
         this.getInfo();
-
     },
-
+    onUnload: function() {
+      // console.log('关闭页面');
+      var pages = getCurrentPages();
+      // console.log(pages.length);
+      var Page = pages[pages.length-1];//当前页
+      // console.log(pages[pages.length-1].route);//输出当前路由
+      var prevPage = pages[pages.length-2];
+      // console.log(pages[pages.length-2].route);//输出上一个页面的路由
+      if(pages[pages.length-2].route == 'pages/index'){  //确定要返回到相应页面，在触发
+          prevPage.$vm.reload()
+      }
+    },
 	 methods:{
 		 getInfo() {
 			 var that = this;
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 83251f5..fb43c78 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -910,7 +910,13 @@
       height: 35rpx;
     }
     .status2{
-      background-image: url("/static/images/fundrecord/wf.png");
+      background-image: url("/static/images/fundrecord/paystatus-2.png");
+      background-size: 100% 100%;
+      width: 100rpx;
+      height: 35rpx;
+    }
+    .status3{
+      background-image: url("/static/images/fundrecord/paystatus-3.png");
       background-size: 100% 100%;
       width: 100rpx;
       height: 35rpx;
diff --git a/static/images/fundrecord/paystatus-2.png b/static/images/fundrecord/paystatus-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7921fdbf94dcb69a44fe80346941e4024637bbd9
GIT binary patch
literal 1108
zcmV-a1grarP)<h;3K|Lk000e1NJLTq0043T001Wl0{{R3<Us5T00018P)t-sM{rEz
z0Dt2Ef8zju;{bo-0Dt2Ef8zju;{bo-0Dt2Ef8zju;{bo-0Dt2EfB*mg;{bp1h{NR(
zi22Or>{Y7$?)LC^yY!jN=OU2%-R}6i-RU!#_NvtGX0qx;p&l!@<NyEw4|GyaQvl#V
z(4b%tfWR>Da3HWyO4hI700009a7bBm001r{001r{0eGc9b^rhaf=NU{R9J<*nAw)3
zAPk1>wWilU?4Zc|Kjs`FAZXW|xoLAzZjdi4Vog;ZZ@()aZ_^;3&+qi>^6=6jKYpLb
z^3*(izKBTlUYNJbh?V(xA(7}QBmex*NGa>d&yW9~`7%v!`_&>m5h;_179)B!9;ytf
zCv8st5fFC~!Hm~WLna+;9s@~a4Z_+DRPcPXa3hgTI3jfsB1%Ua>2><*^(G<-HcL97
zV+v?K&izd`!Jd&4MPwb&%VU>H&#-2eE=QRy7KmDF?_uO7&C2B`WDr7#IU^O8VFJ-d
zhg_jp`CP)XYON)aMiXJ%>E?6-lu{}ns7>sKRFotMNLt#27T;Tk6gZ0}@<Id%79E&i
zpj6^1@i;+Lq=L-I$P*Ndaz7z8s|B3c#h38Ok~!61(gMTrh#dATend*c;n0}(u-}et
zxggL<DkE%2Q|msK9G-Gnkr7-yYybR&w1_97EJY(=GP^Ztf|373t^hZc=<EE1RG3>-
zbyKm4F)p`}ZoO$s1KdLfh@iN&mix$bs)ZeC(#kYfZLS^P<&u-xkZGov*AUYu>xhhi
zDL#hQ#1cwMsj|I!awsd2{Gr0x%&ua2DM&-I4#))vt>uDjcQcKV4tg)YmH}+NUz5=z
zJ+i0zJ~ATOf>L|Rb+%nHcfovI^R~sJOV)-AycFa-rXj8eq=xY{a~NC~47($9<WF5R
zBMhO-LxU>FY|pUF4oDfYZg1eoLG7!e%Yl(wJQGe%T7<<6ca>WZ$*N+|_%0ccaeKHJ
z1eh*TTrYAf;2FI!8xe`tVFGtzaZQ>Wx;sc)pV=`MiT(48bWm}8W!i15gXyMt6T~)5
zD$Jvi9nzN9gU*fsu~{A4q9t8khZI~>vCI|afY^2`3OWxX^6HqS4w=|mZxt}>yeq)G
zrAH%>7cOA+3Tk16MTN}mQBAW3M(~AKS(Q{+wP9Z!&pRO<1lbu3WNiirPUmj1<nw)N
z3Q8)N{8ozwox|kw?C5DVTUumvH9-z$JtN8HIx()9BW(a8C6hCm^g?q>qMSJ*2J=ue
zIVW@7LU9c>klkZ@=*vU>CzngL)|>2}vQnMsD9P7dAG^7is&2+TUb<Ij`Rw<xm&n63
zO%K;1Kc;E=zShatYrpllc(S}cT}P}R(yv$f`QClHe_v8V&!58|6mPe$Kffx^FI+g&
aH2nqbOBDiGGA+{p0000<MNUMnLSTZ=+XANm

literal 0
HcmV?d00001

diff --git a/static/images/fundrecord/paystatus-3.png b/static/images/fundrecord/paystatus-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..322673773c5a5318abb7fd48639fc22b5647beb8
GIT binary patch
literal 940
zcmeAS@N?(olHy`uVBq!ia0vp^ML?|1!3-pyIK1HoQV9V*A+GKPK7tKrNJ9Vr|37f|
zW5A+Y4ZEMb|Ndvenb(RP=L<GJaGZH<!_{|&6EEL?_hZ75=jWe&O;~kT^niI6&@O?J
zAirP+gAE53C<rt-d?>gOkTBuF(I2u$fO4D#9+AZi40_5S%viD1zKnr^>6)jDV@O2n
z-WfN`9xL#)WzI^yv_!V9?D5;b_lx+t8E>0h?oq$y+NbL<UvN^x1dZkWhplTD#@y$Z
zR}VVz^M_Z=q{o(u^|9rOK~=TgM}GSqIAinH)cyPy?q9JtdSZgTqW1-4D=%};oAv9$
zJY9EH%N?yTnN#I2FzGIx(y05!%ZH0Kbo*(ASG-d$nLAxOsFip}gyFlA%7xdPZmLx;
zd_4JtzEhoksqc(=4$tGGxi@TzJ+Q2=%JRqi6Vi&>u_<3UO-|iRu}G<Sq5dt{!|Ps{
zmb8xO;Y&%21RPbZ#8Nlj>7V%eMd!2$yj78kz8@bkhb&NAePgY{YG!AhpVwB#x6dm+
zC(8EjawhYn&j~9Z8+Z0{W(rJlUC=KzG0fijTl$I25Yy*Io4T)U`q}HzTXjx#$p^tF
z7bjor^<eI4jpknR<zPzV1XnBd=Wb5|dS&gs^?f2<B_^+tm_1SEz7qSnN`t()?|<)k
zc6$QPiKVF;N}4mC{=2>-zVqXL1<M0L>B3p>Qo??gr3ZPNq^+upp2!nqTw<pe6&a@g
zH2&CvpakbrUhPvh20ab>5&YzZ(GpJS4mpD}cE>6nE7hI7!~8$0cFy654GUImn~-{z
zPfh7ksiw_^Wpkt!T>6|<zgjU@CzWf%;W;;s)LKtsyYhW~dikV3FS%w2FV_ufF(`d|
zb=MD-BA@to=a?HbY%jMOW$djMO>o(2VAr0b(k8GnkI#!Kc3Y-`X>Vz0w14o{N;|iC
zVJ_*R(&0Q3%WqkSw`{l~%aYsjmf<c>VO`%&o{7g#9KE@`yxV-&NyT}t($BJ2W!5e(
zYxi9sE_AumgYmF1`$TQU?K|B}?yY!Jyl?A2?kSh8y`4IiG45&+)V^=$B**bHB73Ur
zbFSPq-apNv&9)UhJMrwUyplbq<@-w2g<oFj)l83_IRD8-+ZUomJl{`$&dpa+e3GsH
zXz7p54@zok1!DU*|5v|b`?;=i>7Bz<=L&pc-*HLYsPSJgFu5}@c)I$ztaD0e0swd9
BwW9z4

literal 0
HcmV?d00001