提交12-19

lichao
1 parent d9b9463f
Showing 6 changed files with 479 additions and 161 deletions
garbage-removal/src/common/area.js
garbage-removal/src/pages/home-info/address/addSite.vue
garbage-removal/src/pages/home-info/type-guide/index.vue
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
garbage-removal/src/pages/wode/index.vue
-var areaData=[[[{"label":"芙蓉区","value":"430102"},{"label":"天心区","value":"430103"},{"label":"岳麓区","value":"430104"},{"label":"开福区","value":"430105"},{"label":"雨花区","value":"430111"},{"label":"望城区","value":"430112"},{"label":"长沙县","value":"430121"},{"label":"浏阳市","value":"430181"},{"label":"宁乡市","value":"430182"},{ "label": "湘江新区", "value": "430183" }],[{"label":"荷塘区","value":"430202"},{"label":"芦淞区","value":"430203"},{"label":"石峰区","value":"430204"},{"label":"天元区","value":"430211"},{"label":"株洲县","value":"430221"},{"label":"攸县","value":"430223"},{"label":"茶陵县","value":"430224"},{"label":"炎陵县","value":"430225"},{"label":"云龙示范区","value":"430271"},{"label":"醴陵市","value":"430281"}],[{"label":"雨湖区","value":"430302"},{"label":"岳塘区","value":"430304"},{"label":"湘潭县","value":"430321"},{"label":"湖南湘潭高新技术产业园区","value":"430371"},{"label":"湘潭昭山示范区","value":"430372"},{"label":"湘潭九华示范区","value":"430373"},{"label":"湘乡市","value":"430381"},{"label":"韶山市","value":"430382"}],[{"label":"珠晖区","value":"430405"},{"label":"雁峰区","value":"430406"},{"label":"石鼓区","value":"430407"},{"label":"蒸湘区","value":"430408"},{"label":"南岳区","value":"430412"},{"label":"衡阳县","value":"430421"},{"label":"衡南县","value":"430422"},{"label":"衡山县","value":"430423"},{"label":"衡东县","value":"430424"},{"label":"祁东县","value":"430426"},{"label":"衡阳综合保税区","value":"430471"},{"label":"湖南衡阳高新技术产业园区","value":"430472"},{"label":"湖南衡阳松木经济开发区","value":"430473"},{"label":"耒阳市","value":"430481"},{"label":"常宁市","value":"430482"}],[{"label":"双清区","value":"430502"},{"label":"大祥区","value":"430503"},{"label":"北塔区","value":"430511"},{"label":"邵东县","value":"430521"},{"label":"新邵县","value":"430522"},{"label":"邵阳县","value":"430523"},{"label":"隆回县","value":"430524"},{"label":"洞口县","value":"430525"},{"label":"绥宁县","value":"430527"},{"label":"新宁县","value":"430528"},{"label":"城步苗族自治县","value":"430529"},{"label":"武冈市","value":"430581"}],[{"label":"岳阳楼区","value":"430602"},{"label":"云溪区","value":"430603"},{"label":"君山区","value":"430611"},{"label":"岳阳县","value":"430621"},{"label":"华容县","value":"430623"},{"label":"湘阴县","value":"430624"},{"label":"平江县","value":"430626"},{"label":"岳阳市屈原管理区","value":"430671"},{"label":"汨罗市","value":"430681"},{"label":"临湘市","value":"430682"}],[{"label":"武陵区","value":"430702"},{"label":"鼎城区","value":"430703"},{"label":"安乡县","value":"430721"},{"label":"汉寿县","value":"430722"},{"label":"澧县","value":"430723"},{"label":"临澧县","value":"430724"},{"label":"桃源县","value":"430725"},{"label":"石门县","value":"430726"},{"label":"常德市西洞庭管理区","value":"430771"},{"label":"津市市","value":"430781"}],[{"label":"永定区","value":"430802"},{"label":"武陵源区","value":"430811"},{"label":"慈利县","value":"430821"},{"label":"桑植县","value":"430822"}],[{"label":"资阳区","value":"430902"},{"label":"赫山区","value":"430903"},{"label":"南县","value":"430921"},{"label":"桃江县","value":"430922"},{"label":"安化县","value":"430923"},{"label":"益阳市大通湖管理区","value":"430971"},{"label":"湖南益阳高新技术产业园区","value":"430972"},{"label":"沅江市","value":"430981"}],[{"label":"北湖区","value":"431002"},{"label":"苏仙区","value":"431003"},{"label":"桂阳县","value":"431021"},{"label":"宜章县","value":"431022"},{"label":"永兴县","value":"431023"},{"label":"嘉禾县","value":"431024"},{"label":"临武县","value":"431025"},{"label":"汝城县","value":"431026"},{"label":"桂东县","value":"431027"},{"label":"安仁县","value":"431028"},{"label":"资兴市","value":"431081"}],[{"label":"零陵区","value":"431102"},{"label":"冷水滩区","value":"431103"},{"label":"祁阳县","value":"431121"},{"label":"东安县","value":"431122"},{"label":"双牌县","value":"431123"},{"label":"道县","value":"431124"},{"label":"江永县","value":"431125"},{"label":"宁远县","value":"431126"},{"label":"蓝山县","value":"431127"},{"label":"新田县","value":"431128"},{"label":"江华瑶族自治县","value":"431129"},{"label":"永州经济技术开发区","value":"431171"},{"label":"永州市金洞管理区","value":"431172"},{"label":"永州市回龙圩管理区","value":"431173"}],[{"label":"鹤城区","value":"431202"},{"label":"中方县","value":"431221"},{"label":"沅陵县","value":"431222"},{"label":"辰溪县","value":"431223"},{"label":"溆浦县","value":"431224"},{"label":"会同县","value":"431225"},{"label":"麻阳苗族自治县","value":"431226"},{"label":"新晃侗族自治县","value":"431227"},{"label":"芷江侗族自治县","value":"431228"},{"label":"靖州苗族侗族自治县","value":"431229"},{"label":"通道侗族自治县","value":"431230"},{"label":"怀化市洪江管理区","value":"431271"},{"label":"洪江市","value":"431281"}],[{"label":"娄星区","value":"431302"},{"label":"双峰县","value":"431321"},{"label":"新化县","value":"431322"},{"label":"冷水江市","value":"431381"},{"label":"涟源市","value":"431382"}],[{"label":"吉首市","value":"433101"},{"label":"泸溪县","value":"433122"},{"label":"凤凰县","value":"433123"},{"label":"花垣县","value":"433124"},{"label":"保靖县","value":"433125"},{"label":"古丈县","value":"433126"},{"label":"永顺县","value":"433127"},{"label":"龙山县","value":"433130"},{"label":"湖南吉首经济开发区","value":"433172"},{"label":"湖南永顺经济开发区","value":"433173"}]]];export default areaData;
+var areaData = [[[{"label": "湘江新区", "value": "430183"},{"label": "芙蓉区", "value": "430102"}, {"label": "天心区", "value": "430103"}, {
+    "label": "岳麓区",
+    "value": "430104"
+}, {"label": "开福区", "value": "430105"}, {"label": "雨花区", "value": "430111"}, {
+    "label": "望城区",
+    "value": "430112"
+}, {"label": "长沙县", "value": "430121"}, {"label": "浏阳市", "value": "430181"}, {
+    "label": "宁乡市",
+    "value": "430182"
+}], [{"label": "荷塘区", "value": "430202"}, {
+    "label": "芦淞区",
+    "value": "430203"
+}, {"label": "石峰区", "value": "430204"}, {"label": "天元区", "value": "430211"}, {
+    "label": "株洲县",
+    "value": "430221"
+}, {"label": "攸县", "value": "430223"}, {"label": "茶陵县", "value": "430224"}, {
+    "label": "炎陵县",
+    "value": "430225"
+}, {"label": "云龙示范区", "value": "430271"}, {"label": "醴陵市", "value": "430281"}], [{
+    "label": "雨湖区",
+    "value": "430302"
+}, {"label": "岳塘区", "value": "430304"}, {"label": "湘潭县", "value": "430321"}, {
+    "label": "湖南湘潭高新技术产业园区",
+    "value": "430371"
+}, {"label": "湘潭昭山示范区", "value": "430372"}, {"label": "湘潭九华示范区", "value": "430373"}, {
+    "label": "湘乡市",
+    "value": "430381"
+}, {"label": "韶山市", "value": "430382"}], [{"label": "珠晖区", "value": "430405"}, {
+    "label": "雁峰区",
+    "value": "430406"
+}, {"label": "石鼓区", "value": "430407"}, {"label": "蒸湘区", "value": "430408"}, {
+    "label": "南岳区",
+    "value": "430412"
+}, {"label": "衡阳县", "value": "430421"}, {"label": "衡南县", "value": "430422"}, {
+    "label": "衡山县",
+    "value": "430423"
+}, {"label": "衡东县", "value": "430424"}, {"label": "祁东县", "value": "430426"}, {
+    "label": "衡阳综合保税区",
+    "value": "430471"
+}, {"label": "湖南衡阳高新技术产业园区", "value": "430472"}, {
+    "label": "湖南衡阳松木经济开发区",
+    "value": "430473"
+}, {"label": "耒阳市", "value": "430481"}, {"label": "常宁市", "value": "430482"}], [{
+    "label": "双清区",
+    "value": "430502"
+}, {"label": "大祥区", "value": "430503"}, {"label": "北塔区", "value": "430511"}, {
+    "label": "邵东县",
+    "value": "430521"
+}, {"label": "新邵县", "value": "430522"}, {"label": "邵阳县", "value": "430523"}, {
+    "label": "隆回县",
+    "value": "430524"
+}, {"label": "洞口县", "value": "430525"}, {"label": "绥宁县", "value": "430527"}, {
+    "label": "新宁县",
+    "value": "430528"
+}, {"label": "城步苗族自治县", "value": "430529"}, {"label": "武冈市", "value": "430581"}], [{
+    "label": "岳阳楼区",
+    "value": "430602"
+}, {"label": "云溪区", "value": "430603"}, {"label": "君山区", "value": "430611"}, {
+    "label": "岳阳县",
+    "value": "430621"
+}, {"label": "华容县", "value": "430623"}, {"label": "湘阴县", "value": "430624"}, {
+    "label": "平江县",
+    "value": "430626"
+}, {"label": "岳阳市屈原管理区", "value": "430671"}, {"label": "汨罗市", "value": "430681"}, {
+    "label": "临湘市",
+    "value": "430682"
+}], [{"label": "武陵区", "value": "430702"}, {"label": "鼎城区", "value": "430703"}, {
+    "label": "安乡县",
+    "value": "430721"
+}, {"label": "汉寿县", "value": "430722"}, {"label": "澧县", "value": "430723"}, {
+    "label": "临澧县",
+    "value": "430724"
+}, {"label": "桃源县", "value": "430725"}, {"label": "石门县", "value": "430726"}, {
+    "label": "常德市西洞庭管理区",
+    "value": "430771"
+}, {"label": "津市市", "value": "430781"}], [{"label": "永定区", "value": "430802"}, {
+    "label": "武陵源区",
+    "value": "430811"
+}, {"label": "慈利县", "value": "430821"}, {"label": "桑植县", "value": "430822"}], [{
+    "label": "资阳区",
+    "value": "430902"
+}, {"label": "赫山区", "value": "430903"}, {"label": "南县", "value": "430921"}, {
+    "label": "桃江县",
+    "value": "430922"
+}, {"label": "安化县", "value": "430923"}, {
+    "label": "益阳市大通湖管理区",
+    "value": "430971"
+}, {"label": "湖南益阳高新技术产业园区", "value": "430972"}, {
+    "label": "沅江市",
+    "value": "430981"
+}], [{"label": "北湖区", "value": "431002"}, {"label": "苏仙区", "value": "431003"}, {
+    "label": "桂阳县",
+    "value": "431021"
+}, {"label": "宜章县", "value": "431022"}, {"label": "永兴县", "value": "431023"}, {
+    "label": "嘉禾县",
+    "value": "431024"
+}, {"label": "临武县", "value": "431025"}, {"label": "汝城县", "value": "431026"}, {
+    "label": "桂东县",
+    "value": "431027"
+}, {"label": "安仁县", "value": "431028"}, {"label": "资兴市", "value": "431081"}], [{
+    "label": "零陵区",
+    "value": "431102"
+}, {"label": "冷水滩区", "value": "431103"}, {"label": "祁阳县", "value": "431121"}, {
+    "label": "东安县",
+    "value": "431122"
+}, {"label": "双牌县", "value": "431123"}, {"label": "道县", "value": "431124"}, {
+    "label": "江永县",
+    "value": "431125"
+}, {"label": "宁远县", "value": "431126"}, {"label": "蓝山县", "value": "431127"}, {
+    "label": "新田县",
+    "value": "431128"
+}, {"label": "江华瑶族自治县", "value": "431129"}, {
+    "label": "永州经济技术开发区",
+    "value": "431171"
+}, {"label": "永州市金洞管理区", "value": "431172"}, {
+    "label": "永州市回龙圩管理区",
+    "value": "431173"
+}], [{"label": "鹤城区", "value": "431202"}, {"label": "中方县", "value": "431221"}, {
+    "label": "沅陵县",
+    "value": "431222"
+}, {"label": "辰溪县", "value": "431223"}, {"label": "溆浦县", "value": "431224"}, {
+    "label": "会同县",
+    "value": "431225"
+}, {"label": "麻阳苗族自治县", "value": "431226"}, {
+    "label": "新晃侗族自治县",
+    "value": "431227"
+}, {"label": "芷江侗族自治县", "value": "431228"}, {
+    "label": "靖州苗族侗族自治县",
+    "value": "431229"
+}, {"label": "通道侗族自治县", "value": "431230"}, {"label": "怀化市洪江管理区", "value": "431271"}, {
+    "label": "洪江市",
+    "value": "431281"
+}], [{"label": "娄星区", "value": "431302"}, {"label": "双峰县", "value": "431321"}, {
+    "label": "新化县",
+    "value": "431322"
+}, {"label": "冷水江市", "value": "431381"}, {"label": "涟源市", "value": "431382"}], [{
+    "label": "吉首市",
+    "value": "433101"
+}, {"label": "泸溪县", "value": "433122"}, {"label": "凤凰县", "value": "433123"}, {
+    "label": "花垣县",
+    "value": "433124"
+}, {"label": "保靖县", "value": "433125"}, {"label": "古丈县", "value": "433126"}, {
+    "label": "永顺县",
+    "value": "433127"
+}, {"label": "龙山县", "value": "433130"}, {
+    "label": "湖南吉首经济开发区",
+    "value": "433172"
+}, {"label": "湖南永顺经济开发区", "value": "433173"}]]];
+export default areaData;
@@ -57,6 +57,7 @@ import citySelect from &#39;./citySelect/u-city-select.vue&#39;;
 const { proxy } = getCurrentInstance();
 const cityPikerShowFlag = ref(false)
 const addFlag = ref(true)
+const location = ref({});
 const addressInfo = reactive({
 	addressArea: "",
 	addressDetail: "",
@@ -167,23 +168,65 @@ const submit = () =&gt; {
 const chooseAddressDetail = () => {
   console.log('打开地图选择地址');
  
-  // 直接打开地图选择器，不进行定位
-  uni.chooseLocation({
-    success: (res) => {
-      addressInfo.addressDetail = res.name;
-      addressInfo.garLongitude = res.longitude;
-      addressInfo.garLatitude = res.latitude;
+  // 先获取当前位置的经纬度
+  uni.getLocation({
+    type: 'gcj02', // 使用国测局坐标系，与地图选择器的坐标系一致
+    altitude: false,
+    success: (locationRes) => {
+      console.log('获取当前位置成功', locationRes);
+
+      // 使用获取到的经纬度作为初始位置打开地图选择器
+      uni.chooseLocation({
+        longitude: location.value.longitude, // 设置初始经度
+        latitude: location.value.latitude, // 设置初始纬度
+        success: (res) => {
+          addressInfo.addressDetail = res.name;
+          addressInfo.garLongitude = res.longitude;
+          addressInfo.garLatitude = res.latitude;
+        },
+        fail: (err) => {
+          console.error('地图选择失败:', err);
+          uni.$u.toast('地图选择失败');
+        }
+      });
     },
     fail: (err) => {
-      console.error('地图选择失败:', err);
+      console.error('获取当前位置失败:', err);
+
+      // 如果获取位置失败，仍然打开地图选择器，但不自动定位
+      uni.chooseLocation({
+        success: (res) => {
+          addressInfo.addressDetail = res.name;
+          addressInfo.garLongitude = res.longitude;
+          addressInfo.garLatitude = res.latitude;
+        },
+        fail: (err) => {
+          console.error('地图选择失败:', err);
+          uni.$u.toast('地图选择失败');
+        }
+      });
     }
   });
 };
  
 onMounted(() => {
 	proxy.$refs.addressFrom.setRules(rules)
+  window.takeLocationCallBack = takeLocalCallBack
 })
  
+const takeLocalCallBack = (lngLat) => {
+  const ll = lngLat.split(",");
+  console.log(ll);
+  location.value = {
+    longitude: ll[0],
+    latitude: ll[1]
+  };
+}
+
+const takeLocation = () => {
+  window.JsInterface.takeLocation();
+}
+
 onLoad((options) => {
 	if (options.addressObj) {
 		let addressObj = JSON.parse(options.addressObj);
@@ -201,6 +244,7 @@ onLoad((options) =&gt; {
 	if(options.defaultFlag && 'true' == options.defaultFlag){
 		addressInfo.defaultFlag = true;
 	}
+  takeLocation();
 })
 const reset = () => {
 	addressInfo.addressArea = ''
 <template>
-    <view class="type-guide">
-      <image :src="imageUrl"></image>
-    </view>
-  </template>
+  <view class="type-guide">
+    <image :src="imageUrl" mode="widthFix"></image>
+  </view>
+</template>
  
   <script setup>
   const imageUrl = import.meta.env.VITE_BASE_URL + "/type-guide.png";
   </script>
-  
-  <style lang="scss" scoped>
-  .type-guide {
+
+<style lang="scss" scoped>  .type-guide {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  box-sizing: border-box;
+  background-color: white;
+  padding-top: 20rpx;
+
+  image {
     width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    box-sizing: border-box;
-    background-color: white;
-    padding-top: 20rpx;
-  
-    image {
-      background-size: 100% 100%;
-      width: 750rpx;
-      height: 4494rpx;
-    }
+    height: auto;
   }
-  </style>
+}
+</style>
  
 \ No newline at end of file
@@ -19,7 +19,7 @@
     <view class="company-box">
       <view class="info-box">
         <view class="info-box-item" hover-class="click-box" v-for="(item, index) in infoBoxList" :key="index"
-          @click.stop="handlerCLickInfoBox(item.text)">
+              @click.stop="handlerCLickInfoBox(item.text)">
           <view class="info-box-item-icon" :class="item.icon">
           </view>
           <view class="info-box-item-text">{{ item.text }}</view>
@@ -44,20 +44,21 @@
             <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"
-                  @change="handleDropdownAreaChange" :title="'所属区域'" :options="dropdownOptions[0]"></u-dropdown-item>
+                                 @update:modelValue="handleDropdownAreaChange" :title="registrationAreaLabel" :options="dropdownOptions[0]"></u-dropdown-item>
  
                 <u-dropdown-item :placement="'center'" v-model="carTypeValue" @change="handleDropdownCarChange"
-                  :title="'车辆类型'" :options="dropdownOptions[1]"></u-dropdown-item>
+                                 :title="carTypeValue || '车辆类型'" :options="dropdownOptions[1]"></u-dropdown-item>
  
                 <u-dropdown-item :placement="'right'" v-model="sortValue" @change="handleDropdownSortChange"
-                                 :title="'排序'" :options="dropdownOptions[2]"></u-dropdown-item>
+                                 :title="sortLabel" :options="dropdownOptions[2]"></u-dropdown-item>
               </u-dropdown>
             </view>
           </view>
           <view class="company-list-content">
             <view class="company-list-content-box">
-              <z-paging ref="paging" :fixed="false" v-model="companyList" @query="queryList">
-                <empty-view slot:empty></empty-view>
+              <!-- 删除z-paging组件，改为普通容器 -->
+              <view v-if="companyList.length > 0">
+                <empty-view v-if="companyList.length === 0" />
                 <view class="company-list-item" v-for="(item) in companyList" :key="item.id">
                   <view class="company-list-item-main">
                     <view class="company-list-item-main-right">
@@ -69,32 +70,32 @@
                       <view class="company-list-item-main-box" style="display: flex;">
                         <view class="company-list-item-main-left-box" style="flex: 1;">
                           <view class="company-list-item-main-bottom-box"
-                            @click="handleDetailClick(item, item.servicePhone, userAddress)">
+                                @click="handleDetailClick(item, item.servicePhone, userAddress)">
                             <view class="company-list-item-main-right-score">
                               <text class="company-list-item-main-right-text">评分:</text>
                               <view v-if="item.score != 0" class="company-list-item-main-right-score-start">
                                 <u-rate activeColor="#f9ae3d" inactive-color="#f9ae3d" size="28"
-                                  :modelValue="item.score" allowHalf readonly></u-rate>
+                                        :modelValue="item.score" allowHalf readonly></u-rate>
                               </view>
                               <text v-if="item.score > 0" class="company-list-item-main-right-text"
-                                style="color: #fd5d00;">
+                                    style="color: #fd5d00;">
                                 {{ item.score }}分
                               </text>
                               <text v-else class="company-list-item-main-right-text"
-                                style="color: #fd5d00;">最近一月暂无评分</text>
+                                    style="color: #fd5d00;">最近一月暂无评分</text>
                             </view>
                             <view class="company-list-item-main-right-price-number">
-                              
+
                               <view class="company-list-item-main-right-number">
                                 清运数：<text class="company-list-item-main-right-number-text">{{ item.cleanNumber }}</text>
                               </view>
                             </view>
                           </view>
-                         
+
                         </view>
                         <view class="company-list-item-main-right-box" v-if="(addressInfo && userType == '用户')"  style="display: flex;font-size: 28rpx; justify-content: flex-end; align-items: flex-end;color:#458B74;font-weight: bold;">
                           <view class="company-list-item-main-right-box-text"
-                            @click.stop="handleCleanGarbage(item, item.servicePhone, userAddress)">
+                                @click.stop="handleCleanGarbage(item, item.servicePhone, userAddress)">
                             预约清运 ->
                           </view>
                         </view>
@@ -104,7 +105,8 @@
                   <view class="company-list-item-bottom">
                   </view>
                 </view>
-              </z-paging>
+              </view>
+              <empty-view v-else />
             </view>
           </view>
         </view>
@@ -126,6 +128,7 @@
   </view>
 </template>
  
+
 <script setup>
 import { queryAddress } from '@/apis/address.js';
 import { queryEnterpriseList } from '@/apis/company.js';
@@ -143,58 +146,67 @@ let maxScore = 5
 const maxStar = ref([]);
 const lightHeight = ref();//胶囊按钮信息
 const topMargin = ref(null);//状态栏高度
-const musicheadHeight = ref();
-const paging = ref(null)
+const musicheadHeight = ref()
+// 删除paging引用
+// const paging = ref(null)
 const swiperImageList = ref([{
   image: import.meta.env.VITE_BASE_URL + "/swiper-1.jpg"
 }, {
   image: import.meta.env.VITE_BASE_URL + "/swiper-2.jpg"
 }])
  
+// 公司列表缓存
+const companyListCache = ref(new Map())
+
 const userAddress = ref({})
 const addressInfo = ref()
 const sortValue = ref(0)
 const registrationAreaValue = ref('')
-const registrationAreaRealValue = ref('')
+const registrationAreaLabel = ref('所属区域')
+const sortLabel = ref('排序')
 const carTypeValue = ref('')
 const carTypeRealValue = ref('')
 const dropdownOptions = ref([
   [{
-    label: '湘江新区',
-    value: '湘江新区'
+      label: '全部',
+      value: ''
   },
     {
+      label: '湘江新区',
+      value: '湘江新区'
+    },
+    {
       label: '芙蓉区',
       value: '芙蓉区'
     },
-  {
-    label: '天心区',
-    value: '天心区'
-  },
-  {
-    label: '开福区',
-    value: '开福区'
-  },
-  {
-    label: '雨花区',
-    value: '雨花区'
-  },
-  {
-    label: '望城区',
-    value: '望城区'
-  },
-  {
-    label: '长沙县',
-    value: '长沙县'
-  },
-  {
-    label: '浏阳市',
-    value: '浏阳市'
-  },
-  {
-    label: '宁乡市',
-    value: '宁乡市'
-  }
+    {
+      label: '天心区',
+      value: '天心区'
+    },
+    {
+      label: '开福区',
+      value: '开福区'
+    },
+    {
+      label: '雨花区',
+      value: '雨花区'
+    },
+    {
+      label: '望城区',
+      value: '望城区'
+    },
+    {
+      label: '长沙县',
+      value: '长沙县'
+    },
+    {
+      label: '浏阳市',
+      value: '浏阳市'
+    },
+    {
+      label: '宁乡市',
+      value: '宁乡市'
+    }
   ], [{
     label: '暂未开放',
     value: '暂未开放',
@@ -240,9 +252,9 @@ const handlerCLickInfoBox = (val) =&gt; {
     case '分类指南':
       uni.$u.route('/pages/home-info/type-guide/index')
       break;
-	  case '车型说明':
-	    uni.$u.route('/pages/home-info/car-guide/index')
-	    break;  
+    case '车型说明':
+      uni.$u.route('/pages/home-info/car-guide/index')
+      break;
     default:
       break;
   }
@@ -262,33 +274,50 @@ const handleContactClick = (val) =&gt; {
  * @param {number} val
  */
 const handleDropdownSortChange = (val) => {
+  // 查找选中项的完整对象
+  const selectedItem = dropdownOptions.value[2].find(item => item.value === val);
+  if (selectedItem) {
+    sortLabel.value = selectedItem.label;
+  } else {
+    sortLabel.value = '排序'; // 默认标签
+  }
+
   sortValue.value = val;
+  // 清除缓存
+  companyListCache.value.clear();
   // 重新获取列表
-  paging.value.reload()
+  loadCompanyList()
 }
 const handleDropdownAreaChange = (val) => {
-  if (registrationAreaRealValue.value == val) {
-    registrationAreaValue.value = ''
-    registrationAreaRealValue.value = ''
-    // 重新获取列表
-    paging.value.reload()
-    return
+  // 查找选中项的完整对象
+  const selectedItem = dropdownOptions.value[0].find(item => item.value === val);
+  if (selectedItem) {
+    registrationAreaLabel.value = selectedItem.label;
+  } else {
+    registrationAreaLabel.value = '所属区域'; // 默认标签
   }
-  registrationAreaRealValue.value = val;
+
+  registrationAreaValue.value = val;
+  // 清除缓存
+  companyListCache.value.clear();
   // 重新获取列表
-  paging.value.reload()
+  loadCompanyList()
 }
 const handleDropdownCarChange = (val) => {
   if (carTypeRealValue.value == val) {
     carTypeValue.value = ''
     carTypeRealValue.value = ''
+    // 清除缓存
+    companyListCache.value.clear();
     // 重新获取列表
-    paging.value.reload()
+    loadCompanyList()
     return
   }
   carTypeRealValue.value = val;
+  // 清除缓存
+  companyListCache.value.clear();
   // 重新获取列表
-  paging.value.reload()
+  loadCompanyList()
 }
 /**
  * 跳转地址
@@ -323,8 +352,8 @@ const handleCleanClick = () =&gt; {
     // 用户已登录但是没有清运地址的情况
     if (userType.value == '用户') {
       uni.$u.route({
-              url: `pages/home-info/address/addSite?defaultFlag=true`,
-            });
+        url: `pages/home-info/address/addSite?defaultFlag=true`,
+      });
     } else {
       uni.showModal({
         title: '提示',
@@ -364,13 +393,18 @@ const handleCleanGarbage = (companyObj, tel, userAddress) =&gt; {
 }
  
 const handleSearch = (value) => {
+  // 清除缓存
+  companyListCache.value.clear();
   // 重新加载数据
-  paging.value.reload()
+  loadCompanyList()
 }
  
 const handleClearSearch = () => {
   searchKeyword.value = ''
-  paging.value.reload()
+  // 清除缓存
+  companyListCache.value.clear();
+  // 重新加载数据
+  loadCompanyList()
 }
  
 /**
@@ -407,8 +441,11 @@ onShow(() =&gt; {
   updateOrderBadge()
   let flag = uni.getStorageSync("refreshFlag");
   if(flag){
-	console.log(paging.value);
-    paging.value.reload();
+    console.log("refreshing page");
+    // 清除缓存
+    companyListCache.value.clear();
+    // 重新加载数据
+    loadCompanyList();
     uni.removeStorageSync("refreshFlag");
   }
 })
@@ -476,9 +513,24 @@ const initData = () =&gt; {
       addressInfo.value = '';
       userAddress.value = {};
     }
+  }).finally(() => {
+    // 在地址信息加载完成后加载公司列表
+    loadCompanyList();
   })
 }
-const queryList = (pageNo, pageSize) => {
+
+// 新增方法：一次性加载所有公司数据（带缓存）
+const loadCompanyList = () => {
+  // 生成缓存键
+  const cacheKey = `${sortValue.value}-${registrationAreaValue.value}-${carTypeValue.value}-${userType.value}-${searchKeyword.value}`;
+
+  // 检查是否有缓存
+  if (companyListCache.value.has(cacheKey)) {
+    console.log('使用缓存数据');
+    companyList.value = companyListCache.value.get(cacheKey);
+    return;
+  }
+
   let userTypeValue=0;
   if(userType == '用户'){
     userTypeValue=1;
@@ -489,8 +541,8 @@ const queryList = (pageNo, pageSize) =&gt; {
   }
   let query = {
     companyType: 1,
-    pageNum: pageNo,
-    pageSize,
+    pageNum: 1,
+    pageSize: 9999, // 设置一个足够大的数字以获取所有数据
     orderByColumn: sortValue.value,
     registrationArea: registrationAreaValue.value,
     searchValue: carTypeValue.value,
@@ -501,11 +553,72 @@ const queryList = (pageNo, pageSize) =&gt; {
   // 查询公司信息
   queryEnterpriseList(query).then(res => {
     console.log('获取到的公司列表数据:', res);
-    paging.value.complete(res.data.data.list);
+
+    // 直接设置公司列表数据
+    const pageData = res.data.data;
+    const list = pageData.list || [];
+    companyList.value = list;
+
+    // 缓存数据
+    companyListCache.value.set(cacheKey, list);
+  }).catch(err => {
+    console.error('查询公司列表失败:', err);
+    companyList.value = [];
   })
 }
+
+// 删除原有的queryList方法
+// const queryList = (pageNo, pageSize) => {
+//   let userTypeValue=0;
+//   if(userType == '用户'){
+//     userTypeValue=1;
+//   }else if(userType.value == '清运车辆驾驶员'){
+//     userTypeValue=2;
+//   }else if(userType.value == '运输企业负责人'){
+//     userTypeValue=3;
+//   }
+//   let query = {
+//     companyType: 1,
+//     pageNum: pageNo,
+//     pageSize,
+//     orderByColumn: sortValue.value,
+//     registrationArea: registrationAreaValue.value,
+//     searchValue: carTypeValue.value,
+//     userTypeValue:userTypeValue,
+//     userType:userType.value,
+//     name: searchKeyword.value
+//   }
+//   // 查询公司信息
+//   queryEnterpriseList(query).then(res => {
+//     console.log('获取到的公司列表数据:', res);
+
+//     // 从响应中提取分页信息
+//     const pageData = res.data.data;
+//     const dataList = pageData.list || [];
+//     const total = pageData.total || 0;
+//     const currentPage = pageData.pageNum || pageNo;
+//     const totalPages = pageData.pages || Math.ceil(total / pageSize);
+
+//     console.log('分页信息:', { dataList: dataList.length, total, currentPage, totalPages, pageSize });
+
+//     // 使用 z-paging 的标准方式处理分页
+//     // 如果有数据，调用 complete 并传入数据
+//     if (dataList.length > 0) {
+//       paging.value.complete(dataList);
+//     } else {
+//       // 如果没有数据，也要调用 complete 告知没有更多数据
+//       paging.value.complete([]);
+//     }
+//   }).catch(err => {
+//     console.error('查询公司列表失败:', err);
+//     // 数据加载失败时也需要调用 complete
+//     paging.value.complete(false);
+//   })
+// }
 </script>
  
+
+
 <style lang="scss" scoped>
 .home-container {
   background: linear-gradient(to bottom, $u-info-light, $u-info-light);
@@ -19,7 +19,7 @@
           订单信息
         </view>
         <view class="order-detail-container-header-item"
-          @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)">
+          @click.stop="handlerJumpOtherApp(dataGram.garOrderAddress + dataGram.garOrderAddressDetails)">
           <text class="order-detail-container-header-title">清运地点：</text>
           <view class="order-detail-container-header-content" style="text-decoration: underline">
             <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text>
@@ -46,15 +46,16 @@
         </view>
  
  
-        <view class="order-detail-container-header-item" v-for="(disposal,index) in dataGram.disposalSites">
-        <view>
+        <view class="order-detail-container-header-item" v-if="dataGram.disposalSites && dataGram.disposalSites.length > 0" v-for="(disposal,index) in dataGram.disposalSites">
+          <view>
             <text class="order-detail-container-header-title" v-if="index == 0" >处置场地：</text>
             <text class="order-detail-container-header-title" v-else >&emsp;&emsp;&emsp;&emsp;&emsp;</text>
+          </view>
+          <view class="order-detail-container-header-content" style="text-decoration: underline"
+                @click.stop="handlerJumpOtherApp(disposal.addrStr)">
+            <text>{{ disposal.addrStr }}</text>
+          </view>
         </view>
-        <view class="order-detail-container-header-content" style="text-decoration: underline"  @click.stop="handlerJumpOtherApp(disposal.latitude, disposal.longitude, dataGram.garCoordinate)">
-          <text>{{ disposal.addrStr }}</text>
-        </view>
-      </view>
  
  
         <view class="order-detail-container-header-item">
@@ -67,37 +68,6 @@
             <view @click="handleQrCodeClick(orderId)" class="iconfont icon-erweima-xian"></view>
           </view>
         </view>
-      </view>
-      <!-- 车辆信息 -->
-      <view class="order-detail-container-box-card">
-        <view class="order-detail-container-header-card-title">
-          <view class="order-detail-container-header-card-uicon"></view>
-          车辆信息
-        </view>
-        <view class="order-detail-container-header-item" style="justify-content: space-between;"
-              v-for="(item) in handlerList">
-          <text class="order-detail-container-header-title" style="color: #303133;">
-            {{item.garOrderHandlerName}}/{{ item.garHandlerCarCode }}/{{item.garOrderContainerVolume}}
-          </text>
-          <view class="order-detail-container-header-content">
-            <text class="order-detail-container-header-title">
-              趟次:{{item.garCarCount}}车
-            </text>
-          </view>
-        </view>
-      </view>
-      <!-- 订单记录 -->
-      <view class="order-detail-container-box-card">
-        <view class="order-detail-container-header-card-title">
-          <view class="order-detail-container-header-card-uicon"></view>
-          订单信息
-        </view>
-        <!-- <view class="order-detail-container-header-item">
-          <text class="order-detail-container-header-title">订单时间：</text>
-          <view class="order-detail-container-header-content">
-            {{ dataGram.garCreateTime }}
-          </view>
-        </view> -->
         <view class="order-detail-container-header-item">
           <text class="order-detail-container-header-title">预约时间：</text>
           <view class="order-detail-container-header-content">
@@ -110,7 +80,7 @@
             <text selectable="true">{{ dataGram.garOrderContactTel }}</text>
             <view class="icon-box" style="display: flex; align-items: center; justify-content: center;">
               <u-icon v-if="dataGram.handleFlag" name="phone" size="28"
-                @click="handleContactClick(dataGram.garOrderContactTel)"></u-icon>
+                      @click="handleContactClick(dataGram.garOrderContactTel)"></u-icon>
             </view>
           </view>
         </view>
@@ -127,11 +97,26 @@
             {{ dataGram.garRemark }}
           </view>
         </view>
-
-        <view v-if="dataGram.needFollowCar" class="follow-car-notice">
-          <text style="color: red;">该订单需要搬运上车</text>
+      </view>
+      <!-- 车辆信息 -->
+      <view class="order-detail-container-box-card">
+        <view class="order-detail-container-header-card-title">
+          <view class="order-detail-container-header-card-uicon"></view>
+          车辆信息
+        </view>
+        <view class="order-detail-container-header-item" style="justify-content: space-between;"
+              v-for="(item) in handlerList">
+          <text class="order-detail-container-header-title" style="color: #303133;">
+            {{item.garOrderHandlerName}}/{{ item.garHandlerCarCode }}/{{item.garOrderContainerVolume}}
+          </text>
+          <view class="order-detail-container-header-content">
+            <text class="order-detail-container-header-title">
+              趟次:{{item.garCarCount}}车
+            </text>
+          </view>
         </view>
       </view>
+
       <!-- 处理信息 -->
       <view class="order-detail-container-box-card">
         <view class="order-detail-container-header-card-title">
@@ -232,7 +217,8 @@ import {
   queryGarOrderMatchAsk,
   queryGarOrderMatchAsks,
   queryOrderDetail,
-  updateOrder
+  updateOrder,
+  queryDisposalDispatch
 } from "@/apis/order.js";
 import { createQrCode } from '@/apis/qrcode.js';
 import uqrcode from '@/components/Sansnn-uQRCode_4.0.6/components/uqrcode/uqrcode.vue';
@@ -356,6 +342,11 @@ const selectClick = (index) =&gt; {
 const handleOrderDetail = (orderId) => {
   queryOrderDetail(orderId).then(res => {
     dataGram.value = res.data.data;
+    // 确保disposalSites存在，如果不存在则初始化为空数组
+    if (!dataGram.value.disposalSites) {
+      dataGram.value.disposalSites = [];
+    }
+
     currentImages.value = res.data.data.currentImages.map(item => {
       return { url: import.meta.env.VITE_BASE_URL + item};
     });
@@ -417,8 +408,38 @@ const handleOrderDetail = (orderId) =&gt; {
     putDownImages.value = res.data.data.putDownImages.map(item => {
       return { url: import.meta.env.VITE_BASE_URL + item };
     });
+
+    // 新增：调用queryDisposalDispatch API获取处置场所信息
+    queryDisposalDispatch(orderId).then(disposalRes => {
+      if (disposalRes.data.success && disposalRes.data.data && disposalRes.data.data.length > 0) {
+        // 根据实际返回数据结构提取处置场所信息，只显示有选中联系人的处置场所
+        const disposalSites = disposalRes.data.data
+            .map(site => {
+              // 筛选出personnelInfo中checked为true的联系人
+              const selectedPerson = site.personnelInfo && site.personnelInfo.length > 0 ?
+                  site.personnelInfo.find(person => person.checked) : null;
+
+              return {
+                addrStr: site.garOrderDisposalCompanyName || '', // 使用公司名称作为地址显示
+                latitude: site.latitude || 0,
+                longitude: site.longitude || 0,
+                selectedPerson: selectedPerson // 保存选中的联系人信息
+              };
+            })
+            // 过滤掉没有选中联系人的处置场所
+            .filter(site => site.selectedPerson);
+
+        dataGram.value.disposalSites = disposalSites;
+      } else {
+        dataGram.value.disposalSites = [];
+      }
+    }).catch(err => {
+      console.error('获取处置场所信息失败:', err);
+      dataGram.value.disposalSites = [];
+    });
   })
 }
+
 /**
  * 拨打电话回调
  */
@@ -427,25 +448,13 @@ const handleContactClick = (val) =&gt; {
   }).catch(err => { });
 }
  
-const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
-  // 给出提示确定要跳转吗
-  uni.showModal({
-    title: '提示',
-    content: '是否跳转到app定位进行导航？',
-    success: function (res) {
-      if (res.confirm) {
-        uni.openLocation({
-          latitude: latitude,
-          longitude: longitude,
-          success: function () {
-            console.log('success');
-          }
-        });
-      }
-    }
-  })
+const handlerJumpOtherApp = (locationName) => {
+  // 方案一：使用腾讯地图URI API（推荐）
+  // 构建腾讯地图搜索链接，使用更完整的参数
+  window.location.href =`https://apis.map.qq.com/uri/v1/search?keyword=${encodeURIComponent(locationName)}&region=${encodeURIComponent(locationName)}&referer=XICBZ-ALWKT-2KPXZ-VCBL7-XMRYO-2QFS4&policy=1`;
 }
  
+
 const handleEvaluate = (orderId, userType) => {
   uni.$u.route(`pages/order-info/order-other/evaluate/index?orderId=${orderId}&userType=${userType}`)
 }
@@ -7,9 +7,14 @@
       <view style="display: flex; flex-direction: column; width: 100%;">
         <view class="manager-info">
           <view class="manager-info-transport-company-name">
-            <text>{{ userInfo.transportCompanyName ? userInfo.transportCompanyName : userInfo.userName }}</text>
+            <text v-if="userInfo.transportCompanyName === '' || userInfo.transportCompanyName == null">
+              {{userName}}
+            </text>
+            <text v-else>
+              {{ userInfo.transportCompanyName && userInfo.transportCompanyName === userName ? userInfo.transportCompanyName : (userInfo.transportCompanyName ? userInfo.transportCompanyName + '&nbsp;&nbsp;' : '') + (userName ? userName : '') }}
+            </text>
           </view>
-          <view class="choose-type-item-text-right-label">{{ userInfo.userType }}
+          <view class="choose-type-item-text-right-label">{{userInfo.userType}}
           </view>
  
         </view>
@@ -74,6 +79,7 @@ import wodeOther from &#39;./wode-other/index.vue&#39;;
 const store = useMainStore();
 const pic = ref(headImg)
 const userInfo = computed(() => store.userInfo)
+const userName =computed(() => store.userName)