diff --git a/src/pages.json b/src/pages.json
index 8b9b1db..46348a8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -90,6 +90,27 @@
       }
     }
     ,
+    {
+      "path": "pages/work/accounts/posTransferRecord/list",
+      "style": {
+        "navigationBarTitleText": "POS机刷卡记账"
+      }
+    }
+    ,
+    {
+      "path": "pages/work/accounts/posTransferRecord/details",
+      "style": {
+        "navigationBarTitleText": "POS机刷卡记账详情"
+      }
+    }
+    ,
+    {
+      "path": "pages/work/accounts/posTransferRecord/addEdit",
+      "style": {
+        "navigationBarTitleText": "POS机刷卡记账"
+      }
+    }
+    ,
     {
       "path": "pages/work/accounts/accounts/index",
       "style": {
diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue
index bb59406..a04f819 100644
--- a/src/pages/work/accounts/accountDealRecord/addEdit.vue
+++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue
@@ -89,7 +89,22 @@ const accountNameList = ref([])
 const dealCategoryList = ref([])
 const dealTypeList = ref([])
 const data = reactive({
-  form: {},
+  form: {
+    id: null,
+    name: null,
+    type: null,
+    accountId: null,
+    amount: 0,
+    dealType: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    currentBalance: null,
+    dealCategory: null
+  },
   queryAccountParams: {
     pageNum: 1,
     state: '1',
@@ -97,11 +112,11 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    type: [{ required: true, message: '记账类型不能为空', trigger:['change', 'blur'] }],
-    accountId: [{ required: true, message: '记账账户不能为空', trigger: ['change', 'blur'] }],
+    typeName: [{ required: true, message: '记账类型不能为空', trigger:['change', 'blur'] }],
+    accountName: [{ required: true, message: '记账账户不能为空', trigger: ['change', 'blur'] }],
     amount: [{type: 'string', required: true, message: '交易金额不能为空', trigger: ['change', 'blur'] }],
-    dealType: [{ required: true, message: '交易类型不能为空', trigger:['change', 'blur'] }],
-    dealCategory: [{ required: true, message: '交易类别不能为空', trigger: ['change', 'blur'] }],
+    dealTypeName: [{ required: true, message: '交易类型不能为空', trigger:['change', 'blur'] }],
+    dealCategoryName: [{ required: true, message: '交易类别不能为空', trigger: ['change', 'blur'] }],
     createTime: [{ required: true, message: '交易时间不能为空', trigger: ['change', 'blur'] }]
   }
 })
@@ -115,12 +130,14 @@ onLoad((option) => {
        }else{
         title.value="账户交易记录-新增"
        }
-      getDict()
+     
   })
   onReady(() => {
-    // proxy.$refs['uForm'].setRules(rules.value)
+    form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+    getData()
   })
-  function  getDict() {
+  function  getData() {
+   
         // 类型
         getDicts('account_type').then(res => {
         accountTypeList.value =[res.data] 
diff --git a/src/pages/work/accounts/accountDealRecord/list.vue b/src/pages/work/accounts/accountDealRecord/list.vue
index ac6f486..ccd36cf 100644
--- a/src/pages/work/accounts/accountDealRecord/list.vue
+++ b/src/pages/work/accounts/accountDealRecord/list.vue
@@ -151,8 +151,6 @@ const time =ref( Number(new Date()))
 const data = reactive({
   filterPanel: false,
   queryParams: {
-    pageNum: 1,
-    pageSize: 10,
     name: null,
     type: null,
     time: '',
@@ -190,7 +188,7 @@ function getList() {
       status.value = 'loading'
       listAccountDealRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
-        if (listData.length < res.total) {
+        if (listData.value.length < res.total) {
           status.value = 'loadmore'
         } else {
           status.value = 'nomore'
diff --git a/src/pages/work/accounts/posTransferRecord/addEdit.vue b/src/pages/work/accounts/posTransferRecord/addEdit.vue
new file mode 100644
index 0000000..9cac467
--- /dev/null
+++ b/src/pages/work/accounts/posTransferRecord/addEdit.vue
@@ -0,0 +1,226 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="POS机刷卡记账"
+		>
+		</u-navbar>
+      <view class="section">
+        <view class="section-title">{{ title}}</view>
+        <view class="form-view">
+          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+            <u-form-item label="POS机" prop="posName" required @click="handlePosMachine">
+              <u--input v-model="form.posName" disabled disabledColor="#ffffff" placeholder="请选择POS机"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="刷卡费率" prop="rate"  >
+              <u--input v-model="form.rate"  placeholder="请填写刷卡费率"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="费率+" prop="ratePlus" >
+              <u--input v-model="form.ratePlus"  placeholder="请填写费率+"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="信用卡" prop="outAccountName" required @click="handleCreditCard">
+              <u--input v-model="form.outAccountName" disabled disabledColor="#ffffff" placeholder="请选择信用卡"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="刷卡时间" prop="createTime" required @click="selectDate()">
+              <u--input v-model="form.createTime" disabled disabledColor="#ffffff" placeholder="请选择刷卡时间" inputAlign="right" border="none"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+            <u-form-item label="刷卡金额" prop="amount" required >
+              <u--input v-model="form.amount"  placeholder="请填写刷卡金额"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="备注" prop="remark"  labelPosition="top">
+              <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            </u-form-item>
+          </u--form>
+          <view class="form-btn">
+            <u-button type="primary" text="提交" @click="submit"></u-button>
+          </view>
+        </view>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+      <u-picker itemHeight="88" :show="showPosMachine" :columns="posMachineList" keyName="nameMerchantName" @cancel="handlePosMachineCancel"
+        @confirm="handlePosMachineConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showCreditCard" :columns="bankCardLendList" keyName="nameCode" @cancel="handleCreditCardCancel"
+        @confirm="handleCreditCardConfirm"></u-picker>
+        <u-datetime-picker
+			:show="datePickShow"
+			mode="datetime"
+      ref="createTimeRef" 
+			@cancel="datePickShow=false"
+			@confirm="datePickConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import {getAccountsTransferRecord, addAccountsTransferRecord, updateAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+  import { listPosmachine, getPosmachine } from '@/api/invest/posmachine'
+import { listAccounts } from '@/api/invest/accounts'
+  const { proxy } = getCurrentInstance()
+  import dayjs from 'dayjs'
+  import {onLoad,onReady} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const showPosMachine = ref(false)
+const showCreditCard = ref(false)
+const title = ref("POS机刷卡记账")
+const bankCardLendList = ref([])
+const posMachineList = ref([])
+const data = reactive({
+  form: {},
+  queryPosMachineParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryBankCardLendParams: {
+    pageNum: 1,
+    type: '2',
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    outAccountName: [{ required: true, message: '信用卡不能为空', trigger:['change', 'blur'] }],
+    posName: [{ required: true, message: 'POS机不能为空', trigger: ['change', 'blur'] }],
+    // rate: [{type: 'string', required: true, message: '刷卡费率不能为空', trigger: ['change', 'blur'] }],
+    // ratePlus: [{ required: true, message: '费率+不能为空', trigger:['change', 'blur'] }],
+    amount: [{ required: true, message: '刷卡金额不能为空', trigger: ['change', 'blur'] }],
+    createTime: [{ required: true, message: '刷卡时间不能为空', trigger: ['change', 'blur'] }]
+  }
+})
+const { form, queryPosMachineParams, queryBankCardLendParams, rules} = toRefs(data)
+
+
+onLoad((option) => {
+       form.value.id = option.id
+       if(form.value.id!=null){
+        title.value="POS机刷卡记账-修改"
+       }else{
+        title.value="POS机刷卡记账-新增"
+       }
+      getData()
+  })
+  onReady(() => {
+       form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+  })
+  function  getData() {
+      listAccounts(queryBankCardLendParams.value).then((response) => {
+        bankCardLendList.value = [response.rows] 
+      })
+      listPosmachine(queryPosMachineParams.value).then((response) => {
+       posMachineList.value = [response.rows] 
+       })
+    
+      if(form.value.id!=null){
+        getAccountsTransferRecord(form.value.id).then(res => {
+          form.value = res.data   
+        })
+      }
+  }
+
+  function handlePosMachine() {
+        if (posMachineList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: 'POS机为空  ', type: 'warning'
+          })
+        } else {
+          showPosMachine.value = true
+        }
+     }
+  function   handlePosMachineConfirm(e) {
+       form.value.posName = e.value[0].nameMerchantName
+        form.value.posId = e.value[0].id
+        getPosmachine(e.value[0].id).then((response) => {  
+    form.value.rate = response.data.rate
+    form.value.ratePlus = response.data.ratePlus
+    showPosMachine.value = false
+  })
+        
+  }
+ function handlePosMachineCancel() {
+       showPosMachine.value = false
+    }
+function handleCreditCard() {
+        if (bankCardLendList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '信用卡为空  ', type: 'warning'
+          })
+        } else {
+          showCreditCard.value = true
+        }
+     }
+  function   handleCreditCardConfirm(e) {
+        form.value.outAccountName = e.value[0].nameCode
+        form.value.outAccountId = e.value[0].id
+        showCreditCard.value = false
+  }
+ function handleCreditCardCancel() {
+       showCreditCard.value = false
+  }
+  function  selectDate() {
+				datePickShow.value = true
+        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
+		}
+	function datePickConfirm(e) {
+				form.value.createTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+				datePickShow.value = false
+		}
+  function submit() {
+        proxy.$refs['uForm'].validate().then(() => {
+          if (form.value.id != null) {
+            updateAccountsTransferRecord(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '修改成功', complete() {
+                uni.navigateTo({ url: `/pages/work/accounts/posTransferRecord/list` })
+              }
+            })
+          })
+          }else {
+            addAccountsTransferRecord(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '新增成功', complete() {
+                uni.navigateTo({ url: `/pages/work/accounts/posTransferRecord/list` })
+              }
+            })
+          })
+          }
+        })
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 360rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/accounts/posTransferRecord/details.vue b/src/pages/work/accounts/posTransferRecord/details.vue
new file mode 100644
index 0000000..bfc3aa7
--- /dev/null
+++ b/src/pages/work/accounts/posTransferRecord/details.vue
@@ -0,0 +1,84 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="POS机刷卡记账详情"
+		>
+		</u-navbar>
+      <view class="section">
+        <!-- <view class="section-title">{{ detailInfo.name }}</view> -->
+  <u-cell-group>
+        <u-cell title="POS机名称:" titleStyle="font-weight:bolder" :value="detailInfo.posName"></u-cell>
+        <u-cell title="刷卡商户:" titleStyle="font-weight:bolder" :value="detailInfo.merchantName"></u-cell>
+        <u-cell title="信用卡:" titleStyle="font-weight:bolder" :value="detailInfo.outAccountName"></u-cell>
+        <u-cell title="储蓄卡:" titleStyle="font-weight:bolder" :value="detailInfo.inAccountName"></u-cell>
+        <u-cell title="刷卡时间:" titleStyle="font-weight:bolder" :value="detailInfo.createTime"></u-cell>
+        <u-cell title="刷卡金额:" titleStyle="font-weight:bolder" :value="detailInfo.amount"></u-cell>
+        <u-cell title="手续费:" titleStyle="font-weight:bolder" :value="detailInfo.commission" center> </u-cell>
+        <u-cell title="入账金额:" titleStyle="font-weight:bolder" :value="detailInfo.actualAmount"></u-cell>
+      </u-cell-group>
+      </view>
+   
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </template>
+  
+<script setup>
+import { getAccountsTransferRecord} from '@/api/invest/accountsTransferRecord'
+import {onLoad} from "@dcloudio/uni-app";
+import {reactive ,toRefs,ref }from "vue";
+const id = ref('')
+const data = reactive({
+  detailInfo: {} 
+})
+const {detailInfo} = toRefs(data)
+onLoad((option) => {
+    id.value = option.id
+    getInfo()
+  })
+  function getInfo() {
+    getAccountsTransferRecord(id.value).then(res => {
+          detailInfo.value = res.data
+        })
+  }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 280rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .content {
+      width: 647rpx;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+    }
+  
+    .img-con {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx
+    }
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/accounts/posTransferRecord/list.vue b/src/pages/work/accounts/posTransferRecord/list.vue
new file mode 100644
index 0000000..7208f81
--- /dev/null
+++ b/src/pages/work/accounts/posTransferRecord/list.vue
@@ -0,0 +1,490 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u--input v-model="queryParams.name" border="false" placeholder="请输入POS机或信用卡名称" class="search-input"
+          @blur="searchBlur">
+          <template slot="prefix">
+            <u-icon name="search" color="#B8B8B8" size="48"></u-icon>
+          </template>
+        </u--input>
+        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+              <view class="select-header">刷卡时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="datetime"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header" @click="enterDetails(item)">
+            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.posName+'-'+item.outAccountName" size="36rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">POS机名称：</text>
+            <text class="row-value">{{ item.posName }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">刷卡商户：</text>
+            <text class="row-value">{{ item.merchantName }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">信用卡：</text>
+            <text class="row-value">{{ item.outAccountName }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">刷卡时间：</text>
+            <text class="row-value">{{ item.createTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">交易金额：</text>
+            <text class="row-value">{{ item.amount }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">手续费：</text>
+            <text class="row-value">{{ item.commission }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">储蓄卡：</text>
+            <text class="row-value">{{ item.inAccountName }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">入账金额：</text>
+            <text class="row-value">{{ item.actualAmount }}</text>
+          </view>
+          <view class="operate" >
+            <view class="btn filling" @click="enterDetails(item)">查看</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import {
+  listAccountsTransferRecord,
+  delAccountsTransferRecord,
+} from '@/api/invest/accountsTransferRecord'
+import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const accountTypeList = ref([])
+const dealTypeList = ref([])
+const dealCategoryList = ref([])
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const timeShow= ref(false)
+const  flag= ref(true)
+const time =ref( Number(new Date()))
+const data = reactive({
+  filterPanel: false,
+  queryParams: {
+    name: null,
+    type: '1',
+    time: '',
+    posId: null,
+    inAccountId: null,
+    outAccountId: null,
+    dealType: null
+   } 
+})
+const { filterPanel, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getDict()
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      getList()
+      isShow.value = false
+    }
+  });
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+      status.value = 'loading'
+      listAccountsTransferRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+      if (flag.value) {
+        queryParams.value.startTime = date
+      } else {
+        queryParams.value.endTime = date
+      }
+      timeShow.value = false
+    }
+function   getDict() {
+      // 记账类型类型
+      getDicts('account_type').then(res => {
+        accountTypeList.value = res.data
+      })
+       // 交易类型
+       getDicts('deal_type').then(res => {
+        dealTypeList.value = res.data
+      })
+       // 交易类别
+       getDicts('deal_category').then(res => {
+        dealCategoryList.value = res.data
+      })
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+function selectAccountType(item) {
+      queryParams.value.type = item.dictValue
+      accountTypeList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+    function selectDealType(item) {
+      queryParams.value.dealType = item.dictValue
+      dealTypeList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+    function selectDealCategory(item) {
+      queryParams.value.dealCategory = item.dictValue
+      dealCategoryList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+    function searchSubmit() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+        queryParams.value.name = ''
+        queryParams.value.type = ''
+        queryParams.value.dealType = ''
+        queryParams.value.startTime = ''
+        queryParams.value.endTime = ''
+        queryParams.value.dealCategory = ''
+      accountTypeList.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
+      dealTypeList.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
+      dealCategoryList.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
+    }
+    function enterDetails(item) {
+      uni.navigateTo({ url: `/pages/work/accounts/posTransferRecord/details?id=${item.id}` })
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/work/accounts/posTransferRecord/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/work/accounts/posTransferRecord/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delAccountsTransferRecord(item.id)
+              uni.navigateTo({ url: `/pages/work/accounts/posTransferRecord/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+  margin-bottom: 24rpx;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/work/heartJourney/addEdit.vue b/src/pages/work/heartJourney/addEdit.vue
index 52db3a5..62cf02d 100644
--- a/src/pages/work/heartJourney/addEdit.vue
+++ b/src/pages/work/heartJourney/addEdit.vue
@@ -65,7 +65,7 @@ const data = reactive({
   rules: {
           name: [{ type: 'string', required: true, message: '标题不能为空', trigger: ['change', 'blur'] }],
           createTime: [{ type: 'string', required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }],
-          type: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
+          typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
           remark: [{ type: 'string', required: true, message: '内容不能为空', trigger: ['change', 'blur'] }],
   }
 })
@@ -81,7 +81,7 @@ onLoad((option) => {
       getDict()
   })
   onReady(() => {
-    proxy.$refs['uForm'].setRules(rules.value)
+    form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
   })
   function  getDict() {
         // 类型
diff --git a/src/pages/work/heartJourney/list.vue b/src/pages/work/heartJourney/list.vue
index 09acfbf..33ffeb0 100644
--- a/src/pages/work/heartJourney/list.vue
+++ b/src/pages/work/heartJourney/list.vue
@@ -110,7 +110,7 @@ function getList() {
       status.value = 'loading'
       listHeartJourney({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
-        if (listData.length < res.total) {
+        if (listData.value.length < res.total) {
           status.value = 'loadmore'
         } else {
           status.value = 'nomore'
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index 43c1c10..019b520 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -75,7 +75,7 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
   const commonGridList=ref([
         { path: '/pages/work/heartJourney/list', text: '心路历程', icon: 'heart', permission: 'invest:heartJourney:list'  },
         { path: '/pages/work/accounts/accountDealRecord/list', text: '账户交易记录', icon: 'paperclip', permission: 'invest:accountDealRecord:list'  },
-        { path: '/pages/page1/page1', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list'  },
+        { path: '/pages/work/accounts/posTransferRecord/list', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/page1/page1', text: '信用卡还款', icon: 'arrow-left', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/page1/page1', text: '储蓄账户记账', icon: 'tune', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/work/accounts/accounts/index', text: '记账账户', icon: 'staff', permission: 'invest:accounts:list'  },
@@ -102,7 +102,7 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
       ])
       const accountGridList=ref([
         { path: '/pages/work/accounts/accounts/index', text: '记账账户', icon: 'staff', permission: 'invest:accounts:list'  },
-        { path: '/pages/page1/page1', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list'  },
+        { path: '/pages/work/accounts/posTransferRecord/list', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/page1/page1', text: '信用卡还款', icon: 'arrow-left', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/page1/page1', text: '投资账户记账', icon: 'auth-filled', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/page1/page1', text: '投资交易记录', icon: 'chatboxes', permission: 'invest:accountDealRecord:list'  },