Merge remote-tracking branch 'origin/master'

src/Components/fab/fab.vue

@@ -7,10 +7,6 @@
     :draggable="true"
     inactiveIcon="a-controlplatform"
   >
-    <view class="custom-button" @click="go('/pages/assistingAgriculture/index/index')">
-      <image class="fab-icon" src="../../static/index/order.png"></image>
-      <text class="fab-text">助农</text>
-    </view>
     <view class="custom-button" @click="go('/pages/ticket/ticket')">
       <image class="fab-icon" src="../../static/index/coupon.png"></image>
       <text class="fab-text">优惠券</text>

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -163,6 +163,7 @@
         </view>
       </view>
     </view>
+    <fab />
   </view>
 </template>
 
@@ -175,6 +176,7 @@ import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
 import { getPopularList, getProdList, getTour } from '@/api/assistingAgriculture/village';
 import { getPresaleList } from '@/api/assistingAgriculture/building';
 import { onMounted } from 'vue';
+import fab from '../../../components/fab/fab.vue';
 onMounted(async () => {
   getProd();
   getPopular();

src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue

@@ -186,20 +186,29 @@ const dataParams = (item, datePart) => {
 };
 // 景点
 const placeParams = (info) => {
-  console.log('info', info);
-
-  // params.value.attractionIdList = [info.id];
+  params.value.attractionIdList = info.map((item) => {
+    return item.attractionName;
+  });
   refresh().then(() => {
     queryOfferProdListFn();
   });
 }; // 筛选
 const screenParams = (item, type) => {
   if (type === 'screen') {
-    params.value.startCityList = [item.tripCity];
+    params.value.startCityList = item.map((item) => {
+      return item.tripCity;
+    });
   } else if (type === 'serve') {
-    params.value.serviceList = [item.labelName];
+    params.value.serviceList = item.map((item) => {
+      return item.labelName;
+    });
   } else if (type === 'people') {
-    params.value.forPeopleList = [item.labelName];
+    item.map((item) => {
+      return item.labelName;
+    });
+    params.value.forPeopleList = item.map((item) => {
+      return item.labelName;
+    });
   }
   refresh().then(() => {
     queryOfferProdListFn();

src/pages/assistingAgriculture/index/building.vue

@@ -125,11 +125,13 @@
         />
       </wd-badge>
     </view>
+    <fab />
   </view>
 </template>
 
 <script setup>
 import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import fab from '../../../components/fab/fab.vue';
 import {
   getGoodSaleProdList,
   getPlatformProdList,