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 0000000..7921fdb Binary files /dev/null and b/static/images/fundrecord/paystatus-2.png differ diff --git a/static/images/fundrecord/paystatus-3.png b/static/images/fundrecord/paystatus-3.png new file mode 100644 index 0000000..3226737 Binary files /dev/null and b/static/images/fundrecord/paystatus-3.png differ