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

src/pages.json

@@ -208,7 +208,8 @@
 		{
 			"path": "pages/assistingAgriculture/RuralTravel/RuralTravel",
 			"style": {
-				"navigationBarTitleText": "乡村旅居"
+				"navigationBarTitleText": "乡村旅居",
+				"enablePullDownRefresh": true,
 			}
 		},
 

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -137,23 +137,23 @@
             <img class="card-img" :src="item.img" style="width: 248rpx; height: 240rpx" />
             <view class="detail-text">
               <text class="detail-title">{{ item.prodName }}</text>
-              <text class="give">{{ item.prodName }}</text>
+              <text class="give">{{ item.brief }}</text>
               <view class="tag">
                 <wd-tag
                   bg-color="#EEEEEE"
                   round
-                  v-for="(tag, tagIndex) in item.tag"
+                  v-for="(tag, tagIndex) in item.serveList"
                   :key="tagIndex"
                 >
-                  {{ tag }}
+                  {{ tag.labelName }}
                 </wd-tag>
               </view>
               <view class="detail-score">
-                <text class="score">{{ item.deliveryAmount }}分</text>
-                <text class="num">月销{{ item.deliveryAmount }}</text>
+                <text class="score">{{ item.score }}分</text>
+                <text class="num">月销{{ item.monthSoldNum }}</text>
               </view>
               <view class="venue">
-                <text class="place">{{ item.prodName }}</text>
+                <text class="place">{{ item.tripArea }}出发</text>
                 <text class="price">￥{{ item.price }}</text>
               </view>
             </view>
@@ -226,6 +226,13 @@ const locationFiltering = (index) => {
     labelId.value = null;
   }
 };
+onPullDownRefresh(() => {
+  getProd();
+  getPopular();
+  setTimeout(() => {
+    uni.stopPullDownRefresh();
+  }, 1000);
+});
 // 查询热门路线
 const getPopular = () => {
   getPopularList({ current: 1, size: 10 }).then((res) => {
@@ -287,10 +294,12 @@ const getProd = () => {
   getProdList(params).then((res) => {
     res.data.records.forEach((item) => {
       item.img = import.meta.env.VITE_APP_IMG_URL + item.pic;
+      item.serveList = item.serviceList.slice(0, 3);
     });
     cardList.value = res.data.records;
   });
 };
+
 const resetParams = () => {
   sortType.value = null;
   attractionId.value = null;
@@ -549,6 +558,6 @@ page {
   height: 56rpx;
 }
 .detail-score {
-  margin-top: 90rpx;
+  margin-top: 30rpx;
 }
 </style>