From e07b79bc313a35d01d150c6a99f5254b026d92db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 06 五月 2026 15:30:56 +0800
Subject: [PATCH] 管理端bug修改
---
admin/src/components/business/OperaShopApprovalWindow.vue | 2 +-
admin/src/components/business/OperaShopInfoWindow.vue | 2 +-
admin/src/components/business/OperaOrderDetail.vue | 45 ++++++++++++++++++++++++++++++---------------
admin/.env.development | 4 ++--
admin/src/components/business/OperaShopInfoSeeWindow.vue | 2 +-
5 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 8e19371..68c67af 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,4 +1,4 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-VUE_APP_API_URL = 'http://192.168.1.4:10010'
-#VUE_APP_API_URL = 'https://llfc.lmpro.cn/nyx_admin'
+# VUE_APP_API_URL = 'http://192.168.1.4:10010'
+VUE_APP_API_URL = 'https://llfc.lmpro.cn/nyx_admin'
diff --git a/admin/src/components/business/OperaOrderDetail.vue b/admin/src/components/business/OperaOrderDetail.vue
index 4a3fb67..635e17d 100644
--- a/admin/src/components/business/OperaOrderDetail.vue
+++ b/admin/src/components/business/OperaOrderDetail.vue
@@ -50,9 +50,9 @@
</span>
</div>
- <div class="info-item" v-if="detailInfo.type ===1">
+ <div class="info-item" v-if="detailInfo.order.type ===1">
<span class="label">璁㈠崟绾у埆锛�</span>
- <span class="value">{{ detailInfo.isUrgent === 1?'鏋侀�熻揪':'鏍囬�熻揪' }}</span>
+ <span class="value">{{ detailInfo.order.isUrgent === 1?'鏋侀�熻揪':'鏍囬�熻揪' }}</span>
</div>
<div class="info-item">
<span class="label">棰勮鍒板簵鏃堕棿锛�</span>
@@ -75,8 +75,9 @@
<span class="value">楼{{ (detailInfo.order.declaredFee / 100).toFixed(2) }}</span>
</div>
<div class="info-item">
- <span class="label">棰勮瀵勫瓨澶╂暟/閰嶉�侀噷绋嬶細</span>
- <span class="value">{{ detailInfo.order.estimatedDepositDays || '-' }}澶�/{{ detailInfo.order.distance || '-' }}鍏噷</span>
+ <span class="label">{{detailInfo.order.type === 0 ? '棰勮瀵勫瓨澶╂暟' : '閰嶉�侀噷绋�'}}锛�</span>
+ <span class="value" v-if="detailInfo.order.type === 0">{{ detailInfo.order.estimatedDepositDays || '-' }}澶�</span>
+ <span class="value" v-if="detailInfo.order.type === 1">{{ detailInfo.order.distance || '-' }}鍏噷</span>
</div>
<div class="info-item full-width">
<span class="label">瀹㈡埛澶囨敞锛�</span>
@@ -84,13 +85,13 @@
</div>
<div class="info-item full-width">
<span class="label">鐗╁搧鎷嶇収锛�</span>
- <div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
+ <div v-if="detailInfo.orderFiles && detailInfo.orderFiles.length" class="image-list">
<el-image
- v-for="(img, index) in detailInfo.depositImages"
+ v-for="(img, index) in detailInfo.orderFiles"
:key="index"
style="width: 80px; height: 80px; margin-right: 10px"
:src="img"
- :preview-src-list="detailInfo.depositImages"
+ :preview-src-list="detailInfo.orderFiles"
fit="cover"
></el-image>
</div>
@@ -130,11 +131,11 @@
</div>
<div class="info-item">
<span class="label">瀵勪欢鍦板潃锛�</span>
- <span class="value">{{ detailInfo.order.depositLocation || '' }}{{ detailInfo.order.depositLocationRemark || '' }}</span>
+ <span class="value">{{ detailInfo.order.depositLocationRemark || '' }}</span>
</div>
<div class="info-item">
<span class="label">鏀朵欢鍦板潃锛�</span>
- <span class="value">{{ detailInfo.order.takeLocation || '' }}{{ detailInfo.order.takeLocationRemark || '' }}</span>
+ <span class="value">{{ detailInfo.order.takeLocationRemark || '' }}</span>
</div>
<div class="info-item">
<span class="label">鏄惁鏀朵欢鏈嶅姟鐐癸細</span>
@@ -146,13 +147,13 @@
</div>
<div class="info-item full-width">
<span class="label">闂ㄥ簵鏀朵欢鎷嶇収锛�</span>
- <div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
+ <div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
<el-image
- v-for="(img, index) in detailInfo.storeInImages"
+ v-for="(img, index) in detailInfo.depositImages"
:key="index"
style="width: 80px; height: 80px; margin-right: 10px"
:src="img"
- :preview-src-list="detailInfo.storeInImages"
+ :preview-src-list="detailInfo.depositImages"
fit="cover"
></el-image>
</div>
@@ -172,8 +173,22 @@
</div>
<span v-else>-</span>
</div>
- <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1">
- <span class="label">鍙告満閫佽揪鎷嶇収/闂ㄥ簵鍏ュ簱鎷嶇収锛�</span>
+ <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && detailInfo.order.takeShopId">
+ <span class="label">闂ㄥ簵鍏ュ簱鎷嶇収锛�</span>
+ <div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
+ <el-image
+ v-for="(img, index) in detailInfo.storeInImages"
+ :key="index"
+ style="width: 80px; height: 80px; margin-right: 10px"
+ :src="img"
+ :preview-src-list="detailInfo.storeInImages"
+ fit="cover"
+ ></el-image>
+ </div>
+ <span v-else>-</span>
+ </div>
+ <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && !detailInfo.order.takeShopId">
+ <span class="label">鍙告満閫佽揪鎷嶇収锛�</span>
<div v-if="detailInfo.driverDoneImages && detailInfo.driverDoneImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.driverDoneImages"
@@ -203,7 +218,7 @@
</div>
</div>
- <div class="section">
+ <div class="section" v-if="detailInfo.order.cancelTime">
<div class="section-header">
<span class="section-title">鍙栨秷淇℃伅</span>
</div>
diff --git a/admin/src/components/business/OperaShopApprovalWindow.vue b/admin/src/components/business/OperaShopApprovalWindow.vue
index 7dcf8ac..a1ea922 100644
--- a/admin/src/components/business/OperaShopApprovalWindow.vue
+++ b/admin/src/components/business/OperaShopApprovalWindow.vue
@@ -130,7 +130,7 @@
</template>
</div>
- <div class="qualification-section" v-if="storeInfo.companyType === 1">
+ <div class="qualification-section">
<h4 class="section-title">闂ㄥ簵鐓х墖鍙婂叾浠栨潗鏂�</h4>
<div class="image-item-row">
<span class="label">闂ㄥ簵闂ㄥご鐓э細</span>
diff --git a/admin/src/components/business/OperaShopInfoSeeWindow.vue b/admin/src/components/business/OperaShopInfoSeeWindow.vue
index e77a0b1..91dad11 100644
--- a/admin/src/components/business/OperaShopInfoSeeWindow.vue
+++ b/admin/src/components/business/OperaShopInfoSeeWindow.vue
@@ -159,7 +159,7 @@
</template>
</div>
- <div class="qualification-section" v-if="storeInfo.companyType === 1">
+ <div class="qualification-section">
<h4 class="section-title">闂ㄥ簵鐓х墖鍙婂叾浠栨潗鏂�</h4>
<div class="image-item-row">
<span class="label">闂ㄥ簵闂ㄥご鐓э細</span>
diff --git a/admin/src/components/business/OperaShopInfoWindow.vue b/admin/src/components/business/OperaShopInfoWindow.vue
index bb4bd6c..968b9d9 100644
--- a/admin/src/components/business/OperaShopInfoWindow.vue
+++ b/admin/src/components/business/OperaShopInfoWindow.vue
@@ -164,7 +164,7 @@
</div>
<div class="info-row">
<span class="label">瀹℃壒鐘舵�侊細</span>
- <span class="value">{{ storeInfo.auditStatus === 0 ? '寰呭鎵�' : storeInfo.auditStatus === 1 ? '瀹℃壒閫氳繃' : '瀹℃壒鏈�氳繃' }}</span>
+ <span class="value">{{ storeInfo.auditStatus === 0 ? '寰呭鎵�' : storeInfo.auditStatus === 1 ? '瀹℃壒閫氳繃' : storeInfo.auditStatus === 2 ? '瀹℃壒鏈�氳繃' : '宸叉敮浠樻娂閲�' }}</span>
</div>
<div class="info-row">
<span class="label">閰嶉�佽寖鍥达細</span>
--
Gitblit v1.9.3