调整

lichao
1 parent fe819ede
Showing 3 changed files with 35 additions and 4 deletions
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/order/order-driver/index.vue
garbage-removal/src/pages/order/order-other/index.vue
@@ -28,6 +28,19 @@
       <view class="company-container">
         <view class="company-list-box" v-if="(addressInfo && userType == '用户')||userType == '运输企业负责人'||userType == '清运车辆驾驶员'">
           <view class="company-list-header">
+
+            <view class="search-box" v-if="(addressInfo && userType == '用户')">
+              <u-search
+                  v-model="searchKeyword"
+                  :show-action="true"
+                  action-text="搜索"
+                  placeholder="请输入公司名称"
+                  @search="handleSearch"
+                  @custom="handleSearch"
+                  @clear="handleClearSearch"
+              ></u-search>
+            </view>
+
             <view class="company-list-header-left"  v-if="(addressInfo && userType == '用户')">
               <u-dropdown active-color="#19a97c">
                 <u-dropdown-item :height="'240rpx'" :placement="'left'" v-model="registrationAreaValue"
@@ -118,6 +131,7 @@ import { queryRole } from &quot;@/apis/user&quot;;
 import { useMainStore } from "@/stores/index.js";
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { computed, ref } from 'vue';
+const searchKeyword = ref('')
 const mainStore = useMainStore()
 const userType = computed(() => mainStore.userType);
 const prompt = computed(() => userType.value == '用户' ? "请先添加地址" : '非用户无法下单')
@@ -350,6 +364,16 @@ const handleCleanGarbage = (companyObj, tel, userAddress) =&gt; {
   })
 }
+const handleSearch = (value) => {
+  // 重新加载数据
+  paging.value.reload()
+}
+
+const handleClearSearch = () => {
+  searchKeyword.value = ''
+  paging.value.reload()
+}
+
 /**
  * 搜索
  */
@@ -429,7 +453,8 @@ const queryList = (pageNo, pageSize) =&gt; {
     registrationArea: registrationAreaValue.value,
     searchValue: carTypeValue.value,
     userTypeValue:userTypeValue,
-    userType:userType.value
+    userType:userType.value,
+    name: searchKeyword.value
   }
   // 查询公司信息
   queryEnterpriseList(query).then(res => {
@@ -621,7 +646,13 @@ const queryList = (pageNo, pageSize) =&gt; {
           font-size: small;
           font-weight: small;
           align-items: center;
+          .search-box {
+            margin-bottom: 20rpx;
+            ::v-deep .u-search {
+              background-color: #fff;
+            }
+          }
           .company-list-header-left {
             text-align: center;
             margin-bottom: 15rpx;
@@ -21,7 +21,7 @@
           </view>
           <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6"
             :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }"
-            ref="uTabsElement" :list="displayList" :current="current" @change="tabsChange" :scrollable="false"></u-tabs>
+            ref="uTabsElement" :list="displayList" :current="current" @change="tabsChange" :scrollable="true"></u-tabs>
         </template>
         <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish">
           <swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
@@ -37,7 +37,7 @@ import swiperListItem from &#39;./swiper-list-item/index.vue&#39;;
 import { queryOrderList } from "@/apis/order.js";
 // 初始化订单类型列表，添加count属性
-const list = ref([{ name: '待清运', count: 0 }, { name: '清运中', count: 0 }, { name: '全部', count: 0 }, { name: '已完成', count: 0 }])
+const list = ref([, { name: '清运中', count: 0 }, { name: '全部', count: 0 }, { name: '已完成', count: 0 }])
 const current = ref(0);
 const swiperCurrent = ref(0)
 const uTabsElement = ref()
@@ -25,7 +25,7 @@
           </view>
           <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6"
             :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }"
-            ref="uTabsElement" :list="displayList" :current="current" @change="tabsChange" :scrollable="false"></u-tabs>
+            ref="uTabsElement" :list="displayList" :current="current" @change="tabsChange" :scrollable="true"></u-tabs>
         </template>
         <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish">
           <swiper-item class="swiper-item" v-for="( item, index ) in  list " :key="index">