From e53f386fd0e55bc27925898b67a24658846be49b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 三月 2026 10:56:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
mini-program/pagesA/pages/order-details/order-details.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mini-program/pagesA/pages/order-details/order-details.vue b/mini-program/pagesA/pages/order-details/order-details.vue
index f492ee8..1fa68f2 100644
--- a/mini-program/pagesA/pages/order-details/order-details.vue
+++ b/mini-program/pagesA/pages/order-details/order-details.vue
@@ -103,7 +103,7 @@
</view>
<view class="user-jxtime" @click="jumpMap()">
<image class="user-jxtime-icon" src="/static/icon/ic_shopaddress@2x.png" mode="widthFix"></image>
- <text>{{info.linkAddress || ''}}</text>
+ <text>{{(info.shopInfo.areas.provinceName || '') + (info.shopInfo.areas.name || '') + (info.shopInfo.areas.cityName || '') + (info.shopInfo.addr || '')}}</text>
<image class="user-jxtime-to" src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
</view>
<view class="user-qrcode" v-if="info.orderStatus ==1 &&info.receiveType==1">
@@ -242,7 +242,8 @@
</view>
</view>
<view class="shop-info-item">
- <view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">闇�浠樻</view>
+ <view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-if="[1,2,3,4]">瀹炰粯娆�</view>
+ <view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-else-if="[0]">闇�浠樻</view>
<view class="shop-info-item-price xfk">
<text>{{(info.price || 0).toFixed(2)}}</text>
<text></text>
@@ -608,7 +609,7 @@
},
jumpGoodsDetail(item){
uni.navigateTo({
- url: '/pages/details/details?id='+item.id
+ url: '/pages/details/details?id='+item.goodsId
})
}
}
--
Gitblit v1.9.3