Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	app.json
	project.config.json

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",

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{

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() {
+
+  }
+})

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"
+  }
+}

pages/apply/approval/approval.wxml

@@ -0,0 +1,134 @@
+<!--pages/apply/approval/approval.wxml-->
+<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
+  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
+</view>
+<view class="pure_top" style="top:{{isIPX?'88px':'64px'}};"></view>
+<view class="main-box top-box  steps-box" style="margin-top:{{isIPX?'100px':'75px'}};">
+  <text class="box-title">审批事项</text>
+  <van-row wx:for="{{steps}}" wx:key="index">
+    <van-col span="3">
+      <view class="index">{{index+1}}</view>
+      <!-- :class="{'indexCenter':index==0 ? false : true}" -->
+      <block wx:if="{{index==0}}">
+        <view class="indexBorder">
+          <view class="ssT" wx:if="{{index>0}}"></view>
+          <view class="yq"></view>
+          <view class="ss" wx:if="{{steps.length != index+1}}"></view>
+        </view>
+      </block>
+      <block wx:else>
+        <view class="indexBorder indexCenter">
+          <view class="ssT" wx:if="{{index>0}}"></view>
+          <view class="yq"></view>
+          <view class="ss" wx:if="{{steps.length != index+1}}"></view>
+        </view>
+      </block>
+    </van-col>
+    <van-col span="21">
+      <van-cell center="{{true}}" border="{{false}}">
+        <view slot="title">
+          {{item.activityName}}<text style="display: inline-block;margin-left: 10px;">村级主任审批</text>
+        </view>
+        <view style="display: flex;align-items: center;justify-content:flex-end;">
+          <image src="/image/apply/icon_up.png" style="width: 20px;height: 20px;"></image>
+          <image src="/image/apply/icon_down.png" style="width: 20px;height: 20px;margin-left: 10px;"></image>
+        </view>
+      </van-cell>
+    </van-col>
+  </van-row>
+  <view class="check_box">
+    <van-checkbox-group value="{{ result }}" bind:change="onChange">
+      <van-row>
+        <van-col span="12">
+          <van-checkbox name="a" shape="square" checked-color="#2C8E68">董事长：张三</van-checkbox>
+          <van-checkbox name="b" shape="square" checked-color="#2C8E68">董事长：张三</van-checkbox>
+        </van-col>
+        <van-col span="12">
+          <van-checkbox name="c" shape="square" checked-color="#2C8E68">董事长：张三</van-checkbox>
+          <van-checkbox name="d" shape="square" checked-color="#2C8E68">董事长：张三</van-checkbox>
+        </van-col>
+      </van-row>
+      <van-row>
+        <van-col span="12">
+          <van-checkbox name="a" shape="square" checked-color="#2C8E68">村长：张三</van-checkbox>
+          <van-checkbox name="b" shape="square" checked-color="#2C8E68">村书记：张三</van-checkbox>
+        </van-col>
+        <van-col span="12">
+          <van-checkbox name="c" shape="square" checked-color="#2C8E68">村主任：张三</van-checkbox>
+          <van-checkbox name="d" shape="square" checked-color="#2C8E68">村党委：张三</van-checkbox>
+        </van-col>
+      </van-row>
+      <van-row>
+        <van-col span="12">
+          <van-checkbox name="a" shape="square" checked-color="#2C8E68">镇长：张三</van-checkbox>
+          <van-checkbox name="b" shape="square" checked-color="#2C8E68">镇书记：张三</van-checkbox>
+        </van-col>
+        <van-col span="12">
+          <van-checkbox name="c" shape="square" checked-color="#2C8E68">镇主任：张三</van-checkbox>
+          <van-checkbox name="d" shape="square" checked-color="#2C8E68">镇党委：张三</van-checkbox>
+        </van-col>
+      </van-row>
+    </van-checkbox-group>
+  </view> 
+
+  <view class="btn_box">
+    <view bindtap="openBox">选择审批模板</view>
+    <view bindtap="showPopup">保存审批模板</view>
+  </view>
+</view>
+
+<view class="bottom">
+  <view class="btn1" bindtap="openBox">保存</view>
+  <view class="btn2" bindtap="goApproval">保存并提交</view>
+</view>
+
+<van-action-sheet show="{{show}}" title="选择审批模板" bind:close="closeBox">
+  <van-swipe-cell right-width="{{ 65 }}">
+    <van-cell label="支付水电、网费、房租" bindtap="goTemplate" >
+      <view slot="title">
+        <view class="van-cell-text">日常支付水电模板<van-tag plain type="danger" color="#FC9A55" style="margin-left:10px;">默认</van-tag></view>
+      </view>
+      <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mrmb.png?sign=5e5df640777f6a7993c45e1a559dd998&t=1648619865" class="custom-icon" size="40" style="margin-right: 10px;" />
+    </van-cell>
+    <view slot="right" class="deleteBox">
+      <image src="/image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+    </view>
+  </van-swipe-cell>
+  <van-swipe-cell right-width="{{ 65 }}">
+      <van-cell title="日常支付水电模板" label="支付水电、网费、房租"  >
+        <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mb.png?sign=2a8bbe2cb4d4e0f28a99fddbe042d26c&t=1648620032" class="custom-icon" size="40" style="margin-right: 10px;" />
+      </van-cell>
+    <view slot="right" class="deleteBox">
+      <image src="/image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+    </view>
+  </van-swipe-cell>
+  <van-swipe-cell right-width="{{ 65 }}">
+      <van-cell title="日常支付水电模板" label="支付水电、网费、房租"  >
+        <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mb.png?sign=2a8bbe2cb4d4e0f28a99fddbe042d26c&t=1648620032" class="custom-icon" size="40" style="margin-right: 10px;" />
+      </van-cell>
+    <view slot="right" class="deleteBox">
+      <image src="/image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+    </view>
+  </van-swipe-cell>
+  <van-swipe-cell right-width="{{ 65 }}">
+      <van-cell title="日常支付水电模板" label="支付水电、网费、房租"  >
+        <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mb.png?sign=2a8bbe2cb4d4e0f28a99fddbe042d26c&t=1648620032" class="custom-icon" size="40" style="margin-right: 10px;" />
+      </van-cell>
+    <view slot="right" class="deleteBox">
+      <image src="/image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+    </view>
+  </van-swipe-cell>
+</van-action-sheet>
+
+<van-dialog
+  use-slot
+  title="审批模板"
+  show="{{ showPopup }}"
+  bind:close="onClose"
+  theme='round-button'
+  confirmButtonText="保存"
+  closeOnClickOverlay="{{ true }}"
+>
+  <input class="input_tit" placeholder="请输入模板名称" style="width: 90%;margin: 0 auto;margin-top: 15px;margin-bottom: 10px;text-align: center;"/> 
+</van-dialog>

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;
+  }

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',
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

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"
   }
 }

pages/apply/paymentTemplate/paymentTemplate.wxml

@@ -1,14 +1,14 @@
-<!--pages/apply/paymentTemplate/paymentTemplate.wxml-->
-<image src="../../../image/expenditureAudit/bgGreen.png" class="bgPage"></image>
-<view class="ns top" style="height:{{isIPX?'88px':'64px'}};background:none;">
+<!--pages/apply/paymentTemplate/paymentTemplate.wxml height:{{isIPX?'88px':'64px'}};-->
+<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
   <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
 </view>
+<view class="pure_top" style="top:{{isIPX?'88px':'64px'}};"></view>
 <view class="main-box top-box" style="margin-top:{{isIPX?'100px':'75px'}};">
   <text class="box-title">审批事项</text>
   <input class="input_tit" placeholder="房屋出租整年费用"/>
   <text>支出总金额</text>
-  <view class="money_box">￥<input class="input_money" placeholder="总金额"/></view>
+  <view class="money_box">￥<input class="input_money" placeholder="总金额" placeholder-style="color:#E90000;"/></view>
   <text>提交单位：龙华村联合社</text>
   <text>提交日期：2022年1月18日</text>
   <text>提  交  人：报账员</text>
@@ -19,16 +19,50 @@
 
 <view class="main-box top-box">
   <text>支出金额</text>
-  <view class="money_box">￥<input class="input_money" placeholder="金额"/></view>
-  <van-cell-group>
+  <view class="money_box">￥<input class="input_money" placeholder="金额" placeholder-style="color:#E90000;"/></view>
+  <van-cell-group border="{{ false }}">
     <van-cell title="支付联合社办公室12月份租金" border="{{ false }}" >
-      <view slot="icon">事由</view>
+      <view slot="icon" style="width: 15%;">事由：</view>
     </van-cell>
-    <van-cell title="龙华村联合社华" border="{{ false }}" >
-      <view slot="icon"></view>
+    <van-cell title="龙华村联合社华" border="{{ false }}" center >
+      <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_fu.png" style="width: 20px;height: 20px;"></image></view>
     </van-cell>
-    <van-cell title="龙华村联合社龙华村联合社龙华龙华村联合社" border="{{ false }}"  >
-      <view slot="icon"></view>
+    
+    <van-cell title="龙华村联合社龙华村联合社龙华龙华村联合社" center border="{{ false }}"  >
+      <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_shou.png" style="width: 20px;height: 20px;"></image></view>
     </van-cell>
+    <view class="btnBox">
+      <image src="/image/apply/down.png" class="down"></image>
+      <image src="/image/apply/icon_update.png" class="update"></image>
+      <image src="/image/apply/icon_delete.png" class="delete"></image>
+    </view>
   </van-cell-group>
-</view>
+</view>
+
+<view class="bottomBtn">
+  <view bindtap="showPopup">
+    <image src="/image/apply/icon_pres.png"></image>
+    <text>保存模板</text>  
+  </view>
+  <view>
+    <image src="/image/apply/icon_add.png"></image>
+    <text>新增事项</text>  
+  </view>
+</view>
+
+<view class="bottom">
+  <view class="btn1" bindtap="openBox">提交复核</view>
+  <view class="btn2" bindtap="goApproval">下一步</view>
+</view>
+
+<van-dialog
+  use-slot
+  title="支付模板"
+  show="{{ show }}"
+  bind:close="onClose"
+  theme='round-button'
+  confirmButtonText="保存"
+  closeOnClickOverlay="{{ true }}"
+>
+  <input class="input_tit" placeholder="请输入模板名称" style="width: 90%;margin: 0 auto;margin-top: 15px;margin-bottom: 10px;text-align: center;"/> 
+</van-dialog>

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;
 }

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?',
+      })
+    },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/inCome/inCome.wxml

@@ -1,7 +1,7 @@
 <!--pages/apply/index.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
   <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
-  <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">收入登记</text>
 </view>
 <!-- 付款单位开始 -->
 <view class="top">
@@ -9,3 +9,96 @@
   <view class="top-tit">收入单位</view>
   <view class="top-title">龙水镇龙洞村股份经济联合社</view>
 </view>
+<view class="title">
+  <text>基础信息</text>
+</view>
+<view class="main-box table-box">
+      <view>
+        <text class="rules">收入时间</text> 
+        <picker mode="date" value="{{time}}" start="09:01" end="21:01" bindchange="bindTimeChange">
+          <view class="picker">
+             {{time}}
+          </view>
+        </picker>
+      </view>
+      <view>
+        <text class="rules">收入金额</text> 
+        <input type="number" value="{{srje}}" style="text-align:right;"/>
+      </view>
+      <view><text class="rules">存入账户</text> <input type="number" value="{{crzh}}" style="text-align:right;"/></view>
+      <view><text class="rules">收入类型</text> <input type="number" value="{{srlx}}" style="text-align:right;"/></view>
+      <view><text class="rules">单据编码</text> <input type="number" value="{{djbm}}" style="text-align:right;"/></view>
+      <view><text class="rules">备注说明</text> <input type="number" value="{{bzsm}}" style="text-align:right;"/></view>
+</view>
+<view class="title">
+  <text>关联合同</text>
+</view>
+<view class="main-box table-box">
+      <view>
+        <text class="rules">付款人</text> 
+        <input type="text" value="{{srje}}" style="text-align:right;"/>
+      </view>
+      <view><text class="rules">合同编码</text> <input type="text" value="{{htbm}}" style="text-align:right;"/></view>
+</view>
+<view class="title">
+  <text>附件</text>
+</view>
+<view class="main-box table-box">
+  <view style="margin:10px 0 5px;">
+        <text class="fjLable">收据</text> 
+        <view class='content'>
+          <view class='img-box'>
+            <view class='img-list'>
+              <block wx:for="{{sjPics}}" wx:key="index">
+                <view class='img-item'>
+                  <image src='{{item}}' bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
+                </view>
+              </block>
+              <view class='chooseimg' bindtap='uploadSjPics'>
+                <view class="weui-uploader__input-box"></view>
+              </view>
+            </view>
+          </view>
+        </view>
+  </view>
+  <view style="margin:10px 0 5px;">
+        <text class="fjLable">发票</text> 
+        <view class='content'>
+          <view class='img-box'>
+            <view class='img-list'>
+              <block wx:for="{{fpPics}}" wx:key="index">
+                <view class='img-item'>
+                  <image src='{{item}}' bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
+                </view>
+              </block>
+              <view class='chooseimg' bindtap='uploadFpPics'>
+                <view class="weui-uploader__input-box"></view>
+              </view>
+            </view>
+          </view>
+        </view>
+  </view>
+  <view style="margin:10px 0 5px;">
+        <text class="fjLable">其他</text> 
+        <view class='content'>
+          <view class='img-box'>
+            <view class='img-list'>
+              <block wx:for="{{qtPics}}" wx:key="index">
+                <view class='img-item'>
+                  <image src='{{item}}' bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
+                </view>
+              </block>
+              <view class='chooseimg' bindtap='uploadQtPics'>
+                <view class="weui-uploader__input-box"></view>
+              </view>
+            </view>
+          </view>
+        </view>
+  </view>
+</view>
+<view class="main-box table-box">
+    <view class="btn">
+        <button type="primary"  plain="true">暂存</button>
+        <button type="primary"  bindtap="swichAccounting">提交</button>
+    </view>
+</view>

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;
 }

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() {

pages/index/index.wxml

@@ -4,6 +4,7 @@
     <view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
     <!--账户信息-->
     <view class="information_header">
+        <navigator bindtap="swichSettle" class="setup" style="background:url('../../image/index/setup.png') no-repeat; background-size: 100%  100%;"></navigator> 
         <view class="portrait_head"></view>
         <view class="information_main">
             <view class="name_wrap">

pages/index/index.wxss

@@ -8,6 +8,15 @@
   /* padding: 30rpx 32rpx 54rpx; */
   padding: 10rpx 32rpx 54rpx;
   display: flex;
+  position: relative;
+}
+.information_header .setup{
+  width: 38rpx;
+  height: 38rpx;
+  position: absolute;
+  right: 34rpx;
+  top: 15rpx;
+  display: block;
 }
 .information_header .portrait_head{
   width: 110rpx;

project.config.json

@@ -1,4 +1,40 @@
 {
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "packOptions": {
+    "ignore": [
+      {
+        "value": ".eslintrc.js",
+        "type": "file"
+      }
+    ],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": false,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "packOptions": {
         "ignore": [
@@ -9,6 +45,29 @@
         ],
         "include": []
     },
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true,
+    "useStaticServer": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.23.2",
+  "appid": "wxaace54cc2cf8924b",
+  "projectname": "WXMB",
+  "condition": {
+    "search": {
+      "list": []
+
+
+
+
     "setting": {
         "urlCheck": false,
         "es6": true,
@@ -47,6 +106,8 @@
         "useCompilerPlugins": false,
         "ignoreUploadUnusedFiles": true
     },
+    "conversation": {
+      "list": []
     "compileType": "miniprogram",
     "libVersion": "2.23.2",
     "appid": "wxaace54cc2cf8924b",
@@ -55,6 +116,17 @@
         "tabIndent": "insertSpaces",
         "tabSize": 2
     },
+    "game": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
     "condition": {
         "search": {
             "list": []
@@ -75,4 +147,10 @@
             "list": []
         }
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+
 }

project.private.config.json

@@ -38,6 +38,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "支出审批流程",
+          "pathName": "pages/apply/approval/approval",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }