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

src/Components/index/FoodDetails.vue

@@ -4,7 +4,7 @@
     <view class="right">
       <text class="text">{{ item.shopName }}</text>
       <view class="twoBxo">
-        <text class="one-text">{{ item.grade }} 推荐</text>
+        <text class="one-text">{{ item.grade.toFixed(1) }} 推荐</text>
         <!-- <text class="two-text">￥30/人</text> -->
         <text class="three-text">销量{{ item.monthSoldNum }}</text>
         <text class="four-text">

src/Components/index/ShopCard.vue

@@ -7,7 +7,7 @@
         <view class="right">
           <text class="text">{{ shopCardData.shopName }}</text>
           <view class="twoBxo">
-            <text class="one-text">{{ shopCardData.grade }}推荐</text>
+            <text class="one-text">{{ shopCardData.grade.toFixed(1) }}推荐</text>
             <!-- <text class="two-text">￥30/人</text> -->
             <text class="three-text">销量{{ shopCardData.monthSoldNum }}</text>
             <text class="four-text">

src/pages/assistingAgriculture/index/presale.vue

@@ -68,7 +68,7 @@
         <text class="retail-price">零售价：￥{{ item.price }}/盒</text>
         <text class="presale-price">
           预售价：￥
-          <text class="highlight-price">{{ item.oriPrice }}</text>
+          <text class="highlight-price">{{ item.price }}</text>
           /盒
         </text>
         <view>

src/pages/index/index.vue

@@ -428,7 +428,7 @@ const getMerchantList = async () => {
     total = res.data.totalElements;
     res.data.content.forEach((item) => {
       item.shopLogo = import.meta.env.VITE_APP_IMG_URL + item.shopLogo;
-      item.grade = item.grade.toFixed(1);
+      // item.grade = item.grade.toFixed(1);
       if (item.evaluationVos.length > 0) {
         item.simpleProds.forEach((item) => {
           item.avatar = import.meta.env.VITE_APP_IMG_URL + item.avatar;