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

src/pages/assistingAgriculture/RouteDetails/RouteDetails.vue

@@ -304,7 +304,7 @@
                   />
                   <br />
                 </template>
-                <span v-html="v.activityDescribes"></span>
+                <span class="desc" v-html="v.activityDescribes"></span>
               </div>
               <p>
                 <img class="icon" src="/static/assistingAgriculture/routeDetails/clock.png" />
@@ -1059,6 +1059,21 @@ uni-page-body {
           font-weight: normal;
           line-height: normal;
           color: #3d3d3d;
+          .desc {
+            img {
+              max-width: 100%;
+              object-fit: cover;
+              height: auto;
+              margin-top: 20rpx;
+            }
+            p {
+              font-size: 24rpx;
+            }
+            li {
+              font-size: 24rpx;
+              margin-top: 8rpx;
+            }
+          }
         }
         .icon {
           height: 32rpx;

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -55,6 +55,7 @@
             style="width: 32rpx; height: 32rpx"
           />
           <video
+            v-if="videoList.length !== 0"
             :class="{ 'no-progress-bar': !isFullScreen }"
             :show-fullscreen-btn="true"
             :show-play-btn="true"
@@ -66,11 +67,12 @@
             @play="play"
             @fullscreenchange="handleFullscreenChange"
           ></video>
-          <!--          <img-->
-          <!--            class="spe-img"-->
-          <!--            src="/static/assistingAgriculture/rural/img5.png"-->
-          <!--            style="width: 306rpx; height: 204rpx"-->
-          <!--          />-->
+          <img
+            v-else
+            class="spe-img"
+            src="/static/assistingAgriculture/rural/img5.png"
+            style="width: 306rpx; height: 204rpx"
+          />
         </view>
       </view>
       <view class="hot-way">

src/pages/assistingAgriculture/detail/detail.vue

@@ -497,8 +497,19 @@ page {
     padding: 20rpx;
     .desc {
       padding-bottom: 20rpx;
+
       img {
-        width: 100%;
+        max-width: 100%;
+        object-fit: cover;
+        height: auto;
+        margin-top: 20rpx;
+      }
+      p {
+        font-size: 24rpx;
+      }
+      li {
+        font-size: 24rpx;
+        margin-top: 8rpx;
       }
     }
   }

src/pages/assistingAgriculture/index/building.vue

@@ -290,6 +290,9 @@ function toCart() {
 page {
   background: #f3f3f3;
 }
+.container {
+  padding-bottom: 20rpx;
+}
 .top {
   width: 750rpx;
   height: 128rpx;
@@ -386,15 +389,14 @@ page {
   }
 }
 .tabs-list {
-  margin-left: 10px;
+  margin-left: 20rpx;
   width: 712rpx;
-  height: 1172rpx;
-  border-radius: 8px;
+  border-radius: 16rpx;
   background: #ffffff;
 }
 .fruit-img {
-  margin-left: 10px;
-  margin-top: 10px;
+  margin-left: 20rpx;
+  margin-top: 20rpx;
 }
 .son-img {
   display: flex;
@@ -526,4 +528,7 @@ page {
     font-size: 24rpx;
   }
 }
+.whh {
+  padding-bottom: 10rpx;
+}
 </style>

src/pages/assistingAgriculture/index/index.vue

@@ -112,7 +112,7 @@ onMounted(async () => {
 const getList = () => {
   getSortList().then((res) => {
     res.data.forEach((item) => {
-      item.icon = import.meta.env.VITE_APP_IMG_URL + item.pic;
+      item.icon = import.meta.env.VITE_APP_IMG_URL + item.icon;
     });
     sortList.value = res.data;
   });
@@ -334,12 +334,15 @@ page {
 }
 .env {
   width: 750rpx;
-  height: 48rpx;
-  background: linear-gradient(94deg, #82ce8b 0%, rgba(255, 255, 255, 0) 97%);
+  //height: 48rpx;
+  background: rgba(255, 255, 255, 0.005);
+  backdrop-filter: blur(20rpx);
   position: absolute;
   margin-top: -60rpx;
   z-index: 999;
   .env-info {
+    height: 48rpx;
+    line-height: 48rpx;
     font-size: 28rpx;
     color: #ffffff;
     margin-left: 20rpx;

src/pages/assistingAgriculture/index/presale.vue

@@ -64,10 +64,13 @@
         :src="item.img"
         style="width: 670rpx; height: 670rpx; border-radius: 16rpx"
       />
-      <view>
+      <view class="bac">
         <text class="retail-price">零售价：￥{{ item.price }}/盒</text>
-        <text class="presale-price">预售价：￥{{ item.oriPrice }}/盒</text>
-      </view>
+        <text class="presale-price">
+          预售价：￥
+          <text class="highlight-price">{{ item.oriPrice }}</text>
+          /盒
+        </text>
         <view>
           <img
             class="buy-img"
@@ -77,12 +80,12 @@
               width: 284rpx;
               height: 128rpx;
               float: right;
-            margin-top: -80rpx;
-            margin-right: 16rpx;
+              margin-top: -114rpx;
             "
           />
         </view>
       </view>
+    </view>
     <wd-status-tip image="content" tip="暂无数据" v-if="buyList.length === 0" />
   </view>
   <view class="waterfall">
@@ -393,6 +396,7 @@ page {
   font-variation-settings: 'opsz' auto;
   font-feature-settings: 'kern' on;
   color: #b3b3b3;
+  padding-top: 60rpx;
 }
 .presale-price {
   display: block;
@@ -531,4 +535,17 @@ page {
     color: #ffffff;
   }
 }
+.bac {
+  width: 670rpx;
+  height: 160rpx;
+  border-radius: 16rpx;
+  background: rgba(0, 0, 0, 0.4);
+  position: relative;
+  margin-left: 20rpx;
+  top: -44rpx;
+}
+.highlight-price {
+  color: red;
+  font-size: 44rpx;
+}
 </style>

src/pages/packageDetails/packageDetails.vue

@@ -998,10 +998,10 @@ page {
       margin-top: 20rpx;
     }
     p {
-      font-size: 22rpx;
+      font-size: 24rpx;
     }
     li {
-      font-size: 22rpx;
+      font-size: 24rpx;
       margin-top: 8rpx;
     }
     .rich-more-btn {