切图优化

app.json

@@ -10,11 +10,13 @@
     "pages/apply/index",
     "pages/apply/paymentTemplate/paymentTemplate",
     "pages/apply/approval/approval",
-	"pages/inCome/inCome",
-    "pages/apply/approval/approval",
+    "pages/inCome/inCome",
     "pages/inCome/accounting/index",
- 	"pages/apply/paymentTemplate/see/see",
-    "pages/apply/paymentTemplate/add/add"  ],
+    "pages/apply/paymentTemplate/see/see",
+    "pages/apply/paymentTemplate/add/add",
+    "pages/payee/index",
+    "pages/payee/add/add"
+  ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationStyle": "custom",

env/env.js

@@ -1,11 +1,11 @@
 module.exports = {
     DEV: {
-          URL_PREFIX: '192.168.31.228:8080/',
+          URL_PREFIX: 'http://192.168.31.178:8080',
     },
     PRE: {
-          URL_PREFIX: 'http://192.168.31.196:3318/rural_collective_assetes',
+          URL_PREFIX: 'http://192.168.31.178:8080/rural_collective_assetes',
     },
     PROD: {
-          URL_PREFIX: 'http://192.168.31.196:3318/rural_collective_assetes',
+          URL_PREFIX: 'http://192.168.31.178:8080/rural_collective_assetes',
     }
   }

pages/apply/index.js

@@ -1,4 +1,6 @@
 // pages/apply/index.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
 const app = getApp();
 Page({
 
@@ -7,7 +9,8 @@ Page({
    */
   data: {
     isIPX: app.globalData.isIPX,
-    show:false
+    show:false,
+    accountList:[]
   },
 
   /**
@@ -65,7 +68,35 @@ swichPaymentApply:function(e){
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    var that = this;
+    var sendData = {
+      pageNum:'1',
+      pageSize:'100',
+      accountName:'',
+      bankAccountNumber:'',
+      status:'N',
+      method:'GET'
+    }
+    UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          this.setData({userInfoObj:res.user})
+        }
+      }
+    })
+    UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{
+      success: (res) => {
+        console.log(res.rows[0].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 "))
+        for (let i = 0; i < res.rows.length; i++) {
+          console.log("aaa")
+          res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ")
+        }
+        console.log(res.rows)
+        that.setData({
+          accountList:res.rows
+        })
+      }
+    })
   },
 
   /**

pages/apply/index.wxml

@@ -5,42 +5,26 @@
 </view>
 <!-- 付款单位开始 -->
 <view class="top" style="margin-top:{{isIPX?'100px':'75px'}};">
-  <image src="../../image/apply/dress_icon.png" mode="widthFix"></image>
+  <image src="../../image/apply/dress_icon.png"></image>
   <view class="top-tit">付款单位</view>
   <view class="top-title">龙水镇龙洞村股份经济联合社</view>
 </view>
-
 <view class="main">
   <van-tabs sticky color="#000">
     <van-tab title="银行账户">
-
-      <view class="bank_box">
-        <text class="zt">一般户</text>
-        <image src="../../image/apply/jsyh_bg2.png" style="width: 100%;position: absolute;bottom:0;z-index: 9;"  mode="widthFix"></image>
-        <image src="../../image/apply/bgt.png" style="width: 100%;position: absolute;top:0;right:0;z-index: 9;height: 100%;"></image>
-        <view class="bank_content">
-          <image src="../../image/apply/jsyh_icon.png" style="width: 28%;"  mode="widthFix"></image>
-          <view style="margin-bottom: 2vh;">6217 0021 9000 7972 186<text>卡号</text></view> 
-          <view>可用余额</view> 
-          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">10,288.83</view> 
-        </view>
-      </view>
-
-      <view class="bank_box">
+      <view class="bank_box" wx:for="{{accountList}}" wx:key="index">
         <text class="zt">一般户</text>
         <image src="../../image/apply/jsyh_bg2.png" style="width: 100%;position: absolute;bottom:0;z-index: 9;"  mode="widthFix"></image>
         <image src="../../image/apply/bgt.png" style="width: 100%;position: absolute;top:0;right:0;z-index: 9;height: 100%;"></image>
         <view class="bank_content">
           <image src="../../image/apply/jsyh_icon.png" style="width: 28%;"  mode="widthFix"></image>
-          <view style="margin-bottom: 2vh;">6217 0021 9000 7972 186<text>卡号</text></view> 
+          <view style="margin-bottom: 2vh;">{{item.bankAccountNumber}}<text>卡号</text></view> 
           <view>可用余额</view> 
-          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">10,288.83</view> 
+          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">{{item.balance}}</view> 
         </view>
       </view>
-
     </van-tab>
     <van-tab title="公务卡">
-    
       <view class="bank_box">
         <image src="../../image/apply/jsyh_bg2.png" style="width: 100%;position: absolute;bottom:0;z-index: 9;"  mode="widthFix"></image>
         <view class="bank_content gwk">
@@ -51,7 +35,6 @@
         </view>
         <view class="holder">持有人：王强</view>
       </view>
-      
     </van-tab>
   </van-tabs>
 </view>

pages/apply/index.wxss

@@ -17,6 +17,7 @@
 .top image{
   position: absolute;
   width: 94%;
+  height: 55px;
 }
 .top-title{
   flex: 1;

pages/apply/paymentTemplate/add/add.wxml

@@ -50,8 +50,8 @@
             bind:change="onChange"
             direction="horizontal"XX
           >
-            <van-radio name="1" checked-color="#2C8E68" disabled>公户</van-radio>
-            <van-radio name="2" checked-color="#2C8E68" disabled>私户</van-radio>
+            <van-radio name="1" checked-color="#2C8E68" >公户</van-radio>
+            <van-radio name="2" checked-color="#2C8E68" >私户</van-radio>
           </van-radio-group>
         </view>
       </van-cell>

pages/index/index.js

@@ -43,7 +43,7 @@ swichPayment:function(e){
   //     })
   // }
   wx.navigateTo({
-    url: '../apply/index?',
+    url: '/pages/apply/index?',
     })
   },
      //跳转个人设置

pages/payee/add/add.js

@@ -0,0 +1,67 @@
+// pages/payee/add/add.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/payee/add/add.json

@@ -0,0 +1,6 @@
+{
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index"
+  }
+}

pages/payee/add/add.wxml

@@ -0,0 +1,16 @@
+<!--pages/payee/add/add.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="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
+    <van-field label="所属银行" value="{{ value }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"/>
+    <van-field label="户名" value="{{ value }}" placeholder="请输入姓名" border="{{ false }}" bind:change="onChange" input-align="right" required/>
+    <van-field label="卡号" value="{{ value }}" placeholder="请输入收款账号" border="{{ false }}" bind:change="onChange" input-align="right" required/>
+    <van-field label="账户类型" value="{{ value }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"/>
+    <van-field label="开户行" value="{{ value }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" />
+    <van-field label="联行号" value="{{ value }}" placeholder="请输入" border="{{ false }}" bind:change="onChange" input-align="right" required/>
+  </view>
+  <view class="bottom">
+    <view class="btn2" bindtap="swichPaymentApply">确认</view>
+  </view>

pages/payee/add/add.wxss

@@ -0,0 +1,50 @@
+/* pages/payee/add/add.wxss */
+.main-box{
+  background: #ffffff;
+  padding: 20px;
+  width: 94%;
+  margin: 0 auto;
+  border-radius: 10px;
+  box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+}
+.table-box van-field van-cell .van-cell{
+  margin-bottom: 15px;
+}
+.table-box van-field:last-child van-cell .van-cell{
+  margin-bottom: 0px;
+}
+.van-cell{
+  padding: 0!important;
+}
+.van-cell--required:before {
+  left: 0!important;
+}
+
+.van-field__label {
+  padding-left: 10px;
+}
+
+.bottom{
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+  margin-top: 30px;
+  margin-bottom: 30px;
+  display: flex;
+  position: absolute;
+  bottom: 10%;
+}
+
+.bottom view {
+  width: 47%;
+  margin: 0 auto;
+  border-radius: 30px;
+  display: inline-block;
+}
+
+.bottom .btn2{
+  border: 1px solid transparent;
+  padding: 8px 0px;
+  background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+  color: #fff;
+}

pages/payee/index.js

@@ -0,0 +1,80 @@
+// pages/payee/index.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+    list: ['a', 'b', 'c'],
+    result: ['a', 'b'],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+  onChange(event) {
+    this.setData({
+      result: event.detail,
+    });
+  },
+
+  toggle(event) {
+    const { index } = event.currentTarget.dataset;
+    const checkbox = this.selectComponent(`.checkboxes-${index}`);
+    checkbox.toggle();
+  },
+  noop() {},
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/payee/index.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-search": "@vant/weapp/search/index"
+  }
+}

pages/payee/index.wxml

@@ -0,0 +1,48 @@
+<!--pages/payee/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>
+</view>
+<view class="search_box" style="margin-top:{{isIPX?'100px':'75px'}};">
+  <van-search
+    value="{{ value }}"
+    shape="round"
+    background="transparent"
+    placeholder="请输入搜索关键词"
+  />
+  <view class="add_btn"><text>新增</text></view>
+</view>
+
+  <van-checkbox-group value="{{ result }}" bind:change="onChange">
+    <van-cell-group>
+      <van-cell
+        wx:for="{{ list }}"
+        wx:key="index"
+        value-class="value-class"
+        clickable
+        data-index="{{ index }}"
+        bind:click="toggle"
+        use-label-slot
+        center
+      >
+        <view slot="icon" style="margin-right: 10px;">
+          <image src="/image/apply/icon_icbc.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+        </view>
+        <view slot="title">
+          张亮亮
+        </view>
+        <view slot="label">
+          6217****2186 中国银行
+        </view>
+        <van-checkbox
+          catch:tap="noop"
+          checked-color="#2C8E68"
+          class="checkboxes-{{ index }}"
+          name="{{ item }}"
+        />
+      </van-cell>
+    </van-cell-group>
+  </van-checkbox-group>
+  <view class="bottom">
+    <view class="btn2" bindtap="swichPaymentApply">确认</view>
+  </view>

pages/payee/index.wxss

@@ -0,0 +1,54 @@
+/* pages/payee/index.wxss */
+.value-class {
+  flex: none !important;
+}
+.van-cell{
+  background-color: transparent!important;
+}
+.van-search__content {
+  border: 1px solid #5CAE77!important;
+  background: transparent!important;
+}
+van-search {
+  flex: 0.8;
+}
+.search_box{
+  display: flex;
+}
+.add_btn{
+  flex: 0.2;
+  padding: var(--search-padding,10px 12px);
+  padding-left: 0;
+}
+.add_btn text{
+  background-color: #62AD66;
+  display: block;
+  height: 100%;
+  text-align: center;
+  line-height: 36px;
+  color: #fff;
+  border-radius: 36px;
+  box-shadow: 0px 5px 5px #ddd;
+}
+.bottom{
+  width: 84%;
+  margin: 0 auto;
+  text-align: center;
+  margin-top: 30px;
+  margin-bottom: 30px;
+  display: flex;
+}
+
+.bottom view {
+  width: 47%;
+  margin: 0 auto;
+  border-radius: 30px;
+  display: inline-block;
+}
+
+.bottom .btn2{
+  border: 1px solid transparent;
+  padding: 8px 0px;
+  background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+  color: #fff;
+}

pages/user/login/login.js

@@ -73,8 +73,9 @@ Page({
             iv:detail.iv,
             encryptedData:detail.encryptedData
         }
-        UTIL.httpRequest(API.URL_POST_DECRYPTEDWXDATA, sendData,{
+        UTIL.httpRequestNoneDetal(API.URL_POST_DECRYPTEDWXDATA, sendData,"POST",{
             success: (res) => {
+              console.log(res)
               if (res.code == API.SUCCESS_CODE) {
                   let phoneNumber = res.data.phoneNumber;
                   //微信手机号码绑定
@@ -96,7 +97,8 @@ Page({
             openId:STORAGE.getOpenId(),
             phonenumber:phone
         }
-        UTIL.httpRequest(API.URL_POST_USERBAND, sendData,{
+        
+        UTIL.httpRequestNoneDetal(API.URL_POST_USERBAND, sendData,"POST",{
             success: (res) => {
                 if (res.code == API.SUCCESS_CODE) {
                     wx.navigateTo({

project.config.json

@@ -1,55 +1,59 @@
 {
-    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "packOptions": {
-        "ignore": [
-            {
-                "value": ".eslintrc.js",
-                "type": "file"
-            }
-        ],
-        "include": []
+  "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": ""
     },
-    "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": ""
-        },
-        "useIsolateContext": true,
-        "userConfirmedBundleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "minifyWXSS": true,
-        "disableUseStrict": false,
-        "showES6CompileOption": false,
-        "useCompilerPlugins": false,
-        "ignoreUploadUnusedFiles": true,
-        "minifyWXML": true
-    },
-    "editorSetting": {
-        "tabIndent": "insertSpaces",
-        "tabSize": 2
-    },
-    "condition": {}
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true,
+    "minifyWXML": true,
+    "useStaticServer": true
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "condition": {},
+  "appid": "wxaace54cc2cf8924b",
+  "compileType": "miniprogram",
+  "libVersion": "2.23.2"
 }

project.private.config.json

@@ -59,6 +59,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "收款人名册",
+          "pathName": "pages/payee/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "添加收款人",
+          "pathName": "pages/payee/add/add",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

utils/API.js

@@ -34,6 +34,9 @@ const URL_POST_USERBAND = `${URL_PREFIX}/register/wechat/band`;
 //获取用户信息
 const URL_GET_GETINFO = `${URL_PREFIX}/getInfo`;
 
+//当前账套付款账户列表
+const URL_GET_ACCOUNTLIST = `${URL_PREFIX}/cashier/account/list`;
+
 /****************接口地址end****************/
 
 export {
@@ -50,5 +53,6 @@ export {
     URL_GET_OPENID,
     URL_POST_DECRYPTEDWXDATA,
     URL_POST_USERBAND,
-    URL_GET_GETINFO
+    URL_GET_GETINFO,
+    URL_GET_ACCOUNTLIST
 }

utils/util.js

@@ -117,7 +117,7 @@ function httpRequest(url, data, {
 	wx.request({
 		url,
 		data: finalData,
-		method: data.method || 'POST',
+		method:data.method,
 		timeout: 60000,
 		header: {
 			'Authorization':'Bearer '+getApp().globalData.userInfo.token