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

src/pages/assistingAgriculture/detail/comment.vue

@@ -176,7 +176,7 @@ const rateList = ref({
 
 onLoad(async (options) => {
   catalog.shopId = options.shopId;
-  catalog.prodId = options.prodId
+  catalog.prodId = options.prodId;
   console.log(options);
   await getList();
   await getTotal();

src/pages/assistingAgriculture/index/building.vue

@@ -84,8 +84,9 @@
       <!--      ></wd-icon>-->
       <view class="buy-img">
         <view class="hot-img" v-for="(item, index) in hotImgList" :key="index">
-          <img
+          <image
             class="rice"
+            mode="aspectFill"
             @tap="toDetail(item)"
             :src="item.img"
             style="width: 670rpx; height: 236rpx"
@@ -480,13 +481,13 @@ page {
   height: 100%;
   background-color: lightgreen;
 }
-img.rice {
-  border-radius: 16rpx 16rpx 16rpx 16rpx;
-  margin-left: 20rpx;
-}
 .buy-img {
   position: relative;
   top: -20rpx;
+  .rice {
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    margin-left: 20rpx;
+  }
 }
 .searchBox {
   opacity: 1;

src/pages/assistingAgriculture/index/index.vue

@@ -8,9 +8,9 @@
       >
         <view class="searchBox" :style="{ border }">
           <image
+            mode="aspectFill"
             class="magnifyingGlass"
             src="../../../static/index/magnifyingGlass.png"
-            mode="aspectFit|aspectFill|widthFix"
           />
           <input
             type="text"
@@ -43,7 +43,7 @@
             v-for="(item, index) in sortList"
             :key="index"
           >
-            <img :src="item.icon" style="width: 96rpx; height: 96rpx" />
+            <image mode="aspectFill" :src="item.icon" style="width: 96rpx; height: 96rpx" />
             <view class="sort-text">{{ item.categoryName }}</view>
           </view>
         </view>
@@ -51,7 +51,7 @@
       <view class="product-page" v-for="(item, index) in list" :key="index">
         <view>
           <view class="page-title">{{ item.categoryName }}</view>
-          <img :src="item.img" class="main-img" />
+          <image mode="aspectFill" :src="item.img" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view
               class="detail-border"
@@ -59,7 +59,8 @@
               :key="index"
               @click="toDetail(item)"
             >
-              <img
+              <image
+                mode="aspectFill"
                 :src="item.commodityImg"
                 style="width: 216rpx; height: 176rpx; border-radius: 16rpx"
               />