diff --git a/src/components/refresh/refresh.vue b/src/components/refresh/refresh.vue
index 7d29f58..2df2a63 100644
--- a/src/components/refresh/refresh.vue
+++ b/src/components/refresh/refresh.vue
@@ -1,10 +1,9 @@
-
+
-
-
+
@@ -15,10 +14,16 @@
export default {
data() {
return {
- x: 1000, // x大于默认的值就会在最右边
- y: 1000
+ x: 600,
+ y: 800,
+ showButton: false
};
},
+ mounted() {
+ setTimeout(() => {
+ this.showButton = true;
+ }, 100);
+ },
computed: {
},
@@ -48,30 +53,23 @@
z-index: 99999999;
pointer-events: none; //此处要加,鼠标事件可以渗透
.movable-view {
- width: 60rpx;
- height: 60rpx;
+ width: 88rpx;
+ height: 88rpx;
pointer-events: auto; //恢复鼠标事件
.refreshPages {
- width: 60rpx;
- height: 60rpx;
+ width: 88rpx;
+ height: 88rpx;
display: flex;
justify-content: center;
- flex-direction: column;
align-items: center;
background: #ffffff;
border-radius: 50%;
- border: 1px solid #a6a6a6;
- image {
- width: 30rpx;
- height: 30rpx;
- }
-
- text {
- margin-top: 10rpx;
- font-size: 16rpx;
- font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
- color: #000000;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.12);
+ transition: transform 0.3s ease, box-shadow 0.3s ease;
+
+ &:active {
+ transform: scale(0.92) rotate(180deg);
+ box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
}
}
}
diff --git a/src/components/suspend/suspend.vue b/src/components/suspend/suspend.vue
index 8b4221d..d703eca 100644
--- a/src/components/suspend/suspend.vue
+++ b/src/components/suspend/suspend.vue
@@ -1,10 +1,9 @@
-
+
-
-
+
@@ -15,10 +14,16 @@
export default {
data() {
return {
- x: 1000, // x大于默认的值就会在最右边
- y: 1000
+ x: 600,
+ y: 800,
+ showButton: false
};
},
+ mounted() {
+ setTimeout(() => {
+ this.showButton = true;
+ }, 100);
+ },
computed: {
},
@@ -34,7 +39,7 @@
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/creditTransferRecord/details.vue b/src/pages/work/accounts/creditTransferRecord/details.vue
index f92e535..419ebc3 100644
--- a/src/pages/work/accounts/creditTransferRecord/details.vue
+++ b/src/pages/work/accounts/creditTransferRecord/details.vue
@@ -14,21 +14,22 @@
-
- 还款金额
- {{ detailInfo.amount }}元
+ {{ detailInfo.name }}
+
+ {{ detailInfo.dealType }}
+ {{ detailInfo.amount }}元
+
-
还款信息
-
+
+ 信用卡
+ {{ detailInfo.inAccountName }}
+
储蓄账户
{{ detailInfo.outAccountName }}
@@ -80,11 +81,11 @@ onLoad((option) => {
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/debitTransferRecord/details.vue b/src/pages/work/accounts/debitTransferRecord/details.vue
index d1aaccc..8350395 100644
--- a/src/pages/work/accounts/debitTransferRecord/details.vue
+++ b/src/pages/work/accounts/debitTransferRecord/details.vue
@@ -10,13 +10,10 @@
@@ -222,25 +216,54 @@ onLoad((option) => {
+
+
\ No newline at end of file
diff --git a/src/pages/work/bill/onlineLendHistory/list.vue b/src/pages/work/bill/onlineLendHistory/list.vue
index 4063052..0ecfabc 100644
--- a/src/pages/work/bill/onlineLendHistory/list.vue
+++ b/src/pages/work/bill/onlineLendHistory/list.vue
@@ -1,54 +1,47 @@
-
-
-
-
-
-
- 新增
+
+
+
+
+
+
+
+ 新增
+
-
-
-
-
- 结清状态
-
- {{ item.dictLabel }}
-
+
+
+ 结清状态:
+
+
+ 全部
-
-
-
- 重置
-
-
-
- 确定
-
+
+ {{ item.dictLabel }}
-
+
-
-
-
-
- 年化利率
- {{ item.interestRate || '-' }}
-
-
- 计算利率
- {{ item.calculateInterestRate || '-' }}
-
+
+ 计算利率
+ {{ item.calculateInterestRate || '-' }}
-
-
- 剩余本金
- {{ item.outstandingPrincipal || '0' }}元
-
-
- 剩余利息
- {{ item.outstandingInterest || '0' }}元
-
+
+ 剩余本金
+ {{ item.outstandingPrincipal || '0' }}元
-
-
- 到期日期
- {{ item.dueDate || '-' }}
-
-
- 收款账户
- {{ item.receivingAccountName || '-' }}
-
+
+ 剩余利息
+ {{ item.outstandingInterest || '0' }}元
-
-
- 贷款天数
- {{ item.loanDays || '-' }}
-
-
- 最近还款日
- {{ formatRepaymentDate(item.repaymentDate) || '-' }}
-
+
+ 到期日期
+ {{ item.dueDate || '-' }}
+
+
+ 收款账户
+ {{ item.receivingAccountNameCode || '-' }}
@@ -161,7 +131,6 @@ const settingColumns = ref([])
const showOnlineLend = ref(false)
const bankCardLendList = ref([])
const data = reactive({
- filterPanel: false,
queryBankCardLendParams: {
pageNum: 1,
type: '3',
@@ -173,13 +142,10 @@ const data = reactive({
name: null,
type: '3',
bankCardLendId: null,
- state: '0'
+ state: ''
}
})
-const { filterPanel, queryBankCardLendParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
- uni.getSystemInfoSync().windowHeight - 50
- })
+const { queryBankCardLendParams, queryParams} = toRefs(data)
onLoad(() => {
getDict()
getList()
@@ -239,16 +205,11 @@ function dictStr(val, arr) {
})
return str
}
-function selectStatus(item) {
- queryParams.value.state = item.dictValue
- settleStateList.value.map(ele => {
- if (ele.dictValue == item.dictValue) {
- ele.selected = true
- Reflect.set(ele, 'selected', true)
- } else {
- Reflect.set(ele, 'selected', false)
- }
- })
+function selectStatus(value) {
+ queryParams.value.state = value
+ pageNum.value = 1
+ listData.value = []
+ getList()
}
function handleOnlineLend() {
if (bankCardLendList.value[0].length === 0) {
@@ -270,24 +231,14 @@ function selectStatus(item) {
function handleOnlineLendCancel() {
showOnlineLend.value = false
}
- function searchSubmit() {
- pageNum.value = 1
- listData.value = []
- getList()
- filterPanel.value = false
- }
- function searchBlur() {
- pageNum.value = 1
- listData.value = []
- getList()
- }
function resetQuery() {
- queryParams.value.bankCardLendId = '',
- queryParams.value.state= '0',
+ queryParams.value.bankCardLendId = ''
+ queryParams.value.onlineLendName = ''
+ queryParams.value.state = ''
queryParams.value.type = '3'
- settleStateList.value.map(ele => {
- Reflect.set(ele, 'selected', false)
- })
+ pageNum.value = 1
+ listData.value = []
+ getList()
}
function enterDetails(item) {
uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/details?id=${item.id}&name=${item.bankNameCode}` })
@@ -341,6 +292,11 @@ function selectStatus(item) {
text-align: center;
}
+.sticky-container {
+ background-color: #f5f7fa;
+ box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+}
+
.search-view {
padding: 12rpx 32rpx;
background-color: #ffffff;
@@ -349,14 +305,18 @@ function selectStatus(item) {
align-items: center;
position: relative;
z-index: 100;
+ box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
.search-input {
- background: #f5f7fa;
+ background: rgba(102, 126, 234, 0.08);
color: #333333;
flex: 1;
margin-right: 16rpx;
border-radius: 24rpx;
- border: 1rpx solid #e8edf3;
+ border: 2rpx solid rgba(102, 126, 234, 0.3);
+ height: 66rpx !important;
+ display: flex;
+ align-items: center;
}
.add-btn {
@@ -364,118 +324,66 @@ function selectStatus(item) {
align-items: center;
gap: 6rpx;
padding: 12rpx 24rpx;
- background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+ background: rgba(102, 126, 234, 0.08);
border-radius: 24rpx;
- box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
+ border: 2rpx solid rgba(102, 126, 234, 0.3);
transition: all 0.3s ease;
flex-shrink: 0;
&:active {
transform: scale(0.95);
- box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.3);
+ background: rgba(102, 126, 234, 0.12);
}
text {
- color: #ffffff;
+ color: #667eea;
font-size: 28rpx;
font-weight: 600;
}
}
+}
- .filter-panel {
- width: 100%;
- position: absolute;
- left: 0;
- top: 96rpx;
- background-color: rgba(0, 0, 0, 0.5);
-
- .filter-panel-content {
- background-color: #ffffff;
- padding: 0 30rpx 30rpx;
- border-radius: 16rpx 16rpx 0 0;
-
- .filter-title {
- color: #2c3e50;
- font-size: 32rpx;
+.filter-view {
+ padding: 16rpx 32rpx 20rpx;
+ background-color: #ffffff;
+ border-bottom: 1rpx solid #f0f0f0;
+ display: flex;
+ align-items: center;
+ gap: 16rpx;
+
+ .filter-title {
+ color: #333333;
+ font-size: 28rpx;
+ font-weight: 600;
+ flex-shrink: 0;
+ }
+
+ .type-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12rpx;
+ flex: 1;
+
+ .type-item {
+ padding: 0 24rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ border-radius: 30rpx;
+ font-size: 26rpx;
+ color: #666666;
+ background: #f5f7fa;
+ border: 2rpx solid transparent;
+ transition: all 0.3s ease;
+
+ &:active {
+ transform: scale(0.95);
+ }
+
+ &.active {
+ background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+ color: #ffffff;
font-weight: 600;
- padding: 32rpx 0 24rpx;
- }
-
- .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: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
- border: 2rpx solid transparent;
- color: #ffffff;
- box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
- font-weight: 600;
- }
- }
- }
-
- .btn-box {
- display: flex;
- gap: 20rpx;
- padding: 24rpx 30rpx;
- background-color: #fff;
- box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-
- .btn-reset,
- .btn-confirm {
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 8rpx;
- height: 88rpx;
- border-radius: 12rpx;
- font-size: 30rpx;
- font-weight: 600;
- transition: all 0.3s ease;
-
- &:active {
- transform: scale(0.98);
- opacity: 0.9;
- }
-
- text {
- line-height: 1;
- }
- }
-
- .btn-reset {
- flex: 1;
- background: #f5f7fa;
- border: 2rpx solid #dcdfe6;
-
- text {
- color: #606266;
- }
- }
-
- .btn-confirm {
- flex: 1;
- background: #667eea;
- box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
- border: none;
-
- text {
- color: #ffffff;
- }
+ box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.3);
}
}
}
@@ -495,7 +403,7 @@ function selectStatus(item) {
padding: 16rpx 24rpx;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
- .header-row {
+ .first-row {
display: flex;
align-items: center;
gap: 10rpx;
@@ -513,8 +421,8 @@ function selectStatus(item) {
}
.card-name {
- font-size: 24rpx;
- font-weight: 500;
+ font-size: 28rpx;
+ font-weight: 600;
color: #ffffff;
line-height: 1.3;
flex: 1;
@@ -524,7 +432,23 @@ function selectStatus(item) {
white-space: nowrap;
}
- .info-row {
+ .card-date {
+ font-size: 24rpx;
+ color: rgba(255, 255, 255, 0.9);
+ font-weight: 500;
+ line-height: 1.3;
+ flex-shrink: 0;
+ }
+
+ .card-amount {
+ font-size: 28rpx;
+ font-weight: 700;
+ color: #52c41a;
+ line-height: 1.2;
+ flex-shrink: 0;
+ }
+
+ .second-row {
display: flex;
justify-content: space-between;
align-items: center;
@@ -533,28 +457,30 @@ function selectStatus(item) {
border-top: 1rpx solid rgba(255, 255, 255, 0.2);
}
- .time-text {
- font-size: 26rpx;
- color: rgba(255, 255, 255, 0.9);
- font-weight: 500;
- line-height: 1.3;
- flex-shrink: 0;
- }
-
- .type-text {
+ .state-text {
font-size: 24rpx;
font-weight: 600;
color: #ffffff;
line-height: 1.3;
+ flex-shrink: 0;
+ padding: 4rpx 16rpx;
+ background: rgba(255, 255, 255, 0.2);
+ border-radius: 12rpx;
+ }
+
+ .repayment-date {
+ font-size: 24rpx;
+ color: rgba(255, 255, 255, 0.9);
+ font-weight: 500;
+ line-height: 1.3;
flex: 1;
- min-width: 0;
text-align: center;
}
- .amount-value {
- font-size: 32rpx;
+ .balance-value {
+ font-size: 26rpx;
font-weight: 700;
- color: #52c41a;
+ color: #fa8c16;
line-height: 1.2;
flex-shrink: 0;
}
@@ -563,21 +489,25 @@ function selectStatus(item) {
.card-body {
padding: 24rpx;
background: #fff;
- display: flex;
- gap: 16rpx;
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 16rpx 24rpx;
}
.info-item {
- flex: 1;
display: flex;
flex-direction: column;
gap: 6rpx;
min-width: 0;
.info-label {
- font-size: 22rpx;
- color: #999;
- font-weight: 400;
+ font-size: 24rpx;
+ color: #667eea;
+ font-weight: 500;
+ background: rgba(102, 126, 234, 0.08);
+ padding: 6rpx 12rpx;
+ border-radius: 8rpx;
+ align-self: flex-start;
}
.info-value {
@@ -588,68 +518,27 @@ function selectStatus(item) {
text-overflow: ellipsis;
white-space: nowrap;
- &.highlight {
- color: #52c41a;
+ &.orange {
+ color: #fa8c16;
font-weight: 600;
}
}
}
- .detail-body {
- padding: 20rpx 24rpx;
- background: #f5f7fa;
- display: flex;
- flex-direction: column;
- gap: 16rpx;
- border-top: 1rpx solid #e8edf3;
- }
-
- .detail-row {
- display: flex;
- gap: 24rpx;
- }
-
- .detail-item {
- flex: 1;
- display: flex;
- flex-direction: column;
- gap: 6rpx;
- min-width: 0;
-
- &.full-width {
- flex: 2;
- }
-
- .detail-label {
- font-size: 22rpx;
- color: #999;
- font-weight: 400;
- }
-
- .detail-value {
- font-size: 24rpx;
- color: #333;
- font-weight: 500;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- }
-
.operate {
display: flex;
- gap: 12rpx;
- padding: 24rpx;
- background: #fff;
+ justify-content: flex-end;
+ padding: 16rpx 24rpx 24rpx;
+ gap: 16rpx;
.btn-detail,
.btn-edit,
.btn-delete {
- flex: 1;
display: flex;
align-items: center;
justify-content: center;
gap: 6rpx;
+ padding: 0 24rpx;
height: 64rpx;
border-radius: 12rpx;
font-size: 26rpx;
@@ -662,9 +551,9 @@ function selectStatus(item) {
}
.btn-detail {
- background: rgba(102, 126, 234, 0.1);
- color: #667eea;
- border: 1rpx solid rgba(102, 126, 234, 0.3);
+ background: rgba(82, 196, 26, 0.1);
+ color: #52c41a;
+ border: 1rpx solid rgba(82, 196, 26, 0.3);
}
.btn-edit {
diff --git a/src/pages/work/bill/peopleLendHistory/addEdit.vue b/src/pages/work/bill/peopleLendHistory/addEdit.vue
index 0a34e13..1cf5a04 100644
--- a/src/pages/work/bill/peopleLendHistory/addEdit.vue
+++ b/src/pages/work/bill/peopleLendHistory/addEdit.vue
@@ -1,14 +1,13 @@
-
+
+ {{ title}}
@@ -40,8 +39,7 @@
-
+
@@ -53,11 +51,6 @@
keyName="dictLabel"
@cancel="handleCancel"
@confirm="handleConfirm"
- :closeOnClickOverlay="true"
- :defaultIndex="[0]"
- cancelColor="#666666"
- confirmColor="#667eea"
- title="选择结清状态"
>
@@ -270,24 +258,55 @@ onLoad((option) => {
+
+
\ No newline at end of file
diff --git a/src/pages/work/bill/peopleLendHistory/list.vue b/src/pages/work/bill/peopleLendHistory/list.vue
index b8601a4..cca625c 100644
--- a/src/pages/work/bill/peopleLendHistory/list.vue
+++ b/src/pages/work/bill/peopleLendHistory/list.vue
@@ -1,70 +1,57 @@
-
-
-
-
-
-
-
- 新增
+
+
+
+
+
+
+
+ 新增
+
-
-
-
- 结清状态
-
- {{ item.dictLabel }}
-
+
+
+ 结清状态:
+
+
+ 全部
-
-
-
- 重置
-
-
-
- 确定
-
+
+ {{ item.dictLabel }}
-
+
当前余额
- {{ item.currentBalance }}元
+ {{ item.currentBalance }}元
+
+
+ 备注
+ {{ item.remark }}
@@ -185,22 +172,11 @@ function dictStr(val, arr) {
})
return str
}
- 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 searchSubmit() {
+ function selectDealType(value) {
+ queryParams.value.dealType = value
pageNum.value = 1
listData.value = []
getList()
- filterPanel.value = false
}
function searchBlur() {
pageNum.value = 1
@@ -210,17 +186,11 @@ function dictStr(val, arr) {
function resetQuery() {
queryParams.value.name = ''
queryParams.value.type = ''
- queryParams.value.endTime = ''
+ queryParams.value.dealType = null
queryParams.value.dealCategory = '2'
- 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)
- })
+ pageNum.value = 1
+ listData.value = []
+ getList()
}
function enterDetails(item) {
uni.navigateTo({ url: `/pages/work/accounts/accountDealRecord/details?id=${item.id}` })
@@ -229,6 +199,11 @@ function dictStr(val, arr) {