bug

config.js

@@ -2,8 +2,8 @@
 const config = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	//cloud后台网关地址
-	baseUrl: 'http://192.168.100.95:9527',//嵘哥
-	// baseUrl: 'http://192.168.100.112:9527',//龙哥
+	// baseUrl: 'http://192.168.100.95:9527',//嵘哥
+	baseUrl: 'http://192.168.100.101:9527',//龙哥
 	// baseUrl: 'https://zybooks.tech/prod-api',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	appName: '金邻助家',

pages_mine/pages/income/index.vue

@@ -3,13 +3,15 @@
         class="scroll-view-class" @scrolltolower="scrolltolower" scroll-y>
         <view class="income-main">
             <view class="income-header card-box">
-                <text class="income-title" @click="onShows">
+                <!-- <text class="income-title" @click="onShows">
                     {{ dataYMD }}
                 </text>
                 <view class="income-header-right">
                     <text>收入: ¥{{ data.totalEarning }}</text>
                     <text class="income-header-right-right">支出: ¥{{ data.totalExpend }}</text>
-                </view>
+                </view> -->
+                <text>收入: ¥{{ data.totalEarning }}</text>
+                <text class="income-header-right-right">支出: ¥{{ data.totalExpend }}</text>
             </view>
 
             <view v-if="data.clientAccountChangeVOlist && data.clientAccountChangeVOlist.length > 0">
@@ -20,15 +22,24 @@
                         <view class="card-left-text">
                             <view class="card-left-name">
                                 <dict-tag :options="userType === 1?jlzj_client_source_type:jlzj_volunteer_source_type" :value="item.sourceType" />
+                                
+                               
                                 <!-- ({{ item.businessTierName }}) -->
                             </view>
-                            <view class="card-left-date">{{ item.createTime }}</view>
+                            <view class="card-left-date">
+                                {{ item.createTime }}
+                                
+                            </view>
                         </view>
                     </view>
 
                     <view class="card-rigth"
-                        :style="{ color: item.changeType === '1' ? 'rgba(76, 175, 80, 1)' : 'rgba(244, 67, 54, 1)' }">
-                        {{ item.changeType === '1' ? '+' : '-' }}{{ item.changeMoney }}
+                        >
+                        <view :style="{ color: item.changeType === '1' ? 'rgba(76, 175, 80, 1)' : 'rgba(244, 67, 54, 1)' }">{{ item.changeType === '1' ? '+' : '-' }}{{ item.changeMoney }}</view>
+
+                        <view class="is_pay_class" v-if="item.isPay !== '99'">
+                                    <dict-tag :options="is_pay" :value="item.isPay" />
+                                </view>
                     </view>
                 </view>
                 <up-loadmore style="margin-top: 40rpx;" :status="loadmoreInfo.status"
@@ -63,8 +74,9 @@ import NoneView from '@/components/NoneView/index.vue'
 const {
     jlzj_money_change_type,
     jlzj_client_source_type,
-    jlzj_volunteer_source_type
-} = useDict('jlzj_money_change_type', 'jlzj_client_source_type','jlzj_volunteer_source_type');
+    jlzj_volunteer_source_type,
+    is_pay
+} = useDict('jlzj_money_change_type', 'jlzj_client_source_type','jlzj_volunteer_source_type','is_pay');
 const baseUrl = config.baseUrl
 const userType = uni.getStorageSync('userType') //读取本地存储
 const data = ref({
@@ -144,7 +156,7 @@ const init = async (type) => {
 
         const listApi = userType === 1 ? getAccountChangeList : getVolunteerChangeList;
         const res = await listApi({
-            createTime: dayjs(datetime.value).format('YYYY-MM-DD'),
+            // createTime: dayjs(datetime.value).format('YYYY-MM-DD'),
             pageNum: pages.value.current,
 			pageSize: pages.value.pageSize,
         });
@@ -160,9 +172,12 @@ const init = async (type) => {
         if (type === 'top') {
             isRefreshing.value = false;
             uni.hideLoading();
-        } else {
+        }
+        
+        if(data.value.clientAccountChangeVOlist.length === pages.value.total){
             loadmoreInfo.value.status = 'nomore';
         }
+        // 
     }
 }
 
@@ -170,7 +185,7 @@ const totalInit = async () => {
     try {
         const listApi = userType === 1 ? getTotalMoney : getVolunteerTotalMoney;
         const res = await listApi({
-            createTime: dayjs(datetime.value).format('YYYY-MM-DD'),
+            // createTime: dayjs(datetime.value).format('YYYY-MM-DD'),
         });
         data.value.totalEarning = res.data.totalEarning;
         data.value.totalExpend = res.data.totalExpend;
@@ -271,6 +286,8 @@ onShow(() => {
                 font-weight: 500;
                 line-height: 16.41px;
                 color: rgba(153, 153, 153, 1);
+
+
             }
 
         }
@@ -295,4 +312,10 @@ onShow(() => {
     // left: 0;
     // right: 0;
 }
+
+.is_pay_class {
+    margin-top: 8rpx;
+    font-size: 14px;
+    
+}
 </style>