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

src/Components/fab/fab.vue

@@ -40,7 +40,7 @@
         <text class="fab-text">订单</text>
       </view>
       <view class="custom-button" @click="go('/pages/assistingAgriculture/cart/cart')">
-        <image class="fab-icon" src="../../static/index/gwc.png"></image>
+        <image class="fab-icon" src="../../static/index/shoppingCart.png"></image>
         <text class="fab-text">购物车</text>
         <view class="badge" v-if="cartCount > 0">{{ cartCount }}</view>
       </view>
@@ -103,14 +103,15 @@ const go = (url) => {
   .badge {
     font-size: 18rpx;
     font-weight: bold;
-    color: #fa4350;
-    background-color: #fff;
+    color: #fff;
+    background-color: #fa4350;
     text-align: center;
     border-radius: 32rpx;
-    padding: 4rpx 8rpx;
+    padding: 4rpx 10rpx;
     position: absolute;
-    top: 0;
-    right: -6rpx;
+    top: -10rpx;
+    right: -18rpx;
+    border: 4rpx solid #fff;
   }
 }
 </style>

src/pages/assistingAgriculture/RouteDetails/RouteDetails.vue

@@ -310,6 +310,7 @@
       <button @click="openZfType">立即预定</button>
     </div>
     <Payment ref="PaymentRef" @payment="payNow"></Payment>
+    <fab position="3" />
   </div>
 </template>
 
@@ -318,6 +319,7 @@ import timeLine from './timeLine.vue';
 import domain from '@/utils/domain';
 import Payment from '@/pages/order/components/Payment/index.vue';
 import { ref, computed, watch } from 'vue';
+import fab from '../../../components/fab/fab.vue';
 import {
   getProd,
   getEvalStatis,

src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue

@@ -121,6 +121,7 @@
         没有更多啦~
       </view>
     </view>
+    <fab position="3" />
   </view>
 </template>
 
@@ -131,6 +132,7 @@ import Sort from '../../../components/assistingAgriculture/index/Sort.vue';
 import DepartureDate from '../../../components/assistingAgriculture/index/Date.vue';
 import ScenicSpots from '../../../components/assistingAgriculture/index/ScenicSpots.vue';
 import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
+import fab from '../../../components/fab/fab.vue';
 const rotate = ref(false);
 const imgUrl = import.meta.env.VITE_APP_IMG_URL;
 const rotate2 = ref(false);

src/pages/assistingAgriculture/detail/detail.vue

@@ -92,6 +92,7 @@
         </view>
       </view>
     </view>
+    <fab position="3" />
   </view>
 </template>
 
@@ -107,6 +108,7 @@ import {
   getCouponShopList,
   receiveCoupon,
 } from '@/api/packageDetail';
+import fab from '../../../components/fab/fab.vue';
 const imgUrl = import.meta.env.VITE_APP_IMG_URL;
 // 图片
 const swiperList = ref([

src/pages/index/foodClassification.vue

@@ -117,6 +117,7 @@
     >
       没有更多啦~
     </view>
+    <fab />
   </view>
 </template>
 
@@ -125,6 +126,7 @@ import FoodDetails from '../../components/index/FoodDetails.vue';
 // import Search from '../../components/index/Search.vue';
 import Classification from '../../components/index/Classification.vue';
 import Position from '../../components/index/Position.vue';
+import fab from '../../components/fab/fab.vue';
 import Sort from '../../components/index/Sort.vue';
 import { getByParentId, merchantList, prodSpecial } from '../../api/index';
 

src/pages/index/listFood.vue

@@ -73,6 +73,7 @@
     >
       没有更多啦~
     </view>
+    <fab />
   </view>
 </template>
 
@@ -82,6 +83,7 @@ import FoodDetails from '../../components/index/FoodDetails.vue';
 import Classification from '../../components/index/Classification.vue';
 import Position from '../../components/index/Position.vue';
 import Sort from '../../components/index/Sort.vue';
+import fab from '../../components/fab/fab.vue';
 import { merchantList, getByParentId, getByType } from '../../api/index';
 import { getLocation } from '../../utils/tool';
 const business = reactive(['优选商家', '超值半价', '今日可订', '经典单人']);

src/pages/packageDetails/packageDetails.vue

@@ -245,12 +245,14 @@
     </view>
     <!-- 底部-end -->
   </view>
+  <fab />
 </template>
 
 <script setup>
 import { getProdDetail, getCollect, getCouponShopList, receiveCoupon } from '@/api/packageDetail';
 import { getStoreInformation } from '@/api/shop';
 import { getDistance } from '@/utils/common';
+import fab from '../../components/fab/fab.vue';
 const prodInfo = ref({});
 const prodRlue = ref({});
 const myProdId = ref('');

src/pages/shop/shop.vue

@@ -291,10 +291,12 @@
       </view>
       <!-- 周边推荐-end -->
     </view>
+    <fab />
   </view>
 </template>
 
 <script setup>
+import fab from '../../components/fab/fab.vue';
 import {
   likeOrDislike,
   getStoreInformation,

src/pages/ticket/ticket.vue

@@ -144,8 +144,8 @@ onLoad(async () => {
 
 // 优惠券状态 0:失效 2:已使用,3-未使用
 const iconUrl = ref({
-  0: '@/static/ticket/past-icon.png',
-  2: '@/static/ticket/used-icon.png',
+  0: '../../static/ticket/past-icon.png',
+  2: '../..//static/ticket/used-icon.png',
 });
 
 // 主状态