退回上一页动画修改及接单中心样式修改

pages/orderDetailNew/components/pageFour.vue

@@ -504,8 +504,14 @@ export default {
                             message: "入库成功",
                             iconUrl: "https://uviewui.com/demo/toast/success.png",
                             complete() {
-                                uni.navigateTo({
-                                    url: '/pages/pagereceivecenter/pagereceivecenter',
+                                // uni.navigateTo({
+                                //     url: '/pages/pagereceivecenter/pagereceivecenter',
+                                // })
+
+                                //退回上一页
+                                uni.navigateBack({
+                                    delta: 1,
+                                    animationType: 'pop-out'
                                 })
                             },
                         });

pages/pagereceivecenter/pagereceivecenter.vue

@@ -97,7 +97,8 @@ export default {
         //获取统计数据
         async getStatisticsSendStatus() {
             const { data } = await uni.$u.api.statisticsSendStatus({ type: this.activeType });
-            console.log('统计数据是', data)
+            // console.log('统计数据是', data)
+
             this.statisticsSendStatus = data;
         },
         // 处理按钮点击事件
@@ -176,12 +177,13 @@ export default {
 
         //滑动加载
         scrolltolower() {
-            console.log('到底了');
-            // if (this.orderList.length >= this.page.total) {
-            //     return uni.$u.toast('没有更多了');
-            // }
-            this.page.pageNum++;
-            this.getOrderList();
+            // console.log('到底了');
+            if (this.orderList.length >= this.page.total) {
+                //到底了，没有更多
+            } else {
+                this.page.pageNum++;
+                this.getOrderList();
+            }
         },
 
         //获取全部标签
@@ -236,10 +238,19 @@ export default {
         },
         //切换统计数据的类型
         changeStatus(param) {
-            this.activeStatus = param;
-            this.page.pageNum = 1;
-            this.orderList = [];
-            this.getOrderList();
+            if (param == this.activeStatus) {
+                //如果当前点击的状态和当前选中的状态相同，则取消选中
+                this.activeStatus = '';
+                this.page.pageNum = 1;
+                this.orderList = [];
+                this.getOrderList();
+            } else {
+                //如果当前点击的状态和当前选中的状态不同，则切换选中状态
+                this.activeStatus = param;
+                this.page.pageNum = 1;
+                this.orderList = [];
+                this.getOrderList();
+            }
         },
     }
 }
@@ -253,13 +264,16 @@ export default {
         <u-tabs :list="filterList" @click="changeFilter"></u-tabs>
 
         <!-- 统计数据 -->
-        <view class="statisticsContainer">
-            <view v-for="item in statisticsSendStatus" :key="item.status" @click="changeStatus(item.status)"
-                class="statisticsItem">
-                <view>{{ item.statusName }}</view>
-                <view>({{ item.count || 0 }})</view>
+        <scroll-view scroll-x class="statusScrollView" style="width: 100%;">
+            <view class="statisticsContainer">
+                <view v-for="item in statisticsSendStatus" :key="item.status" @click="changeStatus(item.status)"
+                    class="statisticsItem" :class="{ 'activeStatusClass': item.status == activeStatus }">
+                    <view>{{ item.statusName }}</view>
+                    <view>({{ item.count || 0 }})</view>
+                </view>
             </view>
-        </view>
+        </scroll-view>
+
 
         <view class="scrollViewContainer">
             <scroll-view class="scrollView" scroll-y @scrolltolower="scrolltolower">
@@ -349,7 +363,7 @@ export default {
                     </view>
                 </transition-group>
                 <view class="hasMore">
-                    <!-- {{ orderList.length >= page.total ? '没有更多了~' : '向下滑动加载更多~' }} -->
+                    {{ orderList.length >= page.total ? '没有更多了~' : '向下滑动加载更多~' }}
                 </view>
             </scroll-view>
         </view>
@@ -587,9 +601,10 @@ export default {
 
 .statisticsContainer {
     display: flex;
-    justify-content: space-around;
     align-items: center;
-    gap: 20rpx;
+    flex-wrap: nowrap;
+    white-space: nowrap;
+    padding: 0 0rpx;
 }
 
 .statisticsItem {
@@ -601,6 +616,18 @@ export default {
     border-radius: 15rpx;
     font-size: 24rpx;
     font-weight: 700;
-    width: 100rpx;
+    margin: 0 10rpx;
+    white-space: nowrap;
+    flex-shrink: 0;
+}
+
+.activeStatusClass {
+    background-color: #2563EB;
+    color: #fff;
+
+}
+
+::v-deep .u-tabs__wrapper__nav__line {
+    top: 7px;
 }
 </style>