From 16059472df8733c3fc5658813638a9a2d2a758fd Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Wed, 13 Apr 2022 15:34:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/paymentTemplate/add/add.js | 17 +++++++++---- .../apply/paymentTemplate/paymentTemplate.js | 25 +++++++++++-------- pages/index/index.wxss | 2 +- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 1dc1967..2a24969 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -674,6 +674,7 @@ Page({ success: (res) => { if (res.code == API.SUCCESS_CODE) { for (let j = 0; j < res.data.transfers.length; j++) { + if(that.data.form.transfers[j].fileForm == undefined){continue;} for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) { that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id const element = that.data.form.transfers[j].fileForm[i]; @@ -689,11 +690,7 @@ Page({ formData:element, success (response){ console.log(res); - if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){ - wx.navigateTo({ - url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id, - }) - } + }, fail(res){ console.log(res) @@ -701,6 +698,16 @@ Page({ }) } } + + if(e.currentTarget.dataset.type == 0){ + wx.navigateTo({ + url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId, + }) + } + if(e.currentTarget.dataset.type != 0){ + UTIL.showToastNoneIcon('操作成功！'); + that.back(); + } } } }) diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index fe3dad9..711b817 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -54,7 +54,9 @@ Page({ UTIL.httpRequest(API.URL_GET_SAVE, that.data.form, { success: (res) => { if (res.code == API.SUCCESS_CODE) { + console.log(that.data.form); for (let j = 0; j < res.data.transfers.length; j++) { + if(that.data.form.transfers[j].fileForm == undefined){continue;} for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) { that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id const element = that.data.form.transfers[j].fileForm[i]; @@ -70,23 +72,24 @@ Page({ formData:element, success (response){ console.log(res); - if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){ - wx.navigateTo({ - url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id, - }) - } - if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type != 0){ - UTIL.showToastNoneIcon('操作成功！'); - that.back(); - } + }, fail(res){ console.log(res) } }) } - } - + } + + if(e.currentTarget.dataset.type == 0){ + wx.navigateTo({ + url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId, + }) + } + if(e.currentTarget.dataset.type != 0){ + UTIL.showToastNoneIcon('操作成功！'); + that.back(); + } } } }) diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1c90d02..a2ea4e3 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -208,7 +208,7 @@ position: absolute; line-height: 30rpx; padding:0 10rpx; - border-radius: 50%; + border-radius: 50px; top: -10rpx; right: -10rpx; } From b21139d050766eb772c9c7493d0ba27b106d9d24 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Wed, 13 Apr 2022 18:08:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 2 +- env/env.js | 12 ++++++++---- pages/apply/index.wxss | 8 ++++---- pages/apply/paymentTemplate/add/add.js | 1 + pages/handle/liist.js | 5 +++++ pages/handle/liist.wxml | 2 +- pages/index/index.wxml | 10 +++++----- pages/user/login/login.wxml | 2 +- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/app.json b/app.json index 295acc2..d99e9d4 100644 --- a/app.json +++ b/app.json @@ -21,7 +21,7 @@ "window": { "backgroundTextStyle": "light", "navigationStyle": "custom", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#fff", "navigationBarTitleText": "农燊高科", "navigationBarTextStyle": "black" diff --git a/env/env.js b/env/env.js index d406330..45a8b43 100644 --- a/env/env.js +++ b/env/env.js @@ -1,14 +1,18 @@ module.exports = { DEV: { - URL_PREFIX: 'http://192.168.31.178/api', + // URL_PREFIX: 'http://192.168.31.178/api', + URL_PREFIX: 'https://dazu.nongshen.net/api', }, PRE: { - URL_PREFIX: 'http://192.168.31.178:8080/api', + // URL_PREFIX: 'http://192.168.31.178:8080/api', + URL_PREFIX: 'https://dazu.nongshen.net/api', }, PROD: { - URL_PREFIX: 'http://192.168.31.178:8080/api', + // URL_PREFIX: 'http://192.168.31.178:8080/api', + URL_PREFIX: 'https://dazu.nongshen.net/api', }, IMGURL: { - URL_PREFIX: 'http://192.168.31.178:8080', + // URL_PREFIX: 'http://192.168.31.178:8080', + URL_PREFIX: 'https://dazu.nongshen.net', } } \ No newline at end of file diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss index f61fe60..23eb025 100644 --- a/pages/apply/index.wxss +++ b/pages/apply/index.wxss @@ -42,19 +42,19 @@ } .ICBC{ - background:url('http://192.168.31.196:81/bj/bg_ICBC.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center; background-size: 100% 100%; } .ABC{ - background:url('http://192.168.31.196:81/bj/bg_ABC.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center; background-size: 100% 100%; } .CCB{ - background:url('http://192.168.31.196:81/bj/bg_CCB.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center; background-size: 100% 100%; } .RCB{ - background:url('http://192.168.31.196:81/bj/bg_RCB.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center; background-size: 100% 100%; } diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 2a24969..ce32952 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -113,6 +113,7 @@ Page({ */ onLoad(options) { var that = this; + console.log(options); if(options.id){ setTimeout(function(){ UTIL.httpRequest(API.URL_GET_APPROVALITEMS+options.id, {method:'GET'}, { diff --git a/pages/handle/liist.js b/pages/handle/liist.js index b4ab90d..4a92d05 100644 --- a/pages/handle/liist.js +++ b/pages/handle/liist.js @@ -199,6 +199,11 @@ Page({ delta: 1 }) }, + godetail:function(e){ + wx.navigateTo({ + url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml index 89d3478..7a81459 100644 --- a/pages/handle/liist.wxml +++ b/pages/handle/liist.wxml @@ -91,7 +91,7 @@ - + diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 7d79f60..54cc24c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,16 +1,16 @@ - + - + {{userInfoObj.nickName}} - + {{userInfoObj.remark}} @@ -18,7 +18,7 @@ - + {{ region || "请选择" }} @@ -29,7 +29,7 @@ - + {{array[index]|| bookName}} diff --git a/pages/user/login/login.wxml b/pages/user/login/login.wxml index 8595723..0bd7c94 100644 --- a/pages/user/login/login.wxml +++ b/pages/user/login/login.wxml @@ -1,7 +1,7 @@ - + 农村事项审批与记账 报账简单，操作便捷