.

src/pages/addBankCard/index.jsx

@@ -1,59 +1,27 @@
-import React, { useState } from "react"
+import React, { useState,useEffect } from "react"
 import Taro from "@tarojs/taro"
 import { View, Input, Picker } from "@tarojs/components"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav"
 import MyButton from "@/components/MyButton"
 import { useModel } from "@/store"
-import { addBank } from '@/services/bank'
+import { addBank ,getBankTypeList} from '@/services/bank'
+
 import './style.less'
 
-const bankList = [
-  {
-    key: 1,
-    value: '中国建设银行'
-  },
-  {
-    key: 2,
-    value: '中国农业银行'
-  },
-  {
-    key: 3,
-    value: '中国银行'
-  },
-  // {
-  //   key: 4,
-  //   value: '中国工商银行'
-  // },
-  // {
-  //   key: 5,
-  //   value: '中国招商银行'
-  // },
-  // {
-  //   key: 6,
-  //   value: '中国交通银行'
-  // },
-  // {
-  //   key: 7,
-  //   value: '中国邮政银行'
-  // },
-]
-const bankContentList = ['中国建设银行', '中国农业银行', '中国银行']
 
 export default withLayout((props) => {
   const { person } = useModel('person')
   const [name, setName] = useState()
   const [bankCode, setBankCode] = useState()
-  const [bankAddress, setBankAddress] = useState(bankContentList[0])
+  const [bankList,setBankList]=useState([])
+  const [bankAddress, setBankAddress] = useState()
   const [phone, setPhone] = useState()
-  const [index, setIndex] = useState(0)
   const [loading, setLoading] = useState(false)
 
 
   const onChange = e => {
-    console.log(bankList[e.detail.value])
-    setBankAddress(bankContentList[e.detail.value])
-    setIndex(e.detail.value)
+    setBankAddress(bankList[e.detail.value])
   }
   const rulePhone = (val) => {
     if (!/^1[0-9]{10}$/.test(val)) {
@@ -66,9 +34,9 @@ export default withLayout((props) => {
     } else return true
   }
   const ruleCard = (val) => {
-    if (!/[0-9]{19}$/.test(val)) {
+    if (!val||val.length<8) {
       Taro.showToast({
-        title: '请输入正确的19位银行卡号',
+        title: '请输入正确的银行卡号',
         icon: 'none',
         duration: 2000
       })
@@ -104,6 +72,12 @@ export default withLayout((props) => {
       })
     }
   }
+  useEffect(()=>{
+    getBankTypeList({pageSize:500}).then((res)=>{
+      setBankList(res.records.map(item=>item.name))
+      setBankAddress(res.records[0].name)
+    })
+  },[])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -126,8 +100,8 @@ export default withLayout((props) => {
           <View className='cellLeft'>
             <View className='label'>开户行</View>：
           </View>
-          <Picker mode='selector' style={{ width: '100%' }} range={bankContentList} onChange={onChange}>
-            {bankContentList[index]}
+          <Picker mode='selector' style={{ width: '100%' }} range={bankList} onChange={onChange}>
+            {bankAddress}
           </Picker>
         </View>
         <View className='addCardCell'>

src/pages/bankCard/Card/index.jsx

@@ -1,26 +1,24 @@
 import { View, Image, Text } from "@tarojs/components"
-import ABCImg from '@/assets/bank/ABCbank.png'
-import BOCImg from '@/assets/bank/BOCbank.png'
-import CCBImg from '@/assets/bank/CCBbank.png'
+import logoImg from '@/assets/bank/jianhang.jpg'
 import './style.less'
 
 export default (props) => {
-  const { type, value, onChange } = props
+  const { value, onChange } = props
+  let style = { background: `linear-gradient(0deg,#${value.color1},#${value.color2})`  }
   return (
-    <View className='bankCard' >
-      <Image src={
-        type === '中国农业银行' ? ABCImg :
-          type === '中国银行' ? BOCImg :
-            type === '中国建设银行' ? CCBImg : ''
-      } className='CardImg'
-      />
-      <View className='unBind' onClick={onChange}>解除绑定</View>
-      <View className='cardType'>储蓄卡</View>
-      <View className='cCode'>
-        <Text className='codeText'>****</Text>
+    <View className='bank' style={style}>
+      <View className='top'>
+        <Image className='logo' src={logoImg} />
+        <View className='title'>{value.ownerBank}</View>
+        <View className='cardType'>储蓄卡</View>
+        <View className='light'>Bank</View>
+        <View className='unBind' onClick={onChange}>解除绑定</View>
+      </View>
+      <View className='bottom'>
+        <Text className='codeText'>{value.cardNo.substr(0, 4)}</Text>
         <Text className='codeText'>****</Text>
         <Text className='codeText'>****</Text>
-        <Text className='codeText'>{value.substr(15, 4)}</Text>
+        <Text className='codeText'>{value.cardNo.slice(-4)}</Text>
       </View>
     </View>
   )

src/pages/bankCard/Card/style.less

@@ -1,39 +1,48 @@
-.bankCard{
-  height: calc( calc(100vw - 60px) * 0.36);
+.bank{
+  // background: linear-gradient(0deg,#375BCA,#5E93E0);
   border-radius: 40px;
+  color: #FFFFFF;
   position: relative;
-  color: #fff;
+  font-weight: bold;
+  padding: 60px 20px 70px 60px;
   margin-bottom: 30px;
-  .CardImg{
-    width: 100%;
-    height: calc( calc(100vw - 60px) * 0.36);
-    position: absolute;
-    z-index: -1;
-  }
-  .unBind{
-    position: absolute;
-    font-size: 28px;
-    font-weight: bold;
-    right: 36px;
-    top: 41px;
-  }
-  .cardType{
-    position: absolute;
-    font-size: 28px;
-    font-weight: 400;
-    left: 40vw;
-    top: 69px;
+  .top{
+    display: flex;
+    align-items: center;
+    margin-bottom: 40px;
+    .logo{
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+    }
+    .title{
+      font-size: 36px;
+      margin: 0 21px 0 16px;
+    }
+    .cardType{
+      font-size: 28px;
+      font-weight: 400;
+    }
+    .light{
+      font-size: 89px;
+      opacity: 0.1;
+      position: absolute;
+      right: 20px;
+      letter-spacing: 10px;
+    }
+    .unBind{
+      font-size: 28px;
+      position: absolute;
+      right: 20px;
+      top: 40px;
+    }
   }
-  .cCode{
-    position: absolute;
-    font-size: 40px;
-    font-weight: bold;
-    bottom: 69px;
-    left: 8vw;
-    // left: calc(calc(50vw - 30px) - 5.5em);
+  .bottom{
+    .codeText{
+      font-size: 40px;
+    }
     .codeText+.codeText{
       margin-left: 1em;
     }
   }
-  
 }

src/pages/bankCard/index.jsx

@@ -1,10 +1,10 @@
 import { useState, useEffect } from "react"
 import Taro, { useDidShow } from "@tarojs/taro"
-import { View, Image, ScrollView } from "@tarojs/components"
+import { View, Image, ScrollView, Text } from "@tarojs/components"
 import withLayout from '@/layouts'
 import NullCard from "@/components/NullCard";
 import CustomNav from "@/components/CustomNav"
-import { getBankList, deleteBank } from '@/services/bank'
+import { getBankList, deleteBank,getBankTypeList } from '@/services/bank'
 import addImg from '@/assets/bank/addBank.png'
 import BankCard from './Card'
 import './style.less'
@@ -41,8 +41,16 @@ export default withLayout((props) => {
     getList()
   })
   const getList = () => {
-    getBankList().then((res) => {
-      setBankList(res.records)
+    getBankList({pageSize:500}).then((res) => {
+      getBankTypeList({pageSize:500}).then((res2)=>{
+        let list1=[]
+        let current
+        res.records.forEach(item => {
+          current= res2.records.filter(v=>item.ownerBank==v.name)[0]
+          list1.push({...item,color1:current.color1,color2:current.color2})
+        });
+        setBankList(list1)
+      })
     })
   }
   useEffect(() => {
@@ -59,7 +67,7 @@ export default withLayout((props) => {
             bankList.length == 0 ?
               <NullCard value='您还没有添加银行卡！' /> :
               bankList.map(item => {
-                return <BankCard type={item.ownerBank} key={item.cardId} value={item.cardNo} onChange={() => unBind(item.cardId)} />
+                return <BankCard key={item.cardId} value={item} onChange={() => unBind(item.cardId)} />
               })
           }
         </ScrollView>

src/pages/index/components/User/index.jsx

@@ -1,4 +1,3 @@
-import { useState, useEffect } from "react"
 import { useModel } from '@/store'
 import Taro from "@tarojs/taro"
 import { View, Image, ScrollView } from "@tarojs/components"
@@ -18,6 +17,8 @@ import './style.less'
 export default (props) => {
   const { person } = useModel('person')
 
+  const { isOrgManager } = person
+
   const handleAccount = () => {
     Taro.navigateTo({ url: '/pages/userInfo/index' });
   }
@@ -34,20 +35,24 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/machineryList/index' });
   }
   const goWallet = () => {
-    Taro.navigateTo({ url: '/pages/wallet/index?balance=2022.56' });
+    if (isOrgManager) {
+      Taro.navigateTo({ url: '/pages/wallet/index' });
+    }
   }
   const goBank = () => {
-    Taro.navigateTo({ url: '/pages/bankCard/index' });
+    if (isOrgManager) {
+      Taro.navigateTo({ url: '/pages/bankCard/index' });
+    }
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      <View className='personTip'>该账号归{person.nickName||'张三'}所属</View>
+      <View className='personTip'>该账号归{person.nickName || '张三'}所属</View>
       <View className='userHead' onClick={handleAccount}>
         <Image src={userBgi} className='userBgi' />
         <View className='headcontent' >
-          <Image src={person.avatar||avatar} className='avatar' />
+          <Image src={person.avatar || avatar} className='avatar' />
           <View>
-            <View>{person.nickName||''}</View>
+            <View>{person.nickName || ''}</View>
             <View>{person.phone}</View>
           </View>
         </View>
@@ -61,14 +66,14 @@ export default (props) => {
           <View className='text'>我的农机</View>
         </View>
         <View
-          className='cardItem'
+          className={['cardItem', isOrgManager ? '' : 'graystyle']}
           onClick={() => goWallet()}
         >
           <Image className='cardImg' src={wallet}></Image>
           <View className='text'>我的钱包</View>
         </View>
         <View
-          className='cardItem'
+          className={['cardItem', isOrgManager ? '' : 'graystyle']}
           onClick={() => goBank()}
         >
           <Image className='cardImg' src={bankCard}></Image>

src/pages/index/components/User/style.less

@@ -69,4 +69,15 @@
       color: #333333;
     }
   }
+  .graystyle{
+    -webkit-filter: grayscale(100%);
+    -moz-filter: grayscale(100%);
+    -ms-filter: grayscale(100%);
+    -o-filter: grayscale(100%);
+    filter: grayscale(100%);
+    filter: gray;
+    view{
+      color: gray !important;
+    }
+  }
 }

src/pages/wallet/index.jsx

@@ -1,17 +1,31 @@
 import Taro from "@tarojs/taro"
 import { View, ScrollView } from "@tarojs/components"
+import { useEffect,useState } from "react"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav"
 import WalletCard from "@/components/walletCard"
 import ListTitle from "@/components/ListTitle"
+import {getAccount,getLogList} from '@/services/account'
 import './style.less'
 
+
 export default withLayout((props) => {
-  const { router } = props
-  let { balance } = router.params
-  const goWithdrawal = () => { 
+  const [balance,setBlance]=useState(0)
+  const [logList,setLogList]=useState([])
+  const goWithdrawal = () => {
     Taro.navigateTo({ url: `/pages/withdrawal/index?balance=${balance}` });
   }
+  const getList=()=>{
+    getAccount().then(res=>{
+      setBlance(res.amounts)
+    })
+    getLogList().then(res=>{
+      setLogList(res.records)
+    })
+  }
+  useEffect(()=>{
+    getList()
+  },[])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -21,39 +35,33 @@ export default withLayout((props) => {
         <ScrollView scrollY style={{ height: '100%' }}>
           <WalletCard onClick={goWithdrawal} value={balance} />
           <ListTitle value='零钱明细' />
-          <View className='dayClass'>2022-03-10</View>
           <View className='walletCell'>
-            <View className='content'>
-              <View>提现</View>
-              <View className='withDrawalDetail'>申请提现，建设银行5321532154646465
-                4135456465465</View>
+            <View className='flexTop'>
+              <View className='content'>提现</View>
+              <View className='money'>-9000</View>
             </View>
-            <View className='money'>-9000元</View>
+            <View className='withDrawalDetail'>2022-4-10 10:55</View>
           </View>
           <View className='walletCell'>
-            <View className='content'>
-              <View>提现</View>
-              <View className='withDrawalDetail'>申请提现，建设银行5321532154646465
-                4135456465465</View>
+            <View className='flexTop'>
+              <View className='content'>提现</View>
+              <View className='money'>-9</View>
             </View>
-            <View className='money'>-9元</View>
+            <View className='withDrawalDetail'>2022-4-8 10:55</View>
           </View>
-
-          <View className='dayClass'>2022-03-10</View>
           <View className='walletCell'>
-            <View className='content'>
-              <View>收入</View>
-              <View className='withDrawalDetail'>取消订单-退回未使用金额</View>
+            <View className='flexTop'>
+              <View className='content'>收入</View>
+              <View className='money revenue'>+200</View>
             </View>
-            <View className='money revenue'>+200元</View>
+            <View className='withDrawalDetail'>2022-2-10 10:55</View>
           </View>
           <View className='walletCell'>
-            <View className='content'>
-              <View>提现</View>
-              <View className='withDrawalDetail'>申请提现，建设银行5321532154646465
-                4135456465465</View>
+            <View className='flexTop'>
+              <View className='content'>提现</View>
+              <View className='money'>-90</View>
             </View>
-            <View className='money'>-90元</View>
+            <View className='withDrawalDetail'>2022-4-1 10:55</View>
           </View>
         </ScrollView>
       </View>

src/pages/wallet/style.less

@@ -1,47 +1,41 @@
 .wallet{
   margin: 30px;
   font-weight: bold;
-  .dayClass{
-    height: 68px;
-    background: #F8F8F8;
-    font-size: 30px;
-    color: #333333;
-    line-height: 68px;
-    margin-top: 30px;
-    padding-left: 20px;
-  }
   .walletCell{
     background: #FFF;
     box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.12);
-    font-weight: bold;
-    display: flex;
-    align-items: center;
+    font-weight: bold;    
     padding: 30px 20px;
-    margin-bottom: 1px;
-    .content{
-      width: 63vw;
-      font-size: 32px;
-      line-height: 32px;
-      color: #333;
-      .withDrawalDetail{
-        margin-top: 26px;
-        font-style: 30px;
-        color: #666;
-        font-weight:400;
-        overflow: hidden;
-        text-overflow:ellipsis;
-        white-space: nowrap;
+    margin-bottom: 2px;
+    .flexTop{
+      display: flex;
+      align-items: center;
+      .content{
+        width: 63vw;
+        font-size: 32px;
+        line-height: 32px;
+        color: #333;      
+      }
+      .money{
+        font-size: 40px;
+        color: #FF3F3F;
+        position: absolute;
+        right: 30px;
+      }
+      .revenue{
+        font-size: 30px;
+        color: #00AE3A;
       }
     }
-    .money{
-      font-size: 40px;
-      color: #FF3F3F;
-      position: absolute;
-      right: 30px;
-    }
-    .revenue{
-      font-size: 30px;
-      color: #00AE3A;
+    .withDrawalDetail{
+      margin-top: 26px;
+      font-style: 30px;
+      color: #666;
+      font-weight:400;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      white-space: nowrap;
     }
+    
   }
 }

src/pages/withdrawal/index.jsx

@@ -59,7 +59,7 @@ export default withLayout((props) => {
       if (res.records.length != 0) {
         setBankList(res.records)
         setBankContentList(res.records.map(item => {
-          return item.ownerBank + '(' + item.cardNo.substr(15, 4) + ')'
+          return item.ownerBank + '(' + item.cardNo.slice(-4) + ')'
         }))
       }
     })

src/services/account.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+
+/**
+  * 我的钱包
+  * @returns 
+  * params 搜索条件放这里
+  */
+ export const getAccount = (params) => request('/account/mine', { params })
+
+ 
+/**
+  * 我的流水
+  * @returns 
+  * params 搜索条件放这里
+  */
+ export const getLogList = (params) => request('/account-log', { params })

src/services/bank.js

@@ -6,6 +6,12 @@ import request from '@/utils/request'
   * params 搜索条件放这里
   */
  export const getBankList = (params) => request('/bankcard', { params })
+/**
+  * 银行列表
+  * @returns 
+  * params 搜索条件放这里
+  */
+ export const getBankTypeList = (params) => request('/bank', { params })
 
 /**
   * 银行卡详情