-
-
+
+
+
+
我的钱包
-
-
钱包绑定
-
我的店铺
-
商品列表
-
已购商品
-
已售出订单
-
已购买订单列表
-
-
充值记录
-
提现记录
+ >{{ item.label }}
@@ -92,6 +59,26 @@ export default {
return {
activeIndex: '1',
userEmail: '',
+ // 导航分组：buyer(买家) / seller(卖家)；默认卖家
+ activeRole: 'seller',
+ // 买家侧导航
+ buyerLinks: [
+ { label: '我的钱包', to: '/account/wallet' },
+ { label: '已购商品', to: '/account/purchased' },
+ { label: '订单列表', to: '/account/orders' },
+ // { label: '充值记录', to: '/account/rechargeRecord' },
+ // { label: '提现记录', to: '/account/withdrawalHistory' },
+ { label: '资金流水', to: '/account/funds-flow' },
+ ],
+ // 卖家侧导航
+ sellerLinks: [
+ // { label: '我的钱包', to: '/account/wallet' },
+ { label: '我的店铺', to: '/account/shops' },
+ { label: '商品列表', to: '/account/products' },
+ { label: '已售出订单', to: '/account/seller-orders' },
+ { label: '收款记录', to: '/account/receipt-record' },
+
+ ],
}
},
computed: {
@@ -103,6 +90,13 @@ export default {
const email = (this.userEmail || '').trim()
return email ? email[0].toUpperCase() : '?'
},
+ /**
+ * 根据当前分组返回展示的导航链接
+ * @returns {{label:string,to:string}[]}
+ */
+ displayedLinks() {
+ return this.activeRole === 'buyer' ? this.buyerLinks : this.sellerLinks
+ },
},
mounted() {
const getVal = (key) => {
@@ -112,6 +106,23 @@ export default {
}
const val = getVal('userName') || getVal('userEmail') || ''
this.userEmail = typeof val === 'string' ? val : String(val)
+ // 恢复上次选择的导航分组（如无则默认 seller）
+ const savedRole = getVal('accountActiveRole')
+ if (savedRole === 'buyer' || savedRole === 'seller') {
+ this.activeRole = savedRole
+ }
+ },
+ methods: {
+ /**
+ * 点击切换导航分组
+ * @param {('buyer'|'seller')} role 要切换到的分组
+ * @returns {void}
+ */
+ handleClickRole(role) {
+ if (role !== 'buyer' && role !== 'seller') return
+ this.activeRole = role
+ try { localStorage.setItem('accountActiveRole', JSON.stringify(role)) } catch (e) {}
+ },
},
};
@@ -156,6 +167,30 @@ export default {
flex-direction: column;
gap: 8px;
}
+/* 分组切换按钮样式 */
+.user-role {
+ display: flex;
+ gap: 8px;
+ margin-bottom: 8px;
+}
+.role-button {
+ appearance: none;
+ background: #f6f8fa;
+ border: 1px solid #e5e7eb;
+ border-radius: 6px;
+ padding: 6px 10px;
+ color: #2c3e50;
+ cursor: pointer;
+}
+.role-button.active {
+ background: #42b983;
+ border-color: #42b983;
+ color: #fff;
+}
+.role-button:focus {
+ outline: 2px solid #42b98333;
+ outline-offset: 2px;
+}
/* 用户信息卡片：置于导航最前，展示邮箱与首字母头像 */
.user-info-card {
display: flex;
diff --git a/power_leasing/src/views/account/myShops.vue b/power_leasing/src/views/account/myShops.vue
index cbbaae2..a8ff22b 100644
--- a/power_leasing/src/views/account/myShops.vue
+++ b/power_leasing/src/views/account/myShops.vue
@@ -2,6 +2,30 @@
我的店铺
+
+
+
+
+
层级结构：店铺 → 商品 → 出售机器
+
+ -
+ 店铺（唯一）：每个用户在平台仅能创建一个店铺。创建成功后，
+ 请在本页点击 钱包绑定，配置自己的收款地址（支持不同链与币种）。
+
+ -
+ 商品：完成钱包绑定后，即可在“我的店铺”页面 创建商品。
+ 商品可按 币种 进行分类管理，创建的商品会在商城对买家展示。
+ 商品可理解为“不同算法、币种的机器集合分类”。
+
+ -
+ 出售机器：创建商品后，请进入 商品列表 为该商品 添加出售机器明细。
+ 必须添加出售机器，否则买家无法下单。买家点击某个商品后，会看到该商品下的机器明细并进行选购。
+
+
+
提示：建议先创建店铺 → 完成钱包绑定 → 创建商品 → 添加出售机器的顺序，避免漏配导致无法收款或无法下单。
+
+
@@ -26,26 +50,48 @@
删除店铺
新增商品
+ 钱包绑定
-
+
+
修改
@@ -54,7 +100,7 @@
- -->
+
@@ -84,18 +130,35 @@
保存
-
+
-
-
-
-
+
+
+
-
-
+
+
+
+
+
![]()
+
{{ item.label }}
+
@@ -105,29 +168,8 @@
-
-
-
-
-
-
![]()
-
- {{ item.label }}
-
+
+
+
+
-
-
-
-
- kw/h
-
-
-
-
- USDT
-
+
+
-
+
+
+
+
+ 天
+
+
+
+
+ kw/h
+
+
+
+
+
+ 统一售价
+
+
+ 卖家最终收款金额 = 机器售价 × 波动率
+ 波动率规则：
+ 1）0% - 5%（包含5%）：波动率 = 1（按售价结算）
+ 2）5%以上：波动率 = 实际算力 / 理论算力，且不会超过 1,即最终结算时不会超过机器售价
+
+
+
+
+
+ USDT
+
+
+
@@ -69,17 +108,77 @@
已选择机器
-
-
-
+
+
+
+
+
+
+
+ 实际算力(MH/S)
+
+
+
+
+ kw/h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 卖家最终收款金额 = 机器售价 × 波动率
+ 波动率规则：
+ 1）0% - 5%（包含5%）：波动率 = 1（按售价结算）
+ 2）5%以上：波动率 = 实际算力 / 理论算力，且不会超过 1,即最终结算时不会超过机器售价
+
+
+
+ 售价(USDT)
+
+
USDT
@@ -87,7 +186,21 @@
-
+
+
+
+ 天
+
+
+
+
-
+
{
+ const raw = String(value ?? '')
+ if (!raw) { callback(new Error('请填写最大租赁天数')); return }
+ if (!/^\d{1,3}$/.test(raw)) { callback(new Error('仅允许整数，范围 1-365')); return }
+ const n = Number(raw)
+ if (!Number.isInteger(n) || n < 1 || n > 365) { callback(new Error('范围需在 1-365 天')); return }
+ callback()
+ },
+ trigger: 'blur'
+ }
+ ]
},
miners: [
// {
@@ -293,6 +422,10 @@ export default {
saving: false,
lastCostBaseline: 0,
lastTypeBaseline: '',
+ lastMaxLeaseDaysBaseline: 0,
+ lastPowerDissipationBaseline: 0,
+ lastTheoryPowerBaseline: 0,
+ lastUnitBaseline: 'TH/S',
params:{
cost:353400,
powerDissipation:0.01,
@@ -364,6 +497,13 @@ export default {
decPart = decPart.slice(0, 4)
}
v = decPart.length ? `${intPart}.${decPart}` : (endsWithDot ? `${intPart}.` : intPart)
+ } else if (key === 'maxLeaseDays') {
+ // 最大租赁天数：仅整数，范围 1-365，输入阶段限制为最多3位数字
+ v = v.replace(/\D/g, '')
+ if (v.length > 3) v = v.slice(0, 3)
+ this.form[key] = v
+ this.syncMaxLeaseDaysToRows()
+ return
} else {
// 其他：最多6位小数（保持原有逻辑）
if (firstDot !== -1) {
@@ -427,14 +567,164 @@ export default {
user: m.user,
coin: m.coin,
miner: m.miner,
+ realPower: m.realPower,
price: existed ? existed.price : this.form.cost,
+ powerDissipation: existed && existed.powerDissipation !== undefined ? existed.powerDissipation : this.form.powerDissipation,
+ theoryPower: existed && existed.theoryPower !== undefined ? existed.theoryPower : this.form.theoryPower,
+ unit: existed && existed.unit ? existed.unit : this.form.unit,
type: existed ? existed.type : this.form.type,
- state: existed ? existed.state : 0 // 默认上架
+ state: existed ? existed.state : 0, // 默认上架
+ maxLeaseDays: existed && existed.maxLeaseDays !== undefined ? existed.maxLeaseDays : this.form.maxLeaseDays
})
}
})
this.selectedMachineRows = nextRows
},
+ /**
+ * 同步顶部功耗到行（行未自定义或无效则跟随）
+ */
+ syncPowerDissipationToRows() {
+ const newVal = Number(this.form.powerDissipation)
+ if (!Number.isFinite(newVal)) return
+ const oldBaseline = this.lastPowerDissipationBaseline
+ this.selectedMachineRows = this.selectedMachineRows.map(row => {
+ const rowNum = Number(row.powerDissipation)
+ if (!Number.isFinite(rowNum) || rowNum === oldBaseline) {
+ return { ...row, powerDissipation: newVal }
+ }
+ return row
+ })
+ this.lastPowerDissipationBaseline = newVal
+ },
+ /**
+ * 同步顶部理论算力到行（行未自定义或无效则跟随）
+ */
+ syncTheoryPowerToRows() {
+ const newVal = Number(this.form.theoryPower)
+ if (!Number.isFinite(newVal)) return
+ const oldBaseline = this.lastTheoryPowerBaseline
+ this.selectedMachineRows = this.selectedMachineRows.map(row => {
+ const rowNum = Number(row.theoryPower)
+ if (!Number.isFinite(rowNum) || rowNum === oldBaseline) {
+ return { ...row, theoryPower: newVal }
+ }
+ return row
+ })
+ this.lastTheoryPowerBaseline = newVal
+ },
+ /**
+ * 同步顶部单位到行（行未自定义或等于旧基线时跟随）
+ */
+ syncUnitToRows() {
+ const newUnit = this.form.unit
+ if (!newUnit) return
+ const oldBaseline = this.lastUnitBaseline
+ this.selectedMachineRows = this.selectedMachineRows.map(row => {
+ const rowUnit = row.unit
+ if (!rowUnit || rowUnit === oldBaseline) {
+ return { ...row, unit: newUnit }
+ }
+ return row
+ })
+ this.lastUnitBaseline = newUnit
+ },
+ /**
+ * 行内功耗输入（限制：整数最多6位，小数最多4位）
+ */
+ handleRowPowerDissipationInput(index) {
+ let v = String(this.selectedMachineRows[index].powerDissipation ?? '')
+ v = v.replace(/[^0-9.]/g, '')
+ const firstDot = v.indexOf('.')
+ if (firstDot !== -1) {
+ v = v.slice(0, firstDot + 1) + v.slice(firstDot + 1).replace(/\./g, '')
+ }
+ const parts = v.split('.')
+ let intPart = parts[0] || ''
+ let decPart = parts[1] || ''
+ if (intPart.length > 6) intPart = intPart.slice(0, 6)
+ if (decPart) decPart = decPart.slice(0, 4)
+ v = decPart.length ? `${intPart}.${decPart}` : intPart
+ this.$set(this.selectedMachineRows[index], 'powerDissipation', v)
+ },
+ /**
+ * 行内功耗校验
+ */
+ handleRowPowerDissipationBlur(index) {
+ const raw = String(this.selectedMachineRows[index].powerDissipation ?? '')
+ const pattern = /^\d{1,6}(\.\d{1,4})?$/
+ if (!raw || Number(raw) <= 0 || !pattern.test(raw)) {
+ this.$message.warning('功耗需大于0，整数最多6位，小数最多4位')
+ this.$set(this.selectedMachineRows[index], 'powerDissipation', '')
+ }
+ },
+ /**
+ * 行内理论算力输入（限制：整数最多6位，小数最多4位）
+ */
+ handleRowTheoryPowerInput(index) {
+ let v = String(this.selectedMachineRows[index].theoryPower ?? '')
+ v = v.replace(/[^0-9.]/g, '')
+ const firstDot = v.indexOf('.')
+ if (firstDot !== -1) {
+ v = v.slice(0, firstDot + 1) + v.slice(firstDot + 1).replace(/\./g, '')
+ }
+ const parts = v.split('.')
+ let intPart = parts[0] || ''
+ let decPart = parts[1] || ''
+ if (intPart.length > 6) intPart = intPart.slice(0, 6)
+ if (decPart) decPart = decPart.slice(0, 4)
+ v = decPart.length ? `${intPart}.${decPart}` : intPart
+ this.$set(this.selectedMachineRows[index], 'theoryPower', v)
+ },
+ /**
+ * 行内理论算力校验
+ */
+ handleRowTheoryPowerBlur(index) {
+ const raw = String(this.selectedMachineRows[index].theoryPower ?? '')
+ const pattern = /^\d{1,6}(\.\d{1,4})?$/
+ if (!raw || Number(raw) <= 0 || !pattern.test(raw)) {
+ this.$message.warning('理论算力需大于0，整数最多6位，小数最多4位')
+ this.$set(this.selectedMachineRows[index], 'theoryPower', '')
+ }
+ },
+ /**
+ * 行内单位变更
+ */
+ handleRowUnitChange(index, value) {
+ this.$set(this.selectedMachineRows[index], 'unit', value)
+ },
+ syncMaxLeaseDaysToRows() {
+ const raw = this.form.maxLeaseDays
+ const n = Number(raw)
+ if (!Number.isInteger(n)) return
+ const oldBaseline = this.lastMaxLeaseDaysBaseline
+ this.selectedMachineRows = this.selectedMachineRows.map(row => {
+ const rowNum = Number(row.maxLeaseDays)
+ if (!Number.isInteger(rowNum) || rowNum === oldBaseline) {
+ return { ...row, maxLeaseDays: n }
+ }
+ return row
+ })
+ this.lastMaxLeaseDaysBaseline = n
+ },
+ handleRowMaxLeaseDaysInput(index) {
+ let v = String(this.selectedMachineRows[index].maxLeaseDays ?? '')
+ v = v.replace(/\D/g, '')
+ if (v.length > 3) v = v.slice(0, 3)
+ this.$set(this.selectedMachineRows[index], 'maxLeaseDays', v)
+ },
+ handleRowMaxLeaseDaysBlur(index) {
+ const raw = String(this.selectedMachineRows[index].maxLeaseDays ?? '')
+ if (!/^\d{1,3}$/.test(raw)) {
+ this.$message.warning('最大租赁天数需为 1-365 的整数')
+ this.$set(this.selectedMachineRows[index], 'maxLeaseDays', '')
+ return
+ }
+ const n = Number(raw)
+ if (!Number.isInteger(n) || n < 1 || n > 365) {
+ this.$message.warning('最大租赁天数需为 1-365 的整数')
+ this.$set(this.selectedMachineRows[index], 'maxLeaseDays', '')
+ }
+ },
handleRowPriceInput(index) {
// 价格输入：整数最多12位，小数最多2位；允许尾随小数点
let v = String(this.selectedMachineRows[index].price ?? '')
@@ -537,7 +827,7 @@ export default {
console.log('机器列表数据:', this.machineOptions)
} catch (e) {
console.error('获取机器列表失败', e)
- this.$message.error('获取机器列表失败，请重试')
+
} finally {
this.machinesLoading = false
}
@@ -584,6 +874,14 @@ export default {
this.$message.warning(`第${i + 1}行(机器:${label}) 价格必须大于0`)
return
}
+ // 校验：逐行最大租赁天数 1-365
+ const rawDays = String((row && row.maxLeaseDays) ?? '')
+ const n = Number(rawDays)
+ if (!/^\d{1,3}$/.test(rawDays) || !Number.isInteger(n) || n < 1 || n > 365) {
+ const label = (row && (row.miner || row.user)) || i + 1
+ this.$message.warning(`第${i + 1}行(机器:${label}) 最大租赁天数需为 1-365 的整数`)
+ return
+ }
}
// 通过所有预校验后，弹出确认框
this.confirmVisible = true
@@ -600,12 +898,17 @@ export default {
type: this.form.type,
unit: this.form.unit,
cost: this.form.cost,
+ maxLeaseDays: this.form.maxLeaseDays,
productMachineURDVos: this.selectedMachineRows.map(r => ({
miner: r.miner,
price: Number(r.price) || 0,
state: r.state || 0,
type: r.type || this.form.type,
- user: r.user
+ user: r.user,
+ maxLeaseDays: Number(r.maxLeaseDays) || Number(this.form.maxLeaseDays) || 0,
+ powerDissipation: Number(r.powerDissipation) || Number(this.form.powerDissipation) || 0,
+ theoryPower: Number(r.theoryPower) || Number(this.form.theoryPower) || 0,
+ unit: r.unit || this.form.unit
}))
}
@@ -616,9 +919,7 @@ export default {
this.$message.success('添加成功')
this.confirmVisible = false
this.$router.back()
- } else {
- this.$message.error(res?.msg || '添加失败')
- }
+ }
} catch (e) {
console.error('添加出售机器失败', e)
console.log('添加失败')
@@ -631,6 +932,10 @@ export default {
watch: {
'form.cost': function() { this.syncCostToRows() },
'form.type': function() { this.updateMachineType() },
+ 'form.maxLeaseDays': function() { this.syncMaxLeaseDaysToRows() },
+ 'form.powerDissipation': function() { this.syncPowerDissipationToRows() },
+ 'form.theoryPower': function() { this.syncTheoryPowerToRows() },
+ 'form.unit': function() { this.syncUnitToRows() },
selectedMachines() {
this.updateSelectedMachineRows()
}
@@ -642,6 +947,11 @@ export default {
.product-machine-add { padding: 8px; }
.header { display: flex; align-items: center; gap: 12px; margin-bottom: 8px; }
.title { margin: 0; font-size: 18px; font-weight: 600; }
+.notice-alert { margin-bottom: 12px; }
+.notice-alert :deep(.el-alert__content) { text-align: left; }
+.notice-alert :deep(.el-alert__title),
+.notice-alert :deep(.el-alert__description) { text-align: left; }
+.label-help { margin-left: 4px; color: #909399; cursor: help; }
.form-card { margin-bottom: 12px; }
.actions { text-align: right; }
@@ -649,11 +959,11 @@ export default {
.product-machine-add :deep(.el-form-item__content) {
justify-content: flex-start;
}
-.product-machine-add :deep(.el-input),
+/* .product-machine-add :deep(.el-input),
.product-machine-add :deep(.el-select),
.product-machine-add :deep(.el-textarea) {
width: 50%;
-}
+} */
.product-machine-add :deep(.el-input-group__append) {
background: #f5f7fa;
color: #606266;
diff --git a/power_leasing/src/views/account/productNew.vue b/power_leasing/src/views/account/productNew.vue
index 570eec7..a218beb 100644
--- a/power_leasing/src/views/account/productNew.vue
+++ b/power_leasing/src/views/account/productNew.vue
@@ -27,7 +27,7 @@
矿机
- 算力
+
@@ -274,7 +274,7 @@ export default {
type: 'success',
showClose: true
})
- this.$router.push('/account/shops')
+ this.$router.push('/account/products')
}else {
this.$message({
message: res && res.msg ? res.msg : '创建失败',
diff --git a/power_leasing/src/views/account/products.vue b/power_leasing/src/views/account/products.vue
index 8114d20..d1e2c2d 100644
--- a/power_leasing/src/views/account/products.vue
+++ b/power_leasing/src/views/account/products.vue
@@ -29,8 +29,8 @@
stripe
style="width: 100%"
>
-
-
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+ 订单号
+ {{ scope.row.orderId || '-' }}
+
+
+ 付款链
+ {{ formatChain(scope.row.fromChain) || '-' }}
+
+
+ 付款币种
+ {{ String((scope.row.fromSymbol || scope.row.coin) || '') .toUpperCase() }}
+
+
+ 付款地址
+
+ {{ scope.row.fromAddress || '-' }}
+ 复制
+
+
+
+
+
+
+
+
+
+