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

src/Components/fab/fab.vue

@@ -7,6 +7,10 @@
     :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/RouteDetails/RouteDetails.vue

@@ -104,7 +104,7 @@
           <div class="package-list">
             <div
               class="package-item"
-              :class="{ active: activeMeal === v, 'special-offer': true }"
+              :class="{ active: activeMeal === v, 'special-offer': v.isEspecially }"
               v-for="(v, i) in mealList"
               @click="onActiveMeal(v)"
               :key="i"

src/pages/assistingAgriculture/order/components/stepBar/index.vue

@@ -110,6 +110,12 @@
 </template>
 
 <script setup>
+const props = defineProps({
+  dataList: {
+    type: Array,
+    default: null,
+  },
+});
 const show = ref(false);
 // 正则表达式匹配电话号码
 const phoneRegex = /\b(\d{3,4}-\d{7,8}|\d{11})\b/g;