From b898e42bd46726a0c25081ca79136911b4ca1b4c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 27 四月 2026 22:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/pages/index/index.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 97d7090..1b2f032 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -30,18 +30,18 @@
<view class="service-card deposit-card" @click="jumpxiadan">
<image class="service-image" src="/static/image/home_ic_jicun@2x.png" mode="aspectFit"></image>
</view>
- <view class="service-card retrieve-card">
+ <view class="service-card retrieve-card" @click="jumpOrderList(3)">
<image class="service-image" src="/static/image/home_ic_qujian@2x.png" mode="aspectFit"></image>
</view>
</view>
- <view class="notice-card">
+ <view class="notice-card" v-if="ingOrder && ingOrder.orderId" @click="jumpOrderDetail(ingOrder.orderId)">
<view class="notice-icon-wrap">
<image src="/static/icon/home_ic_daizhifu@2x.png" mode="aspectFit"></image>
</view>
<view class="notice-copy">
- <text class="notice-title">寰呮敮浠�</text>
- <text class="notice-text">璇峰湪 10 鍒嗛挓鍐呭畬鎴愭敮浠橈紝瓒呮椂璁㈠崟灏嗚嚜鍔ㄥ彇娑�</text>
+ <text class="notice-title">{{ingOrder.statusDesc || ''}}</text>
+ <text class="notice-text">{{ingOrder.tip || ''}}</text>
</view>
</view>
@@ -58,14 +58,14 @@
</view>
<view class="point-main">
<view class="point-head">
- <text class="point-name">{{ item.name }}</text>
- <text class="point-distance">{{ item.distanceText }}</text>
+ <text class="point-name">{{ item.name ||'' }}</text>
+ <text class="point-distance">{{ item.distanceText ||''}}</text>
</view>
<view class="point-address">
<image src="/static/icon/home_ic_location3@2x.png" mode="aspectFit"></image>
- <text>{{ item.address }}</text>
+ <text>{{ item.address ||''}}</text>
</view>
- <text class="point-time">{{ item.shopHours }}</text>
+ <text class="point-time">{{ item.shopHours ||'' }}</text>
</view>
</view>
</template>
@@ -109,6 +109,7 @@
bannerList: [],
pointList: [],
page: 1,
+ ingOrder:null,
isRequest: true
}
},
@@ -119,12 +120,34 @@
await this.getNearbyShopList()
}
},
+ onShow() {
+ this.ingOrder =null
+ this.getIngorder()
+ },
onReachBottom() {
if (this.cityId && this.latitude && this.longitude) {
this.getNearbyShopList()
}
},
methods: {
+ jumpOrderDetail(id){
+ uni.navigateTo({
+ url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+id
+ })
+ },
+ async getIngorder(){
+ var that =this
+ let res = await that.$u.api.getActiveOrderTip()
+ if (res && res.code === 200) {
+ this.ingOrder = res.data
+ }
+ },
+ jumpOrderList(status){
+ uni.setStorageSync("orderStatus",status)
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
+ })
+ },
jumpxiadan() {
if (!this.cityId) return uni.showToast({
title: '褰撳墠鍩庡競鏆傛湭寮�閫�',
--
Gitblit v1.9.3