Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

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/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,