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 | 1005 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 735 insertions(+), 270 deletions(-)
diff --git a/src/views/productManage/productPriceViewer/index.vue b/src/views/productManage/productPriceViewer/index.vue
index 71022ee..4caf97c 100644
--- a/src/views/productManage/productPriceViewer/index.vue
+++ b/src/views/productManage/productPriceViewer/index.vue
@@ -23,18 +23,19 @@
{{ group.productSuite }}
</th>
</tr>
- <tr class="sub-header">
- <th>閿�鍞舰寮�</th>
- <th
- v-for="priceItem in tabData"
- :key="priceItem.id"
- :colspan="getColspan(priceItem)"
- >
- {{ getSalesFormText(priceItem.salesForm) }}
- </th>
- </tr>
</thead>
<tbody>
+ <tr>
+ <td class="feature-label">閿�鍞舰寮�</td>
+ <td
+ v-for="priceItem in tabData"
+ :key="priceItem.id"
+ :colspan="getColspan(priceItem)"
+ class="feature-value"
+ >
+ {{ getSalesFormText(priceItem.salesForm) }}
+ </td>
+ </tr>
<tr>
<td class="feature-label">瀹㈡埛瀵硅薄</td>
<td
@@ -76,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>
@@ -95,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">
- <el-icon class="price-icon currency"><Money /></el-icon>
- <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>
@@ -191,12 +149,12 @@
<table class="suite-table">
<thead>
<tr>
- <th class="th-left">璇︽儏</th>
- <th class="th-left">瑙勬牸</th>
- <th class="th-left">鍗曚环</th>
- <th class="th-center">鏁伴噺</th>
- <th class="th-center">骞撮檺</th>
- <th class="th-center">鎿嶄綔</th>
+ <th class="th-detail">璇︽儏</th>
+ <th class="th-spec">瑙勬牸</th>
+ <th class="th-price">鍗曚环</th>
+ <th class="th-quantity">鏁伴噺</th>
+ <th class="th-years">骞撮檺</th>
+ <th class="th-action">鎿嶄綔</th>
</tr>
</thead>
<tbody>
@@ -209,12 +167,12 @@
</td>
<td class="cell-spec cell-spec-gg">
<div class="spec-line-gg">
- <div class="spec-line">閿�鍞舰寮忥細{{ getSalesFormText(suite.salesForm) }}</div>
- <div class="spec-line">瀹㈡埛瀵硅薄锛歿{ getCustomerObjectText(suite.customerObject) }}</div>
+ <div class="spec-line">閿�鍞舰寮忥細<span class="spec-value">{{ getSalesFormText(suite.salesForm) }}</span></div>
+ <div class="spec-line">瀹㈡埛瀵硅薄锛�<span class="spec-value">{{ getCustomerObjectText(suite.customerObject) }}</span></div>
</div>
<div class="spec-line-gg">
- <div class="spec-line">璐︽埛鏁伴噺锛歿{ suite.accountQuantityUnlimited ? '涓嶉檺' : suite.accountQuantity }}</div>
- <div class="spec-line">骞跺彂鑺傜偣鏁帮細{{ suite.concurrentNodeQuantityUnlimited ? '涓嶉檺' : suite.concurrentNodeQuantity }}</div>
+ <div class="spec-line">璐︽埛鏁伴噺锛�<span class="spec-value">{{ suite.accountQuantityUnlimited ? '涓嶉檺' : suite.accountQuantity }}</span></div>
+ <div class="spec-line">骞跺彂鑺傜偣鏁帮細<span class="spec-value">{{ suite.concurrentNodeQuantityUnlimited ? '涓嶉檺' : suite.concurrentNodeQuantity }}</span></div>
</div>
</td>
@@ -248,7 +206,8 @@
:max="999"
:controls="true"
size="large"
- @change="(value) => handleQuantityChange(suite.id, value?value:1)"
+ class="quantity-input"
+ @change="(value) => handleQuantityChange(suite.id,value?value:1)"
/>
</td>
<td class="th-center">
@@ -258,6 +217,7 @@
:max="100"
:controls="true"
size="large"
+ class="duration-input"
:disabled="suite.priceType === 'FREE'"
@change="(value) => handleDurationChange(suite.id, value?value:1)"
/>
@@ -302,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>
@@ -334,7 +297,7 @@
<div class="footer" v-if="showPricePanel">
<el-button type="primary" @click="handleOrder">绔嬪嵆璁㈣喘</el-button>
</div>
- <div class="footer" v-else>
+ <div class="footer" v-if="showOrderPanel">
<el-button @click="returnPricePanel">杩斿洖浠锋牸瀵规瘮</el-button>
<el-button type="primary" @click="submitOrder">鎻愪氦鐢宠</el-button>
</div>
@@ -345,17 +308,19 @@
<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'
import cartApi from '@/api/cartApi'
import orderApi from '@/api/orderApi'
-import { ShoppingCart, Coin, Money } from '@element-plus/icons-vue'
import { useUserInfo } from '@/stores/modules/userInfo'
import { queryUserDetail } from '@/api/userInfo'
import productApi from '@/api/productApi'
+import workFlowApi from '@/api/workFlowApi'
const route = useRoute()
+const router = useRouter()
interface PriceItem {
id: number
@@ -390,7 +355,7 @@
const showOrderStatus = ref(false)
// 妯℃嫙鐢ㄦ埛淇℃伅锛堝疄闄呭簲浠庣敤鎴风姸鎬佽幏鍙栵級
const userStore = useUserInfo()
-let currentUserId = computed(() => userStore.getUserId || userStore.getUserInfo?.userId)
+const currentUserId = computed(() => userStore.getUserId || userStore.getUserInfo?.userId)
const currentUnitId = computed(() => userStore.getUnitId || userStore.getUserInfo?.unitId || '')
onMounted(async () => {
@@ -399,7 +364,8 @@
const res: any = await queryUserDetail()
if (res?.code === 200 && res.data) {
userStore.updateUserDetail(res.data)
- currentUserId = res.data.userId || res.data.id
+ // currentUserId.value = res.data.id || res.data.userId
+ console.log(currentUserId.value)
userInfo.value = res.data
} else {
ElMessage.error(res?.msg || '鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛岃鍏堢櫥褰�')
@@ -413,7 +379,8 @@
}else{
userInfo.value = userStore.getUserInfos
}
-
+ // 鑾峰彇璁㈣喘淇℃伅
+ fetchProductData(currentProductId.value ? currentProductId.value : '')
})
type PriceTypeKey = 'POINTS' | 'CURRENCY' | 'AGREEMENT' | 'FREE'
interface OrderSuite extends PriceItem {
@@ -470,6 +437,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)
@@ -543,6 +514,7 @@
try {
await removeFromCart(String(suite.id))
orderSuites.value.splice(index, 1)
+ selectedSuiteIds.value.delete(suite.id)
} catch (e) {
}
}
@@ -634,7 +606,8 @@
loading.value = true
try {
- const res: any = await productPricingApi.listByProductId(productId)
+ // 鍙煡璇㈠凡鍚敤鐨勫畾浠�
+ const res: any = await productPricingApi.listBycondition({ productId: productId,isActive: true })
if (res?.code === 200) {
const list = Array.isArray(res.data) ? res.data : []
const mapped: PriceItem[] = list.map((it: any) => {
@@ -704,6 +677,13 @@
} finally {
loading.value = false
}
+ // 淇敼activeTab 榛樿鍊�
+ if(priceList.value.length > 0){
+
+ activeTab.value = groupedPriceData.value.hasOwnProperty('enterprise') ? 'enterprise'
+ : groupedPriceData.value.hasOwnProperty('project') ? 'project' : 'personal'
+ }
+
}
// 鐩戝惉浜у搧ID鍙樺寲
@@ -711,7 +691,7 @@
if (newProductId) {
fetchProductData(newProductId)
}
-},{ immediate: true })
+})
// 濂椾欢閫夋嫨澶勭悊
const handleSuiteSelect = (suiteId: number, checked: any) => {
@@ -783,6 +763,21 @@
}else{
paymentType = '鍗忚'
}
+ let processdefId: string = ''
+ const type = hasAGREEMENT ? 'trade_agreement' : 'trade_point';
+ // 鑾峰彇宸ヤ綔娴佸弬鏁�
+ const wkParamsRes: any = await workFlowApi.getWorkFlowParams({
+ type: type,
+ // unitId: '1',
+ businessKey: type
+ })
+ if(wkParamsRes?.code === 200 && wkParamsRes.data?.processTemplateId){
+ processdefId = wkParamsRes.data.processTemplateId
+ }else {
+ ElMessage.error('鑾峰彇宸ヤ綔娴佸弬鏁板け璐�!')
+ return
+ }
+
// 缁勮鍒涘缓璁㈠崟鍙傛暟锛圕reateOrderDTO锛�
const payload = {
userId: currentUserId.value,
@@ -792,6 +787,7 @@
providerId: productHeader.value.createUserId,
paymentType: paymentType,
buyerRemarks: '',
+ processdefId: processdefId,
items: items.map(it => ({
pricingId: it.id,
productId: it.productId,
@@ -826,25 +822,35 @@
applyTime: data.applyTime ? String(data.applyTime) : new Date().toLocaleString()
}
// 璋冪敤宸ヤ綔娴佹帴鍙ｅ彂璧峰鎵规祦绋嬶紝鎷垮埌娴佺▼瀹炰緥ID鍚庡洖鍐欒鍗晈orkflow_id
- try {
- // 鏍规嵁鏄惁鍖呭惈鍗忚鏄庣粏锛岄厤缃笉鍚屾祦绋嬪畾涔変笌涓氬姟Key锛堝厛鐢ㄩ潤鎬佸�煎崰浣嶏級
- const processdefId = hasAGREEMENT ? 'Process_Agreement_Static' : 'Process_Points_Static'
- const businessKey = hasAGREEMENT ? 'agreement_biz_key' : 'points_biz_key'
- const wfRes: any = await orderApi.startWorkflowAndComplete({
- processdefId,
- userid: String(currentUserId.value || ''),
- businessKey
- })
- if (wfRes?.code === 200 && wfRes.data?.processinstId) {
- await orderApi.updateWorkflowId(data.orderId, wfRes.data.processinstId)
- }
- } catch (e) {
- console.warn('鍚姩宸ヤ綔娴佸け璐ユ垨鏇存柊workflow_id澶辫触', e)
- }
+ // 鏀惧悗绔鐞�
+ // try {
+ // // 鏍规嵁鏄惁鍖呭惈鍗忚鏄庣粏锛岄厤缃笉鍚屾祦绋嬪畾涔変笌涓氬姟Key锛堝厛鐢ㄩ潤鎬佸�煎崰浣嶏級
+ // // const processdefId = hasAGREEMENT ? 'Process_Agreement_Static' : 'Process_Points_Static'
+ // const businessKey = hasAGREEMENT ? 'agreement_biz_key' : 'points_biz_key'
+ // const type = hasAGREEMENT ? 'trade_agreement' : 'trade_point';
+ // // 鑾峰彇宸ヤ綔娴佸弬鏁�
+ // const wkParamsRes: any = await workFlowApi.getWorkFlowParams({
+ // type: type,
+ // unitId: '1'
+ // })
+ // if(wkParamsRes?.code === 200 && wkParamsRes.data?.processTemplateId){
+ // const wfRes: any = await workFlowApi.startWorkflowAndComplete({
+ // processdefId: wkParamsRes.data.processTemplateId,
+ // userid: String(currentUserId.value || ''),
+ // businessKey: businessKey
+ // })
+ // if (wfRes?.code === 200 && wfRes.data?.processinstId) {
+ // await orderApi.updateWorkflowId(data.orderId, wfRes.data.processinstId)
+ // }
+ // }
+ //
+ // } catch (e) {
+ // console.warn('鍚姩宸ヤ綔娴佸け璐ユ垨鏇存柊workflow_id澶辫触', e)
+ // }
// 娓呯┖璐墿杞︼紙鍚庣 + 鏈湴鐘舵�侊級
try {
- const clearRes: any = await cartApi.clearCart(currentUserId.value, currentUnitId.value)
+ const clearRes: any = await cartApi.clearCart(currentUserId.value, currentUnitId.value,currentProductId.value ? currentProductId.value : '')
if (clearRes?.code === 200) {
cartItems.value = []
orderSuites.value = []
@@ -897,7 +903,7 @@
const removeFromCart = async (pricingId: string) => {
try {
- const res: any = await cartApi.removeFromCart(currentUserId.value, currentUnitId.value, pricingId)
+ const res: any = await cartApi.removeFromCart(currentUserId.value, currentUnitId.value, currentProductId.value? currentProductId.value : '',pricingId)
if (res?.code === 200) {
ElMessage.success('宸蹭粠璐墿杞︾Щ闄�')
} else {
@@ -909,10 +915,16 @@
}
}
-const updateCartItem = async (pricingId: number, quantity: number, duration: number) => {
+const updateCartItem = async (pricingId: number, quantity: number | null, duration: number | null) => {
try {
// 杩欓噷闇�瑕佹牴鎹疄闄呮帴鍙ｈ皟鏁达紝鍙兘闇�瑕佷紶閫掓洿澶氬弬鏁�
- const res: any = await cartApi.updateCartItem(currentUserId.value, currentUnitId.value, pricingId, quantity)
+ let res: any = {}
+ if(quantity){
+ res = await cartApi.updateCartItem(currentUserId.value, currentUnitId.value, currentProductId.value? currentProductId.value : '', pricingId, quantity)
+ }
+ if(duration){
+ res = await cartApi.updateCartItemDuration(currentUserId.value, currentUnitId.value, currentProductId.value? currentProductId.value : '', pricingId, duration)
+ }
if (res?.code === 200) {
ElMessage.success('璐墿杞﹀凡鏇存柊')
} else {
@@ -927,7 +939,7 @@
const fetchCartItems = async () => {
cartLoading.value = true
try {
- const res: any = await cartApi.getCartItems(currentUserId.value, currentUnitId.value)
+ const res: any = await cartApi.getCartItems(currentUserId.value, currentUnitId.value, currentProductId.value? currentProductId.value : '')
if (res?.code === 200) {
cartItems.value = res.data || []
// 灏嗚喘鐗╄溅鏁版嵁杞崲涓鸿鍗曞浠舵牸寮�
@@ -969,7 +981,7 @@
// 澶勭悊鏁伴噺鍙樺寲
const handleQuantityChange = async (pricingId: number, quantity: number) => {
try {
- await updateCartItem(pricingId, quantity, 1) // 鏆傛椂浼犻�掗粯璁uration涓�1
+ await updateCartItem(pricingId, quantity, null) // 鏆傛椂浼犻�掗粯璁uration涓�1
} catch (error) {
console.error('鏇存柊鏁伴噺澶辫触:', error)
}
@@ -979,7 +991,7 @@
const handleDurationChange = async (pricingId: number, duration: number) => {
try {
// 杩欓噷鍙兘闇�瑕佹牴鎹疄闄呮帴鍙ｈ皟鏁达紝浼犻�抎uration鍙傛暟
- await updateCartItem(pricingId, 1, duration) // 鏆傛椂浼犻�掗粯璁uantity涓�1
+ await updateCartItem(pricingId, null, duration) // 鏆傛椂浼犻�掗粯璁uantity涓�1
} catch (error) {
console.error('鏇存柊骞撮檺澶辫触:', error)
}
@@ -993,7 +1005,9 @@
PRIVATE_INCREMENT: '绉佹湁澧為噺鍖�',
PUBLIC_INCREMENT: '鍏湁澧為噺鍖�',
OTA: 'OTA鏈嶅姟',
- CLOUD: '浜戞湇鍔�'
+ CLOUD: '浜戞湇鍔�',
+ RESOURCE_PACKAGE: '璧勬簮鍖�',
+ PERSONAL: '涓汉'
}
return map[salesForm] || salesForm
}
@@ -1069,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 }> = {}
@@ -1090,12 +1122,38 @@
</script>
<style scoped lang="scss">
+.default-main {
+ padding: 20px;
+ background-color: #f5f5f5;
+ min-height: 100vh;
+ position: relative;
+ z-index: 1;
+}
+
+// 鍏ㄥ眬琛ㄥご鏂囧瓧澶у皬璋冩暣
+:deep(.el-table__header) {
+ th {
+ .cell {
+ font-size: 14px !important;
+ font-weight: 700;
+ }
+ }
+}
+
+.search-card {
+ margin-bottom: 20px;
+}
+
+.mt15 {
+ margin-top: 15px;
+}
+
.price-viewer-container {
.pricing-table-container {
- .pricing-tabs {
- :deep(.el-tabs__header) {
- margin-bottom: 12px;
- }
+ .pricing-tabs {
+ :deep(.el-tabs__header) {
+ margin-bottom: 2px;
+ }
/* 灞呬腑 tabs 瀵艰埅 */
:deep(.el-tabs__nav-wrap) {
display: flex;
@@ -1105,95 +1163,185 @@
margin: 0 auto;
border: none !important;
}
- /* 鍗＄墖鍨� tabs 缇庡寲涓哄渾瑙掕兌鍥婃晥鏋� */
- :deep(.el-tabs--card > .el-tabs__header .el-tabs__nav) {
- border: none;
- }
- :deep(.el-tabs--card > .el-tabs__header .el-tabs__item) {
- border: none;
- }
- :deep(.el-tabs__item) {
- border-radius: 999px;
- padding: 8px 18px;
- margin: 0 6px;
- color: #606266;
- background: #f6f8fb;
- transition: all .2s ease;
- }
- :deep(.el-tabs__item:hover) {
- color: #3a7afe;
- background: #eff4ff;
- }
- :deep(.el-tabs__item.is-active) {
- font-weight: 600;
- color: #fff;
- background: #3a7afe;
- box-shadow: 0 6px 16px rgba(58, 122, 254, 0.25);
- }
+ /* 鏅�� tabs 鏍峰紡 */
+ :deep(.el-tabs--card > .el-tabs__header .el-tabs__nav) {
+ border: none;
+ border-radius: 0;
+ background: transparent;
+ box-shadow: none;
+ display: flex;
+ gap: 8px;
+ }
+ :deep(.el-tabs--card > .el-tabs__header .el-tabs__item) {
+ border: 1px solid #e4e7ed;
+ border-radius: 6px;
+ margin: 0;
+ padding: 14px 24px;
+ color: #606266;
+ background: #fff;
+ transition: all .2s ease;
+ font-size: 14px;
+ font-weight: 500;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+
+ &:hover {
+ border-color: #409eff;
+ box-shadow: 0 4px 8px rgba(64, 158, 255, 0.15);
+ }
+ }
+ :deep(.el-tabs__item:hover) {
+ color: #409eff;
+ background: #f5f7fa;
+ }
+ :deep(.el-tabs__item.is-active) {
+ font-weight: 600;
+ color: #409eff;
+ background: #ecf5ff;
+ border-color: #409eff;
+ box-shadow: 0 4px 12px rgba(64, 158, 255, 0.2);
+
+ &::after {
+ content: '';
+ position: absolute;
+ bottom: -1px;
+ left: 0;
+ right: 0;
+ height: 3px;
+ background: #409eff;
+ border-radius: 0 0 6px 6px;
+ }
+ }
}
- .pricing-table-wrapper {
- overflow-x: auto;
- background: #fff;
- border-radius: 12px;
- box-shadow: 0 6px 24px rgba(0, 0, 0, 0.06);
- padding: 8px;
+ .pricing-table-wrapper {
+ overflow-x: auto;
+ background: #fff;
+ border-radius: 8px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+ padding: 0;
+ border: 1px solid #e4e7ed;
+ margin-top: 2px;
- .pricing-table {
- width: 100%;
- border-collapse: separate;
- border-spacing: 0;
- background: #fff;
- border-radius: 10px;
-
- th, td {
- border-bottom: 1px solid #eef2f7;
- border-right: 1px solid #f3f5f7;
- padding: 12px 14px;
- text-align: center;
- vertical-align: middle;
- font-size: 14px;
- }
- tr th:first-child, td:first-child{
- font-weight: 700;
- color: #303133;
- }
-
- th {
- background: linear-gradient(180deg, #f7f9fc 0%, #eef2f7 100%);
- font-weight: 600;
- color: #303133;
- }
-
- .feature-column {
- width: 120px;
- background-color: #f5f7fa;
- }
-
- .sub-header {
- th {
- background-color: #f8fafc;
- font-weight: 500;
- font-size: 13px;
- color: #606266;
+ .pricing-table {
+ width: 100%;
+ border-collapse: collapse;
+ background: #fff;
+ border: 1px solid #e4e7ed;
+ border-radius: 8px;
+ overflow: visible;
+
+ // 缁熶竴鎵�鏈夊崟鍏冩牸鏍峰紡
+ th, td {
+ border-top: 1px solid #e4e7ed !important;
+ border-bottom: 1px solid #e4e7ed !important;
+ border-left: none !important;
+ border-right: none !important;
+ padding: 8px 10px;
+ text-align: center;
+ vertical-align: middle;
+ font-size: 14px;
+ line-height: 1.5;
+ color: #303133;
+ background: #fff;
+ transition: all 0.2s ease;
}
- }
-
- .feature-label {
- background-color: #f5f7fa;
- font-weight: 500;
- color: #606266;
- text-align: center;
- }
-
- .feature-value {
- color: #303133;
- background: #fff;
- }
+
+ // 绗竴鍒楁牱寮�
+ tr th:first-child, td:first-child{
+ font-weight: 700;
+ color: #303133;
+ background: #f8fafc;
+ text-align: left;
+ padding-left: 16px;
+ }
+
+ // 琛ㄥご鏍峰紡
+ th {
+ background: linear-gradient(180deg, #f7f9fc 0%, #eef2f7 100%);
+ font-weight: 600;
+ color: #303133;
+ border-bottom: 2px solid #e4e7ed !important;
+ border-left: none !important;
+ border-right: none !important;
+ position: relative;
+ }
+
+ .feature-column {
+ width: 140px;
+ min-width: 140px;
+ }
+
+ // 瀛愯〃澶存牱寮忓凡绉婚櫎锛岄攢鍞舰寮忚鐜板湪鏄櫘閫氳
+
+ // 鍔熻兘鏍囩鏍峰紡
+ .feature-label {
+ font-weight: 600;
+ color: #303133;
+ text-align: left;
+ background: #f8fafc;
+ border-right: none !important;
+ }
+
+ // 鍔熻兘鍊兼牱寮�
+ .feature-value {
+ color: #303133;
+ background: #fff;
+ font-weight: 500;
+ }
- tbody tr:hover td {
- background: #fafcff;
- }
+ // 琛屾偓鍋滄晥鏋�
+ tbody tr:hover td {
+ background: #f0f7ff;
+ border-color: #b3d8ff !important;
+ }
+
+ // 鍋舵暟琛岃儗鏅�
+ tbody tr:nth-child(even) td {
+ background: #fafbfc;
+ }
+
+ tbody tr:nth-child(even):hover td {
+ background: #e6f3ff;
+ }
+
+ // 寮哄埗纭繚鏈�鍚庝竴琛屾湁瀹屾暣鐨勮竟妗�
+ tbody tr:last-child td {
+ border-bottom: 1px solid #e4e7ed !important;
+ }
+
+ // 寮哄埗纭繚鎵�鏈夊崟鍏冩牸閮芥湁瀹屾暣鐨勮竟妗�
+ tbody td {
+ border: 1px solid #e4e7ed !important;
+ }
+
+ // 鐗瑰埆澶勭悊琛ㄦ牸搴曢儴杈规
+ tbody tr:last-child {
+ border-bottom: 1px solid #e4e7ed !important;
+ }
+
+ // 浣跨敤鏇村叿浣撶殑閫夋嫨鍣ㄧ‘淇濊竟妗嗘樉绀�
+ .pricing-table tbody tr:last-child td {
+ border-bottom: 1px solid #e4e7ed !important;
+ }
+
+ // 纭繚琛ㄦ牸鏈韩鏈夊畬鏁寸殑杈规
+ .pricing-table {
+ border: 1px solid #e4e7ed !important;
+ }
+
+ // 鐗瑰埆澶勭悊濂椾欢閫夋嫨琛岀殑杈规
+ .pricing-table tbody tr:last-child .feature-label,
+ .pricing-table tbody tr:last-child .feature-value {
+ border-bottom: 1px solid #e4e7ed !important;
+ }
+
+ // 纭繚鎵�鏈夎閮芥湁瀹屾暣鐨勮竟妗�
+ .pricing-table tbody tr td {
+ border-top: 1px solid #e4e7ed !important;
+ border-bottom: 1px solid #e4e7ed !important;
+ border-left: none !important;
+ border-right: none !important;
+ }
.order-methods {
display: flex;
@@ -1211,49 +1359,64 @@
}
}
- .price-info {
- display: flex;
- flex-direction: column; /* 绔栨帓 */
- gap: 10px;
- align-items: center;
-
- .price-item {
- display: flex;
- align-items: flex-start;
- flex-direction: column;
- gap: 6px;
- padding: 10px 12px;
- border: 1px solid #f0f2f5;
- border-radius: 10px;
- background: #fff;
- box-shadow: inset 0 -1px 0 rgba(0,0,0,0.02);
- .price-lable-icon{
+ .price-info {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ align-items: center;
+
+ .price-item {
display: flex;
+ align-items: center;
gap: 6px;
- }
- .price-label {
- font-size: 12px;
- color: #909399;
- }
-
- .price-value {
- font-weight: 600;
- font-size: 18px;
- &.points {
- color: #e7900d;
- }
-
- &.currency {
- color: #10b981;
- }
-
- &.free {
- color: #67c23a;
- }
- }
- .price-icon.points { color: #e6a23c; }
- .price-icon.currency { color: #16a34a; }
- }
+ padding: 6px 10px;
+ border: 1px solid #f0f2f5;
+ border-radius: 6px;
+ background: #fff;
+ box-shadow: inset 0 -1px 0 rgba(0,0,0,0.02);
+
+ .price-lable-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ }
+
+ .price-label {
+ font-size: 12px;
+ color: #909399;
+ white-space: nowrap;
+ }
+
+ .price-value {
+ font-weight: 600;
+ font-size: 16px;
+ white-space: nowrap;
+
+ &.points {
+ color: #e7900d;
+ }
+
+ &.currency {
+ color: #10b981;
+ }
+
+ &.free {
+ color: #67c23a;
+ }
+ }
+
+ .price-icon.points {
+ color: #e6a23c;
+ font-size: 14px;
+ }
+
+ .price-icon.currency {
+ color: #16a34a;
+ font-size: 16px;
+ font-weight: 600;
+ font-family: "Microsoft YaHei", "PingFang SC", sans-serif;
+ }
+ }
.add-checkbox {
margin-top: 4px;
@@ -1280,7 +1443,11 @@
.no-price-data {
text-align: center;
- padding: 40px 0;
+ padding: 60px 0;
+ background: #fff;
+ border-radius: 8px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+ margin: 20px 0;
}
.price-value.agreement {
@@ -1307,14 +1474,23 @@
}
.order-header-card {
- :deep(.el-card__body) { padding: 10px; }
- .basic-grid { display:grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 30px 16px;}
- .grid-item { font-size: 16px; color:#606266; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
- .label { color:#606266; }
+ :deep(.el-card__body) { padding: 16px; }
+ .basic-grid { display:grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 20px 16px;}
+ .grid-item {
+ font-size: 14px;
+ color:#606266;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ line-height: 2;
+ }
+ .label { color:#606266; font-weight: 500; }
.value { color:#303133; }
.value.strong { font-weight: 600; }
- margin-bottom: 20px;
+ margin-bottom: 10px;
margin-top: 10px;
+ border-radius: 8px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
}
.points-info-card {
@@ -1333,6 +1509,8 @@
.selected-suites-card {
:deep(.el-card__body) { padding: 8px; }
+ border-radius: 8px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
}
.suite-table-wrapper { overflow-x: auto; width: 100%; }
@@ -1341,63 +1519,255 @@
border-collapse: collapse;
background: #fff;
table-layout: fixed;
+ border: 1px solid #e4e7ed;
+ border-radius: 8px;
+ overflow: hidden;
+ box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
}
.suite-table th,
.suite-table td {
border: 1px solid #e4e7ed;
- padding: 6px 8px;
+ padding: 8px 10px;
vertical-align: middle;
- font-size: 16px;
+ font-size: 14px;
+ line-height: 1.5;
+ color: #303133;
+ background: #fff;
+ transition: all 0.2s ease;
+ text-align: center;
}
-.suite-table thead th { background: #f0f2f5; color: #303133; font-weight: 600; font-size: 16px;}
-.table-toolbar { display:flex; justify-content: space-between; align-items:center; padding: 4px 0 8px; }
-.toolbar-left { display:flex; align-items:center; gap: 12px; width: 100%;justify-content: space-between;}
-.toolbar-right { display:flex; align-items:center; gap: 12px; }
-.summary-info { font-size: 14px; color: #606266; }
-.summary-count { color: #409eff; font-weight: 600; }
-.summary-points { color: #e6a23c; font-weight: 600; }
+.suite-table thead th {
+ background: linear-gradient(180deg, #f7f9fc 0%, #eef2f7 100%);
+ color: #303133;
+ font-weight: 600;
+ font-size: 14px;
+ border-bottom: 2px solid #e4e7ed;
+ position: relative;
+}
-.suite-table .th-left { text-align: center; width: 21%;}
-.suite-table .th-center { text-align: center; }
+.suite-table tbody tr:hover td {
+ background: #f0f7ff;
+ border-color: #b3d8ff;
+}
+
+.suite-table tbody tr:nth-child(even) td {
+ background: #fafbfc;
+}
+
+.suite-table tbody tr:nth-child(even):hover td {
+ background: #e6f3ff;
+}
+
+// 纭繚濂椾欢琛ㄦ牸鏈�鍚庝竴琛屾湁瀹屾暣鐨勮竟妗�
+.suite-table tbody tr:last-child td {
+ border-bottom: 1px solid #e4e7ed;
+}
+
+// 纭繚濂椾欢琛ㄦ牸鎵�鏈夊崟鍏冩牸閮芥湁瀹屾暣鐨勮竟妗�
+.suite-table tbody td {
+ border: 1px solid #e4e7ed;
+}
+
+.table-toolbar {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 12px 16px;
+ background: #f8fafc;
+ border-top: 1px solid #e4e7ed;
+ border-radius: 0 0 8px 8px;
+}
+.toolbar-left {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+ width: 100%;
+ justify-content: space-between;
+}
+.toolbar-right {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+}
+.summary-info {
+ font-size: 14px;
+ color: #606266;
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+.summary-count {
+ color: #409eff;
+ font-weight: 600;
+ background: #ecf5ff;
+ padding: 4px 8px;
+ border-radius: 4px;
+}
+.summary-points {
+ color: #e6a23c;
+ font-weight: 600;
+ background: #fdf6ec;
+ padding: 4px 8px;
+ border-radius: 4px;
+}
+
+.suite-table .th-detail { text-align: center; width: 25%;}
+.suite-table .th-spec { text-align: center; width: 25%;}
+.suite-table .th-price { text-align: center; width: 18%;}
+.suite-table .th-quantity { text-align: center; width: 12%;}
+.suite-table .th-years { text-align: center; width: 12%;}
+.suite-table .th-action { text-align: center; width: 8%;}
+
+// 璇︽儏銆佽鏍笺�佷环鏍煎垪鐨勫唴瀹瑰乏瀵归綈
+.suite-table .cell-detail,
+.suite-table .cell-spec,
+.suite-table .cell-price {
+ text-align: left !important;
+}
+
.cell-detail .detail-content { display: inline-flex; align-items: center; gap: 8px; }
.suite-name { font-weight: 600; color: #303133; }
-.cell-spec .spec-line { color: #606266; font-size: 16px; line-height: 20px; }
-.cell-spec-gg {display: flex; flex-direction: column; gap: 16px;
- .spec-line-gg{
- display: flex;
- gap: 30px;
+.cell-spec .spec-line {
+ color: #606266;
+ font-size: 13px;
+ line-height: 18px;
+ padding: 2px 0;
+
+ // 瑙勬牸鍒椾腑鏁板�肩殑缁熶竴棰滆壊
+ .spec-value {
+ color: #409eff;
+ font-weight: 500;
}
}
-.cell-price .price-inline { display: inline-flex; align-items: center; gap: 8px; white-space: nowrap; }
-.cell-price .price-tag.points { color: #E6A23C; font-weight: 600; }
-.cell-price .price-tag.currency { color: #F56C6C; font-weight: 600; }
-.cell-price .price-free { color: #67C23A; font-weight: 600; }
-.cell-price .price-agreement { color: #409EFF; }
+.cell-spec-gg {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+
+ .spec-line-gg{
+ display: flex;
+ gap: 24px;
+ }
+}
+.cell-price .price-inline {
+ display: inline-flex;
+ align-items: center;
+ gap: 8px;
+ white-space: nowrap;
+}
+.cell-price .price-tag.points {
+ color: #E6A23C;
+ font-weight: 600;
+ background: #fdf6ec;
+ padding: 4px 8px;
+ border-radius: 4px;
+}
+.cell-price .price-tag.currency {
+ color: #F56C6C;
+ font-weight: 600;
+ background: #fef0f0;
+ padding: 4px 8px;
+ border-radius: 4px;
+}
+.cell-price .price-free {
+ color: #67C23A;
+ font-weight: 600;
+ background: #f0f9ff;
+ padding: 4px 8px;
+ border-radius: 4px;
+}
+.cell-price .price-agreement {
+ color: #409EFF;
+ background: #ecf5ff;
+ padding: 4px 8px;
+ border-radius: 4px;
+}
.cell-summary .summary-item { font-size: 14px; color: #606266; line-height: 1.5; }
.order-status-panel {
- .steps-wrapper { padding: 6px 8px 0 8px; }
- .result-text { text-align: center; margin: 18px 0 12px; font-size: 18px; color: #303133; }
+ .steps-wrapper {
+ padding: 20px 16px;
+ background: #fff;
+ border-radius: 8px 8px 0 0;
+ border-bottom: 1px solid #e4e7ed;
+ }
+ .result-text {
+ text-align: center;
+ margin: 24px 0 20px;
+ font-size: 18px;
+ color: #303133;
+ font-weight: 500;
+ }
.order-info-card {
:deep(.el-card__body) { padding: 0; }
+ border-radius: 0 0 8px 8px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
}
.order-info-title {
- background: #f5f7fa;
- padding: 12px 16px;
+ background: linear-gradient(180deg, #f7f9fc 0%, #eef2f7 100%);
+ padding: 16px 20px;
font-weight: 600;
- border-bottom: 1px solid #ebeef5;
+ border-bottom: 1px solid #e4e7ed;
+ color: #303133;
}
.order-info-table {
width: 100%;
border-collapse: collapse;
+ border: 1px solid #e4e7ed;
+ border-radius: 8px;
+ overflow: hidden;
+
td {
- padding: 12px 16px;
- border-bottom: 1px solid #ebeef5;
+ padding: 10px 12px;
+ border-bottom: 1px solid #e4e7ed;
+ border-right: 1px solid #e4e7ed;
+ vertical-align: middle;
+ font-size: 14px;
+ line-height: 1.5;
+ color: #303133;
+ background: #fff;
+ transition: all 0.2s ease;
}
- .label { width: 120px; color: #606266; }
- .value { color: #303133; }
- .link { text-align: right; }
+
+ td:last-child {
+ border-right: none;
+ }
+
+ tr:last-child td {
+ border-bottom: none;
+ }
+
+ .label {
+ width: 120px;
+ color: #606266;
+ font-weight: 500;
+ background: #f8fafc;
+ text-align: center;
+ }
+
+ .value {
+ color: #303133;
+ background: #fff;
+ }
+
+ .link {
+ text-align: right;
+ background: #fff;
+ }
+
+ tr:hover td {
+ background: #f0f7ff;
+ border-color: #b3d8ff;
+ }
+
+ tr:nth-child(even) td {
+ background: #fafbfc;
+ }
+
+ tr:nth-child(even):hover td {
+ background: #e6f3ff;
+ }
}
}
@@ -1407,5 +1777,100 @@
.order-summary .summary-value.highlight{ color:#409eff; }
.order-summary .summary-value.total{ color:#e6a23c; }
.order-summary .summary-value.currency{ color:#f56c6c; }
-.footer { display: flex; flex-direction: row-reverse; margin-right: 50px; gap: 50px; margin-top: 20px;}
+.footer {
+ display: flex;
+ flex-direction: row-reverse;
+ margin-right: 50px;
+ gap: 20px;
+ margin-top: 10px;
+ padding: 10px 0;
+
+ .el-button {
+ border-radius: 6px;
+ font-weight: 500;
+ padding: 12px 24px;
+
+ &.el-button--primary {
+ background: linear-gradient(135deg, #409eff 0%, #3a7afe 100%);
+ border: none;
+ box-shadow: 0 4px 12px rgba(64, 158, 255, 0.3);
+
+ &:hover {
+ background: linear-gradient(135deg, #66b1ff 0%, #5a8cff 100%);
+ box-shadow: 0 6px 16px rgba(64, 158, 255, 0.4);
+ }
+ }
+
+ &:not(.el-button--primary) {
+ border: 1px solid #dcdfe6;
+ background: #fff;
+
+ &:hover {
+ border-color: #409eff;
+ color: #409eff;
+ }
+ }
+ }
+}
+
+// 纭繚椤甸潰鏁翠綋灞傜骇姝ｇ‘
+:deep(.el-card) {
+ position: relative;
+ z-index: 1;
+}
+
+// 淇鍙兘鐨勫叏灞�z-index鍐茬獊
+:deep(.el-table__body-wrapper) {
+ z-index: 1 !important;
+}
+
+:deep(.el-table__header-wrapper) {
+ z-index: 1 !important;
+}
+
+// 鏁伴噺鍜屽勾闄愯緭鍏ユ鏍峰紡
+.quantity-input,
+.duration-input {
+ width: 100px !important;
+ height: 35px !important;
+
+ :deep(.el-input__wrapper) {
+ padding: 0 8px !important;
+ }
+
+ :deep(.el-input__inner) {
+ width: 30px !important;
+ text-align: center !important;
+ min-width: 30px !important;
+ max-width: 30px !important;
+ }
+
+ :deep(.el-input-number__decrease),
+ :deep(.el-input-number__increase) {
+ width: 32px !important;
+ height: 32px !important;
+ }
+}
+
+// 浣跨敤鏇村己鐨勯�夋嫨鍣ㄧ‘淇濇牱寮忕敓鏁�
+.suite-table .quantity-input,
+.suite-table .duration-input {
+ :deep(.el-input__inner) {
+ width: 40px !important;
+ text-align: center !important;
+ min-width: 40px !important;
+ max-width: 40px !important;
+ box-sizing: border-box !important;
+ }
+}
+
+// 鍏ㄥ眬鏍峰紡瑕嗙洊锛岀‘淇濊緭鍏ユ鍐呴儴瀹藉害鐢熸晥
+:deep(.el-input-number.quantity-input .el-input__inner),
+:deep(.el-input-number.duration-input .el-input__inner) {
+ width: 40px !important;
+ text-align: center !important;
+ min-width: 40px !important;
+ max-width: 40px !important;
+ box-sizing: border-box !important;
+}
</style>
--
Gitblit v1.8.0