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

src/Components/fab/fab.vue

@@ -24,14 +24,14 @@
         <image class="fab-icon" src="../../static/index/coupon.png"></image>
         <text class="fab-text">优惠券</text>
       </view>
-      <view class="custom-button" @click="go('/pages/storeEntry/index')">
+      <!-- <view class="custom-button" @click="go('/pages/storeEntry/index')">
         <image class="fab-icon" src="../../static/index/coupon.png"></image>
         <text class="fab-text">商家</text>
       </view>
       <view class="custom-button" @click="go('/pages/assistingAgriculture/index/index')">
         <image class="fab-icon" src="../../static/index/coupon.png"></image>
         <text class="fab-text">助农</text>
-      </view>
+      </view> -->
     </view>
     <!-- 预售主页   -->
     <view v-if="position === '2'" class="outer-view">

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/index/index.vue

@@ -34,7 +34,10 @@
           height="220"
           imageMode="aspectFill"
         ></wd-swiper>
-        <view class="env">
+      </view>
+      <view class="env">
+        <view class="env-css">
+          <text class="line"></text>
           <text class="env-info">贵阳市农业农村局 贵阳日报传媒集团联合打造</text>
         </view>
       </view>
@@ -112,7 +115,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,18 +337,22 @@ page {
 }
 .env {
   width: 750rpx;
-  //height: 48rpx;
-  background: rgba(255, 255, 255, 0.005);
-  backdrop-filter: blur(20rpx);
-  position: absolute;
-  margin-top: -60rpx;
-  z-index: 999;
-  .env-info {
+  background: linear-gradient(180deg, #f5fdf3 0%, #82ce8b 100%);
+  border-radius: 10rpx 10rpx 0rpx 0rpx;
+  .env-css {
     height: 48rpx;
-    line-height: 48rpx;
-    font-size: 28rpx;
-    color: #ffffff;
-    margin-left: 20rpx;
+    display: flex;
+    align-items: center;
+    .line {
+      width: 4rpx;
+      height: 20rpx;
+      background: #659c27;
+      margin: 16rpx 20rpx;
+    }
+    .env-info {
+      font-size: 24rpx;
+      color: #202020;
+    }
   }
 }
 </style>

src/pages/assistingAgriculture/index/presale.vue

@@ -376,7 +376,6 @@ page {
   margin-left: 20rpx;
   border-radius: 16rpx;
   background: #ffffff;
-  margin-top: 6rpx;
 }
 .buy-list {
   margin-top: 30rpx;