diff --git a/app.json b/app.json index d181c05..53750aa 100644 --- a/app.json +++ b/app.json @@ -10,10 +10,13 @@ "pages/apply/index", "pages/apply/paymentTemplate/paymentTemplate", "pages/apply/approval/approval", - "pages/inCome/inCome", + "pages/inCome/inCome", "pages/inCome/accounting/index", - "pages/apply/paymentTemplate/see/see", - "pages/apply/paymentTemplate/add/add" ], + "pages/apply/paymentTemplate/see/see", + "pages/apply/paymentTemplate/add/add", + "pages/payee/index", + "pages/payee/add/add" + ], "window": { "backgroundTextStyle": "light", "navigationStyle": "custom", diff --git a/image/apply/icon_icbc.png b/image/apply/icon_icbc.png new file mode 100644 index 0000000..bc4f989 Binary files /dev/null and b/image/apply/icon_icbc.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 2a78e5d..78ba164 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -201,11 +201,20 @@ Page({ }) }, //跳转支出申请 - swichPayment:function(e){ - wx.navigateTo({ - url: '../apply/index?', - }) - }, +swichPayment:function(e){ + console.log(e.currentTarget.dataset.current); + // let cur = e.currentTarget.dataset.current; + // if (this.data.currentTaB == cur) { + // return false; + // }else{ + // wx.navigateTo({ + // url: '../inCome/index?id=' + id, + // }) + // } + wx.navigateTo({ + url: '/pages/apply/index?', + }) + }, //跳转个人设置 swichSettle:function(e){ // console.log(e.currentTarget.dataset.current); diff --git a/pages/user/login/login.js b/pages/user/login/login.js index 6f681ea..d6664f8 100644 --- a/pages/user/login/login.js +++ b/pages/user/login/login.js @@ -93,6 +93,7 @@ Page({ } UTIL.httpRequestNoneDetal(API.URL_POST_DECRYPTEDWXDATA, sendData, "POST", { success: (res) => { + console.log(res) if (res.code == API.SUCCESS_CODE) { let phoneNumber = res.data.phoneNumber; //微信手机号码绑定 diff --git a/utils/API.js b/utils/API.js index 92a5b04..d1abc25 100644 --- a/utils/API.js +++ b/utils/API.js @@ -45,6 +45,9 @@ const URL_POST_UPDATEPWD = `${URL_PREFIX}/system/user/profile/updatePwd`; const URL_POST_UPLOADFILE = `${URL_PREFIX}/system/user/profile/electronicSignature`; // 保存电子签名 const URL_POST_USEREDIT = `${URL_PREFIX}/system/user/edit`; +//当前账套付款账户列表 +const URL_GET_ACCOUNTLIST = `${URL_PREFIX}/cashier/account/list`; + /****************接口地址end****************/ export { @@ -67,5 +70,6 @@ export { URL_GET_TRANSFERLIST, URL_POST_UPDATEPWD, URL_POST_UPLOADFILE, - URL_POST_USEREDIT + URL_POST_USEREDIT, + URL_GET_ACCOUNTLIST } \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index abf4c43..da62a2c 100644 --- a/utils/util.js +++ b/utils/util.js @@ -118,7 +118,7 @@ function httpRequest(url, data, { wx.request({ url, data: finalData, - method: data.method || 'POST', + method:data.method, timeout: 60000, header: { 'Authorization':'Bearer '+getApp().globalData.userInfo.token,