From b3fedd4221b807a07058be9d5d5d8ba8998adbcb Mon Sep 17 00:00:00 2001
From: Bang Hu <hu_bang@hotmail.com>
Date: 星期四, 11 九月 2025 21:35:31 +0800
Subject: [PATCH] Bug修改代码提交
---
src/views/productManage/productPriceViewer/index.vue | 95 ++++++++++++++++++++---------------------------
1 files changed, 41 insertions(+), 54 deletions(-)
diff --git a/src/views/productManage/productPriceViewer/index.vue b/src/views/productManage/productPriceViewer/index.vue
index 0a7690d..4caf97c 100644
--- a/src/views/productManage/productPriceViewer/index.vue
+++ b/src/views/productManage/productPriceViewer/index.vue
@@ -77,15 +77,7 @@
:colspan="getColspan(priceItem)"
class="feature-value"
>
- <div class="order-methods">
- <span
- v-for="method in priceItem.priceSettings"
- :key="method"
- class="method-item"
- >
- 鉁� {{ getPriceSettingText(method) }}
- </span>
- </div>
+ {{ priceItem.priceSettings.map((m:any) => getPriceSettingText(m)).join('銆�') }}
</td>
</tr>
<tr>
@@ -96,42 +88,7 @@
:colspan="getColspan(priceItem)"
class="feature-value"
>
- <div class="price-info">
- <div
- v-if="priceItem.priceSettings.includes('POINTS') && priceItem.pointsAmount > 0"
- class="price-item"
- >
- <div class="price-lable-icon">
- <el-icon class="price-icon points"><Coin /></el-icon>
- <span class="price-label">绉垎</span>
- </div>
- <span class="price-value points">{{ formatNumber(priceItem.pointsAmount) }} / {{ getPriceUnitText(priceItem.priceUnit) }}</span>
- </div>
- <div
- v-if="priceItem.priceSettings.includes('CURRENCY') && priceItem.currencyAmount > 0"
- class="price-item"
- >
- <div class="price-lable-icon">
- <span class="price-icon currency">楼</span>
- <span class="price-label">璐у竵</span>
- </div>
- <span class="price-value currency">{{ formatNumber(priceItem.currencyAmount) }} / {{ getPriceUnitText(priceItem.priceUnit) }}</span>
- </div>
- <div
- v-if="priceItem.priceSettings.includes('FREE')"
- class="price-item"
- >
- <span class="price-label">璐圭敤</span>
- <span class="price-value free">鍏嶈垂</span>
- </div>
- <div
- v-if="priceItem.priceSettings.includes('AGREEMENT')"
- class="price-item"
- >
- <span class="price-label">鍗忚:</span>
- <span class="price-value agreement">姣弡{ getPriceUnitText(priceItem.priceUnit) }}</span>
- </div>
- </div>
+ {{ renderPrice(priceItem) }}
</td>
</tr>
<tr>
@@ -305,23 +262,26 @@
<table class="order-info-table">
<tbody>
<tr>
- <td class="label">璁㈠崟缂栧彿锛�</td>
- <td class="value">{{ orderStatus.id }}</td>
- <td class="label">鐢宠鏃堕棿锛�</td>
+ <td class="label">璁㈠崟缂栧彿</td>
+ <td class="value">
+ {{ orderStatus.id }}
+ <el-link type="primary" @click="goBuyerCenter" style="margin-left: 8px">鐐瑰嚮鏌ョ湅</el-link>
+ </td>
+ <td class="label">鐢宠鏃堕棿</td>
<td class="value">{{ orderStatus.applyTime }}</td>
</tr>
<tr>
- <td class="label">浜у搧鍚嶇О锛�</td>
+ <td class="label">浜у搧鍚嶇О</td>
<td class="value">{{ orderStatus.productName }}</td>
- <td class="label">鎻愪緵鑰咃細</td>
+ <td class="label">鎻愪緵鑰�</td>
<td class="value">{{ orderStatus.provider }}</td>
</tr>
<tr>
- <td class="label">璁㈠崟鐘舵�侊細</td>
+ <td class="label">璁㈠崟鐘舵��</td>
<td class="value">{{ statusText(orderStatus.status) }}</td>
<td></td>
<td class="value link">
- <el-link type="primary" @click="viewOrder">鏌ョ湅璁㈠崟淇℃伅</el-link>
+<!-- <el-link type="primary" @click="viewOrder">鏌ョ湅璁㈠崟淇℃伅</el-link>-->
</td>
</tr>
</tbody>
@@ -348,6 +308,7 @@
<script setup lang="ts">
import { ref, watch, computed, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
import { ElMessage } from 'element-plus'
import { useRoute } from 'vue-router'
import productPricingApi from '@/api/productPricingApi'
@@ -359,6 +320,7 @@
import workFlowApi from '@/api/workFlowApi'
const route = useRoute()
+const router = useRouter()
interface PriceItem {
id: number
@@ -476,6 +438,10 @@
const viewOrder = () => {
window.alert('杩欓噷鍙烦杞埌璁㈠崟璇︽儏椤碉紙绀轰緥锛�')
}
+
+const goBuyerCenter = () => {
+ router.push({ name: 'tradeBuyerCenter', query: { t: String(Date.now()) } })
+}
const selectedCount = computed(() => orderSuites.value.filter(s => s.selected).length)
const totalByType = computed(() => {
@@ -548,6 +514,7 @@
try {
await removeFromCart(String(suite.id))
orderSuites.value.splice(index, 1)
+ selectedSuiteIds.value.delete(suite.id)
} catch (e) {
}
}
@@ -801,7 +768,7 @@
// 鑾峰彇宸ヤ綔娴佸弬鏁�
const wkParamsRes: any = await workFlowApi.getWorkFlowParams({
type: type,
- unitId: '1',
+ // unitId: '1',
businessKey: type
})
if(wkParamsRes?.code === 200 && wkParamsRes.data?.processTemplateId){
@@ -1038,7 +1005,9 @@
PRIVATE_INCREMENT: '绉佹湁澧為噺鍖�',
PUBLIC_INCREMENT: '鍏湁澧為噺鍖�',
OTA: 'OTA鏈嶅姟',
- CLOUD: '浜戞湇鍔�'
+ CLOUD: '浜戞湇鍔�',
+ RESOURCE_PACKAGE: '璧勬簮鍖�',
+ PERSONAL: '涓汉'
}
return map[salesForm] || salesForm
}
@@ -1114,6 +1083,24 @@
return map[unit] || unit
}
+// 缁熶竴娓叉煋浠锋牸锛氬幓闄も�滅Н鍒�/璐у竵/璐圭敤/鍗忚鈥濈瓑绫诲瀷鍓嶇紑锛屼粎杈撳嚭绾环鏍兼枃鏈�
+const renderPrice = (priceItem: PriceItem) => {
+ const segments: string[] = []
+ if (priceItem.priceSettings.includes('POINTS') && priceItem.pointsAmount > 0) {
+ segments.push(`${formatNumber(priceItem.pointsAmount)} / ${getPriceUnitText(priceItem.priceUnit)}`)
+ }
+ if (priceItem.priceSettings.includes('CURRENCY') && priceItem.currencyAmount > 0) {
+ segments.push(`${formatNumber(priceItem.currencyAmount)} / ${getPriceUnitText(priceItem.priceUnit)}`)
+ }
+ if (priceItem.priceSettings.includes('FREE')) {
+ segments.push('鍏嶈垂')
+ }
+ if (priceItem.priceSettings.includes('AGREEMENT')) {
+ segments.push(`姣�${getPriceUnitText(priceItem.priceUnit)}`)
+ }
+ return segments.join('锛�')
+}
+
// 鑾峰彇鍒嗙粍鍚庣殑琛ㄥご鏁版嵁
const getGroupedHeaders = (tabData: PriceItem[]) => {
const groups: Record<string, { count: number; productSuite: string }> = {}
--
Gitblit v1.8.0