Merge remote-tracking branch 'origin/master'

src/Components/assistingAgriculture/index/Date.vue

@@ -37,6 +37,10 @@ const props = defineProps({
   },
 });
 
+const reset = () => {
+  selectedItem.value = null;
+};
+defineExpose({ reset });
 onMounted(async () => {
   getStartDateList();
 });

src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue

@@ -86,10 +86,10 @@
             <wd-icon size="24rpx" class="icons"></wd-icon>
           </view>
         </view>
-        <Sort v-show="rotate" @sortParams="sortParams" />
-        <DepartureDate v-show="rotate2" @dataParams="dataParams" />
-        <ScenicSpots v-show="rotate3" @placeParams="placeParams" />
-        <Screen v-show="rotate4" @screenParams="screenParams" />
+        <Sort v-show="rotate" ref="sortRef" @sortParams="sortParams" />
+        <DepartureDate v-show="rotate2" ref="departureDateRef" @dataParams="dataParams" />
+        <ScenicSpots v-show="rotate3" ref="scenicSpotsRef" @placeParams="placeParams" />
+        <Screen v-show="rotate4" ref="screenRef" @screenParams="screenParams" />
       </view>
       <view class="list">
         <view @click="jumpPage(item)" class="item" v-for="(item, index) in cardData" :key="index">
@@ -140,6 +140,10 @@ const textColor = ref('#ffffff');
 const backIconColor = ref('white');
 const current = ref(0);
 const isLoadReachBottom = ref(null);
+const sortRef = ref(null);
+const departureDateRef = ref(null);
+const scenicSpotsRef = ref(null);
+const screenRef = ref(null);
 const params = ref({
   current: 1,
   size: 15,
@@ -235,6 +239,12 @@ const screenParams = (item, type) => {
   });
 };
 const resetParams = () => {
+  if (sortRef.value || departureDateRef.value || scenicSpotsRef.value || screenRef.value) {
+    sortRef.value.reset();
+    departureDateRef.value.reset();
+    scenicSpotsRef.value.reset();
+    screenRef.value.reset();
+  }
   params.value = {
     size: 15,
     current: 1,

src/pages/assistingAgriculture/reviewDetails/scenicSpotDetails.vue

@@ -3,7 +3,7 @@
   <!-- 点评详情页面 -->
   <search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
     <view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
-      点评详情
+      景点详情
     </view>
   </search>
   <view class="review-details-pages">