From fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 17:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/applicationRecord/applicationRecord.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index 7a93ddb..5317783 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -36,7 +36,7 @@
:key="index"
>
<view class="box_list_item_head">
- <text>{{ item.name }}鐨勫姵鍔″叆鍘傜敵璇�</text>
+ <text>{{ item.name }}鐨勫姵鍔″叆鍥敵璇�</text>
<text class="loading">{{ statusMap[item.status] }}</text>
</view>
<view class="box_list_item_nr">
@@ -53,7 +53,7 @@
<text>{{ item.starttime }}</text>
</view>
<view class="box_list_item_nr_item">
- <text>绂诲巶鏃堕棿锛�</text>
+ <text>绂诲洯鏃堕棿锛�</text>
<text>{{ item.endtime }}</text>
</view>
<view class="box_list_item_nr_item">
@@ -122,9 +122,9 @@
},
}).then(res => {
if (res.data.records.length > 0) {
- if(pagination.page === 1){
+ if (pagination.page === 1) {
this.list = res.data.records
- }else{
+ } else {
this.list = [...list, ...res.data.records]
}
this.total = res.data.total
@@ -135,7 +135,7 @@
}
}
</script>
-<style>
+<style lang="scss">
page {
background-color: #f7f7f7 !important;
}
@@ -158,8 +158,8 @@
display: flex;
align-items: center;
.active {
- border: 1rpx solid #279baa !important;
- color: #279baa !important;
+ border: 1rpx solid $uni-color-primary !important;
+ color: $uni-color-primary !important;
}
.box_head_item {
padding: 0 30rpx;
@@ -196,7 +196,7 @@
align-items: center;
justify-content: space-between;
.loading {
- color: #279baa;
+ color: $uni-color-primary;
}
.success {
color: #03c68f;
--
Gitblit v1.9.3