diff --git a/app.json b/app.json index b6243f2..fc7e88b 100644 --- a/app.json +++ b/app.json @@ -9,10 +9,12 @@ "pages/handle/expenditureAudit/expenditureAudit", "pages/apply/index", "pages/apply/paymentTemplate/paymentTemplate", - "pages/inCome/inCome", "pages/apply/approval/approval", - "pages/inCome/accounting/index" - ], + "pages/inCome/inCome", + "pages/apply/approval/approval", + "pages/inCome/accounting/index", + "pages/apply/paymentTemplate/see/see", + "pages/apply/paymentTemplate/add/add" ], "window": { "backgroundTextStyle": "light", "navigationStyle": "custom", diff --git a/app.wxss b/app.wxss index 53e6313..a0134d4 100644 --- a/app.wxss +++ b/app.wxss @@ -51,7 +51,9 @@ contact-button { width: 100%; text-align:center; z-index: 999; - background:linear-gradient(to right, #2C8E68, #B3DB62); + position: fixed; + top: 0; + background: linear-gradient(to right, #429a68, #9ecf67); } .ns image{ position: absolute; @@ -69,3 +71,22 @@ contact-button { width: 100%; font-size: 16px; } +.pure_top { + width: 100%; + height: 120px; + position: absolute; + z-index: -1; + overflow: hidden +} + +.pure_top::after { + content: ''; + width: 140%; + height: 120px; + position: absolute; + left: -20%; + top: 0; + z-index: -1; + border-radius: 0 0 50% 50%; + background: linear-gradient(to right, #2C8E68, #B3DB62); +} \ No newline at end of file diff --git a/image/apply/fj_upload.png b/image/apply/fj_upload.png new file mode 100644 index 0000000..016c9d3 Binary files /dev/null and b/image/apply/fj_upload.png differ diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml index dd91b73..4162fc8 100644 --- a/pages/apply/index.wxml +++ b/pages/apply/index.wxml @@ -4,7 +4,7 @@ 支出申请 - + 付款单位 龙水镇龙洞村股份经济联合社 diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js new file mode 100644 index 0000000..663b6ad --- /dev/null +++ b/pages/apply/paymentTemplate/add/add.js @@ -0,0 +1,102 @@ +// pages/apply/paymentTemplate/add/add.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + radio:'1', + steps: [ + { + assigneeName: '同意', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '1' + }, + { + assigneeName: '申请中', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '2' + }, + { + assigneeName: '驳回', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '3' + }, + { + assigneeName: '步骤四', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意' + }, + ], + active:0 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/apply/paymentTemplate/add/add.json b/pages/apply/paymentTemplate/add/add.json new file mode 100644 index 0000000..d2f2434 --- /dev/null +++ b/pages/apply/paymentTemplate/add/add.json @@ -0,0 +1,16 @@ +{ + "navigationStyle": "custom", + "usingComponents": { + "van-row": "@vant/weapp/row/index", + "van-col": "@vant/weapp/col/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-tag": "@vant/weapp/tag/index", + "van-icon": "@vant/weapp/icon/index", + "van-steps": "@vant/weapp/steps/index", + "van-button": "@vant/weapp/button/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", + "van-field": "@vant/weapp/field/index" + } +} \ No newline at end of file diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml new file mode 100644 index 0000000..569ad34 --- /dev/null +++ b/pages/apply/paymentTemplate/add/add.wxml @@ -0,0 +1,165 @@ + +pages/apply/paymentTemplate/add/add.wxml + + + 支出申请 + + + + 审批事项 + + 提交单位:龙华村联合社 + 提交日期:2022年1月18日 + 提 交 人:报账员 + 联系电话:13906311234 + +事项一 + + 基础信息 + + + + + + + + 关联项目 + + + + 付款方信息 + + + + + + 付款方名称必填 + + + + + + + 收款方信息 + + + + + + 公户 + 私户 + + + + + + + + 姓名收款方 + + + + + + + + + + + + + + 附件可拍照 + + + 总数 0张 + + + + + +收 +据 + + + + + +发 +票 + + + + + +其 +他 + + + + + + + + + + + 保存模板 + + + + 新增事项 + + + + + 保存 + 下一步 + + + + diff --git a/pages/apply/paymentTemplate/add/add.wxss b/pages/apply/paymentTemplate/add/add.wxss new file mode 100644 index 0000000..2e14633 --- /dev/null +++ b/pages/apply/paymentTemplate/add/add.wxss @@ -0,0 +1,323 @@ +/* pages/apply/paymentTemplate/add/add.wxss */ +text{display: block;} +.top{ + height: 64px; + width: 100%; + position: fixed; + z-index: 999; + top:0px; +} +.top text{ + position: relative; + top: 30px; + margin-right: 30px; + display: block; + color: #eee; + text-align: center; + width: 100%; + font-size: 16px; +} +.input_tit{ + border: 1px solid #DCDCDC; + padding: 0px 10px; + height: 32px; + line-height: 32px; + border-radius: 5px; + margin-bottom: 15px; +} +.bgPage{ + width: 140%; + position:absolute; + transform: translate(-15%, -50%); + height: 300px; + z-index: -1; +} +.center{ + padding-bottom: 50px; +} +.main-title{ + background-image: linear-gradient(to right, #2C8E68 , #B3DB62); + color: #ffffff; + font-size: 18px; + padding: 10px 0; + text-align: center; +} +.main-box{ + background: #ffffff; + padding: 20px; + width: 94%; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); +} +.main-box block{ + float: right; +} +.title{ + padding: 10px calc(3% + 20px); +} +.top-box{ + margin-top: 20px; + margin-bottom: 28px; +} +.top-box text{ + margin-bottom: 15px; +} +.top-box text:last-child{ + margin-bottom: 0px; +} +.box-title{ + color: #2C8E68; + text-align: center; + font-size: 16px; +} +.center-box .main-box{ + margin-bottom: 15px; +} +.xm van-cell:first-child .van-cell{ + border-bottom: 1px solid #cccccc; + margin: 0; + padding-bottom: 15px!important; + margin-bottom: 15px; +} +.table-box van-field van-cell .van-cell{ + margin-bottom: 15px; +} +.table-box van-field:last-child van-cell .van-cell{ + margin-bottom: 0px; +} +.table-box view text icon{ + display: inline-block; + font-size: 14px; + border: 1px solid red; + color: red; +} +.van-cell{ + padding: 0!important; +} +@font-face { + font-family: 'my-icon'; + src: url('../../../image/icon/fj_icon.png') format('truetype'); +} +.my-icon { + font-family: 'my-icon'; +} + +.my-icon-extra::before { + content: '\e626'; +} +.fj-box text{ + background-color: #5CAE77; + color: #ffffff; + display: inline-block; + text-align: center; + border-radius: 5px; + white-space:pre-wrap +} +.fj-li{ + margin-top: 20px; + display: flex; + flex-wrap: wrap; +} +.fj-li image{ + width: 22%; + margin-left: 5%; +} +.fj-li image:nth-child(4n+1){ + margin-left: 0; +} +.fj-li image:nth-child(n+5){ + margin-top: 15px; +} +.bottomBtn{ + display: flex; + width: 94%; + margin: 0 auto; + margin-top: 25px; + justify-content:space-between; +} +.bottomBtn view{ + display: flex; + width: 48%; + background-color: #ffffff; + border-radius: 5px; + box-shadow: 0px 5px 9px #DCDCDC; + padding: 10px 0px; + text-align: center; + align-items:center; + justify-content:center; + font-size: 14px; + color: #2C8E68; +} +.bottomBtn view image{ + width: 18px; + height: 18px; + margin-right: 5px; +} + + +.bottom{ + width: 84%; + margin: 0 auto; + text-align: center; + margin-top: 50px; + margin-bottom: 50px; + display: flex; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn1{ + border: 1px solid #2C8E68; + padding: 8px 0px; + color: #2C8E68; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 8px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + margin-left: 6%; + color: #fff; +} +.steps-box{ + padding: 0; + margin-top: 15px; +} +.steps-box .van-row{ + padding: 0 20px; +} + +.steps-box view{ + margin-bottom: 0; +} + +.steps-box .van-col{ + position: relative; + height: 70px; + } + .steps-box .van-col--21{ + padding: 12PX 0; + padding-left: 10px; + } + .steps-box .van-row:nth-child(2n){ + background: rgba(29,111,233,0.1); + } + .steps-box .van-cell{ + background: transparent; + padding: 0 10Px; + } + .steps-box .bq{ + display: inline-block; + padding: 0PX 10PX; + line-height: 0.64rem; + border-radius: 5PX; + } + .steps-box .index{ + background: #1D6FE9; + color: #ffffff; + text-align: center; + width: 20PX; + height: 20PX; + line-height: 20PX; + border-radius: 50%; + position: absolute; + left: 0; + top: 50%; + transform: translate(0,-50%); + } + .steps-box .indexCenter{ + top: 0!important; + } + .steps-box .van-row:first-child .van-col:first-child .indexBorder{ + top: calc(50% - 5px); + } + .steps-box .indexBorder{ + width: 10PX; + position: absolute; + right: 0; + top: 0; + height: 100%; + + } + .steps-box .indexBorder .yq{ + height: 10PX; + width: 10PX; + background: #C9C9C9; + border-radius: 50%; + } + .steps-box .indexBorder .ss{ + height: calc(50% - 5PX); + width: 1PX; + background: #C9C9C9; + position: relative; + left: 4PX; + } + .steps-box .indexBorder .ssT{ + height: calc(50% - 5PX); + width: 1PX; + background: #C9C9C9; + position: relative; + left: 4PX; + } + .agree{ + background-color: rgba(92, 174, 119, 0.1); + color:#5CAE77 ; + width: 80%; + text-align: center; + float: right; + } + .in{ + background-color: rgba(245, 163, 39, 0.1); + color:#F5A327 ; + width: 80%; + text-align: center; + float: right; + } + .disagree{ + background-color: rgba(233, 0, 0, 0.1); + color:#E90000 ; + width: 80%; + text-align: center; + float: right; + } + .steps-box .van-cell__title{ + flex: 0.7; + } + .steps-box .van-cell__value{ + flex: 0.3; + } + .steps-tit{ + font-size: 16px; + text-align: center; + background-color: #2C8E68; + color: #ffffff; + padding: 20px 0; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + } + .bottom{ + width: 84%; + margin: 0 auto; + text-align: center; + margin-top: 30px; + margin-bottom: 30px; + } + + .bottom button { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; + } + + .bottom .btnAgree{ + border: 1px solid transparent; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + margin-left: 6%; + } \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index 78060c5..7273b79 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -22,6 +22,11 @@ Page({ url: '../approval/approval', }) }, + goSee(){ + wx.navigateTo({ + url: 'see/see', + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index b0497d7..3fb239c 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -32,7 +32,7 @@ - + diff --git a/pages/apply/paymentTemplate/see/see.js b/pages/apply/paymentTemplate/see/see.js new file mode 100644 index 0000000..0581c96 --- /dev/null +++ b/pages/apply/paymentTemplate/see/see.js @@ -0,0 +1,102 @@ +// pages/apply/paymentTemplate/see/see.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + radio:'1', + steps: [ + { + assigneeName: '同意', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '1' + }, + { + assigneeName: '申请中', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '2' + }, + { + assigneeName: '驳回', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '3' + }, + { + assigneeName: '步骤四', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意' + }, + ], + active:0 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/apply/paymentTemplate/see/see.json b/pages/apply/paymentTemplate/see/see.json new file mode 100644 index 0000000..236d6a4 --- /dev/null +++ b/pages/apply/paymentTemplate/see/see.json @@ -0,0 +1,15 @@ +{ + "navigationStyle": "custom", + "usingComponents": { + "van-row": "@vant/weapp/row/index", + "van-col": "@vant/weapp/col/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-tag": "@vant/weapp/tag/index", + "van-icon": "@vant/weapp/icon/index", + "van-steps": "@vant/weapp/steps/index", + "van-button": "@vant/weapp/button/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index" + } +} \ No newline at end of file diff --git a/pages/apply/paymentTemplate/see/see.wxml b/pages/apply/paymentTemplate/see/see.wxml new file mode 100644 index 0000000..f12aba2 --- /dev/null +++ b/pages/apply/paymentTemplate/see/see.wxml @@ -0,0 +1,142 @@ + + + + 支出申请 + + + + 审批事项 + 房屋出租整年费用 + 提交单位:龙华村联合社 + 提交日期:2022年1月18日 + 提 交 人:报账员 + 联系电话:13906311234 + +事项一 + + 基础信息 + + + + + + + + 关联项目 + + + + 付款方信息 + + + + + 付款方名称必填 + + + + + + + 收款方信息 + + + + + + 公户 + 私户 + + + + + + + + + + + + + + + + + + + 附件可拍照 + + + 总数6张 + + + + + +收 +据 + + + + +发 +票 + + + + +其 +他 + + + + + + + 审批流程 + + + {{index+1}} + + + + + + + + + + + + + + + + + + {{ item.assigneeName }} + {{ item.assigneeName }} + {{ item.assigneeName }} + + + + + {{ item.durationInMillis }} + + {{ item.endTime }} + + + + + + + diff --git a/pages/apply/paymentTemplate/see/see.wxss b/pages/apply/paymentTemplate/see/see.wxss new file mode 100644 index 0000000..134d330 --- /dev/null +++ b/pages/apply/paymentTemplate/see/see.wxss @@ -0,0 +1,246 @@ +/* pages/apply/paymentTemplate/see/see.wxss */ +text{display: block;} +.top{ + height: 64px; + width: 100%; + position: fixed; + z-index: 999; + top:0px; +} +.top text{ + position: relative; + top: 30px; + margin-right: 30px; + display: block; + color: #eee; + text-align: center; + width: 100%; + font-size: 16px; +} +.bgPage{ + width: 140%; + position:absolute; + transform: translate(-15%, -50%); + height: 300px; + z-index: -1; +} +.center{ + padding-bottom: 50px; +} +.main-title{ + background-image: linear-gradient(to right, #2C8E68 , #B3DB62); + color: #ffffff; + font-size: 18px; + padding: 10px 0; + text-align: center; +} +.main-box{ + background: #ffffff; + padding: 20px; + width: 94%; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); +} +.main-box block{ + float: right; +} +.title{ + padding: 10px calc(3% + 20px); +} +.top-box{ + margin-top: 20px; + margin-bottom: 28px; +} +.top-box text{ + margin-bottom: 15px; +} +.top-box text:last-child{ + margin-bottom: 0px; +} +.box-title{ + color: #2C8E68; + text-align: center; +} +.center-box .main-box{ + margin-bottom: 15px; +} +.xm van-cell:first-child .van-cell{ + border-bottom: 1px solid #cccccc; + margin: 0; + padding-bottom: 15px!important; + margin-bottom: 15px; +} +.table-box .van-cell{ + margin-bottom: 15px; +} +.table-box van-cell:last-child .van-cell{ + margin-bottom: 0px; +} +.table-box view text icon{ + display: inline-block; + font-size: 14px; + border: 1px solid red; + color: red; +} +.van-cell{ + padding: 0!important; +} +@font-face { + font-family: 'my-icon'; + src: url('../../../image/icon/fj_icon.png') format('truetype'); +} +.my-icon { + font-family: 'my-icon'; +} + +.my-icon-extra::before { + content: '\e626'; +} +.fj-box text{ + background-color: #5CAE77; + color: #ffffff; + display: inline-block; + text-align: center; + border-radius: 5px; + white-space:pre-wrap +} +.fj-li{ + margin-top: 20px; +} +.steps-box{ + padding: 0; + margin-top: 15px; +} +.steps-box .van-row{ + padding: 0 20px; +} + +.steps-box view{ + margin-bottom: 0; +} + +.steps-box .van-col{ + position: relative; + height: 70px; + } + .steps-box .van-col--21{ + padding: 12PX 0; + padding-left: 10px; + } + .steps-box .van-row:nth-child(2n){ + background: rgba(29,111,233,0.1); + } + .steps-box .van-cell{ + background: transparent; + padding: 0 10Px; + } + .steps-box .bq{ + display: inline-block; + padding: 0PX 10PX; + line-height: 0.64rem; + border-radius: 5PX; + } + .steps-box .index{ + background: #1D6FE9; + color: #ffffff; + text-align: center; + width: 20PX; + height: 20PX; + line-height: 20PX; + border-radius: 50%; + position: absolute; + left: 0; + top: 50%; + transform: translate(0,-50%); + } + .steps-box .indexCenter{ + top: 0!important; + } + .steps-box .van-row:first-child .van-col:first-child .indexBorder{ + top: calc(50% - 5px); + } + .steps-box .indexBorder{ + width: 10PX; + position: absolute; + right: 0; + top: 0; + height: 100%; + + } + .steps-box .indexBorder .yq{ + height: 10PX; + width: 10PX; + background: #C9C9C9; + border-radius: 50%; + } + .steps-box .indexBorder .ss{ + height: calc(50% - 5PX); + width: 1PX; + background: #C9C9C9; + position: relative; + left: 4PX; + } + .steps-box .indexBorder .ssT{ + height: calc(50% - 5PX); + width: 1PX; + background: #C9C9C9; + position: relative; + left: 4PX; + } + .agree{ + background-color: rgba(92, 174, 119, 0.1); + color:#5CAE77 ; + width: 80%; + text-align: center; + float: right; + } + .in{ + background-color: rgba(245, 163, 39, 0.1); + color:#F5A327 ; + width: 80%; + text-align: center; + float: right; + } + .disagree{ + background-color: rgba(233, 0, 0, 0.1); + color:#E90000 ; + width: 80%; + text-align: center; + float: right; + } + .steps-box .van-cell__title{ + flex: 0.7; + } + .steps-box .van-cell__value{ + flex: 0.3; + } + .steps-tit{ + font-size: 16px; + text-align: center; + background-color: #2C8E68; + color: #ffffff; + padding: 20px 0; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + } + .bottom{ + width: 84%; + margin: 0 auto; + text-align: center; + margin-top: 30px; + margin-bottom: 30px; + } + + .bottom button { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; + } + + .bottom .btnAgree{ + border: 1px solid transparent; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + margin-left: 6%; + } \ No newline at end of file diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml index a297521..9adbb04 100644 --- a/pages/handle/liist.wxml +++ b/pages/handle/liist.wxml @@ -1,4 +1,8 @@ + + + 支出申请 + 待办 已办 diff --git a/pages/inCome/accounting/index.js b/pages/inCome/accounting/index.js new file mode 100644 index 0000000..de874f3 --- /dev/null +++ b/pages/inCome/accounting/index.js @@ -0,0 +1,90 @@ +// pages/apply/index.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + show:false, + array:["未提交","待审核","已审核","已挂起"], + index:"0", + list:[1,1,1,1,1,1], + list1:[1,1,1,1,1,1], + inOrOut:true, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + switchTab:function(e){ + if(e.currentTarget.dataset.gid=="1"){ + this.setData({ + inOrOut:true + }) + }else{ + this.setData({ + inOrOut:false + }) + } + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/inCome/accounting/index.json b/pages/inCome/accounting/index.json new file mode 100644 index 0000000..0c83a4f --- /dev/null +++ b/pages/inCome/accounting/index.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "van-action-sheet": "@vant/weapp/action-sheet/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-icon": "@vant/weapp/icon/index", + "van-tag": "@vant/weapp/tag/index" + } +} \ No newline at end of file diff --git a/pages/inCome/accounting/index.wxml b/pages/inCome/accounting/index.wxml new file mode 100644 index 0000000..8a38aee --- /dev/null +++ b/pages/inCome/accounting/index.wxml @@ -0,0 +1,61 @@ + + + + 记账申请 + + + + 收入流水0 + 支出流水0 + + + + + {{array[index]}} + + + + + + + + + 银行流水 + 罚款收入 + + + 附件6 + 2020-02-11 + + + + + 未提交 + + + + ¥3300.00 + + + + + + + 银行流水 + 罚款支出 + + + 附件6 + 2020-02-11 + + + + + 未提交 + + + + ¥3300.00 + + + diff --git a/pages/inCome/accounting/index.wxss b/pages/inCome/accounting/index.wxss new file mode 100644 index 0000000..5bfc088 --- /dev/null +++ b/pages/inCome/accounting/index.wxss @@ -0,0 +1,104 @@ +/* pages/apply/index.wxss */ +.inComeUnit{ + border:1rpx solid #ddd; + width:90%; + margin:0 auto; + +} +.top{ + display: flex; + width: 94%; + margin: 0 auto; + background-color: #ffffff; + border-radius: 10rpx; + margin-top: 3vw; + overflow: hidden; +} +.top view{ + padding: 40rpx 15rpx; + align-items: center; + justify-content: center; + position: relative; +} +.top image{ + position: absolute; + width: 94%; +} +.top-title{ + flex: 1; + text-align: center; +} +.top-tit{ + color: #fff; +} +.rules:before{ + content:'*'; + color:red; +} +main-title{ + background-image: linear-gradient(to right, #2C8E68 , #B3DB62); + color: #ffffff; + font-size: 18rpx; + padding: 10rpx 0; + text-align: center; +} +.main-box{ + background: #ffffff; + padding: 20rpx; + width: 94%; + margin: 10rpx auto; + border-radius: 10rpx; + box-shadow: 0px 5rpx 5rpx rgba(0, 0, 0, 0.16); +} +.main-box block{ + float: right; +} +.title{ + padding: 10rpx calc(3% + 20px); + color : #07c160; + margin-top:30rpx; + font-size:30rpx; +} +.table-box{ + display: flex; + flex-direction: row; +} +.table-box text{ + line-height: 55rpx; +} +.work_plan{ + padding: 40rpx 32.5rpx 30rpx; + display: flex; + justify-content:space-between +} + +.work_plan .menu_item{ + height: 60rpx; + width: 180rpx; + background-color: #fff; + box-shadow: 0rpx 0rpx 9rpx rgba(0,0,0,.2); + border-radius: 60rpx; + line-height: 60rpx; + text-align: center; + font-size: 32rpx; + position: relative; + margin-right: 16rpx; + padding:0 10rpx; + display: inline-block; +} +.work_plan .menu_item.active{ + background-color: #5bae78; + color: #fff; +} +.remind{ + height: 30rpx; + background: #e90101; + color: #fff; + font-size: 26rpx; + position: absolute; + line-height: 30rpx; + padding:0 10rpx; + border-radius: 50%; + top: -10rpx; + right: -10rpx; +} \ No newline at end of file diff --git a/pages/index/settle/eSign/index.js b/pages/index/settle/eSign/index.js new file mode 100644 index 0000000..fd9945e --- /dev/null +++ b/pages/index/settle/eSign/index.js @@ -0,0 +1,76 @@ +import SignaturePad from '../../../../utils/signature_pad' +let signaturePad = {}; +let pix = 7; +let penColor = 'black'; +let lineWidth = 0.6; +Page({ + data: { + penColor: 'black', + lineWidth: 0.6, + isEmpty: true + }, + onLoad: function(options) { + var ctx = wx.createCanvasContext('handWriting'); + const data = { + devicePixelRatio: pix, + }; + signaturePad = new SignaturePad(ctx, data); + console.info(ctx, SignaturePad); + }, + uploadScaleStart(e) { + const item = { + penColor: penColor, + lineWidth: lineWidth + }; + signaturePad._handleTouchStart(e, item); + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + uploadScaleMove(e) { + signaturePad._handleTouchMove(e); + }, + uploadScaleEnd: function(e) { + signaturePad._handleTouchEnd(e); + const isEmpty = signaturePad.isEmpty(); + this.setData({ + isEmpty: isEmpty + }) + }, + retDraw: function() { + signaturePad.clear(); + const isEmpty = signaturePad.isEmpty(); + this.setData({ + isEmpty: isEmpty + }) + }, + getSysInfo: function() { + var that = this + wx.getSystemInfo({ + success: function(res) { + pix = res.pixelRatio + that.setData({ + width: res.windowWidth * pix, + height: res.windowHeight * pix + }) + } + }) + }, + //保存canvas图像 + subCanvas: function() { + if (this.data.isEmpty) { + return false + } + wx.canvasToTempFilePath({ + canvasId: 'handWriting', + success: function(res) { + console.log(res.tempFilePath) + }, + fail: function(res) { + console.log(res) + } + }) + } +}) \ No newline at end of file diff --git a/pages/index/settle/eSign/index.json b/pages/index/settle/eSign/index.json new file mode 100644 index 0000000..3ced4d8 --- /dev/null +++ b/pages/index/settle/eSign/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "icon-loading":"/component/iconLoading/iconLoading" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/index/settle/eSign/index.wxml b/pages/index/settle/eSign/index.wxml new file mode 100644 index 0000000..50b4d39 --- /dev/null +++ b/pages/index/settle/eSign/index.wxml @@ -0,0 +1,18 @@ + + + + 电子签名 + + + + + + + + + + + + 手写签名 + + \ No newline at end of file diff --git a/pages/index/settle/eSign/index.wxss b/pages/index/settle/eSign/index.wxss new file mode 100644 index 0000000..5583907 --- /dev/null +++ b/pages/index/settle/eSign/index.wxss @@ -0,0 +1,105 @@ +/* pages/apply/index.wxss */ +.inComeUnit{ + border:1rpx solid #ddd; + width:90%; + margin:0 auto; + + } + .top{ + display: flex; + width: 94%; + margin: 0 auto; + background-color: #ffffff; + border-radius: 10rpx; + margin-top: 3vw; + overflow: hidden; + } + .top view{ + padding: 40rpx 15rpx; + align-items: center; + justify-content: center; + position: relative; + } + .top image{ + position: absolute; + width: 94%; + } + .top-title{ + flex: 1; + text-align: center; + } + .top-tit{ + color: #fff; + } + page { + background: #fbfbfb; + height: auto; + overflow: hidden; +} + +.wrapper { + width: 100%; + height: 100vh; + overflow: hidden; + display: flex; + align-content: center; + flex-direction: row; + justify-content: center; + font-size: 28rpx; +} + +.hand-writing { + background: #fff; + width: 100%; + height: 100vh; +} + +.hand-right { + display: inline-flex; + align-items: center; + height: 100%; + width: 60px; +} + +.hand-center { + border: 1rpx dashed #e9e9e9; + flex: 1; + overflow: hidden; + box-sizing: border-box; +} + +.hand-title { + transform: rotate(90deg); + flex: 1; + position: absolute; + width: 100px; + right: -19px; +} + +.hand-left { + height: 100vh; + width: 60px; +} + +.del-btn { + position: absolute; + top: 130px; + bottom: 16px; + transform: rotate(90deg); + color: #02d000; + height: 36px; +} + +.del-btn image { + position: absolute; + top: 13rpx; + left: 25rpx; +} + +.sub-btn { + position: absolute; + bottom: 52rpx; + color: #999999; + transform: rotate(90deg); + margin-bottom: 30rpx; +} \ No newline at end of file diff --git a/pages/index/settle/index.js b/pages/index/settle/index.js new file mode 100644 index 0000000..e4fcc64 --- /dev/null +++ b/pages/index/settle/index.js @@ -0,0 +1,105 @@ +// pages/apply/index.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + show:false, + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + //跳转密码修改 + switchPassWord: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: 'passWord/index?', + }) + }, + //跳转电子签名 +switchESign: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: 'eSign/index?', + }) + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/index/settle/index.json b/pages/index/settle/index.json new file mode 100644 index 0000000..3ced4d8 --- /dev/null +++ b/pages/index/settle/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "icon-loading":"/component/iconLoading/iconLoading" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/index/settle/index.wxml b/pages/index/settle/index.wxml new file mode 100644 index 0000000..2599bff --- /dev/null +++ b/pages/index/settle/index.wxml @@ -0,0 +1,25 @@ + + + + 设置 + + + + + + 密码修改 + + + + + + + + + 电子签名 + + + + + + \ No newline at end of file diff --git a/pages/index/settle/index.wxss b/pages/index/settle/index.wxss new file mode 100644 index 0000000..ca28151 --- /dev/null +++ b/pages/index/settle/index.wxss @@ -0,0 +1,68 @@ +/* pages/apply/index.wxss */ +.inComeUnit{ + border:1rpx solid #ddd; + width:90%; + margin:0 auto; + + } + .top{ + display: flex; + width: 94%; + margin: 0 auto; + background-color: #ffffff; + border-radius: 10rpx; + margin-top: 3vw; + overflow: hidden; + } + .top view{ + padding: 40rpx 15rpx; + align-items: center; + justify-content: center; + position: relative; + } + .top image{ + position: absolute; + width: 94%; + } + .top-title{ + flex: 1; + text-align: center; + } + .top-tit{ + color: #fff; + } + main-title{ + background-image: linear-gradient(to right, #2C8E68 , #B3DB62); + color: #ffffff; + font-size: 18rpx; + padding: 10rpx 0; + text-align: center; + } + .main-box{ + background: #ffffff; + padding: 20rpx; + width: 94%; + margin: 0 auto; + border-radius: 10rpx; + box-shadow: 0px 5rpx 5rpx rgba(0, 0, 0, 0.16); + margin-top: 20rpx; + } + .main-box block{ + float: right; + } + .title{ + padding: 10rpx calc(3% + 20px); + color : #07c160; + margin-top:30rpx; + font-size:30rpx; + } + .table-box>view{ + display: flex; + justify-content: space-between; + border-bottom: 1rpx solid #ecebeb; + line-height: 80rpx; + } + .table-box text{ + line-height: 80rpx; + } + \ No newline at end of file diff --git a/pages/index/settle/passWord/index.js b/pages/index/settle/passWord/index.js new file mode 100644 index 0000000..3b3d75a --- /dev/null +++ b/pages/index/settle/passWord/index.js @@ -0,0 +1,76 @@ +// pages/apply/index.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + show:false, + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/index/settle/passWord/index.json b/pages/index/settle/passWord/index.json new file mode 100644 index 0000000..3ced4d8 --- /dev/null +++ b/pages/index/settle/passWord/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "icon-loading":"/component/iconLoading/iconLoading" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/index/settle/passWord/index.wxml b/pages/index/settle/passWord/index.wxml new file mode 100644 index 0000000..ec372b6 --- /dev/null +++ b/pages/index/settle/passWord/index.wxml @@ -0,0 +1,25 @@ + + + + 密码修改 + + + + + + 旧密码 + + + + + + + + + 新密码 + + + + + + \ No newline at end of file diff --git a/pages/index/settle/passWord/index.wxss b/pages/index/settle/passWord/index.wxss new file mode 100644 index 0000000..ca28151 --- /dev/null +++ b/pages/index/settle/passWord/index.wxss @@ -0,0 +1,68 @@ +/* pages/apply/index.wxss */ +.inComeUnit{ + border:1rpx solid #ddd; + width:90%; + margin:0 auto; + + } + .top{ + display: flex; + width: 94%; + margin: 0 auto; + background-color: #ffffff; + border-radius: 10rpx; + margin-top: 3vw; + overflow: hidden; + } + .top view{ + padding: 40rpx 15rpx; + align-items: center; + justify-content: center; + position: relative; + } + .top image{ + position: absolute; + width: 94%; + } + .top-title{ + flex: 1; + text-align: center; + } + .top-tit{ + color: #fff; + } + main-title{ + background-image: linear-gradient(to right, #2C8E68 , #B3DB62); + color: #ffffff; + font-size: 18rpx; + padding: 10rpx 0; + text-align: center; + } + .main-box{ + background: #ffffff; + padding: 20rpx; + width: 94%; + margin: 0 auto; + border-radius: 10rpx; + box-shadow: 0px 5rpx 5rpx rgba(0, 0, 0, 0.16); + margin-top: 20rpx; + } + .main-box block{ + float: right; + } + .title{ + padding: 10rpx calc(3% + 20px); + color : #07c160; + margin-top:30rpx; + font-size:30rpx; + } + .table-box>view{ + display: flex; + justify-content: space-between; + border-bottom: 1rpx solid #ecebeb; + line-height: 80rpx; + } + .table-box text{ + line-height: 80rpx; + } + \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index db3ca8a..3513a52 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -45,6 +45,20 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "事项查看", + "pathName": "pages/apply/paymentTemplate/see/see", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "事项新增", + "pathName": "pages/apply/paymentTemplate/add/add", + "query": "", + "launchMode": "default", + "scene": null } ] }