Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

2026-05-20 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd

 small-program/pages/index/index.vue

@@ -1,6 +1,6 @@
<template>
   <view class="index-page">
      <view class="top-gradient-bg" :style="{ backgroundImage: 'url(' + backgroundImage + ')' }"></view>
      <image class="top-gradient-bg" src="/static/image/bg_home@2x.png" mode="aspectFill"></image>
      <view class="top-hero">
         <view :style="{ height: statusbarHeight + 'px' }"></view>
         <view class="hero-bar" :style="{ height: navHeight + 'px' }">
@@ -18,7 +18,7 @@

         <view class="banner-card hero-banner">
            <swiper class="banner-swiper" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="500" :circular="true" :indicator-color="'rgba(255, 255, 255, 0.5)'" :indicator-active-color="'#ffffff'">
                <swiper-item v-for="(item, index) in bannerList" :key="index">
                <swiper-item v-for="(item, index) in bannerList" :key="index" @click="jumpBannerDetail(item)">
                    <image class="banner-image" :src="item.imgurlFull" mode="aspectFill"></image>
                </swiper-item>
            </swiper>
@@ -49,10 +49,18 @@
            <text class="section-title">推荐寄存点</text>
            <text class="section-more" @click="jumpJC">查看更多</text>
         </view>
			
         <scroll-view class="label-list" scroll-x="true">
            <view class="list-item" v-for="(item, index) in tagShopList" :key="index">
               <text class="tag-name">{{ item.tagName }}</text>
               <text>{{ item.shopCount }}</text>
               <image src="/static/icon/ic_box@2x.png" mode="widthFix"></image>
            </view>
         </scroll-view>

         <view class="recommend-list">
            <template v-if="pointList.length > 0">
               <view v-for="(item, index) in pointList" :key="index" class="point-card" @click="goStoragePage(item)">
               <view v-for="(item, index) in pointList" :key="index" class="point-card" @click="goShopDetails(item)">
                  <view class="point-thumb">
                     <image class="point-thumb-image" :src="item.coverImg" mode="widthFix"></image>
                  </view>
@@ -60,6 +68,9 @@
                     <view class="point-head">
                        <text class="point-name">{{ item.name ||'' }}</text>
                        <text class="point-distance">{{ item.distanceText  ||''}}</text>
                     </view>
                     <view class="point-tips" v-if="item.locationTagNames && item.locationTagNames.length > 0">
                        <view class="point-tips-item" v-for="(tag, idx) in item.locationTagNames" :key="idx">{{ tag }}</view>
                     </view>
                     <view class="point-address">
                        <image src="/static/icon/home_ic_location3@2x.png" mode="aspectFit"></image>
@@ -84,6 +95,7 @@
         </view>
         <view class="toast-btn" @click="handleLocation">开启定位</view>
      </view>
      <auth-login :show="showLogin" @close="showLogin = false"></auth-login>
      <custom-tabbar></custom-tabbar>
   </view>
</template>
@@ -98,19 +110,20 @@
         CustomTabbar
      },
      computed: {
         ...mapState(['navHeight', 'statusbarHeight', 'address', 'latitude', 'cityId', 'longitude']),
         ...mapState(['navHeight', 'statusbarHeight', 'address', 'latitude', 'cityId', 'longitude', 'token']),
         currentAddress() {
            return this.address && this.address !== '定位中' ? this.address : '获取定位'
         }
      },
      data() {
         return {
            backgroundImage: require('@/static/image/bg_home@2x.png'),
            bannerList: [],
            pointList: [],
            page: 1,
            ingOrder:null,
            isRequest: true
            tagShopList: [],
            ingOrder: null,
            showLogin: false,
            pendingNavigate: null,
            lastLocationAuth: null
         }
      },
      async onLoad() {
@@ -119,36 +132,91 @@
         if (this.cityId && this.latitude && this.longitude) {
            await this.getNearbyShopList()
         }
         await this.getTagShopCount()
      },
      onShow() {
         this.ingOrder =null
         this.getIngorder()
         this.checkLocationAuth()
      },
      onReachBottom() {
         if (this.cityId && this.latitude && this.longitude) {
            this.getNearbyShopList()
      watch: {
         token(newToken) {
            if (newToken && this.pendingNavigate) {
               const fn = this.pendingNavigate
               this.pendingNavigate = null
               this.showLogin = false
               fn()
            }
         },
         cityId() {
            this.getTagShopCount()
         }
      },
      methods: {
         jumpOrderDetail(id){
            uni.navigateTo({
               url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+id
         async getTagShopCount() {
            if (!this.cityId) return
            const res = await this.$u.api.locationTagShopCount({ cityId: this.cityId })
            if (res.code === 200) {
               this.tagShopList = res.data || []
            }
         },
         async checkLocationAuth() {
            const _this = this
            uni.getSetting({
               success(res) {
                  const authLocation = res.authSetting['scope.userLocation']
                  if (_this.lastLocationAuth !== null && _this.lastLocationAuth !== authLocation) {
                     if (authLocation) {
                        _this.positioning()
                     }
                  }
                  _this.lastLocationAuth = authLocation
               }
            })
         },
         async getIngorder(){
         async getIngorder() {
            var that =this
            let res = await that.$u.api.getActiveOrderTip()
            if (res && res.code === 200) { 
               this.ingOrder = res.data
            } 
         },
         jumpBannerDetail(item) {
            if(!item.content || item.content =='' || item.type==0){
               return
            }
            if (item.type == 1) {
               uni.navigateTo({
                  url: '/shop/pages/article-details/article-details?id=' + item.id
               })
            } else if(item.type == 2) {
               uni.navigateTo({
                  url: '/shop/pages/webview/webview?url=' + item.content
               })
            }
         },
         jumpOrderDetail(id){
            uni.navigateTo({
               url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+id
            })
         },
         jumpOrderList(status){
            if (!this.token) {
               this.pendingNavigate = () => this.jumpOrderList(status)
               this.showLogin = true
               return
            }
            uni.setStorageSync("orderStatus",status)
            uni.switchTab({
               url: '/pages/itinerary/itinerary'
            })
         },
         jumpxiadan() {
            if (!this.token) {
               this.pendingNavigate = () => this.jumpxiadan()
               this.showLogin = true
               return
            }
            if (!this.cityId) return uni.showToast({
               title: '当前城市暂未开通',
               icon: 'none'
@@ -164,10 +232,9 @@
            }
         },
         async getNearbyShopList() {
            if (!this.isRequest) return;
            const res = await this.$u.api.getNearbyShopList({
               capacity: 10,
               page: this.page,
               capacity: 5,
               page: 1,
               model: {
                  latitude: this.latitude,
                  longitude: this.longitude,
@@ -176,11 +243,13 @@
               }
            })
            if (res.code === 200) {
               this.pointList = res.data.records || []
               this.page++
               if (res.data.total <= this.pointList.length) {
                  this.isRequest = false
               }
               const list = res.data.records || []
               list.forEach(item => {
                  if (item.locationTagNames) {
                     item.locationTagNames = item.locationTagNames.split(',')
                  }
               })
               this.pointList = list
            }
         },
         jumpJC() {
@@ -207,45 +276,36 @@
            uni.chooseLocation({
               type: 'gcj02',
               success: async function(addr) {
                  console.log(addr, '==================uniapp选择位置成功');
                  if (addr.errMsg === 'chooseLocation:ok' && addr.latitude) {
                     const locParam = { latitude: addr.latitude, longitude: addr.longitude };
                     // uni.setStorageSync('address', locParam);
							
                     var myAmapFun = new amapFile.AMapWX({ key: 'e4d46c87adf151dca20060317592b1b6' });
                     var myAmapFun = new amapFile.AMapWX({ key: that.$gaodeMapKey });
                     myAmapFun.getRegeo({
                        location: addr.longitude + ',' + addr.latitude,
                        success: async function(data) {
                           console.log(data, '==================选择地址逆解析');
                           let info = data[0];
                           locParam.province = info.province;
                           locParam.city = (info.regeocodeData.addressComponent.city && typeof info.regeocodeData.addressComponent.city === 'string') 
                              ? info.regeocodeData.addressComponent.city 
                              : info.regeocodeData.addressComponent.province;
                           var ta = info.name || '地址获取失败';
                           locParam.adcode = info.regeocodeData.addressComponent.adcode
                           var ta = addr.name || '地址获取失败';
                           locParam.address = ta
                           const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
                           const resCity = await that.$u.api.getCityByName({ code: locParam.adcode })
                           if (resCity.code === 200 && resCity.data) {
                              locParam.cityId = resCity.data.id
                              that.$store.commit('setPosition', locParam)
                              that.page = 1
                              that.pointList = []
                              that.isRequest = true
                              that.getNearbyShopList()
                           } else {
                              that.$store.commit('setPosition', locParam)
                              that.$store.commit('clearCityId')
                              that.page = 1
                              that.pointList = []
                              that.isRequest = true
                           }
                        },
                        fail: function(err) {
                           console.error('获取位置失败===========', err);
                           that.$store.commit('setPosition', locParam)
                           that.page = 1
                           that.pointList = []
                           that.isRequest = true
                           // that.getNearbyShopList()
                           that.getNearbyShopList()
                        }
                     });
                  }
@@ -264,23 +324,24 @@
               isHighAccuracy: true,
               success: function (addr) {
                  const locParam = { latitude: addr.latitude, longitude: addr.longitude };
                  var myAmapFun = new amapFile.AMapWX({ key: 'f2e6c0bfcac14c27b4f0d6d0d5b9d7d' });
                  var myAmapFun = new amapFile.AMapWX({ key: that.$gaodeMapKey });
                  myAmapFun.getRegeo({
                     location: addr.longitude + ',' + addr.latitude,
                     success: async function(data) {
                        console.log(data, '==================获取地址');
                        let info = data[0];
                        locParam.province = info.province;
                        locParam.city = info.city;
                        locParam.adcode = info.regeocodeData.addressComponent.adcode;
                        locParam.area = info.district;
                        locParam.street = info.street;
                        var ta = info.name || '地址获取失败';
                        locParam.address = ta
                        const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
                        const resCity = await that.$u.api.getCityByName({ code: locParam.adcode })
                        if (resCity.code === 200) {
                           locParam.cityId = resCity.data.id
                        }
                        that.$store.commit('setPosition', locParam)
                        that.getNearbyShopList()
                        that.$isResolve()
                     },
                     fail: (err) => {
@@ -289,6 +350,11 @@
                  });
               }
            });
         },
         goShopDetails(item){
            uni.navigateTo({
               url: '/pages/storage-point-detail/storage-point-detail?id='+item.id
            })
         },
         goStoragePage() {
            if (!this.cityId) return uni.showToast({
@@ -490,6 +556,56 @@
      justify-content: space-between;
      margin-top: 40rpx;
   }
	
   .label-list {
      width: 100%;
      margin-top: 30rpx;
      white-space: nowrap;
      .list-item {
         width: 210rpx;
         height: 120rpx;
         padding: 16rpx 20rpx;
         box-sizing: border-box;
         background: #E6F7FF;
         border-radius: 16rpx;
         position: relative;
         display: inline-flex;
         flex-direction: column;
         justify-content: space-between;
         margin-right: 20rpx;
         vertical-align: middle;
         text {
            &:nth-child(1) {
               font-weight: 400;
               font-size: 26rpx;
               color: #10B2FA;
            }
            &:nth-child(2) {
               font-weight: 600;
               font-size: 34rpx;
               color: #222222;
            }
         }
         image {
            width: 76rpx;
            height: 62rpx;
            position: absolute;
            bottom: 0;
            right: 0;
         }
      }
   }
	
   .label-list::-webkit-scrollbar {
      display: none;
   }
	
   .tag-name {
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
      max-width: 170rpx;
   }

   .section-title {
      font-size: 36rpx;
@@ -557,6 +673,28 @@
      gap: 10rpx;
   }

   .point-tips {
      width: 100%;
      display: flex;
      align-items: center;
      margin-top: 12rpx;
      .point-tips-item {
         width: 130rpx;
         height: 36rpx;
         line-height: 36rpx;
         text-align: center;
         border-radius: 8rpx;
         font-weight: 400;
         font-size: 20rpx;
         color: #10B2FA;
         margin-right: 12rpx;
         border: 1rpx solid #10B2FA;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
      }
   }

   .point-name {
      flex: 1;
      font-size: 32rpx;