diff --git a/app.json b/app.json
index dde626f..bb4e027 100644
--- a/app.json
+++ b/app.json
@@ -5,7 +5,8 @@
"pages/handle/liist",
"pages/handle/expenditureAudit/expenditureAudit",
"pages/apply/index",
- "pages/apply/paymentTemplate/paymentTemplate"
+ "pages/apply/paymentTemplate/paymentTemplate",
+ "pages/apply/approval/approval"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/app.wxss b/app.wxss
index 98e8c3f..53e6313 100644
--- a/app.wxss
+++ b/app.wxss
@@ -50,6 +50,7 @@ contact-button {
.ns {
width: 100%;
text-align:center;
+ z-index: 999;
background:linear-gradient(to right, #2C8E68, #B3DB62);
}
.ns image{
diff --git a/image/apply/icon_down.png b/image/apply/icon_down.png
new file mode 100644
index 0000000..4cd6a86
Binary files /dev/null and b/image/apply/icon_down.png differ
diff --git a/image/apply/icon_up.png b/image/apply/icon_up.png
new file mode 100644
index 0000000..8179128
Binary files /dev/null and b/image/apply/icon_up.png differ
diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js
new file mode 100644
index 0000000..267fca5
--- /dev/null
+++ b/pages/apply/approval/approval.js
@@ -0,0 +1,127 @@
+// pages/apply/approval/approval.js
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ isIPX: app.globalData.isIPX,
+ 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,
+ result:[],
+ show:false,
+ showPopup:false,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+ onChange(event) {
+ this.setData({
+ result: event.detail,
+ });
+ },
+ openBox:function(){
+ var that = this ;
+ that.setData({
+ show: true,
+ })
+ },
+ closeBox:function(){
+ var that = this ;
+ that.setData({
+ show: false,
+ })
+ },
+ showPopup() {
+ this.setData({ showPopup: true });
+ },
+
+ onClose() {
+ this.setData({ showPopup: false });
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/apply/approval/approval.json b/pages/apply/approval/approval.json
new file mode 100644
index 0000000..bc56a53
--- /dev/null
+++ b/pages/apply/approval/approval.json
@@ -0,0 +1,18 @@
+{
+ "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-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+ "van-action-sheet": "@vant/weapp/action-sheet/index",
+ "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+ "van-dialog": "@vant/weapp/dialog/index",
+ "van-field": "@vant/weapp/field/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml
new file mode 100644
index 0000000..a378531
--- /dev/null
+++ b/pages/apply/approval/approval.wxml
@@ -0,0 +1,134 @@
+
+
+
+ 支出申请
+
+
+
+ 审批事项
+
+
+ {{index+1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.activityName}}村级主任审批
+
+
+
+
+
+
+
+
+
+
+
+
+ 董事长：张三
+ 董事长：张三
+
+
+ 董事长：张三
+ 董事长：张三
+
+
+
+
+ 村长：张三
+ 村书记：张三
+
+
+ 村主任：张三
+ 村党委：张三
+
+
+
+
+ 镇长：张三
+ 镇书记：张三
+
+
+ 镇主任：张三
+ 镇党委：张三
+
+
+
+
+
+
+ 选择审批模板
+ 保存审批模板
+
+
+
+
+ 保存
+ 保存并提交
+
+
+
+
+
+
+ 日常支付水电模板默认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/approval/approval.wxss b/pages/apply/approval/approval.wxss
new file mode 100644
index 0000000..b7522c6
--- /dev/null
+++ b/pages/apply/approval/approval.wxss
@@ -0,0 +1,237 @@
+/* pages/apply/approval/approval.wxss */
+text{display: block;}
+
+.ns{
+ position: fixed;
+ top: 0;
+ background: linear-gradient(to right, #429a68, #9ecf67);
+}
+
+.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);
+}
+
+.main-box{
+ background: #ffffff;
+ padding: 20px 0;
+ width: 94%;
+ margin: 0 auto;
+ border-radius: 10px;
+ box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+}
+
+.top-box text{
+ margin-bottom: 15px;
+}
+.top-box text:last-child{
+ margin-bottom: 0px;
+}
+.box-title{
+ color: #2C8E68;
+ text-align: center;
+ font-size: 16px;
+}
+
+.steps-box view{
+ margin-bottom: 0;
+}
+.steps-box .van-row{
+ padding: 0 20px;
+}
+.steps-box van-row:nth-child(2n+1) .van-row{
+ background-color: rgba(92, 174, 119, 0.1);
+}
+
+.steps-box .van-col{
+ position: relative;
+ height: 50px;
+ }
+ .steps-box .van-col--21{
+ padding: 5PX 0;
+ line-height: 50px;
+ }
+ .steps-box .van-row:nth-child(2n){
+ background: rgba(29,111,233,0.1);
+ }
+ .steps-box .van-cell{
+ background: transparent;
+ padding: 0 ;
+ line-height: 40px;
+ }
+ .steps-box .bq{
+ display: inline-block;
+ padding: 0PX 10PX;
+ line-height: 0.64rem;
+ border-radius: 5PX;
+ }
+ .steps-box .index{
+ background: #2C8E68;
+ 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% - 15px);
+ }
+ .steps-box .indexBorder{
+ width: 10PX;
+ position: absolute;
+ left: 9px;
+ top: 0;
+ height: 100%;
+
+ }
+ .steps-box .indexBorder .yq{
+ height: 30PX;
+ width: 30PX;
+ background: transparent;
+ border-radius: 50%;
+ }
+ .steps-box .indexBorder .ss{
+ height: calc(50% - 15PX);
+ width: 1PX;
+ background: #C9C9C9;
+ position: relative;
+ }
+ .steps-box .indexBorder .ssT{
+ height: calc(50% - 15PX);
+ width: 1PX;
+ background: #C9C9C9;
+ position: relative;
+ }
+
+ .steps-box .van-cell__title{
+ flex: 0.8;
+ }
+ .steps-box .van-cell__value {
+ flex: 0.2;
+ }
+ .check_box{
+ padding: 50px 0;
+ }
+ .check_box .van-row{
+ background-color: rgba(92, 174, 119, 0.1);
+ margin-top: 10px;
+ padding: 15px 20px;
+ }
+ .check_box .van-col{
+ height: auto;
+ }
+ .check_box van-checkbox:nth-child(2n) .van-checkbox {
+ margin-top: 15px;
+ }
+ .van-checkbox__icon-wrap {
+ border-radius: 5px;
+ }
+ .van-checkbox__icon {
+ border-radius: 5px;
+ border: 2px solid #2C8E68!important;
+ background-color: rgba(44, 142, 104, 0.2);
+ }
+
+ .btn_box{
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10px;
+ }
+ .btn_box view:nth-child(1){
+ display: inline-block;
+ padding: 8px 15px;
+ background-color: rgba(252, 154, 85, 0.2);
+ color: #FC9A55;
+ border-radius: 20px;
+ font-size: 16px;
+ }
+ .btn_box view:nth-child(2){
+ display: inline-block;
+ padding: 8px 15px;
+ background-color: rgba(92, 174, 119, 0.2);
+ color: #5CAE77;
+ border-radius: 20px;
+ font-size: 16px;
+ margin-left: 30px;
+ }
+
+ .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;
+ }
+ .deleteBox{
+ width: 65px;
+ text-align: center;
+ height: 100%;
+ background: #F6F6F6;
+ align-items: center;
+ display: flex;
+ }
+ .van-action-sheet__header {
+ background: #f2f2f2;
+ color: #2C8E68;
+ }
+
+ .input_tit{
+ border: 1px solid #DCDCDC;
+ padding: 0px 10px;
+ height: 32px;
+ line-height: 32px;
+ border-radius: 5px;
+ margin-bottom: 15px;
+ }
+ .van-dialog__header {
+ color: #2C8E68;
+ font-size: 18px;
+ }
+ .van-button--normal {
+ background: linear-gradient(to right, #2C8E68, #5CAE77)!important;
+ }
\ No newline at end of file
diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js
index cf3bb86..78060c5 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.js
+++ b/pages/apply/paymentTemplate/paymentTemplate.js
@@ -16,6 +16,12 @@ Page({
onClose() {
this.setData({ show: false });
},
+
+ goApproval(){
+ wx.navigateTo({
+ url: '../approval/approval',
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/apply/paymentTemplate/paymentTemplate.json b/pages/apply/paymentTemplate/paymentTemplate.json
index f7f42cc..7c415ff 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.json
+++ b/pages/apply/paymentTemplate/paymentTemplate.json
@@ -3,6 +3,7 @@
"van-cell": "@vant/weapp/cell/index",
"van-cell-group": "@vant/weapp/cell-group/index",
"van-icon": "@vant/weapp/icon/index",
- "van-popup": "@vant/weapp/popup/index"
+ "van-dialog": "@vant/weapp/dialog/index",
+ "van-field": "@vant/weapp/field/index"
}
}
\ No newline at end of file
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml
index bb9eec7..b0497d7 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxml
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxml
@@ -1,14 +1,14 @@
-
-
-
+
+
支出申请
+
审批事项
支出总金额
- ￥
+ ￥
提交单位：龙华村联合社
提交日期：2022年1月18日
提 交 人：报账员
@@ -19,7 +19,7 @@
支出金额
- ￥
+ ￥
事由：
@@ -52,11 +52,17 @@
提交复核
- 下一步
+ 下一步
-
-
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxss b/pages/apply/paymentTemplate/paymentTemplate.wxss
index 5d0d8fb..56ed9bb 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxss
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxss
@@ -1,10 +1,16 @@
/* pages/apply/paymentTemplate/paymentTemplate.wxss */
text{display: block;}
+.ns{
+ position: fixed;
+ top: 0;
+ background: linear-gradient(to right, #429a68, #9ecf67);
+}
+
.pure_top {
width: 100%;
- height: 100px;
- position: relative;
+ height: 120px;
+ position: absolute;
z-index: -1;
overflow: hidden
}
@@ -12,13 +18,13 @@ text{display: block;}
.pure_top::after {
content: '';
width: 140%;
- height: 100px;
+ height: 120px;
position: absolute;
left: -20%;
top: 0;
z-index: -1;
border-radius: 0 0 50% 50%;
- background: #1496f1
+ background: linear-gradient(to right, #2C8E68, #B3DB62);
}
.top{
@@ -54,10 +60,7 @@ text{display: block;}
border-radius: 10px;
box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
}
-.top-box{
- /* margin-top: 20px; */
- /* margin-bottom: 28px; */
-}
+
.top-box text{
margin-bottom: 15px;
}
@@ -191,4 +194,17 @@ text{display: block;}
background-image: linear-gradient(to right, #2C8E68, #5CAE77);
margin-left: 6%;
color: #fff;
+}
+
+.window{
+ background: #fff;
+ width: 94%;
+}
+
+.van-dialog__header {
+ color: #2C8E68;
+ font-size: 18px;
+}
+.van-button--normal {
+ background: linear-gradient(to right, #2C8E68, #5CAE77)!important;
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 5e94748..db3ca8a 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -38,6 +38,13 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "支出审批流程",
+ "pathName": "pages/apply/approval/approval",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}