From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaShopInfoWindow.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/business/OperaShopInfoWindow.vue b/admin/src/components/business/OperaShopInfoWindow.vue
index bb4bd6c..10f8587 100644
--- a/admin/src/components/business/OperaShopInfoWindow.vue
+++ b/admin/src/components/business/OperaShopInfoWindow.vue
@@ -91,10 +91,13 @@
</template>
</el-table-column>
<el-table-column prop="goodsInfo" label="鐗╁搧淇℃伅" min-width="180px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="isUrgent" label="绫诲瀷" min-width="80px">
+ <template slot-scope="{row}"><span>{{ row.type === 1?'寮傚湴瀛樺彇':'灏卞湴瀛樺彇' }}</span></template>
+ </el-table-column>
<el-table-column prop="isUrgent" label="璁㈠崟绾у埆" min-width="80px">
<template slot-scope="{row}"><span v-if="row.type ===1">{{ row.isUrgent === 1?'鏋侀�熻揪':'鏍囬�熻揪' }}</span></template>
</el-table-column>
- <el-table-column label="鐗╁搧淇濊垂锛堝厓锛�" min-width="120px">
+ <!-- <el-table-column label="鐗╁搧淇濊垂锛堝厓锛�" min-width="120px">
<template slot-scope="{row}">楼{{ (row.declaredFee / 100).toFixed(2) }}</template>
</el-table-column>
<el-table-column label="鐗╁搧淇濊垂锛堝厓锛�" min-width="120px">
@@ -102,6 +105,12 @@
</el-table-column>
<el-table-column label="鍩虹鏈嶅姟璐癸紙鍏冿級" min-width="120px">
<template slot-scope="{row}">楼{{ (row.price / 100).toFixed(2) }}</template>
+ </el-table-column> -->
+
+ <el-table-column label="缁撶畻閲戦锛堝厓锛�" min-width="120px">
+ <template slot-scope="{row}">
+ 楼{{ storeInfo.id == row.depositShopId ? (row.depositShopFee / 100).toFixed(2) : storeInfo.id == row.takeShopId ? (row.takeShopFee / 100).toFixed(2) : '' }}
+ </template>
</el-table-column>
<el-table-column label="璁㈠崟鎬讳环锛堝厓锛�" min-width="120px">
<template slot-scope="{row}">楼{{ (row.totalAmount / 100).toFixed(2) }}</template>
@@ -109,18 +118,19 @@
<el-table-column label="瀹炰粯鐜伴噾锛堝厓锛�" min-width="120px">
<template slot-scope="{row}">楼{{ (row.payAmount / 100).toFixed(2) }}</template>
</el-table-column>
- <el-table-column label="鍔犳�ヨ垂锛堝厓锛�" min-width="120px">
- <template slot-scope="{row}"><span v-if="row.type ===1 ">楼{{ (row.urgentAmount / 100).toFixed(2) }}</span></template>
- </el-table-column>
<el-table-column label="閫�娆鹃噾棰濓紙鍏冿級" min-width="120px">
<template slot-scope="{row}">楼{{ (row.refundAmount / 100).toFixed(2) }}</template>
+ </el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150px"> </el-table-column>
+ <!-- <el-table-column label="鍔犳�ヨ垂锛堝厓锛�" min-width="120px">
+ <template slot-scope="{row}"><span v-if="row.type ===1 ">楼{{ (row.urgentAmount / 100).toFixed(2) }}</span></template>
</el-table-column>
<el-table-column label="瓒呮椂閲戦" min-width="100px">
<template slot-scope="{row}">楼{{ (row.overdueAmount / 100).toFixed(2) }}</template>
</el-table-column>
<el-table-column label="寮傚父閲戦" min-width="100px">
<template slot-scope="{row}">楼{{ (row.exceptionAmount / 100).toFixed(2) }}</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="statusDesc" label="璁㈠崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :style="{ color: row.status <7 ? '#e6a23c' : (row.status ===7 ? '#67c23a' : 'grey' )}">
@@ -136,7 +146,6 @@
</template>
</el-table-column>
<el-table-column prop="payTime" label="鏀粯鏃堕棿" min-width="150px"> </el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150px"> </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -164,7 +173,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>
@@ -243,7 +252,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>
--
Gitblit v1.9.3