修改

app.json

@@ -9,8 +9,6 @@
     "pages/bankDraft/add/add",
     "pages/project/project",
     "pages/project/add/add",
-    "pages/finance/finance",
-    "pages/finance/voucher/voucher",
     "pages/pay/detail",
     "pages/pay/payee/payee",
     "pages/contractAssets/fixedAssets",
@@ -23,10 +21,6 @@
     "pages/bill/bill",
     "pages/statistics/statistics",
     "pages/user/region/region",
-    "pages/finance/index",
-    "pages/resources/resources",
-    "pages/resources/detail/detail",
-    "pages/resources/edit/edit",
     "pages/phoneLogin"
   ],
   "subPackages": [
@@ -144,6 +138,40 @@
         "list/edit",
         "list/detail"
       ]
+    },
+    {
+      "root": "pages/finance/",
+      "pages": [
+        "index",
+        "finance",
+        "voucher/voucher",
+        "list_balance_ranking/list_balance_ranking",
+        "detailed_liabilities/detailed_liabilities",
+        "detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic"
+      ]
+    },
+    {
+      "root": "pages/mainBody/",
+      "pages": [
+        "list/list",
+        "detail/detail"
+      ]
+    },
+    {
+      "root": "pages/resources/",
+      "pages": [
+        "resources",
+        "edit/edit",
+        "detail/detail"
+      ]
+    },
+    {
+      "root": "pages/discussions/",
+      "pages": [
+        "list",
+        "form/form",
+        "detail/detail"
+      ]
     }
   ],
   "window": {
@@ -151,7 +179,7 @@
     "navigationStyle": "custom",
     "enablePullDownRefresh": false,
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "农燊高科",
+    "navigationBarTitleText": "中农融信",
     "navigationBarTextStyle": "black"
   },
   "sitemapLocation": "sitemap.json",

app.wxss

@@ -67,7 +67,7 @@ contact-button {
   top: 30px;
   margin-right: 30px;
   display: block;
-  color: #eee;
+  color: #000000;
   text-align: center;
   width: 100%;
   font-size: 16px;

component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js

@@ -0,0 +1,32 @@
+// component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
+const app = getApp()
+Component({
+  properties: {
+      type: Object,
+      popupVisible:false,
+      subjects: {},
+      observer: function (newVal, oldVal) {}
+  },
+  observers: {
+    'subjects': function(val) {
+      // this.selectComponent('#tabs').resize();
+    },
+    'popupVisible': function(val) {
+    }
+  },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    open(e){
+      console.log(e);
+    },
+  }
+})

component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json

@@ -0,0 +1,14 @@
+{
+  "component": true,
+  "usingComponents": {
+    "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-datetime-picker": "@vant/weapp/datetime-picker/index",
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index"
+  }
+}

component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml

@@ -0,0 +1,15 @@
+<!--component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml-->
+<van-popup show="{{popupVisible}}" position="bottom" close-on-click-overlay  bind:close="onClose">
+      <!-- <van-search
+        v-model="searchValue"
+        placeholder="按科目编码/名称筛选"
+        @input="onSearch"
+      /> -->
+    <van-tabs animated sticky id="tabs" bind:change="onTabChanged">
+      <van-tab title="{{item.subjectName}}" name="{{item.subjectId}}" wx:for="{{subjects}}" wx:key="index">
+        <view style="height: 480px;">
+          <childrenPage subjects="{{item.children}}"></childrenPage>
+        </view>
+      </van-tab>
+    </van-tabs>
+</van-popup>

component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss

@@ -0,0 +1 @@
+/* component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss */

component/SubjectTreeChooserNodeItem/childrenPage.js

@@ -0,0 +1,43 @@
+// component/SubjectTreeChooserNodeItem/childrenPage.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    type: Object,
+    subjects: {},
+  },
+  observers: {
+    'subjects': function(val) {
+      // console.log(val); // 打印innerText的当前值
+      // this.selectComponent('#tabs').resize();
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    activeNames:''
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    open(e){
+      console.log(e);
+    },
+    onChange(event) {
+      this.setData({
+        activeNames: event.detail,
+      });
+    },
+    onItemClicked(e){
+      console.log(e);
+      // this.triggerEvent('cancel',e)
+      this.triggerEvent('cancel', e, { bubbles: true, composed: true })
+    }
+  }
+})

component/SubjectTreeChooserNodeItem/childrenPage.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage",
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index"
+  }
+}

component/SubjectTreeChooserNodeItem/childrenPage.wxml

@@ -0,0 +1,19 @@
+<!--component/SubjectTreeChooserNodeItem/childrenPage.wxml-->
+<van-collapse value="{{ activeNames }}" bind:change="onChange">
+  <van-collapse-item 
+      wx:for="{{subjects}}"
+      name="{{item.subjectId}}"
+      is-link="{{item.children && item.children.length > 0}}"
+      disabled="{{!(item.children && item.children.length > 0)}}"
+      >
+        <view slot="title" bind:tap="onItemClicked" data-item="{{item}}" style="color: #333333;">
+          {{ item.subjectId }} {{ item.subjectName }}
+        </view>
+        <view>
+          <childrenPage wx:if="{{item.children && item.children.length > 0}}" subjects="{{item.children}}"></childrenPage>
+        </view>
+        
+    <!-- bind:tap="($event) => onItemClicked($event, subject)" wx:if="{{item.visible}}" is-link="{{item.is_last != 'Y'}}"  <SubjectTreeChooserNodeItem :ref="'childCollapse' + index" :subjects="subject.children" v-if="subject.children && Array.isArray(subject.children) && subject.children.length > 0" @clicked="onChildItemClicked" :can-select-non-leaf="canSelectNonLeaf">
+    </SubjectTreeChooserNodeItem> -->
+  </van-collapse-item>
+</van-collapse>

component/SubjectTreeChooserNodeItem/childrenPage.wxss

@@ -0,0 +1 @@
+/* component/SubjectTreeChooserNodeItem/childrenPage.wxss */

component/editor/editor.js

@@ -24,6 +24,7 @@ Component({
   },
   ready() {
     const platform = wx.getSystemInfoSync().platform
+    console.log(platform);
     const isIOS = platform === 'ios'
     this.setData({
       isIOS

component/editor/editor.wxml

@@ -1,7 +1,4 @@
-<editor id="editor" class="ql-container" placeholder="{{placeholder}}" bindstatuschange="onStatusChange" bindready="onEditorReady" bindinput="getContent" style="width:{{width}};height:{{height}};" show-img-size show-img-toolbar show-img-resize>
-</editor>
-
-<view class="toolbar" catchtouchend="format" hidden="{{keyboardHeight > 0 ? false : true}}" style="bottom: {{isIOS ? keyboardHeight : 0}}px">
+<view class="toolbar" catchtouchend="format" hidden="{{false}}">
 <!-- 官方案例 -->
 <!-- <i class="iconfont icon-charutupian" catchtouchend="insertImage"></i>
     <i class="iconfont icon-format-header-2 {{formats.header === 2 ? 'ql-active' : ''}}" data-name="header" data-value="{{2}}"></i>
@@ -47,4 +44,6 @@
     <!-- <i class="iconfont icon-quanping"></i> -->
     <i class="iconfont icon-shanchu" bindtap="clear"></i>
     <i class="iconfont icon-direction-rtl {{formats.direction === 'rtl' ? 'ql-active' : ''}}" data-name="direction" data-value="rtl"></i>
-</view>
+</view>
+<editor id="editor" class="ql-container" placeholder="{{placeholder}}" bindstatuschange="onStatusChange" bindready="onEditorReady" bindinput="getContent" style="width:{{width}};height:{{height}};" show-img-size show-img-toolbar show-img-resize>
+</editor>

component/editor/editor.wxss

@@ -20,9 +20,7 @@
 
 .toolbar {
   padding: 0 16rpx;
-  height: 200rpx;
   width: 100%;
-  position: fixed;
   left: 0;
   right: 100%;
   bottom: 0;

pages/index/index.js

@@ -91,12 +91,17 @@ Page({
     //   })
     // },
     onShow(){
+      //获取滚动条高度
+      // this.computeBarLocation();
+      UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'payment_state', {method:'GET'}, {
+        success: (res) => {
+          this.setData({
+            paymentStateOption:res.data
+          })
+        }
+      })
       //获取用户信息
       this.getUserInfo()
-      //查询待办
-      this.getTaskList();
-      //查询已办
-      this.getTaskDoneList();
       //查询dept
       this.getTreeDept();
     },
@@ -132,36 +137,28 @@ Page({
       let data = {
         pageNum:1,
         pageSize:999,
-        orderByColumn:"A.ID_",
-        isAsc:"desc",
+        // orderByColumn:"A.ID_",
+        // isAsc:"desc",
         systemType:4,
         method:"GET",
+        deptId:JSON.parse(wx.getStorageSync('user')).deptId,
         // taskName:'相关人员审批'
       }
       UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'activity_business_type', {method:'GET'}, {
         success: (res) => {
         }
       })
-      UTIL.httpRequest(API.URL_GET_TASKLIST,data, {
+      UTIL.httpRequest(API.A_myTodoList,data, {
         success: (res) => {
           if (res.code == API.SUCCESS_CODE) {
             let list = [];
-              for(let i = 0;i < res.total;i++){
-                if(res.rows[i].formData){
-                  if (res.rows[i].formData.activityBusinessType == '16' || res.rows[i].formData.activityBusinessType=='36') {
-                    res.rows[i].formData.expenditureAmount =   Number(res.rows[i].formData.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
-                      return $1 + ","; }).replace(/\.$/, "")
-                    list.push(res.rows[i])
-                  }
-                }
-              }
-              this.setData({todoList:list,todoNum:list.length})
-            
+            for(let i = 0;i < res.total;i++){
+                res.rows[i].createTime = res.rows[i].createTime.substr(0,10)
+                console.log(res.rows[i].createTime);
+                list.push(res.rows[i])
+            }
+            this.setData({todoList:list,todoNum:res.rows.length})
           }
-        },	fail: (res) => {
-          console.log(res);
-        },
-        complete: (res) => {
         }
       })
     },
@@ -169,27 +166,36 @@ Page({
       let data = {
         pageNum:1,
         pageSize:999,
-        orderByColumn:"A.ID_",
-        isAsc:"desc",
+        // orderByColumn:"A.ID_",
+        // isAsc:"desc",
         systemType:4,
         method:"GET",
+        deptId:JSON.parse(wx.getStorageSync('user')).deptId,
         // taskName:'相关人员审批'
       }
-      UTIL.httpRequest(API.URL_GET_TASKDONELIST,data, {
+      UTIL.httpRequest(API.A_myDoneList,data, {
         success: (res) => {
           if (res.code == API.SUCCESS_CODE) {
             let list = [];
-              for(let i = 0;i<res.total;i++){
-                if(res.rows[i].formData){
-                  if (res.rows[i].formData.activityBusinessType == '16' || res.rows[i].formData.activityBusinessType=='36') {
-                    let d = this.dictTranslate(this.data.transferType,res.rows[i].formData.transferType)
-                    res.rows[i].formData.transferType =  d
-                    res.rows[i].formData.expenditureAmount =   Number(res.rows[i].formData.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
-                      return $1 + ","; }).replace(/\.$/, "")
-                    list.push(res.rows[i])
-                  }
-                }
-              } 
+              // for(let i = 0;i<res.total;i++){
+              //   if(res.rows[i].formData){
+              //     if (res.rows[i].formData.activityBusinessType == '16' || res.rows[i].formData.activityBusinessType=='36') {
+              //       let d = this.dictTranslate(this.data.transferType,res.rows[i].formData.transferType)
+              //       res.rows[i].formData.transferType =  d
+              //       res.rows[i].formData.expenditureAmount =   Number(res.rows[i].formData.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              //         return $1 + ","; }).replace(/\.$/, "")
+              //       list.push(res.rows[i])
+              //     }
+              //   }
+              // } 
+
+              for(let i = 0;i < res.total;i++){
+                res.rows[i].data.expenditureAmount =   Number(res.rows[i].data.expenditureAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                  return $1 + ","; }).replace(/\.$/, "")
+                res.rows[i].auditTime = res.rows[i].auditTime.substr(0,10)
+                console.log(res.rows[i].createTime);
+                list.push(res.rows[i])
+              }
               this.setData({doneList:list,doneNum:list.length})
           }
         },	fail: (res) => {
@@ -199,7 +205,7 @@ Page({
         }
       })
     },
-    getTransferList:function(e){
+    getTransferList:function(e){//已废弃
       let data = {
         // pageNum:1,
         // pageSize:10,
@@ -216,7 +222,8 @@ Page({
             this.setData({yfqNum:a})
             for(let i = 0;i<res.total;i++){
               res.rows[i].totalAmount =   Number(res.rows[i].totalAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
-                return $1 + ","; }).replace(/\.$/, "") 
+                return $1 + ","; }).replace(/\.$/, "");
+                
             }
             this.setData({yfqList:res.rows})
           }
@@ -245,6 +252,7 @@ Page({
             for(let i = 0;i< c.length;i++){
               c[i].totalAmount = Number(c[i].totalAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
                 return $1 + ","; }).replace(/\.$/, "") 
+                c[i].paymentStateText = UTIL.getTransform(res.rows[i].paymentState,this.data.paymentStateOption); 
             }
             this.setData({yfqList:c})
           }
@@ -315,6 +323,7 @@ Page({
   },
     /* 计算bar 高度*/
     computeBarLocation() {
+      console.log('aaaaaaaaaaaaa');
       var that = this;
       let CustomMenuButton = wx.getMenuButtonBoundingClientRect();
       let CustomWidows = wx.getSystemInfoSync();
@@ -325,11 +334,12 @@ Page({
       query.select('.navList_main').boundingClientRect();
       query.select('.child_function').boundingClientRect();
       query.select('.work_plan').boundingClientRect();
-      
+
       query.exec((res) => {
         let wrokScrollHeight = CustomWidows.windowHeight;
         res.forEach((v)=>{
           wrokScrollHeight = wrokScrollHeight - v.height;
+          console.log(v.height);
         })
         wrokScrollHeight = wrokScrollHeight-CustomMenuButton.top-CustomMenuButton.bottom -15;
         that.setData({
@@ -348,13 +358,16 @@ Page({
             this.setData({userInfoObj:res.user})
             this.setData({region:res.user.deptName})
             this.setData({item:JSON.stringify(res.user)})
+            wx.setStorageSync('user', JSON.stringify(res.user))
             this.getBookList()
             //查询已制单
             this.getTransferList2();
-            
             //查询已发起
-            // this.getTransferList();
             this.getTransferList1();
+            //查询待办
+            this.getTaskList();
+            //查询已办
+            this.getTaskDoneList();
           }
         }
       })
@@ -367,7 +380,9 @@ Page({
             this.setData({provinces:res.data})
             if(res.data[0].children){
               this.setData({citys:res.data[0].children})
-              if(res.data[0].children[this.data.value[1]].children){this.setData({areas:res.data[0].children[this.data.value[1]].children})}
+              if(res.data[0].children[this.data.value[1]].children){
+                this.setData({areas:res.data[0].children[this.data.value[1]].children})
+              }
             }
             
           }
@@ -471,9 +486,9 @@ Page({
     cityCancel(e) {
       var id = this.data.provinces[0].id 
       this.setData({
-        citys: this.data.lastCitys ||  this.data.userInfoObj.parentDeptName, //默认北京市辖区,
-        areas: this.data.lastAreas || this.data.userInfoObj.deptName,
-        value: [...this.data.regionValue],
+        // citys: this.data.lastCitys ||  this.data.userInfoObj.parentDeptName, //默认北京市辖区,
+        // areas: this.data.lastAreas || this.data.userInfoObj.deptName,
+        // value: [...this.data.regionValue],
         visible: false
       })
     },

pages/index/index.wxml

@@ -1,322 +1,333 @@
 <view class="container" style="background:url('https://www.nongshen.net/static/wechat/header_bg.png') top center no-repeat; background-size: 100% auto;">
     
-     <!--自定义 顶部标题样式和位置-->
-    <view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
-    <!--账户信息-->
-    <view class="information_header">
-        <navigator url="{{'settle/index?item='+item}}">
-          <view class="portrait_head">
-            <image src="/image/index/headImg.png" style="width: 110rpx;height: 110rpx;"></image>
-          </view>
-        </navigator> 
-        <view class="information_main">
-            <view class="name_wrap">
-                <text class="name">{{userInfoObj.nickName}}</text>
-                <view class="jobs">
-                    <view class="icon" style="background:url('https://www.nongshen.net/static/wechat/header_job.png') no-repeat; background-size: 100% 100%;"></view>
-                     {{userInfoObj.roles.length>0?userInfoObj.roles[0].roleName:""}}
-                </view>
-                <image style="margin-left: auto;width: 20px;height: 20px;" bindtap="goRegion" src="../../image/icon/icon_address.png" ></image>
-            </view>
-            <view class="task_wrap ">
-                <view class="flex_block">
-                   <!-- <view class="desc">未完成</view> -->
-                    <view class="event" bindtap="pickAddress">
-                        <view class="icon" style="background:url('https://www.nongshen.net/static/wechat/local.png') no-repeat; background-size: 100% 100%;"></view> 
-                        {{ region || "请选择" }}
-                    </view>
-                </view>
-            </view>
-            <view class="task_wrap ">
-                <view class="flex_block">
-                    <!-- <view class="desc">已完成</view> -->
-                    <view class="event">
-                        <picker bindchange="bindPickerChange" value="{{index}}" range-key="bookName" range="{{bookList}}">
-                            <view class="picker">
-                                <view class="icon" style="background:url('https://www.nongshen.net/static/wechat/dept.png') no-repeat; background-size: 100% 100%;"></view> 
-                                {{array[index]|| bookName}}
-                            </view>
-                        </picker>
-                    </view>
-                </view>
-            </view>
+    <!--自定义 顶部标题样式和位置-->
+   <view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
+   <!--账户信息-->
+   <view class="information_header">
+       <navigator url="{{'settle/index?item='+item}}">
+         <view class="portrait_head">
+           <image src="/image/index/headImg.png" style="width: 110rpx;height: 110rpx;"></image>
+         </view>
+       </navigator> 
+       <view class="information_main">
+           <view class="name_wrap">
+               <text class="name">{{userInfoObj.nickName}}</text>
+               <view class="jobs">
+                   <view class="icon" style="background:url('https://www.nongshen.net/static/wechat/header_job.png') no-repeat; background-size: 100% 100%;"></view>
+                    {{userInfoObj.roles.length>0?userInfoObj.roles[0].roleName:""}}
+               </view>
+               <image style="margin-left: auto;width: 20px;height: 20px;" bindtap="goRegion" src="../../image/icon/icon_address.png" ></image>
+           </view>
+           <view class="task_wrap ">
+               <view class="flex_block">
+                  <!-- <view class="desc">未完成</view> -->
+                   <view class="event" bindtap="pickAddress">
+                       <view class="icon" style="background:url('https://www.nongshen.net/static/wechat/local.png') no-repeat; background-size: 100% 100%;"></view> 
+                       {{ region || "请选择" }}
+                   </view>
+               </view>
+           </view>
+           <view class="task_wrap ">
+               <view class="flex_block">
+                   <!-- <view class="desc">已完成</view> -->
+                   <view class="event">
+                       <picker bindchange="bindPickerChange" value="{{index}}" range-key="bookName" range="{{bookList}}">
+                           <view class="picker">
+                               <view class="icon" style="background:url('https://www.nongshen.net/static/wechat/dept.png') no-repeat; background-size: 100% 100%;"></view> 
+                               {{array[index]|| bookName}}
+                           </view>
+                       </picker>
+                   </view>
+               </view>
+           </view>
 
-        </view>
-    </view>
-   
-    <!--主导航-->
-    <view class="navList_main">
-        <view class="tab_item" bindtap='swichPayment' hover-class="btnView">
-            <view class="icon">
-                <image class="icon_img" src="../../image/index/nav_01.png" mode="aspectFit"></image>
-            </view>
-            <text class="desc">支出申请</text>
-        </view>
-        <view class="tab_item"  bindtap='swichInCome' hover-class="btnView">
-            <view class="icon">
-                <image class="icon_img" src="../../image/index/nav_02.png" mode="aspectFit"></image>
-            </view>
-            <text class="desc">收入登记</text>
-        </view>
-        <view class="tab_item" bindtap="swichKeeping" hover-class="btnView">
-            <view class="icon">
-                <image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
-            </view>
-            <text class="desc">记账申请</text>
-        </view>
-        <view class="tab_item" data-url="/pages/paymentManager/paymentManager"  bindtap="navigate" hover-class="btnView">
-            <view class="icon">
-             <image class="icon_img" src="../../image/index/nav_04.png" mode="aspectFit"></image>
-            </view>
-            <text class="desc">支付管理</text>
-        </view>
-    </view>
-    <!--子导航功能导航-->
-    <view class="child_function">
-        <!-- <view class="flex_block" bindtap="testBtn" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
-            <text class="desc">消息推送</text>
-        </view> -->
-        <view class="flex_block" data-url="/pages/contract/contract" bindtap="navigate" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/icon_index_01.png" mode="aspectFit"></image></view>
-            <text class="desc">合同信息</text>
-        </view>
-        <view class="flex_block"  data-url="/pages/fixedAssets/fixedAssets" bindtap="navigate" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/icon_index_02.png" mode="aspectFit"></image></view>
-            <text class="desc">固定资产</text>
-        </view>
-        <view class="flex_block"  data-url="/pages/resources/resources" bindtap="navigate" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/icon_index_03.png" mode="aspectFit"></image></view>
-            <text class="desc">资源资产</text>
-        </view>
-        <view class="flex_block" data-url="/pages/project/project" bindtap="navigate" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/icon_index_04.png" mode="aspectFit"></image></view>
-            <text class="desc">工程项目</text>
-        </view>
-        
-        <block wx:if="{{showList}}">
+       </view>
+   </view>
+  
+   <!--主导航-->
+   <view class="navList_main">
+       <view class="tab_item" bindtap='swichPayment' hover-class="btnView">
+           <view class="icon">
+               <image class="icon_img" src="../../image/index/nav_01.png" mode="aspectFit"></image>
+           </view>
+           <text class="desc">支出申请</text>
+       </view>
+       <view class="tab_item"  bindtap='swichInCome' hover-class="btnView">
+           <view class="icon">
+               <image class="icon_img" src="../../image/index/nav_02.png" mode="aspectFit"></image>
+           </view>
+           <text class="desc">收入登记</text>
+       </view>
+       <view class="tab_item" bindtap="swichKeeping" hover-class="btnView">
+           <view class="icon">
+               <image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
+           </view>
+           <text class="desc">记账申请</text>
+       </view>
+       <view class="tab_item" data-url="/pages/paymentManager/paymentManager"  bindtap="navigate" hover-class="btnView">
+           <view class="icon">
+            <image class="icon_img" src="../../image/index/nav_04.png" mode="aspectFit"></image>
+           </view>
+           <text class="desc">支付管理</text>
+       </view>
+   </view>
+   <!--子导航功能导航-->
+   <view class="child_function">
+       <!-- <view class="flex_block" bindtap="testBtn" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
+           <text class="desc">消息推送</text>
+       </view> -->
+       <view class="flex_block" data-url="/pages/contract/contract" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/icon_index_01.png" mode="aspectFit"></image></view>
+           <text class="desc">合同信息</text>
+       </view>
+       <view class="flex_block"  data-url="/pages/fixedAssets/fixedAssets" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/icon_index_02.png" mode="aspectFit"></image></view>
+           <text class="desc">固定资产</text>
+       </view>
+       <view class="flex_block"  data-url="/pages/resources/resources" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/icon_index_03.png" mode="aspectFit"></image></view>
+           <text class="desc">资源资产</text>
+       </view>
+       <view class="flex_block" data-url="/pages/project/project" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/icon_index_04.png" mode="aspectFit"></image></view>
+           <text class="desc">工程项目</text>
+       </view>
+       
+       <block wx:if="{{showList}}">
 
-          <view class="flex_block"  data-url="/pages/finance/index" bindtap="navigate" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
-            <text class="desc">财务公开</text>
-          </view>
+         <!-- <view class="flex_block"  data-url="/pages/finance/index" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
+           <text class="desc">财务公开</text>
+         </view> -->
 
-          <view class="flex_block" data-url="/pages/bank/bank" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_06.png" mode="aspectFit"></image></view>
-              <text class="desc">开户行</text>
-          </view>
-          <view class="flex_block" data-url="/pages/payee/list/list"  bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_07.png" mode="aspectFit"></image></view>
-              <text class="desc">收款方</text>
-          </view>
-          <view class="flex_block" data-url="/pages/drawee/drawee"  bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_08.png" mode="aspectFit"></image></view>
-              <text class="desc">村账户</text>
-          </view>
-          <view class="flex_block" data-url="/pages/bankDraft/bankDraft" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_09.png" mode="aspectFit"></image></view>
-              <text class="desc">银行汇票</text>
-          </view>
-          <view class="flex_block"  data-url="/pages/majorEvent/majorEvent" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_10.png" mode="aspectFit"></image></view>
-              <text class="desc">重大事项</text>
-          </view>
+         <view class="flex_block"  data-url="/pages/discussions/list" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
+           <text class="desc">四议表决</text>
+         </view>
 
-          <view class="flex_block"  data-url="/pages/transaction/transaction" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_11.png" mode="aspectFit"></image></view>
-              <text class="desc">交易明细</text>
-          </view>
-          <view class="flex_block"  data-url="/pages/transferAccounts/transferAccounts" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_12.png" mode="aspectFit"></image></view>
-              <text class="desc">转账对账</text>
-          </view>
-          <view class="flex_block"  data-url="/pages/statistics/statistics" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_13.png" mode="aspectFit"></image></view>
-              <text class="desc">收支统计</text>
-          </view>
-          <view class="flex_block"  data-url="/pages/bill/bill" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/icon_index_14.png" mode="aspectFit"></image></view>
-              <text class="desc">票据签收</text>
-          </view>
-          <!-- <view class="flex_block"  data-url="/pages/paymentManager/paymentManager" bindtap="navigate" hover-class="btnView">
-            <view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
-            <text class="desc">支付管理</text>
-          </view>
-          <view class="flex_block"  data-url="/pages/escrowAccount/escrowAccount" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/nav_dlzh.png" mode="aspectFit"></image></view>
-              <text class="desc">代管账户</text>
-          </view>
-            
-          <view class="flex_block"  data-url="/pages/billUse/billUse" bindtap="navigate" hover-class="btnView">
-              <view class="image"><image class="attribute" src="../../image/index/nav_pjsy.png" mode="aspectFit"></image></view>
-              <text class="desc">票据使用</text>
-          </view> -->
-        </block>
-        <view class="flex_block" bindtap="openView" hover-class="btnView">
-            <view class="image" wx:if="{{showListText == '更多'}}"><image class="attribute" src="../../image/index/nav_ckqb.png" mode="aspectFit"></image></view>
-            <view class="image" wx:if="{{showListText == '收起'}}"><image class="attribute" src="../../image/index/nav_sqqb.png" mode="aspectFit"></image></view>
-            <text class="desc">{{showListText}}</text>
-        </view>
-    </view>
-    <!--工作计划-->
-    <view class="work_plan">
-        <view class="menu_item {{active==1?'active':''}}" bindtap="switchTab" data-gid='{{1}}'>待办<text class="remind">{{todoNum}}</text></view>
-        <view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
-        <view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已提交<text class="remind">{{yfqNum}}</text></view>
-        <view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>草稿箱<text class="remind">{{yzdNum}}</text></view>
-        <!-- <view class="more" bindtap="toList">></view> -->
-    </view>
+         <view class="flex_block" data-url="/pages/bank/bank" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_06.png" mode="aspectFit"></image></view>
+             <text class="desc">开户行</text>
+         </view>
+         <view class="flex_block" data-url="/pages/payee/list/list"  bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_07.png" mode="aspectFit"></image></view>
+             <text class="desc">收款方</text>
+         </view>
+         <view class="flex_block" data-url="/pages/drawee/drawee"  bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_08.png" mode="aspectFit"></image></view>
+             <text class="desc">村账户</text>
+         </view>
+         <view class="flex_block" data-url="/pages/bankDraft/bankDraft" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_09.png" mode="aspectFit"></image></view>
+             <text class="desc">银行汇票</text>
+         </view>
+         <view class="flex_block"  data-url="/pages/majorEvent/majorEvent" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_10.png" mode="aspectFit"></image></view>
+             <text class="desc">重大事项</text>
+         </view>
 
-    <scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;padding: 0rpx 32.5rpx;" > 
-        <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="up" bindtap="{{item.formData.activityBusinessType == '20' ? 'goMajorDetail':'gosee'}}">
-            <!--1-->
-            <view class="workflow_list">
-                <view class="process_intro">
-                    <view class="name">
-                      <view class="name_tit">{{item.formData.remark}}</view>
-                    </view>
-                    <!-- <view class="state">待审</view> -->
-                    <view class="time">{{item.formData.applyTime}}</view>
-                </view>
-                <view class="process_pay">
-                    <view class="describe">
-                        <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}}</text>
-                    </view>
-                    <view class="amount" wx:if="{{item.formData.activityBusinessType!='20'}}"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
-                </view>
-            </view> 
-        </view>
-        <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="see" bindtap="{{item.formData.activityBusinessType == '20' ? 'goMajorDetail':'gosee'}}">
-            <!--1-->
-            <view class="workflow_list">
-                <view class="process_intro">
-                    <view class="name">
-                      <view class="name_tit">{{item.formData.remark}}</view>
-                    </view>
-                    <!-- <view class="state">已审</view> -->
-                    <view class="time">{{item.formData.applyTime}}</view>
-                </view>
-                <view class="process_pay">
-                    <view class="describe">
-                        <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}}</text>
-                    </view>
-                    <view class="amount" wx:if="{{item.formData.activityBusinessType!='20'}}"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
-                </view>
-            </view> 
-        </view>
-        <!-- <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
-            <view class="workflow_list">
-                <view class="process_intro">
-                    <view class="name">
-                      <view class="name_tit">{{item.remark}}</view>
-                      <view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
-                    </view>
-                    <view class="time">{{item.applyDate}}</view>
-                </view>
-                <view class="process_pay">
-                    <view class="describe">
-                        <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
-                    </view>
-                    <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
-                </view>
-            </view> 
-        </view> -->
-        <van-swipe-cell right-width="{{ item.auditStatus == '1'?'65':0 }}"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" class="workflow">
-            <!--1-->
-            <view class="workflow_list" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
-                <view class="process_intro">
-                    <view class="name">
-                      <view class="name_tit">{{item.remark}}</view>
-                      <view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
-                    </view>
-                    
-                    <!-- <view class="state">已制单</view> -->
-                    <view class="time">{{item.applyDate}}</view>
-                </view>
-                <view class="process_pay">
-                    <view class="describe">
-                        <image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
-                    </view>
-                    <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
-                </view>
-            </view> 
-            <view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
-              <view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="rollback">
-                <view>
-                  <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
-                  <text style="display: block;text-align: center;color: #e90000;">撤回</text>
-                </view>
-              </view>
-            </view>
-        </van-swipe-cell>
-        <van-swipe-cell right-width="{{ 65 }}"  wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" class="workflow">
-            <!--1-->
-            <view class="workflow_list" data-id="{{item.id}}" bindtap="godetail">
-                <view class="process_intro">
-                    <view class="name">
-                      <view class="name_tit">{{item.remark}}</view>
-                      <view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':'caogao'}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':'草稿'}}</view>
-                    </view>
-                    <!-- <view class="state">已制单</view> -->
-                    <view class="time">{{item.applyDate}}</view>
-                </view>
-                <view class="process_pay">
-                    <view class="describe">
-                        <image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
-                    </view>
-                    <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
-                </view>
-            </view> 
-            <view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
-              <view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
-                <view>
-                  <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
-                  <text style="display: block;text-align: center;color: #e90000;">删除</text>
-                </view>
-              </view>
-            </view>
-        </van-swipe-cell>
-        
+         <view class="flex_block"  data-url="/pages/transaction/transaction" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_11.png" mode="aspectFit"></image></view>
+             <text class="desc">交易明细</text>
+         </view>
+         <view class="flex_block"  data-url="/pages/transferAccounts/transferAccounts" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_12.png" mode="aspectFit"></image></view>
+             <text class="desc">转账对账</text>
+         </view>
+         <view class="flex_block"  data-url="/pages/statistics/statistics" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_13.png" mode="aspectFit"></image></view>
+             <text class="desc">收支统计</text>
+         </view>
+         <view class="flex_block"  data-url="/pages/bill/bill" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/icon_index_14.png" mode="aspectFit"></image></view>
+             <text class="desc">票据签收</text>
+         </view>
+         <!-- <view class="flex_block"  data-url="/pages/paymentManager/paymentManager" bindtap="navigate" hover-class="btnView">
+           <view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
+           <text class="desc">支付管理</text>
+         </view>
+         <view class="flex_block"  data-url="/pages/escrowAccount/escrowAccount" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/nav_dlzh.png" mode="aspectFit"></image></view>
+             <text class="desc">代管账户</text>
+         </view>
+           
+         <view class="flex_block"  data-url="/pages/billUse/billUse" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/nav_pjsy.png" mode="aspectFit"></image></view>
+             <text class="desc">票据使用</text>
+         </view> -->
+         <view class="flex_block"  data-url="/pages/mainBody/list/list" bindtap="navigate" hover-class="btnView">
+             <view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
+             <text class="desc">主体名录</text>
+         </view>
+       </block>
+       <view class="flex_block" bindtap="openView" hover-class="btnView">
+           <view class="image" wx:if="{{showListText == '更多'}}"><image class="attribute" src="../../image/index/nav_ckqb.png" mode="aspectFit"></image></view>
+           <view class="image" wx:if="{{showListText == '收起'}}"><image class="attribute" src="../../image/index/nav_sqqb.png" mode="aspectFit"></image></view>
+           <text class="desc">{{showListText}}</text>
+       </view>
+   </view>
+   <!--工作计划-->
+   <view class="work_plan">
+       <view class="menu_item {{active==1?'active':''}}" bindtap="switchTab" data-gid='{{1}}'>待办<text class="remind">{{todoNum}}</text></view>
+       <view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
+       <view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已提交<text class="remind">{{yfqNum}}</text></view>
+       <view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>草稿箱<text class="remind">{{yzdNum}}</text></view>
+       <!-- <view class="more" bindtap="toList">></view> -->
+   </view>
 
-        <van-empty wx:if="{{todoNum == '0' && active=='1'}}" description="暂无待办数据" />
+   <scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;padding: 0rpx 32.5rpx;" > 
+       <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.data.id}}" data-taskId="{{item.id}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="up" bindtap="gosee">
+           <!--1-->
+           <view class="workflow_list">
+               <view class="process_intro">
+                   <view class="name">
+                     <view class="name_tit">{{item.auditName}}</view>
+                   </view>
+                   <!-- <view class="state">待审</view> -->
+                   <view class="time">{{item.createTime}}</view>
+               </view>
+               <view class="process_pay">
+                   <view class="describe">
+                       <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
+                       <text class="textLimit">{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}</text>
+                   </view>
+                   <view class="amount"><text class="unit">￥</text>{{item.data.expenditureAmount}}</view>
+               </view>
+           </view> 
+       </view>
+       <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id"  data-id="{{item.data.id}}" data-taskId="{{item.id}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="see" bindtap="gosee">
+           <!--1-->
+           <view class="workflow_list">
+               <view class="process_intro">
+                   <view class="name">
+                     <view class="name_tit">{{item.auditName}}</view>
+                   </view>
+                   <!-- <view class="state">已审</view> -->
+                   <view class="time">{{item.auditTime}}</view>
+               </view>
+               <view class="process_pay">
+                   <view class="describe">
+                       <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
+                       <text class="textLimit">{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}</text>
+                   </view>
+                   <view class="amount"><text class="unit">￥</text>{{item.data.expenditureAmount}}</view>
+               </view>
+           </view> 
+       </view>
+       <!-- <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
+           <view class="workflow_list">
+               <view class="process_intro">
+                   <view class="name">
+                     <view class="name_tit">{{item.remark}}</view>
+                     <view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
+                   </view>
+                   <view class="time">{{item.applyDate}}</view>
+               </view>
+               <view class="process_pay">
+                   <view class="describe">
+                       <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
+                       <text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
+                   </view>
+                   <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
+               </view>
+           </view> 
+       </view> -->
+       <!-- {{active}} -->
+       <van-swipe-cell right-width="{{ item.auditStatus == '1'?'65':0 }}"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" class="workflow">
+           <!--1-->
+           <view class="workflow_list" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
+               <view class="process_intro">
+                   <view class="name">
+                     <view class="name_tit">{{item.remark}}</view>
+                     <view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
+                   </view>
+                   
+                   <!-- <view class="state">已制单</view> -->
+                   <view class="time">{{item.applyDate}}</view>
+               </view>
+               <view class="process_pay">
+                   <view class="describe">
+                       <image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
+                       <text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
+                   </view>
+                   <view style="font-size: 12px;">{{item.paymentStateText}}</view>
+                   <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
+               </view>
+           </view> 
+           <view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
+             <view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="rollback">
+               <view>
+                 <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+                 <text style="display: block;text-align: center;color: #e90000;">撤回</text>
+               </view>
+             </view>
+           </view>
+       </van-swipe-cell>
+       <van-swipe-cell right-width="{{ 65 }}"  wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" class="workflow">
+           <!--1-->
+           <view class="workflow_list" data-id="{{item.id}}" bindtap="godetail">
+               <view class="process_intro">
+                   <view class="name">
+                     <view class="name_tit">{{item.remark}}</view>
+                     <view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':'caogao'}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':'草稿'}}</view>
+                   </view>
+                   <!-- <view class="state">已制单</view> -->
+                   <view class="time">{{item.applyDate}}</view>
+               </view>
+               <view class="process_pay">
+                   <view class="describe">
+                       <image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
+                       <text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
+                   </view>
+                   <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
+               </view>
+           </view> 
+           <view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
+             <view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
+               <view>
+                 <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+                 <text style="display: block;text-align: center;color: #e90000;">删除</text>
+               </view>
+             </view>
+           </view>
+       </van-swipe-cell>
+       
 
-        <van-empty wx:if="{{doneNum == 0 && active=='2'}}" description="暂无已办数据" />
+       <van-empty wx:if="{{todoNum == '0' && active=='1'}}" description="暂无待办数据" />
 
-        <van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已提交数据" />
+       <van-empty wx:if="{{doneNum == 0 && active=='2'}}" description="暂无已办数据" />
 
-        <van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无草稿箱数据" />
-    </scroll-view>
-    <pop-up visible="{{visible}}" onClose="closePopUp">
-        <view slot="content">
-            <view class="picker-view">
-            <view class="picker-view__pane">
-                <text catchtap="cityCancel">取消</text>
-                <text catchtap="citySure">确定</text>
-            </view>
-            <picker-view class="pick-view__group" bindchange="cityChange" bindpickstart="chooseStart" bindpickend="chooseEnd" value="{{value}}">
-                <picker-view-column indicator-class="item_active">
-                <view wx:for="{{provinces}}" class="picker-item" wx:key="index">{{item.label}}</view>
-                </picker-view-column>
-                <picker-view-column>
-                <view wx:for="{{citys}}" class="picker-item" wx:key="index">{{item.label}}</view>
-                </picker-view-column>
-                <picker-view-column>
-                <view wx:for="{{areas}}" class="picker-item" wx:key="index">{{item.label}}</view>
-                </picker-view-column>
-            </picker-view>
-            </view>
-        </view>
-    </pop-up>
+       <van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已提交数据" />
+
+       <van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无草稿箱数据" />
+   </scroll-view>
+   <pop-up visible="{{visible}}" onClose="closePopUp">
+       <view slot="content">
+           <view class="picker-view">
+           <view class="picker-view__pane">
+               <text catchtap="cityCancel">取消</text>
+               <text catchtap="citySure">确定</text>
+           </view>
+           <picker-view class="pick-view__group" bindchange="cityChange" bindpickstart="chooseStart" bindpickend="chooseEnd" value="{{value}}">
+               <picker-view-column indicator-class="item_active">
+               <view wx:for="{{provinces}}" class="picker-item" wx:key="index">{{item.label}}</view>
+               </picker-view-column>
+               <picker-view-column>
+               <view wx:for="{{citys}}" class="picker-item" wx:key="index">{{item.label}}</view>
+               </picker-view-column>
+               <picker-view-column>
+               <view wx:for="{{areas}}" class="picker-item" wx:key="index">{{item.label}}</view>
+               </picker-view-column>
+           </picker-view>
+           </view>
+       </view>
+   </pop-up>
 </view>
 
 <wxs module="float">
-  var float = function(money){
-    return parseFloat(money).toFixed(2)
-  }
-  module.exports.float = float;
+ var float = function(money){
+   return parseFloat(money).toFixed(2)
+ }
+ module.exports.float = float;
 </wxs>

pages/index/index.wxss

@@ -40,11 +40,10 @@
 .information_header  .name_wrap .jobs{
   margin-left: 18rpx;
   /* width: 155rpx; */
-  height: 40rpx;
-  background: #5bae75;
-  border:2rpx solid #2c8e68;
+  height: 50rpx;
+  background: linear-gradient( 97deg, #73DE7E 0%, #0EAF63 100%);
   color: #fff;
-  border-radius: 40rpx;
+  border-radius: 10rpx;
   display: flex;
   font-size: 28rpx;
   justify-content: center; 
@@ -154,11 +153,30 @@
   font-size: 26rpx;
 }
 
-.child_function{
+.title{
+  display: flex;
+  justify-content: space-between;
   margin: 35rpx 20rpx 0;
+}
+.title text{
+  flex: 1;
+  background-color: #ffffff;
+  display: flex;
+  align-items: flex-end;
+  border-radius: 24rpx 0 0 0;
+  font-size: 2vh;
+  font-weight: bold;
+  padding-left: 5%;
+}
+.title image{
+  width: 45%;
+}
+.child_function{
+  margin: 0 20rpx 0;
   display: flex;
   flex-wrap: wrap;
   align-content:space-between;
+  padding: 20px 0;
 }
 .child_function .flex_block{
   display: flex;
@@ -185,7 +203,7 @@
 }
 
 .work_plan{
-  padding: 40rpx 32.5rpx 30rpx;
+  padding: 0rpx 32.5rpx 30rpx;
   display: flex;
   justify-content: space-between;
 }
@@ -288,7 +306,7 @@
 
 .workflow .workflow_list .process_pay .describe{
   font-size: 30rpx;
-  width: 330rpx;
+  width: 320rpx;
   color: #3c9370;
   display: flex;
   align-items: center; 

pages/noLoginIndex.wxml

@@ -1,2 +1,2 @@
 <!--pages/noLoginIndex.wxml-->
-<image src="https://www.nongshen.net/static/wechat/index_no_login.jpg" style="width: 100%;" mode="widthFix" bind:tap="goLogin"></image>
+<image src="/image/index/index.jpg" style="width: 100%;" mode="widthFix" bindtap='goLogin'></image>

pages/noLoginIndex.wxss

@@ -1,6 +1,6 @@
 /* pages/noLoginIndex.wxss */
 page{
-  background-color: #ffffff!important;
+  background-color: #F6F6F6!important;
   height: 100vh;
 }
 .navList_main{

pages/user/login/login.wxml

@@ -1,39 +1,34 @@
 
 <import src="/templates/global/global"/>
 <template is="toast" data="{{...toastData}}"></template>
-
-<image src="/image/login/login_bg.png" style="width: 100%;position: absolute;z-index: -1;" mode="widthFix" bindtap='goLogin'></image>
-<view class="container">    
+<view class="container" style="background: url('https://www.nongshen.net/static/wechat/container_bg.jpg') center center  no-repeat; background-size: 100% 100%;">    
     
-    <view style="position: absolute;left:2.5%;top:{{isIPX?'57px':'32px'}};display: flex;align-items: center;background-color:#ffffff;padding: 5px 20px 5px 10px;border-radius: 50px;" bindtap="goRegion">
-      <image src="/image/login/loc2.png" style="width: 25px;height: 25px;"></image>
-      <text style="color:#00B268;font-size: 14px;line-height: 15px;margin-left: 5px;">{{nowDress == '' ? '暂未选择':nowDress}}</text>
+    <view style="position: absolute;left:2.5%;top:{{isIPX?'57px':'32px'}};display: flex;align-items: center;background-color:rgba(127,191,105,0.8);padding: 5px 10px;border-radius: 50px;" bindtap="goRegion">
+      <image src="/image/icon/loc2.png" style="width: 13px;height: 15px;"></image>
+      <text style="color:#fff;font-size: 14px;line-height: 15px;margin-left: 5px;">{{nowDress == '' ? '暂未选择':nowDress}}</text>
     </view>
-
     <view class="header" style="text-align: center;" >
-        <view class="principal">您好，</view>
-        <view class="instructions">欢迎登录<text>e报账</text></view>
-        <image src="/image/login/login_icon.png" style="width: 100%;" mode="widthFix"></image>
+        <!-- <view class="principal">农村事项审批与记账</view>
+         <view class="instructions">报账简单，操作便捷</view> -->
+         <image src="/image/login/login_text.png" style="width: 80%;margin: 0 auto;" mode="widthFix"></image>
     </view>
     <view class="quick-login" style="bottom:{{isIPhoneX?'6vh':'4vh'}}">
-        <button wx:if="{{showPhoneBtn}}" class="key-login" type='primary' open-type='getPhoneNumber' bindgetphonenumber="getPhoneNumber">一键快捷登录</button>
-        <button wx:if="{{!showPhoneBtn}}" class="key-login" type='primary' bind:tap="goIndex">一键登录</button>
-        <button class="key-login2" type='primary' bindtap="goPhoneLogin">账号密码登录</button >
+        <button  class="key-login"  type='primary' open-type='getPhoneNumber' bindgetphonenumber="getPhoneNumber">微信一键登录</button >
         <view class="authorization" style="margin-top:{{isIPhoneX?'2vh':'2vh'}}">
             <checkbox-group bindchange="checkboxChange">
                 <label>
                     <checkbox value="privacy" checked="{{privacyCheck}}" class="changeSize" />
                 </label>
-                <text bindtap="openDialog">我已查看并同意<text style="color: #00A65E;margin: 0 5px;text-decoration: underline;">服务须知</text>相关内容</text>
+                <text bindtap="openDialog">我已阅读并同意用户协议和隐私政策</text>
             </checkbox-group>
         </view>
-        <!-- <text style="display: block;text-align: center;color: #fff;margin-top: 3vh;" bindtap="goPhoneLogin">中农融信(北京)科技股份有限公司</text> -->
+        <text bindtap="goPhoneLogin" style="display: block;text-align: center;color: #fff;margin-top: 3vh;">北京中农融信科技股份有限公司</text>
     </view>
 </view>
 
 <van-dialog
   use-slot
-  title="服务须知"
+  title="用户协议和隐私政策"
   show="{{ showDialog }}"
   bind:close="onClose"
   confirmButtonText="同意"
@@ -44,10 +39,77 @@
   showCancelButton="{{true}}"
 >
   <scroll-view scroll-y="true" style="height: 300px;padding: 0 15px;margin-top: 15px;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
-    <text>关于”融信云e三资+“的小程序服务（以下简称“本服务”）的说明：</text>
-    <text>1.本服务是已线下签约客户的内部办公移动端工具，不统一对外开放！</text>
-    <text>2.本服务不设用户注册功能，不采集用户信息！</text>
-    <text>3.”微信一键登录“是通过该微信手机号验证系统后台用户中心是否存在此用户，存在则授权登录令牌！</text>
+    <text>为使用融信云微信小程序服务（以下简称“本服务”或“小程序服务”），您应当阅读并遵守《融信云微信小程序用户协议》，请务必审慎阅读、充分理解各条款内容，特别是免除或限制责任的相应条款，以及开通或使用某项服务的单独协议，并选择接受或不接受。</text>
+    <text>除非您已阅读并接受本条款所有条款，否则您无权使用融信云微信小程序服务。您对本服务的登录、查看、发布信息等行为即视为已阅读并同意本条款的约束。</text>
+    <text>如果您未满18周岁，请在法定监护人的陪同下阅读本您协议，并特别注意未成年人使用条款。</text>
+    <text>一、协议的范围</text>
+    <text>1.1本条款是用户（以下简称“您”）与融信云之间关于用户使用小程序服务所订立的协议。“用户”是指注册、登录、使用微信小程序的个人或组织；“其他用户”是指包括其他微信小程序用户、微信公众账号用户和微信用户等除您本人外与小程序服务相关的用户。</text>
+    <text>1.2本服务是指融信云根据本协议向您提供的服务，包括协助您交接和管理租赁车辆等。我们会不断丰富您使用本服务的终端、形式等，如您已注册使用一种形式的服务，则可以以同一账号使用其他服务，本协议自动适用于您对所有版本的软件和服务的使用。</text>
+    <text> 1.3提供本服务的微信小程序的所有权和全部的使用权均归融信云所有，您开通后仅授权使用部分功能，具体以产品展示的为准。</text>
+    <text>1.4小程序属于微信公众账号，在不与本协议冲突的情况下，您应遵守《微信公众平台服务协议》、《腾讯微信软件许可及服务协议》等关于微信公众账号的其他相关规定。</text>
+    <text>1.5本协议内容包括本协议正文及所有我们已经发布或将来可能发布的隐私权政策、各项政策、规则、声明、通知、警示、提示、说明（以下统称为“用户规则”）。前述用户规则为本协议不可分割的补充部分，与本协议具有同等法律效力。如您使用融信云产品及服务，视为您同意上述补充部分。</text>
+
+    <text>二、小程序注册与审核</text>
+
+    <text>2.1账号注册</text>
+    <text>2.1.1您在使用本服务前需要先进行注册和认证。您确认，在您开始注册使用融信云产品及服务前，您应当是具备完全民事权利能力和与所从事的民事行为相适应的行为能力的自然人、法人或其他组织。若您不具备前述主体资格，请勿使用服务，否则您及您的监护人应承担因此而导致的一切后果，且我们有权注销（永久冻结）您的账户，并向您及您的监护人索偿。</text>
+    <text>2.1.2当您按照注册页面提示填写信息、阅读并同意本协议且完成全部注册程序后，您可获得融信云平台账户并成为产品用户，即有权使用融信云平台并获得相应服务。融信云平台只允许每位用户使用一个主账户，但您可以在授权范围内获得多个子账号。</text>
+    <text>2.1.3该账户是您通过融信云平台寻求并获得服务的唯一有效身份证明，请您妥善保管账号和密码。为使您更好地使用融信云平台的各项服务，保障您的账户安全，本小程序主体可要求您按本协议、用户规则及我国法律规定完成实名认证。</text>
+    <text>2.1.4为维护小程序的健康运营，您应当准确完整地提供您的最新信息（包括您的名称及电子邮件地址、联系电话、联系地址等）。并且您承诺，在使用本服务的过程中提交和发布的信息均是真实、合法的，因不实信息导致融信云或者第三方合法权益受损的，由您独立承担全部责任。</text>
+    <text>2.2账号安全</text>
+    <text>2.2.1在您成功注册后，我们将根据您的身份要素识别您的身份和授权登录。“身份要素”包括但不限于您的账户名称、密码、短信校验码、手机号码、身份证件号码及人脸信息、眼纹信息。您同意基于不同的终端以及您的使用习惯，我们可能采取不同的验证措施识别您的身份。</text>
+    <text>2.2.2如您发现账号遭他人非法使用，应立即通知本小程序主体。因黑客行为或您自身保管疏忽导致账号、密码遭他人非法使用所发生的一切责任，均应由您本人承担，本小程序主体不承担任何责任。</text>
+    <text>2.2.3您注册成功后，融信云将给予您一个帐号，并由您自行设置相应密码，任何该账户项下的预订及支付等行为均视为您本人的操作。您应对您账户项下的所有行为结果（包括但不限于授权、绑定、结算）负责。</text>
+
+    <text>三、服务及规范</text>
+
+    <text>3.1服务内容</text>
+    <text>3.1.1本服务内容包含【支持通讯录、车辆调度、车辆管理、账单管理、业务信息推荐及】等技术功能，这些功能服务可能根据用户需求的变化，随着因服务版本不同、或服务提供方的单方判断而被优化或修改，或因定期、不定期的维护而暂缓提供。</text>
+    <text>3.1.2融信云有权自行决定对服务或服务任何部分及其相关功能、应用软件进行变更、升级、修改、转移，并有权决定以适当的方式进行公示或通知。</text>
+    <text>3.2服务费用</text>
+    <text>3.2.1融信云平台向您提供的服务目前是免费的。我们保留日后就程序及/或服务向您收费的权利。如果我们决定收取此类费用，我们会采取合理途径并以足够合理的期限提前通过法定程序并以本协议约定的方式通知您，确保您有充分选择的权利。</text>
+    <text>3.2.2您在使用小程序的过程中与第三方发生的费用结算，融信云仅为您使用微信小程序服务提供技术支持，本协议的签署不代表融信云成为您在汽车租赁过程中的参与者。融信云不对基于服务而产生的任何行为担保、许可或向任何第三人承担共同责任。</text>
+    <text>3.3服务使用规则</text>
+    <text>3.3.1您在本服务中或通过本服务所传送、发布的任何内容并不反映或代表，也不得被视为反映或代表融信云的观点、立场或政策，融信云对此不承担任何责任。</text>
+    <text>3.3.2您不得利用融信云账号或本服务进行如下行为：\n(1)提交、发布虚假信息，或盗用他人头像或资料，冒充、利用他人名义的；\n(2)强制、诱导其他您关注、点击链接页面或分享信息的；\n(3)虚构事实、隐瞒真相以误导、欺骗他人的；\n(4)利用技术手段批量建立虚假账号的；\n(5)利用平台账号或本服务从事任何违法犯罪活动的；\n(6)制作、发布与以上行为相关的方法、工具，或对此类方法、工具进行运营或传播，无论这些行为是否为商业目的；\n(7)其他违反法律法规规定、侵犯其他您合法权益、干扰融信云正常运营或融信云未明示授权的行为。</text>
+    <text>3.3.3融信云有权查阅您的注册、交易数据及交易行为，如发现可能存在违反法律法规、本协议或相关规则的情形或其他任何问题，融信云有权直接做出其认为合理的处理，包括但不限于通知修改、删除相关信息，停止被协议项下的服务内容等。前述约定不代表融信云应对您的行为承担任何连带责任，您应对此产生的法律责任独立负责。</text>
+
+    <text>四、法律责任</text>
+
+    <text>4.1用户责任</text>
+    <text>4.1.1您应遵守《微信公众平台服务协议》中关于“法律责任”的约定，除非该等约定与本协议存在冲突。</text>
+    <text>4.1.2如果我们发现或收到他人举报或投诉您违反本协议约定的，我们有权不经通知随时对相关内容，包括但不限于对您的资料、聊天记录进行审查、删除，并视情节轻重对违规账号处以包括但不限于警告、账号封禁、设备封禁、功能封禁的处罚，且通知您处理结果。</text>
+    <text>4.1.3您理解并同意，因您违反相关法律法规或本协议约定引发的任何后果，均由您独立承担责任、赔偿损失，与我们无关。如侵害到融信云或他人权益的，您须自行承担全部责任和赔偿一切损失。</text>
+    <text>4.2平台责任本小程序主体保证并承诺，本小程序主体系合法成立的法人，依据本协议约定向您提供相关网络服务，并会参考您提出的建议不断改善我们的服务，努力提高您的使用满意度。</text>
+    <text>4.3责任限制</text>
+    <text>4.3.1本服务仅为您与第三方之间的汽车租赁行为而提供协助，融信云并非其中的参与者，对汽车租赁过程中产生的一切纠纷不承担任何责任。</text>
+    <text>4.3.2您理解并确认，我们需要定期或不定期地对融信云平台或相关的设备进行检修或者维护，且互联网连接能力受到全球网路稳定性、技术状态、使用者所在地与使用的网路、电力供应、政府管制、计算机病毒、黑客攻击等既存不确定性的限制，如因此类情况而造成服务在合理时间内的中断，我们无需为此承担任何责任，但会事先进行通告。</text>
+    <text>4.3.3您理解并同意，在使用本服务的过程中，可能会遇到不可抗力等风险因素，使本服务发生中断。不可抗力是指不能预见、不能克服并不能避免且对一方或双方造成重大影响的客观事件，包括但不限于自然灾害如洪水、地震、瘟疫流行和风暴等以及社会事件如战争、动乱、政府行为等。出现上述情况时，融信云将努力在第一时间与相关单位配合，及时进行修复，但是由此给您造成的损失融信云在法律允许的范围内免责。</text>
+    <text>4.3.4融信云不保证为向您提供便利而设置的外部链接的准确性和完整性。同时，对于该等外部链接指向的不由融信云实际控制的任何网页上的内容，融信云不承担任何责任。</text>
+    <text>4.4知识产权声明</text>
+    <text>4.4.1融信云在本服务中提供的内容（包括但不限于网页、文字、图片、音频、视频、图表等）的知识产权归融信云所有，您在使用本服务中所产生的内容的知识产权归您或相关权利人所有。</text>
+    <text>4.4.2除另有特别声明外，融信云提供本服务时所依托软件的著作权、专利权、代码技术及其他知识产权均归融信云所有。</text>
+
+    <text>五、隐私政策</text>
+
+    <text>5.1保护用户隐私是的融信云一项基本政策，融信云保证不对外公开或向第三方提供您的注册资料及您在使用网络服务时存储在融信云的非公开内容，但下列情况除外：\n（1）事先获得用户的明确授权；\n（2）根据有关的法律法规要求；\n（3）按照相关政府主管部门的要求；\n（4）为维护社会公众的利益；\n（5）为维护融信云的合法权益。</text>
+    <text>5.2当融信云与第三方合作向用户提供相关的网络服务，在此情况下，如该第三方允诺严格承担与融信云同等的保护用户隐私的责任，则视为您授权融信云将包含个人注册资料在内的相关信息仅提供给该等第三方。</text>
+
+    <text>六、协议解除和终止</text>
+
+    <text>6.1如有下列情形的，我们有权单方面解除本协议，终止向您提供服务：\n（1）您为了非法目的而使用本服务的；\n（2）您使用本服务损害融信云或其他第三方合法权益的；\n（3）您违反法律法规或本协议约定或违反与腾讯的其他约定的；\n（4）根据法律规定平台用户应提交真实信息，而您提供的资料不真实、或未能提供合理证明以证明其真实性的；</text>
+    <text>6.2您同意，除上述所述情形外，融信云有权根据风险及自身业务运营情况需要，随时终止向您提供本服务及接口的部分及全部，因此导致您无法使用服务或服务受到限制的，融信云不构成违约，亦不承担任何法律责任。</text>
+    <text>6.3您停用该服务，或融信云终止向您提供本协议项下的服务后，融信云不再为您保留原账户中与之相关的任何信息。</text>
+    <text>6.4您使用本服务即视为您已阅读并同意受本协议的约束。融信云小程序主体有权在必要时修改本协议。您可以在相关服务页面查阅最新版本的协议。本协议变更后，如果您继续使用微信小程序服务，即视为您已接受修改后的协议。如果您不接受修改后的协议，应当停止使用小程序服务。</text>
+
+    <text>七、违约责任如</text>
+
+    <text>如您因为使用本服务给融信云造成损失的或者给第三方造成损失的，该损失（包括为维权而产生的合理支出）由您来承担。</text>
+
+    <text>八、法律管辖</text>
+
+    <text>8.1如双方就本协议内容或其执行发生任何争议，双方应友好协商解决；协商不成时，任何一方均可向融信云所在地的人民法院提起诉讼。</text>
+    <text>8.2本协议的成立、生效、履行、解释及纠纷解决，适用中华人民共和国大陆地区法律（不包括冲突法）8.3本协议条款无论因何种原因部分无效或不可执行，其余条款仍有效，对双方都具有约束力。</text>
   </scroll-view>
     
 </van-dialog>

pages/user/login/login.wxss

@@ -1,73 +1,46 @@
-page{
-  background-color: #ffffff;
-}
 .container{
   width: 100vw;
   height: 100vh; 
 }
 .container .header{
-    /* height: 36.94vh; */
-    padding: 12.24vh 40px 0;
+    padding-top: 25.24vh;
+    height: 36.94vh;
 }
 
 .container .header .principal{
   height: 6.15vh;
   line-height: 6.15vh;
   margin-bottom: 0.61vh;
-  text-align: left;
+  text-align: center;
   font-size: 4.92vh;
-  color: #000000;
-  font-weight: bold;
+  color: #2c7339;
 }
 
 .container .header .instructions{
-  font-size: 3.92vh;
+  font-size: 2.46vh;
   height: 4.92vh;
   line-height: 4.92vh;
-  text-align: left;
-  font-weight: bold;
-  color: #000000;
-}
-
-.container .header .instructions text{
-  font-weight: bold;
-  color: #1DCA84;
+  text-align: center;
+  color: #2c7339;
 }
 .container .quick-login{
-  /* position: fixed; */
+  position: fixed;
   /* bottom: 8vh; */
   width: 100%;
 }
 
 .container .quick-login .key-login{
-  width: 80vw;
-  height: 6.17vh;
-  background: linear-gradient( 90deg, #2FE398 0%, #1BCF84 39%, #0ABD73 77%, #00B268 100%);
-  margin:1vh auto 0;
-  border-radius: 6.17vh;
-  text-align: center;
-  line-height: 6.17vh;
-  font-size: 2.21vh;
-  color: #ffffff;
-  padding: 0;
-}
-
-.container .quick-login .key-login2{
-  width: 80vw;
-  height: 6.17vh;
-  background: #E5F5EE;
-  margin:1vh auto 0;
-  border-radius: 6.17vh;
+  width: 89vw;
+  height: 5.17vh;
+  background:#ffffff;
+  margin:0 auto;
+  border-radius: 5.17vh;
   text-align: center;
-  line-height: 6.17vh;
+  line-height: 5.17vh;
   font-size: 2.21vh;
-  color: #00B268;
+  color: #2c7339;
+  box-shadow: 8rpx 6rpx 20rpx rgba(0,0,0,.3);
   padding: 0;
-  border: none;
-}
-
-.container .quick-login .key-login2::after{
-  border: none;
 }
 
 .container .quick-login .authorization{
@@ -75,7 +48,7 @@ page{
   display: flex; 
   justify-content: center; /* 相对父元素水平居中 */
   align-items: center; /*  子元素相对父元素垂直居中 */
-  color: #999999;
+  color: #fff;
 }
 
 .container .quick-login .authorization .changeSize{

pages/user/region/region.js

@@ -10,8 +10,7 @@ Page({
   data: {
     isIPX: app.globalData.isIPX,
     activeNames: ['1'],
-    nowDress:'',
-    identity:'bzy'
+    nowDress:''
   },
 
   /**
@@ -46,13 +45,6 @@ Page({
       url: '../login/login',
     })
   },
-  identityChange(e){
-    const type = e.currentTarget.dataset.type;
-    wx.setStorageSync('identity', type);
-    this.setData({
-      identity: type,
-    });
-  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/user/region/region.wxml

@@ -5,18 +5,6 @@
 </view>
 
 <view class="top_win" style="margin-top:{{isIPX?'103px':'74px'}};">
-  <view class="top flex">
-    <text>您的身份</text>
-  </view>
-  <view class="nowDress2 {{identity == 'bzy' ? 'active' : ''}}" data-type="bzy" bind:tap="identityChange">
-    <text>报账员</text>
-  </view>
-  <view class="nowDress2 {{identity == 'spy' ? 'active' : ''}}" data-type="spy" bind:tap="identityChange">
-    <text>审批员</text>
-  </view>
-</view>
-
-<view class="top_win" style="margin-top:15px;">
   <view class="top flex">
     <text>您的位置</text>
     <!-- <view class="dw_box" bindtap="getLocation">
@@ -27,14 +15,15 @@
   <view class="nowDress">
     <text>{{nowDress == '' ? '暂未选择':nowDress}}</text>
   </view>
-  <van-index-bar highlight-color="#2C8E68" sticky sticky-offset-top="{{isIPX?'88':'64'}}">
-    <van-collapse value="{{ activeNames }}" bind:change="onChange">
-      <view class="list_bar" wx:for="{{list}}" wx:key="index">
-        <van-index-anchor index="{{item.name}}" />
-        <van-collapse-item title="{{cldItem.name}}" wx:for="{{item.value}}" wx:for-index="childrenIndex" wx:for-item="cldItem" wx:key="childrenIndex">
-          <text class="list_bar_text" wx:for="{{cldItem.subset}}" wx:for-index="dressIndex" wx:for-item="dressItem" wx:key="dressIndex" data-url="{{dressItem.url}}" data-name="{{dressItem.name}}" data-parentname="{{cldItem.name}}" bindtap="goChangeUrl">{{dressItem.name}}</text>
-        </van-collapse-item>
-      </view>
-    </van-collapse>
-  </van-index-bar>
 </view>
+
+<van-index-bar highlight-color="#2C8E68" sticky sticky-offset-top="{{isIPX?'88':'64'}}">
+  <van-collapse value="{{ activeNames }}" bind:change="onChange">
+    <view class="list_bar" wx:for="{{list}}" wx:key="index">
+      <van-index-anchor index="{{item.name}}" />
+      <van-collapse-item title="{{cldItem.name}}" wx:for="{{item.value}}" wx:for-index="childrenIndex" wx:for-item="cldItem" wx:key="childrenIndex">
+        <text class="list_bar_text" wx:for="{{cldItem.subset}}" wx:for-index="dressIndex" wx:for-item="dressItem" wx:key="dressIndex" data-url="{{dressItem.url}}" data-name="{{dressItem.name}}" data-parentname="{{cldItem.name}}" bindtap="goChangeUrl">{{dressItem.name}}</text>
+      </van-collapse-item>
+    </view>
+  </van-collapse>
+</van-index-bar>

pages/user/region/region.wxss

@@ -1,6 +1,6 @@
 /* pages/user/region/region.wxss */
 page{
-  background: #F6F6F6;
+  background-color: #ffffff;
 }
 text{
   display: block;
@@ -11,11 +11,9 @@ text{
   justify-content: space-between;
 }
 .top_win{
-  width: 96%;
+  width: 90%;
   margin: 0 auto;
-  background: #ffffff;
-  padding: 4%;
-  border-radius: 15px;
+  border-bottom: 1px dashed #DCDCDC;
 }
 .top{
   margin: 0 auto 15px;
@@ -37,21 +35,6 @@ text{
   background: url("https://www.nongshen.net/static/wechat/local.png") no-repeat 15px center;
   margin-bottom: 15px;
 }
-.nowDress2{
-  border: 1px solid #2C8E68;
-  width: auto;
-  display: inline-block;
-  padding: 5px 20px 5px 20px;
-  border-radius: 50px;
-  color: #333333;
-  margin-bottom: 15px;
-  margin-right: 15px;
-}
-.nowDress2.active{
-  background: linear-gradient( 92deg, #2FE398 0%, #00B268 100%);
-  border-color: transparent;
-  color: #ffffff;
-}
 .list_bar .list_bar_text{
   border: 1px solid #2C8E68;
   width: auto;

project.config.json

@@ -1,14 +1,5 @@
 {
   "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "packOptions": {
-    "ignore": [
-      {
-        "value": ".eslintrc.js",
-        "type": "file"
-      }
-    ],
-    "include": []
-  },
   "setting": {
     "urlCheck": false,
     "es6": true,
@@ -29,8 +20,6 @@
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -54,7 +43,15 @@
     "tabSize": 2
   },
   "condition": {},
-  "appid": "wx42bfbc1eab7aacce",
   "compileType": "miniprogram",
-  "libVersion": "2.23.2"
+  "packOptions": {
+    "ignore": [
+      {
+        "value": ".eslintrc.js",
+        "type": "file"
+      }
+    ],
+    "include": []
+  },
+  "appid": "wx42bfbc1eab7aacce"
 }

project.private.config.json

@@ -1,10 +1,66 @@
 {
   "setting": {
-    "compileHotReLoad": false
+    "compileHotReLoad": true
   },
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "报账员首页",
+          "pathName": "pages/index/index_bzy",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "pages/phoneLogin",
+          "pathName": "pages/phoneLogin",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/majorEvent/add/add",
+          "pathName": "pages/majorEvent/add/add",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/transaction/transaction",
+          "pathName": "pages/transaction/transaction",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/discussions/detail/detail",
+          "pathName": "pages/discussions/detail/detail",
+          "query": "id=12",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/discussions/detail/detail",
+          "pathName": "pages/discussions/detail/detail",
+          "query": "id=5",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/finance/list_balance_ranking/list_balance_ranking",
+          "pathName": "pages/finance/list_balance_ranking/list_balance_ranking",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/finance/list_balance_ranking/list_balance_ranking",
+          "pathName": "pages/finance/list_balance_ranking/list_balance_ranking",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/user/login/login",
           "pathName": "pages/user/login/login",
@@ -226,5 +282,5 @@
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "nsgk_yebz",
-  "libVersion": "2.25.0"
+  "libVersion": "3.8.11"
 }

utils/API.js

@@ -28,6 +28,10 @@ const URL_POST_USERBAND = `/wechat/phoneLogin`;
 const URL_GET_GETINFO = `/getInfo`;
 //获取待办
 const URL_GET_TASKLIST = `/activiti/process/taskList`;
+//获取待办
+const A_myTodoList = `/approval/audit/todoList`;
+//获取已办
+const A_myDoneList = `/approval/audit/doneList`;
 //获取已办
 const URL_GET_TASKDONELIST = `/activiti/process/taskDoneList`;
 //获取已发起、已制单
@@ -137,6 +141,8 @@ const URL_GET_UPDATETYINNONGTRANSFERFOSTATUS = `/yinnong/transfer/updateTYinnong
 
 //查询审批事项流转进度
 const URL_GET_GETPROCESS = `/yinnong/transfer/getProcessSchedule/`;
+//查询审批事项流转进度(新-2024-7-16)
+const URL_GET_GETPROCESSNEW = `/yinnong/transfer/getProcessScheduleInfoNew/`;
 
 //查询审批事项流转进度
 const URL_GET_GETPROCESSHISTORY = `/activiti/process/listHistory/`;
@@ -147,6 +153,9 @@ const URL_GET_GETYRANSFERPROCESS = `/yinnong/transfer/getProcessSchedule/`;
 //审批流办理
 const URL_GET_PROCESSCOMPLETE = `/activiti/process/mobileComplete`;
 
+//审批流办理（新）
+const A_audit = `/approval/audit/audit`;
+
 //复核
 const URL_GET_TOREVIEWSUBMIT = `/yinnong/approvalItems/toReviewSubmit/`;
 
@@ -380,7 +389,7 @@ const URL_GET_TRANSFERINFOS= `/yinnong/transferDetail/getDetails/`;
 const URL_GET_SENDMSG= `/yinnong/transfer/sendSms/`;
 
 //支付
-const URL_GET_PAY= `/yinnong/transfer/pay/`;
+const URL_GET_PAY= `/yinnong/transfer/pay`;
 
 //重大事项列表
 const URL_GET_MAJOREVENTLIST= `/yinnong/majorevent/list/`;
@@ -394,6 +403,9 @@ const URL_POST_MAJOREVENTADD= `/yinnong/majorevent/add/`;
 //重大事项修改
 const URL_POST_MAJOREVENTUPDATE= `/yinnong/majorevent/edit/`;
 
+//重大事项查询审批模板列表
+// const URL_POST_MAJOREVENTUPDATE= `/yinnong/majorevent/edit/`;
+
 //重大事项删除
 const URL_GET_MAJOREVENTDELETE= `/yinnong/majorevent/remove/`;
 
@@ -475,6 +487,36 @@ const URL_GET_GETDIANZIHUIDAN2= `/yinnong/receipt/queryReceiptPhoto5/`;
 //交易明细回单3
 const URL_GET_GETDIANZIHUIDAN3= `/yinnong/receipt/queryReceiptPhoto/`;
 
+//回单1
+const transactionDetailsQuery2OnlyQuery= `/yinnong/receipt/transactionDetailsQuery2OnlyQuery`;
+
+//回单2
+const queryReceiptPhoto= `/yinnong/receipt/queryReceiptPhoto/`;
+
+//回单3
+const getDianzihuidan= `/yinnong/recordDetail/getDianzihuidan/`;
+
+//回单4
+const queryReceiptPhoto4= `/yinnong/receipt/queryReceiptPhoto4/`;
+
+//回单5
+const queryReceiptPhoto5= `/yinnong/receipt/queryReceiptPhoto5/`;
+
+//回单6
+const queryReceiptPhoto6= `/yinnong/receipt/queryReceiptPhoto6/`;
+
+//回单8
+const queryReceiptPhoto8= `/yinnong/receipt/queryReceiptPhoto8/`;
+
+//回单18
+const queryReceiptPhoto18= `/yinnong/receipt/queryReceiptPhoto18/`;
+
+//回单18
+const queryReceiptPhoto10= `/yinnong/receipt/queryReceiptPhoto10/`;
+
+//验证验证码
+const bankReceiptPhoto4sms= `/yinnong/receipt/bankReceiptPhoto4sms`;
+
 //代管账户列表查询
 const URL_GET_GETTACCOUNTLIST= `/yinnong/taccount/list`;
 
@@ -573,6 +615,7 @@ const URL_GET_TRANSFERADD = `/yinnong/transfer/add`;
 
 //提交审批
 const URL_GET_TRANSFERCUSTOMSUBMIT = `/yinnong/transfer/customSubmit/`;
+const URL_GET_TRANSFERCUSTOMSUBMIT2 = `/yinnong/transfer/offlineCustomSubmit/`;
 
 //修改银行转账
 const URL_GET_TRANSFEREDIT = `/yinnong/transfer/edit`;
@@ -583,6 +626,40 @@ const URL_GET_GETCODE = `/gkyzm`;
 //账号密码登录
 const URL_GET_LOGIN = `/login`;
 
+//
+const getLoginBook = `/finance/book/getLoginBook`;
+
+// 查询科目余额表 可分页 需授权
+const trailBalanceList = `/finance/balance/list`;
+
+//查询资产负债表(公式报表模板)
+const assetLiabilityReportByExpTpl = `/finance/report/assetLiabilityReportByExpTpl`;
+
+//查询收支公开榜
+const financialIncomeExpenditurePublic = `/finance/open/financialIncomeExpenditurePublic`;
+
+//公式科目模板分类列表
+const expressionReportByCategory = `/finance/expressionReport/category/`;
+
+//公式科目模板分类列表
+const reapply = `/yinnong/transfer/reapply/`;
+
+
+//查询主体基本信息列表
+const URL_GET_ENTITYLIST = `/entity/entity/list`;
+
+//查询主体基本信息列表
+const URL_GET_ENTITYDETAIL = `/entity/entity/get/`;
+
+//查询主体基本信息列表
+const URL_GET_VOTELIST = `/subcontract/vote/list`;
+
+//查询主体基本信息列表
+const URL_GET_VOTEDETAIL = `/subcontract/vote/get/`;
+
+//查询主体基本信息列表
+const votedetailAdd = `/subcontract/vote/votedetailAdd`;
+
 
 
 
@@ -606,6 +683,8 @@ export {
     URL_POST_USERBAND,
     URL_GET_GETINFO,
     URL_GET_TASKLIST,
+    A_myTodoList,
+    A_myDoneList,
     URL_GET_TASKDONELIST,
     URL_GET_TRANSFERLIST,
     URL_POST_UPDATEPWD,
@@ -642,8 +721,10 @@ export {
     URL_GET_USERAPPRO,
     URL_GET_FINDLIST,
     URL_GET_APPROVALITEMS,
+    A_audit,
     URL_GET_REMOVEAPPROVAL,
     URL_GET_GETPROCESS,
+    URL_GET_GETPROCESSNEW,
     URL_GET_PROCESSCOMPLETE,
     URL_GET_TOREVIEWSUBMIT,
     URL_GET_REVIEWPROCESS,
@@ -790,11 +871,33 @@ export {
     URL_GET_TRANSFERREMOVE,
     URL_GET_TRANSFERADD,
     URL_GET_TRANSFERCUSTOMSUBMIT,
+    URL_GET_TRANSFERCUSTOMSUBMIT2,
     URL_GET_PAYEESELECTLISTNEW,
     URL_GET_TRANSFEREDIT,
     URL_GET_REMOVETRANFERL,
     URL_GET_selectApprovalByTemplateId,
     URL_GET_UPDATETYINNONGTRANSFERFOSTATUS,
     URL_GET_GETCODE,
-    URL_GET_LOGIN
+    URL_GET_LOGIN,
+    getLoginBook,
+    trailBalanceList,
+    assetLiabilityReportByExpTpl,
+    financialIncomeExpenditurePublic,
+    expressionReportByCategory,
+    transactionDetailsQuery2OnlyQuery,
+    queryReceiptPhoto,
+    getDianzihuidan,
+    queryReceiptPhoto4,
+    queryReceiptPhoto5,
+    queryReceiptPhoto6,
+    queryReceiptPhoto8,
+    queryReceiptPhoto18,
+    queryReceiptPhoto10,
+    bankReceiptPhoto4sms,
+    reapply,
+    URL_GET_ENTITYLIST,
+    URL_GET_ENTITYDETAIL,
+    URL_GET_VOTELIST,
+    URL_GET_VOTEDETAIL,
+    votedetailAdd
 }

utils/util.js

@@ -473,7 +473,7 @@ const hideLoadings = () => {
 }
 
 const hideLoadingWithErrorTips = (err = '加载失败...') => {
-  hideLoading()
+  wx.hideLoading()
   wx.showToast({
     title: err,
     icon: 'error',