diff --git a/src/views/lb-business/assessment-apply/index.vue b/src/views/lb-business/assessment-apply/index.vue
index bdbe511..0baa5ff 100644
--- a/src/views/lb-business/assessment-apply/index.vue
+++ b/src/views/lb-business/assessment-apply/index.vue
@@ -302,8 +302,12 @@ export default {
{ label: '张宝凤老师', value: '张宝凤老师' },
{ label: '付韾蕊老师', value: '付韾蕊老师' },
{ label: '陈晓琴老师', value: '陈晓琴老师' },
- { label: '李军老师', value: '李军老师' },
- { label: '刘伟翔老师', value: '刘伟翔老师' }
+ { label: '李军A老师', value: '李军A老师' },
+ { label: '刘伟翔老师', value: '刘伟翔老师' },
+ { label: '李家让老师', value: '李家让老师' },
+ { label: '张伟老师', value: '张伟老师' },
+ { label: '林显竹老师', value: '林显竹老师' },
+ { label: '袁慧榕老师', value: '袁慧榕老师' }
],
assessmentTeacherOptions: [
{ label: '张健老师', value: '张健老师' },
diff --git a/src/views/lb-business/goods-package-predict/index.vue b/src/views/lb-business/goods-package-predict/index.vue
index 4f91152..12f7ea1 100644
--- a/src/views/lb-business/goods-package-predict/index.vue
+++ b/src/views/lb-business/goods-package-predict/index.vue
@@ -2,9 +2,6 @@
-
-
-
@@ -70,28 +67,30 @@
-
-
-
-
-
- {{ formatAmount(scope.row.price) }}
-
-
+
{{ formatAmount(scope.row.totalMoney) }}
-
-
+
+
+ {{ formatDayAmountList(getDay2Amounts(scope.row.totalMoney)) }}
+
+
+
+
+ {{ formatDayAmountList(getDay3Amounts(scope.row.totalMoney)) }}
+
+
{{ formatYesNo(scope.row.isShow) }}
+
{{ formatDateTime(scope.row.createdAt) }}
@@ -123,18 +122,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -226,7 +216,6 @@ import { getBusinessHeaders } from '@/utils/business-headers'
function emptyForm() {
return {
id: '',
- oldId: '',
userId: '',
title: '',
image: '',
@@ -284,7 +273,6 @@ export default {
queryParams: {
current: 1,
size: 10,
- oldId: '',
userId: '',
title: '',
sellerId: '',
@@ -357,7 +345,6 @@ export default {
const params = {
current: this.queryParams.current,
size: this.queryParams.size,
- oldId: parseOptionalLong(this.queryParams.oldId),
userId: parseOptionalLong(this.queryParams.userId),
title: this.queryParams.title || undefined,
sellerId: parseOptionalLong(this.queryParams.sellerId),
@@ -389,7 +376,6 @@ export default {
this.queryParams = {
current: 1,
size: 10,
- oldId: '',
userId: '',
title: '',
sellerId: '',
@@ -412,7 +398,6 @@ export default {
const pickLong = (k) => (row[k] !== undefined && row[k] !== null ? String(row[k]) : '')
return {
id: pickLong('id'),
- oldId: pickLong('oldId'),
userId: pickLong('userId'),
title: row.title || '',
image: row.image || '',
@@ -487,7 +472,6 @@ export default {
buildPayload() {
const payload = {
id: parseOptionalLong(this.form.id),
- oldId: parseOptionalLong(this.form.oldId),
userId: parseOptionalLong(this.form.userId),
title: this.form.title || undefined,
image: this.form.image || undefined,
@@ -514,6 +498,26 @@ export default {
const n = Number(val)
return Number.isNaN(n) ? String(val) : n.toFixed(2)
},
+ computeDayAmounts(baseAmount) {
+ const base = Number(baseAmount)
+ if (!Number.isFinite(base)) return []
+ const value = base * 1.02
+ if (value > 40000) {
+ const half = value / 2
+ return [half, half]
+ }
+ return [value]
+ },
+ getDay2Amounts(totalMoney) {
+ return this.computeDayAmounts(totalMoney)
+ },
+ getDay3Amounts(totalMoney) {
+ return this.getDay2Amounts(totalMoney).flatMap((amount) => this.computeDayAmounts(amount))
+ },
+ formatDayAmountList(amounts) {
+ if (!amounts || !amounts.length) return '-'
+ return amounts.map((amount) => this.formatAmount(amount)).join('\n')
+ },
formatYesNo(value) {
if (value === 1) return '是'
if (value === 0) return '否'
@@ -546,6 +550,11 @@ export default {
}
.table-container {
+ .day-amount-cell {
+ white-space: pre-line;
+ line-height: 1.5;
+ }
+
.el-pagination {
margin-top: 20px;
text-align: right;
diff --git a/src/views/lb-business/order-manage/index.vue b/src/views/lb-business/order-manage/index.vue
index 33f2706..b360daf 100644
--- a/src/views/lb-business/order-manage/index.vue
+++ b/src/views/lb-business/order-manage/index.vue
@@ -695,9 +695,17 @@ export default {
this.syncForm.buyTimeRange = normalized
}
},
+ getTodayBuyTimeRange() {
+ const date = new Date()
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ const dateStr = `${year}-${month}-${day}`
+ return [`${dateStr} 00:00:00`, `${dateStr} 23:59:59`]
+ },
openSyncDialog() {
this.syncForm = {
- buyTimeRange: null,
+ buyTimeRange: this.getTodayBuyTimeRange(),
isResell: undefined
}
this.syncDialogVisible = true