update

pages/index/index.vue

@@ -9,7 +9,7 @@
       height: menu.bottom + 14 + 'px',
       backgroundImage:
         pageType === 'spring'
-          ? `url(https://eshangtech.com/minTestImg/springPageBg.png)` 
+          ? `url(https://eshangtech.com/minTestImg/springPageBg.png)`
           : `url(https://eshangtech.com/minTestImg/pageBg.png)`,
     }">
       <view class="topContent" :style="{ paddingTop: menu.top + 'px', height: menu.height + 'px' }">
@@ -189,12 +189,15 @@
                 <image class="scenicIcon" src="https://eshangtech.com/caiyunyiImg/fixedIcon.png" />
                 <view class="scenicLabel">距离{{ ScenicData.ScenicDistance || '-' }}km</view>
               </view>
-              <view class="scenicRight">
+              <view class="scenicRight" v-if="ScenicData.TICKET_PRICE > 0">
                 <view class="scenicRightLabel">门票</view>
                 <view class="scenicUnit">¥</view>
-                <view class="scenicPrice">{{ ScenicData.TICKET_PRICE }}</view>
+                <view class="scenicPrice">{{ ScenicData.TICKET_PRICE || "0" }}</view>
                 <view class="scenicUnit">起</view>
               </view>
+              <view class="scenicRight" v-else>
+                <view class="scenicPrice" style="font-size: 24rpx;">免费</view>
+              </view>
             </view>
           </view>
         </view>

pages/scenicList/scenicList.vue

@@ -33,12 +33,15 @@
                                 <image class="scenicIcon" src="https://eshangtech.com/caiyunyiImg/fixedIcon.png" />
                                 <view class="scenicLabel">距离{{ item.ScenicDistance || '-' }}km</view>
                             </view>
-                            <view class="scenicRight">
+                            <view class="scenicRight" v-if="item.TICKET_PRICE > 0">
                                 <view class="scenicRightLabel">门票</view>
                                 <view class="scenicUnit">¥</view>
-                                <view class="scenicPrice">{{ item.TICKET_PRICE || "-" }}</view>
+                                <view class="scenicPrice">{{ item.TICKET_PRICE || "0" }}</view>
                                 <view class="scenicUnit">起</view>
                             </view>
+                            <view class="scenicRight" v-else>
+                                <view class="scenicPrice" style="font-size: 24rpx;">免费</view>
+                            </view>
                         </view>
                     </view>
                 </view>
@@ -56,6 +59,7 @@ export default {
             dataList: [],// 表单数据
             seat: {},
             SCENICAREAOBJ: {},// 服务区类型的枚举
+            pageIndex: 1
         }
     },
     async onLoad() {
@@ -101,7 +105,10 @@ export default {
                 longitude: this.seat.longitude || "",
                 SortStr: this.sortType === 1 ? '' : 'TICKET_PRICE desc',
                 // ServerpartID: this.serviceDetail.SERVERPART_ID || "",
-                type: 'encryption'
+                type: 'encryption',
+                PageIndex: this.pageIndex,
+                PageSize: 20,
+                SortStr: ""
             }
             console.log('reqreqreqreq', req);
 
@@ -120,7 +127,7 @@ export default {
                     }
                 })
             }
-            this.dataList = list
+            this.dataList = this.dataList.concat(list)
         },
         handleChangeSortType() {
             // 这里可以添加排序逻辑
@@ -133,7 +140,10 @@ export default {
         },
         // 滑动到底部
         handleScrollBottom() {
+            console.log('滑动到底部滑动到底部滑动到底部');
 
+            this.pageIndex = this.pageIndex + 1
+            this.handleGetData()
         },
         // 跳转导航
         handleGoNavigation(obj) {

pages/shopMallPage/index/index.vue

@@ -58,8 +58,8 @@
                 : shopTypeList.length * 136 + 60 + 'rpx',
           }" -->
           <!-- 工会之家 -->
-          <div class="rowBox" @click="handleGoUnionMall"
+          <div class="rowBox" @click="handleGoUnionMall" v-if="pageType !== 'UnionMall'">
-            v-if="pageType !== 'UnionMall' && user && user.INDUSTRY_MEMBERSHIP_ID">
+            <!-- && user && user.INDUSTRY_MEMBERSHIP_ID -->
             <div class="imgBox">
               <div class="itemImgBox">
                 <image class="img" src="/static/images/home/unionMallIcon.svg"></image>

pages/shopMallPage/shopType/index.vue

@@ -27,8 +27,8 @@
         <div class="scrollBox">
           <!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" -->
 
-          <div class="bigTabItem" @click="handleGoUnionMall"
+          <div class="bigTabItem" @click="handleGoUnionMall" v-if="pageType !== 'UnionMall'">
-            v-if="pageType !== 'UnionMall' && user && user.INDUSTRY_MEMBERSHIP_ID">
+            <!-- && user && user.INDUSTRY_MEMBERSHIP_ID -->
             <!-- style="width: 70px" -->
 
             <div class="itemBox">