From 87a0661bd4bfd91228747f77ce575db7775a44a5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 12 二月 2026 09:43:06 +0800
Subject: [PATCH] 合并
---
mini-program/pagesA/pages/order-details/order-details.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/mini-program/pagesA/pages/order-details/order-details.vue b/mini-program/pagesA/pages/order-details/order-details.vue
index 9013427..043c5c0 100644
--- a/mini-program/pagesA/pages/order-details/order-details.vue
+++ b/mini-program/pagesA/pages/order-details/order-details.vue
@@ -66,7 +66,7 @@
<view class="user-jxa-lx">
<image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
<text v-if="userType==1" @click="contact(info.linkphone)">鑱旂郴瀹㈡埛</text>
- <text v-if="info.orderStatus!=0 && userType==0" @click="contact(info.shopPhone)">鑱旂郴缁忛攢鍟�</text>
+ <text v-if="info.orderStatus!=0 && userType==0" @click="contact(info.shopInfo.phone || '')">鑱旂郴缁忛攢鍟�</text>
</view>
</view>
<view class="user-jxtime">
@@ -86,27 +86,27 @@
<view class="user-qrcode-btn" @click="copyText(info.exchangeCode)">澶嶅埗鑷彁鐮�</view>
</view>
</view>
- <!-- <view class="user">
+ <view class="user" v-if="info.receiveType!=1">
<view class="user-top">
<view class="user-icon">
<image src="/static/icon/ic_location@2x.png" mode="widthFix"></image>
</view>
<view class="user-info">
<view class="user-info-a">
- <text>鏉庨噾骞�</text>
- <text>181777889338</text>
+ <text>{{info.linkename || ''}}</text>
+ <text>{{info.linkephone || ''}}</text>
</view>
<view class="user-info-b">
- 瀹夊窘鐪佸悎鑲ュ競缁忓紑鍖烘澗璋疯矾鍑ゅ嚢鍥介檯B搴�808 璞嗙背绉戞妧鏈夐檺鍏徃
+ {{info.addr||''}}
</view>
</view>
</view>
<view class="user-xian"></view>
<view class="user-kd">
<image src="/static/icon/ic_wuliu@2x.png" mode="widthFix"></image>
- <text>椤轰赴閫熻繍锝淪F1923218478129473</text>
+ <text>{{info.kdName || ''}}锝渰{info.kdCode || ''}}</text>
</view>
- </view> -->
+ </view>
<view class="shop">
<view class="shop-info" style="margin: 0;" v-if="info.status ==6">
<view class="shop-info-item" style="margin-bottom: 12rpx;">
@@ -133,8 +133,7 @@
<view class="shop">
<view class="shop-top">
<view :class="'shop-top-tips '+(info.receiveType==1?'shop-top-tips-a':'shop-top-tips-b' )">{{info.receiveType==1?'鑷彁':'閰嶉��'}}</view>
- <text v-if="info.receiveType==1">{{info.shopInfo.name}}</text>
- <text v-if="info.receiveType!=1">{{info.kdName}}</text>
+ <text>{{info.shopInfo.name || ''}}</text>
</view>
<view class="b">
<view class="b-item" v-for="(item, index) in (info.goodsorderDetailList||[])" :key="index">
--
Gitblit v1.9.3