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

src/pages/assistingAgriculture/index/presale.vue

@@ -65,8 +65,8 @@
         style="width: 670rpx; height: 670rpx; border-radius: 16rpx"
       />
       <view>
-        <text class="retail-price">零售价：￥{{ item.oriPrice }}/盒</text>
-        <text class="presale-price">预售价：￥{{ item.price }}/盒</text>
+        <text class="retail-price">零售价：￥{{ item.price }}/盒</text>
+        <text class="presale-price">预售价：￥{{ item.oriPrice }}/盒</text>
       </view>
       <view>
         <img
@@ -117,7 +117,7 @@
             <text class="introduction">{{ item.introduction }}</text>
           </view>
           <view class="price-info">
-            <text class="good-price">￥{{ item.price }}</text>
+            <text class="good-price">￥{{ item.oriPrice }}</text>
             <img class="add" src="/static/assistingAgriculture/presale/add.png" />
           </view>
         </view>