diff --git a/app.json b/app.json
index 9d5e40a..b6243f2 100644
--- a/app.json
+++ b/app.json
@@ -2,11 +2,16 @@
"pages": [
"pages/user/login/login",
"pages/index/index",
+ "pages/index/settle/index",
+ "pages/index/settle/passWord/index",
+ "pages/index/settle/eSign/index",
"pages/handle/liist",
"pages/handle/expenditureAudit/expenditureAudit",
"pages/apply/index",
"pages/apply/paymentTemplate/paymentTemplate",
- "pages/inCome/inCome"
+ "pages/inCome/inCome",
+ "pages/apply/approval/approval",
+ "pages/inCome/accounting/index"
],
"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/down.png b/image/apply/down.png
new file mode 100644
index 0000000..02f42c5
Binary files /dev/null and b/image/apply/down.png differ
diff --git a/image/apply/icon_add.png b/image/apply/icon_add.png
new file mode 100644
index 0000000..cb627e2
Binary files /dev/null and b/image/apply/icon_add.png differ
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_fu.png b/image/apply/icon_fu.png
new file mode 100644
index 0000000..51189fe
Binary files /dev/null and b/image/apply/icon_fu.png differ
diff --git a/image/apply/icon_pres.png b/image/apply/icon_pres.png
new file mode 100644
index 0000000..be3ea17
Binary files /dev/null and b/image/apply/icon_pres.png differ
diff --git a/image/apply/icon_shou.png b/image/apply/icon_shou.png
new file mode 100644
index 0000000..bfd8bf6
Binary files /dev/null and b/image/apply/icon_shou.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/image/apply/icon_update.png b/image/apply/icon_update.png
new file mode 100644
index 0000000..87199f9
Binary files /dev/null and b/image/apply/icon_update.png differ
diff --git a/image/index/setup.png b/image/index/setup.png
new file mode 100644
index 0000000..ee8fc5f
Binary files /dev/null and b/image/index/setup.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 a69de0c..78060c5 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.js
+++ b/pages/apply/paymentTemplate/paymentTemplate.js
@@ -7,8 +7,21 @@ Page({
*/
data: {
isIPX: app.globalData.isIPX,
+ show: false
+ },
+ showPopup() {
+ this.setData({ show: true });
+ },
+
+ 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 26f00aa..7c415ff 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.json
+++ b/pages/apply/paymentTemplate/paymentTemplate.json
@@ -1,6 +1,9 @@
{
"usingComponents": {
"van-cell": "@vant/weapp/cell/index",
- "van-cell-group": "@vant/weapp/cell-group/index"
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-icon": "@vant/weapp/icon/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 58eea45..b0497d7 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxml
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxml
@@ -1,14 +1,14 @@
-
-
-
+
+
支出申请
+
审批事项
支出总金额
- ￥
+ ￥
提交单位：龙华村联合社
提交日期：2022年1月18日
提 交 人：报账员
@@ -19,16 +19,50 @@
支出金额
- ￥
-
+ ￥
+
- 事由
+ 事由：
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
\ 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 d7fdf07..56ed9bb 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxss
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxss
@@ -1,5 +1,32 @@
/* 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: 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);
+}
+
.top{
height: 64px;
width: 100%;
@@ -33,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;
}
@@ -83,4 +107,104 @@ text{display: block;}
padding: 10px calc(3% + 20px);
color: #2C8E68;
font-size: 16px;
+}
+
+.van-cell {
+ padding-left: 0!important;
+ padding-right: 0!important;
+}
+
+.down{
+ width: 15px;
+ height: 8px;
+ margin: 0 auto;
+ margin-top: 18px;
+}
+
+.update{
+ width: 26px;
+ height: 26px;
+ position: absolute;
+ right: 41px;
+}
+.delete{
+ width: 26px;
+ height: 26px;
+ position: absolute;
+ right: 0;
+}
+
+.btnBox{
+ text-align: center;
+ position: relative;
+ height: 26px;
+}
+.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;
+}
+
+.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/pages/inCome/inCome.js b/pages/inCome/inCome.js
index f483b01..f1e6ba3 100644
--- a/pages/inCome/inCome.js
+++ b/pages/inCome/inCome.js
@@ -7,7 +7,19 @@ Page({
*/
data: {
isIPX: app.globalData.isIPX,
- show:false
+ show:false,
+ time:"2022-1-22",
+ srje:0,
+ crzh:123132,
+ srlx:"发包收入",
+ djbm:3423497895934633,
+ bzsm:"收合同2022年第一季度款",
+ fkr:"列示合同乙方或填写",
+ htbm:"DZ000001",
+ sjPics:[],
+ fpPics:[],
+ qtPics:[],
+ count:9
},
/**
@@ -23,6 +35,99 @@ Page({
delta: 1
})
},
+ uploadSjPics: function (e) { //这里是选取图片的方法
+ var that = this;
+ var pics = [];
+ var detailPics = that.data.sjPics;
+ if (detailPics.length >= that.data.count) {
+ wx.showToast({
+ title: '最多选择' + that.data.count + '张！',
+ })
+ return;
+ }
+ wx.chooseImage({
+ count: that.data.count, // 最多可以选择的图片张数，默认9
+ sizeType: ['original', 'compressed'], // original 原图，compressed 压缩图，默认二者都有
+ sourceType: ['album', 'camera'], // album 从相册选图，camera 使用相机，默认二者都有
+ success: function (res) {
+ var imgs = res.tempFilePaths;
+ for (var i = 0; i < imgs.length; i++) {
+ pics.push(imgs[i])
+ }
+ that.uploadimg({
+ url: "http://www.test.com//test-api/wechat/applet/api/uploadUserAvatar", //这里是你图片上传的接口
+ path: pics, //这里是选取的图片的地址数组
+ });
+ },
+ })
+ },
+ uploadFpPics: function (e) { //这里是选取图片的方法
+ var that = this;
+ var pics = [];
+ var detailPics = that.data.fpPics;
+ if (detailPics.length >= that.data.count) {
+ wx.showToast({
+ title: '最多选择' + that.data.count + '张！',
+ })
+ return;
+ }
+ wx.chooseImage({
+ count: that.data.count, // 最多可以选择的图片张数，默认9
+ sizeType: ['original', 'compressed'], // original 原图，compressed 压缩图，默认二者都有
+ sourceType: ['album', 'camera'], // album 从相册选图，camera 使用相机，默认二者都有
+ success: function (res) {
+ var imgs = res.tempFilePaths;
+ for (var i = 0; i < imgs.length; i++) {
+ pics.push(imgs[i])
+ }
+ that.uploadimg({
+ url: "http://www.test.com//test-api/wechat/applet/api/uploadUserAvatar", //这里是你图片上传的接口
+ path: pics, //这里是选取的图片的地址数组
+ });
+ },
+ })
+ },
+ uploadQtPics: function (e) { //这里是选取图片的方法
+ var that = this;
+ var pics = [];
+ var detailPics = that.data.qtPics;
+ if (detailPics.length >= that.data.count) {
+ wx.showToast({
+ title: '最多选择' + that.data.count + '张！',
+ })
+ return;
+ }
+ wx.chooseImage({
+ count: that.data.count, // 最多可以选择的图片张数，默认9
+ sizeType: ['original', 'compressed'], // original 原图，compressed 压缩图，默认二者都有
+ sourceType: ['album', 'camera'], // album 从相册选图，camera 使用相机，默认二者都有
+ success: function (res) {
+ var imgs = res.tempFilePaths;
+ for (var i = 0; i < imgs.length; i++) {
+ pics.push(imgs[i])
+ }
+ that.uploadimg({
+ url: "http://www.test.com//test-api/wechat/applet/api/uploadUserAvatar", //这里是你图片上传的接口
+ path: pics, //这里是选取的图片的地址数组
+ });
+ },
+ })
+ },
+
+ swichAccounting: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: '../inCome/accounting/index?',
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/inCome/inCome.wxml b/pages/inCome/inCome.wxml
index 9d046d5..edaaf11 100644
--- a/pages/inCome/inCome.wxml
+++ b/pages/inCome/inCome.wxml
@@ -1,7 +1,7 @@
- 支出申请
+ 收入登记
@@ -9,3 +9,96 @@
收入单位
龙水镇龙洞村股份经济联合社
+
+ 基础信息
+
+
+
+ 收入时间
+
+
+ {{time}}
+
+
+
+
+ 收入金额
+
+
+ 存入账户
+ 收入类型
+ 单据编码
+ 备注说明
+
+
+ 关联合同
+
+
+
+ 付款人
+
+
+ 合同编码
+
+
+ 附件
+
+
+
+ 收据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发票
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/inCome/inCome.wxss b/pages/inCome/inCome.wxss
index 915393c..bd9692e 100644
--- a/pages/inCome/inCome.wxss
+++ b/pages/inCome/inCome.wxss
@@ -1,6 +1,6 @@
/* pages/apply/index.wxss */
.inComeUnit{
- border:1px solid #ddd;
+ border:1rpx solid #ddd;
width:90%;
margin:0 auto;
@@ -10,12 +10,12 @@
width: 94%;
margin: 0 auto;
background-color: #ffffff;
- border-radius: 10px;
+ border-radius: 10rpx;
margin-top: 3vw;
overflow: hidden;
}
.top view{
- padding: 18px 15px;
+ padding: 40rpx 15rpx;
align-items: center;
justify-content: center;
position: relative;
@@ -30,4 +30,148 @@
}
.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: 0 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 view{
+ display: flex;
+ justify-content: space-between;
+}
+.table-box text{
+ line-height: 55rpx;
+}
+.fjLable{
+ display: inline-block;
+ width:24px;
+ margin:30rpx 5rpx;
+ color:#fff;
+ background:#07c160;
+ border-radius: 10rpx;
+ text-align: center;
+ line-height: 40rpx!important;
+ padding:25rpx 0;
+}
+.content {
+ width: 100%;
+ background-color: #fff;
+}
+
+.img-list {
+ display: flex;
+ display: -webkit-flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+ flex-wrap: wrap;
+}
+
+.img-item {
+ width: 30%;
+ text-align: left;
+ margin-right: 20rpx;
+ margin-bottom: 10rpx;
+}
+
+.img-item image {
+ width: 180rpx;
+ height: 180rpx;
+}
+
+.submit-btn {
+ width: 100%;
+ background-color: #fff;
+ height: 80rpx;
+ text-align: center;
+ line-height: 80rpx;
+ font-size: 30rpx;
+ position: fixed;
+ bottom: 100rpx;
+}
+
+.chooseimg {
+ background-color: #fff;
+}
+
+.weui-uploader__input-box {
+ float: left;
+ position: relative;
+ margin-right: 9rpx;
+ margin-bottom: 9rpx;
+ width: 120rpx;
+ height: 120rpx;
+ border: 1px solid #d9d9d9;
+}
+
+.weui-uploader__input-box:before {
+ width: 2px;
+ height: 39.5px;
+}
+
+.weui-uploader__input-box:after, .weui-uploader__input-box:before {
+ content: " ";
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ -webkit-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+ background-color: #d9d9d9;
+}
+
+.weui-uploader__input-box:after {
+ width: 39.5px;
+ height: 2px;
+}
+
+.weui-uploader__input-box:after, .weui-uploader__input-box:before {
+ content: " ";
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ -webkit-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+ background-color: #d9d9d9;
+}
+
+.tips {
+ color: #666;
+ font-size: 24rpx;
+ padding-bottom: 20rpx;
+}
+
+.img-box {
+ width: 92%;
+ margin: auto;
+ padding-top: 20rpx;
+}
+.btn button{
+ line-height: 1.7;
+ padding-left:80rpx;
+ padding-right:80rpx;
+ border-radius: 30rpx;
}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index eb501a0..a38c52e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -45,6 +45,21 @@ swichPayment:function(e){
wx.navigateTo({
url: '../apply/index?',
})
+ },
+ //跳转个人设置
+swichSettle: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: 'settle/index?',
+ })
},
/* 计算bar 高度*/
computeBarLocation() {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f193e7b..0f0970f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -4,6 +4,7 @@