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

src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue

@@ -84,34 +84,15 @@
           <image mode="aspectFill" :src="imgUrl + item.pic"></image>
           <view class="info">
             <text class="title multi-line">{{ item.prodName }}</text>
-            <text class="subtitle">赠价值59元特产伴手礼一份</text>
+            <!-- <text class="subtitle">{{ item.brief }}</text> -->
+            <text class="subtitle"></text>
             <view class="tag-list">
+              <!-- <text class="tag">可定明日</text>
               <text class="tag">可定明日</text>
-              <text class="tag">可定明日</text>
-              <text class="tag">可定明日</text>
-            </view>
-            <view class="fs-box">
-              <text class="fs-num">{{ item.score }}分</text>
-              <text style="margin-left: 20rpx" class="sales-volume">
-                月销{{ item.monthSoldNum }}
-              </text>
-            </view>
-            <text class="address">{{ item.tripArea }}出发</text>
-          </view>
-          <text class="price">¥{{ item.price }}</text>
-        </view>
-        <view class="item" v-for="(item, index) in cardData" :key="index">
-          <image mode="aspectFill" :src="imgUrl + item.pic"></image>
-          <view class="info">
-            <text class="title multi-line">{{ item.prodName }}</text>
-            <text class="subtitle">赠价值59元特产伴手礼一份</text>
-            <view class="tag-list">
-              <text class="tag">可定明日</text>
-              <text class="tag">可定明日</text>
-              <text class="tag">可定明日</text>
+              <text class="tag">可定明日</text> -->
             </view>
             <view class="fs-box">
-              <text class="fs-num">{{ item.score }}分</text>
+              <text class="fs-num" v-if="item.score">{{ item.score }}分</text>
               <text style="margin-left: 20rpx" class="sales-volume">
                 月销{{ item.monthSoldNum }}
               </text>
@@ -148,13 +129,6 @@ const params = ref({
   current: 1,
   size: 15,
   isEnd: false,
-  sortType: '',
-  dateType: '', // 日期
-  allocateDate: '',
-  attractionId: '',
-  startCity: '',
-  serviceCommitment: '',
-  labelId: '',
 });
 const shopSwiperList = ref([
   'https://registry.npmmirror.com/wot-design-uni-assets/*/files/redpanda.jpg',
@@ -209,33 +183,29 @@ const dataParams = (item, datePart) => {
 };
 // 景点
 const placeParams = (info) => {
-  console.log('id', info);
-
-  params.value.attractionId = info.id;
+  params.value.attractionIdList = [info.id];
   refresh().then(() => {
     queryOfferProdListFn();
   });
 }; // 筛选
 const screenParams = (item, type) => {
   if (type === 'screen') {
-    params.value.startCity = item.tripCity;
+    params.value.startCityList = [item.tripCity];
   } else if (type === 'serve') {
-    params.value.serviceCommitment = item.labelName;
+    params.value.serviceList = [item.labelName];
   } else if (type === 'people') {
-    params.value.labelId = item.labelName;
+    params.value.forPeopleList = [item.labelName];
   }
   refresh().then(() => {
     queryOfferProdListFn();
   });
 };
 const resetParams = () => {
-  params.value.sortType = null;
-  params.value.attractionId = null;
-  params.value.dateType = null;
-  params.value.startCity = null;
-  params.value.serviceCommitment = null;
-  params.value.labelId = null;
-  params.value.allocateDate = null;
+  params.value = {
+    size: 15,
+    current: 1,
+    isEnd: false,
+  };
   refresh().then(() => {
     queryOfferProdListFn();
   });
@@ -471,6 +441,7 @@ page {
         font-weight: bold;
         /* 主题色 */
         color: #fa5151;
+        margin-left: auto;
         align-self: flex-end;
       }
     }