From 485226d9dcce8adee537c02fe37bb5a190f597aa Mon Sep 17 00:00:00 2001
From: yaoqin <497681109@qq.com>
Date: Fri, 28 Nov 2025 15:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E9=9C=80=E6=B1=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 power_leasing/src/api/machine.js              |   94 +-
 power_leasing/src/api/products.js             |   80 ++
 .../src/views/account/productMachineAdd.vue   |  285 +++-
 power_leasing/src/views/account/products.vue  | 1141 ++++++++++++++---
 .../src/views/productDetail/index.js          |  573 +++++++--
 .../src/views/productDetail/index.vue         |  381 ++----
 power_leasing/src/views/productList/index.js  |  146 +--
 power_leasing/src/views/productList/index.vue |  108 +-
 8 files changed, 2070 insertions(+), 738 deletions(-)

diff --git a/power_leasing/src/api/machine.js b/power_leasing/src/api/machine.js
index c613035..2c0a0ec 100644
--- a/power_leasing/src/api/machine.js
+++ b/power_leasing/src/api/machine.js
@@ -12,51 +12,73 @@ export function addSingleOrBatchMachine(data) {
 
 //根据矿机id 删除商品矿机
 export function deleteMachine(data) {
-    return request({
-      url: `/lease/product/machine/delete`,
-      method: 'post',
-      data
-    })
-  }
+  return request({
+    url: `/lease/product/machine/delete`,
+    method: 'post',
+    data
+  })
+}
 
 
-  //根据挖矿账户获取矿机列表
+//根据挖矿账户获取矿机列表
 export function getUserMachineList(data) {
-    return request({
-      url: `/lease/product/machine/getUserMachineList`,
-      method: 'post',
-      data
-    })
-  }
+  return request({
+    url: `/lease/product/machine/getUserMachineList`,
+    method: 'post',
+    data
+  })
+}
 
 
-  
-  //根据 登录账户 获取挖矿账户及挖矿币种集合
+
+//根据 登录账户 获取挖矿账户及挖矿币种集合
 export function getUserMinersList(data) {
-    return request({
-      url: `/lease/product/machine/getUserMinersList`,
-      method: 'post',
-      data
-    })
-  }
+  return request({
+    url: `/lease/product/machine/getUserMinersList`,
+    method: 'post',
+    data
+  })
+}
 
 
-    //编辑矿机 + 矿机上下架
+//编辑矿机 + 矿机上下架
 export function updateMachine(data) {
-    return request({
-      url: `/lease/product/machine/updateMachine`,
-      method: 'post',
-      data
-    })
-  }
+  return request({
+    url: `/lease/product/machine/updateMachine`,
+    method: 'post',
+    data
+  })
+}
 
 
-  
-    //获取矿机列表
+
+//获取矿机列表
 export function getMachineListForUpdate(data) {
-    return request({
-      url: `/lease/product/machine/getMachineListForUpdate`,
-      method: 'post',
-      data
-    })
-  }
\ No newline at end of file
+  return request({
+    url: `/lease/product/machine/getMachineListForUpdate`,
+    method: 'post',
+    data
+  })
+}
+
+
+//GPU下载客户端
+export function downloadClient() {
+  return request({
+    url: `/lease/user/downloadClient`,
+    method: 'get',
+
+  })
+}
+
+
+//卖家页面---新增ASIC矿机
+export function addAsicMachine(data) {
+  return request({
+    url: `/lease/v2/product/machine/addAsicMachine`,
+    method: 'post',
+    data
+  })
+}
+
+
diff --git a/power_leasing/src/api/products.js b/power_leasing/src/api/products.js
index e126562..4644e47 100644
--- a/power_leasing/src/api/products.js
+++ b/power_leasing/src/api/products.js
@@ -97,3 +97,83 @@ export function getPayTypes(data) {
 }
 
 
+// 卖家页面---矿机列表
+export function getShopMachineListForSeller(data) {
+  return request({
+    url: `/lease/v2/product/machine/getShopMachineListForSeller`,
+    method: 'post', 
+    data
+  })
+}
+
+
+// 更新设置GPU商品列表的信息
+export function updateGpuMachine(data) {
+  return request({
+    url: `/lease/v2/product/machine/updateGpuMachine`,
+    method: 'post', 
+    data
+  })
+}
+
+
+// 修改商品列表ASIC商品信息
+export function updateAsicMachine(data) {
+  return request({
+    url: `/lease/v2/product/machine/updateAsicMachine`,
+    method: 'post', 
+    data
+  })
+}
+
+
+
+// 删除ASIC 或者GPU
+export function deleteMachine(data) {
+  return request({
+    url: `/lease/v2/product/machine/deleteMachine`,
+    method: 'post', 
+    data
+  })
+}
+
+
+
+// 获取商场页面的店铺列表
+export function getShopList(data) {
+  return request({
+    url: `/lease/v2/product/machine/getShopList`,
+    method: 'post', 
+    data
+  })
+}
+
+
+// 获取店铺详情
+export function getShopMachineList(data) {
+  return request({
+    url: `/lease/v2/product/machine/getShopMachineList`,
+    method: 'post', 
+    data
+  })
+}
+
+
+
+// 获取店铺详情
+export function addGoodsV2(data) {
+  return request({
+    url: `/lease/v2/shopping/cart/addGoodsV2`,
+    method: 'post', 
+    data
+  })
+}
+
+
+
+
+
+
+
+
+
diff --git a/power_leasing/src/views/account/productMachineAdd.vue b/power_leasing/src/views/account/productMachineAdd.vue
index 986c89e..c13da85 100644
--- a/power_leasing/src/views/account/productMachineAdd.vue
+++ b/power_leasing/src/views/account/productMachineAdd.vue
@@ -28,6 +28,7 @@
             v-model="form.coinsInput"
             placeholder="例如：USDT, BTC, ETH"
             style="width: 50%;"
+            @input="handleCoinsInput"
           />
         </el-form-item>
         <el-form-item label="算法(多个用逗号隔开)" prop="algorithmsInput" :required="form.machineCategory === 'ASIC'">
@@ -35,13 +36,14 @@
             v-model="form.algorithmsInput"
             placeholder="例如：SHA-256, ETHASH"
             style="width: 50%;"
+            @input="handleAlgorithmsInput"
           />
         </el-form-item>
         <div style="text-align:left; color:#909399; font-size:12px; margin:-6px 0 10px 160px;">
           输入多个用逗号隔开
         </div>
 
-        <el-form-item label="矿机型号">
+        <el-form-item label="矿机型号" prop="type" :required="true">
           <el-input style="width: 50%;" v-model="form.type" placeholder="示例：龍珠" :maxlength="20" @input="handleTypeInput" />
         </el-form-item>
         <el-form-item label="理论算力" prop="theoryPower">
@@ -84,7 +86,11 @@
           </el-input>
         </el-form-item>
       
-        <el-form-item label="统一售价" prop="cost" :required="true">
+        <el-form-item
+          label="统一售价"
+          :prop="(payTypeDefs && payTypeDefs.length) ? 'costMap' : 'cost'"
+          :required="true"
+        >
           <span slot="label">统一售价</span>
           <!-- 若商品定义了多个结算币种，则按链-币种动态生成多个售价输入；否则回退为旧的 USDT 单价 -->
           <div v-if="payTypeDefs && payTypeDefs.length" class="cost-multi">
@@ -136,15 +142,33 @@
     <el-dialog
       title="请确认上架信息"
       :visible.sync="confirmVisible"
-      width="400px"
+      width="560px"
     >
-      <div>
-        <p>请仔细确认已选择机器列表、价格及相关参数定义。</p>
-        <p style="text-align: left;">机器上架后，一经售出，在机器出售期间不能修改价格及机器参数。</p>
+      <div style="text-align:left;line-height:1.9;">
+        <div>币种：<b>{{ confirmData.coin }}</b></div>
+        <div>算法：<b>{{ confirmData.algorithm }}</b></div>
+        <div>最大租赁天数：<b>{{ confirmData.maxLeaseDays || '-' }}</b></div>
+        <div>出售机器数量：<b>{{ confirmData.saleNumbers || '-' }}</b></div>
+        <div style="margin-top:8px;">售价：</div>
+        <el-table
+          :data="confirmData.priceList"
+          border
+          size="mini"
+          style="width:100%;"
+        >
+          <el-table-column prop="chain" label="链" width="120" />
+          <el-table-column prop="coin" label="币种" width="120" />
+          <el-table-column label="价格">
+            <template slot-scope="scope">
+              {{ scope.row.price }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <p style="color:#666;margin-top:12px;">请仔细确认以上参数无误后提交。</p>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="confirmVisible = false">取消</el-button>
-        <el-button type="primary" :loading="saving" @click="doSubmit">确认上架已选择机器</el-button>
+        <el-button type="primary" :loading="saving" @click="doSubmit">确认提交</el-button>
       </span>
     </el-dialog>
     <!-- GPU 引导弹窗 -->
@@ -171,8 +195,8 @@
 </template>
 
 <script>
-import { addSingleOrBatchMachine } from '../../api/machine'
-
+import { addSingleOrBatchMachine ,downloadClient,addAsicMachine} from '../../api/machine'
+import { getPayTypes } from '../../api/products'
 export default {
   name: 'AccountProductMachineAdd',
   data() {
@@ -197,14 +221,47 @@ export default {
         maxLeaseDays: ''
       },
       confirmVisible: false,
+      confirmData: {
+        coin: '',
+        algorithm: '',
+        maxLeaseDays: '',
+        saleNumbers: '',
+        priceList: []
+      },
       rules: {
         productName: [ { required: true, message: '商品名称不能为空', trigger: 'change' } ],
+        type: [
+          { required: true, message: '矿机型号不能为空', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              const s = String(value || '')
+              // 不允许全是空格
+              if (s && s.trim().length === 0) {
+                callback(new Error('矿机型号不能全是空格'))
+                return
+              }
+              callback()
+            },
+            trigger: 'blur'
+          }
+        ],
         coinsInput: [
           {
             validator: (rule, value, callback) => {
               if (String(this.form.machineCategory).toUpperCase() !== 'ASIC') { callback(); return }
               const s = String(value || '').trim()
               if (!s) { callback(new Error('请输入币种，多个用逗号隔开')); return }
+              // 禁止汉字，且仅允许英数字与逗号/空格/连字符
+              if (/[\u4e00-\u9fa5]/.test(s)) { callback(new Error('币种不允许输入汉字')); return }
+              // 逐项校验（英文、数字，长度1-10）
+              const tokens = s.split(/[,\s，、]+/).map(i => i.trim()).filter(Boolean)
+              const pattern = /^[A-Za-z0-9]{1,10}$/
+              for (let i = 0; i < tokens.length; i += 1) {
+                if (!pattern.test(tokens[i])) {
+                  callback(new Error(`币种“${tokens[i]}”格式非法，仅允许字母或数字`))
+                  return
+                }
+              }
               callback()
             },
             trigger: 'blur'
@@ -216,6 +273,16 @@ export default {
               if (String(this.form.machineCategory).toUpperCase() !== 'ASIC') { callback(); return }
               const s = String(value || '').trim()
               if (!s) { callback(new Error('请输入算法，多个用逗号隔开')); return }
+              if (/[\u4e00-\u9fa5]/.test(s)) { callback(new Error('算法不允许输入汉字')); return }
+              // 逐项校验（字母/数字/连字符，2-20）
+              const tokens = s.split(/[,\s，、]+/).map(i => i.trim()).filter(Boolean)
+              const pattern = /^[A-Za-z0-9-]{2,20}$/
+              for (let i = 0; i < tokens.length; i += 1) {
+                if (!pattern.test(tokens[i])) {
+                  callback(new Error(`算法“${tokens[i]}”格式非法，仅允许字母、数字或“-”`))
+                  return
+                }
+              }
               callback()
             },
             trigger: 'blur'
@@ -400,6 +467,8 @@ export default {
       clientDownloadUrl: process.env.VUE_APP_GPU_CLIENT_URL || '',
       /** 是否点击过下载客户端（用于控制“已启动客户端”按钮禁用态） */
       hasDownloadedClient: false,
+      /** 支持的支付方式定义（用于动态渲染统一售价输入组） */
+      payTypeDefs: [],
       params:{
         cost:353400,
         powerDissipation:0.01,
@@ -435,8 +504,88 @@ export default {
     if (this.rules && this.rules.cost) {
       this.$set(this.rules, 'cost', [{ validator: this.validateCost, trigger: 'blur' }])
     }
+    // 多币种价格专用校验
+    this.$set(this.rules, 'costMap', [{ validator: this.validateCostMap, trigger: 'blur' }])
+
+    this.getPayTypes()
   },
   methods: {
+    /** 实时过滤币种输入中的中文字符（仅保留英文/数字/分隔符） */
+    handleCoinsInput() {
+      let v = String(this.form.coinsInput || '')
+      // 去除中文
+      v = v.replace(/[\u4e00-\u9fa5]/g, '')
+      this.form.coinsInput = v
+    },
+    /** 实时过滤算法输入中的中文字符（仅保留英文/数字/连字符/分隔符） */
+    handleAlgorithmsInput() {
+      let v = String(this.form.algorithmsInput || '')
+      v = v.replace(/[\u4e00-\u9fa5]/g, '')
+      this.form.algorithmsInput = v
+    },
+    /** 将输入按中英文逗号、空格分割，去空，统一英文逗号连接；可选：统一大写 */
+    normalizeCsv(input, upper = true) {
+      const arr = String(input || '')
+        .split(/[,\s，、]+/)
+        .map(s => s.trim())
+        .filter(Boolean)
+      const list = upper ? arr.map(s => s.toUpperCase()) : arr
+      return list.join(',')
+    },
+    /** 从 payTypeDefs 与 costMap 生成价格列表 */
+    buildPriceList() {
+      const list = []
+      const defs = Array.isArray(this.payTypeDefs) ? this.payTypeDefs : []
+      defs.forEach(d => {
+        const key = d.key
+        const priceRaw = this.form.costMap ? this.form.costMap[key] : ''
+        const priceNum = Number(priceRaw)
+        // 允许为空/非数字则不加入
+        if (!Number.isFinite(priceNum) || priceNum <= 0) return
+        list.push({
+          chain: d.chain,
+          coin: d.coin,
+          price: priceNum
+        })
+      })
+      return list
+    },
+    async getPayTypes() {
+      try {
+        const res = await getPayTypes()
+        // 期望结构：{ code:200, data:[ { payChain, payCoin, payCoinImage } ] }
+        if (res && (res.code === 0 || res.code === 200)) {
+          const list = Array.isArray(res.data) ? res.data : []
+          const defs = []
+          const seen = new Set()
+          list.forEach(it => {
+            const chain = String(it && it.payChain ? it.payChain : '').toUpperCase()
+            const coin = String(it && it.payCoin ? it.payCoin : '').toUpperCase()
+            if (!chain && !coin) return
+            const key = [chain, coin].filter(Boolean).join('-')
+            if (seen.has(key)) return
+            seen.add(key)
+            defs.push({
+              chain,
+              coin,
+              key,
+              label: key,
+              image: it && it.payCoinImage ? String(it.payCoinImage) : ''
+            })
+          })
+          // 根据接口结果渲染“统一售价”输入组
+          this.payTypeDefs = defs
+          const nextCostMap = {}
+          this.payTypeDefs.forEach(d => {
+            // 保留已输入的数值；否则置空
+            nextCostMap[d.key] = (this.form.costMap && this.form.costMap[d.key]) || ''
+          })
+          this.form.costMap = nextCostMap
+        }
+      } catch (e) {
+        // 忽略错误，维持当前 payTypeDefs
+      }
+    },
     /**
      * ASIC 模式：出售机器数量输入，仅允许 0-9999 的整数
      */
@@ -479,24 +628,35 @@ export default {
      * 下载 GPU 客户端
      */
     handleDownloadClient() {
-      const url = (this.clientDownloadUrl || '').trim()
-      if (!url) {
-        this.$message.warning('暂无客户端下载地址，请联系管理员')
-        return
-      }
-      try {
-        window.open(url, '_blank')
-      } catch (e) {
-        this.$message.error('打开下载链接失败，请稍后重试')
-      }
-      // 点击下载后即可启用“已启动客户端”按钮
-      this.hasDownloadedClient = true
+      // 走后端接口下载客户端程序
+      downloadClient()
+        .then((res) => {
+          // 处理 blob 下载（兼容封装返回 data 或直接返回 Blob）
+          const data = (res && res.data) ? res.data : res
+          const blob = data instanceof Blob ? data : new Blob([data], { type: 'application/octet-stream' })
+          const url = window.URL.createObjectURL(blob)
+          const a = document.createElement('a')
+          a.style.display = 'none'
+          a.href = url
+          // 默认文件名（可由后端 Content-Disposition 提供，这里简单兜底）
+          a.download = 'gpu-client.zip'
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+          window.URL.revokeObjectURL(url)
+          this.$message.success('客户端下载已开始')
+          this.hasDownloadedClient = true
+        })
+        .catch(() => {
+          this.$message.error('下载失败，请稍后重试')
+        })
     },
     /**
      * GPU 客户端已启动：跳转至商品列表
      */
     handleGpuClientStarted() {
-      this.$router.push('/productList')
+      // 跳转到“个人中心-商品列表”页面
+      this.$router.push('/account/products')
     },
     /**
      * GPU 弹窗关闭：自动恢复为 ASIC
@@ -507,9 +667,9 @@ export default {
     },
     /** 统一售价校验：多结算币种时跳过，单价时按 USDT 校验 */
     validateCost(rule, value, callback) {
+      // 多支付方式：逐个校验 costMap
       if (Array.isArray(this.payTypeDefs) && this.payTypeDefs.length > 0) {
-        callback()
-        return
+        return this.validateCostMap(rule, value, callback)
       }
       const str = String(value || '')
       if (!str) { callback(new Error('请填写机器成本（USDT）')); return }
@@ -518,6 +678,25 @@ export default {
       if (Number(str) <= 0) { callback(new Error('成本必须大于 0')); return }
       callback()
     },
+    // 多支付方式下的价格校验：要求每个支付方式都需填写有效价格
+    validateCostMap(rule, value, callback) {
+      try {
+        const defs = Array.isArray(this.payTypeDefs) ? this.payTypeDefs : []
+        if (!defs.length) { callback(); return }
+        const pattern = /^\d{1,12}(\.\d{1,2})?$/
+        for (let i = 0; i < defs.length; i += 1) {
+          const d = defs[i]
+          const key = d.key
+          const v = this.form && this.form.costMap ? String(this.form.costMap[key] || '') : ''
+          if (!v) { callback(new Error(`请填写 ${d.label} 的价格`)); return }
+          if (!pattern.test(v)) { callback(new Error(`${d.label} 价格整数最多12位，小数最多2位`)); return }
+          if (Number(v) <= 0) { callback(new Error(`${d.label} 价格必须大于0`)); return }
+        }
+        callback()
+      } catch (e) {
+        callback(new Error('价格填写有误，请检查'))
+      }
+    },
     /** 解析路由参数中的支付方式，生成标准定义 */
     initPayTypesFromRoute() {
       this.payTypeDefs = []
@@ -895,10 +1074,10 @@ export default {
       } catch (e) {
         return
       }
-      if (!this.form.productId) {
-        this.$message.warning('缺少商品ID')
-        return
-      }
+      // if (!this.form.productId) {
+      //   this.$message.warning('缺少商品ID')
+      //   return
+      // }
       // 现在统一按出售数量提交（GPU 模式不在本页提交）
       {
         // ASIC：校验出售机器数量（允许 0-9999；为 0 则提示）
@@ -929,47 +1108,41 @@ export default {
         return
       }
       // 统一售价与最大租赁天数已在表单级校验中处理，无需逐机校验
-      // 通过所有预校验后，弹出确认框
+      // 组装确认数据并弹框
+      const coinStr = this.normalizeCsv(this.form.coinsInput || this.form.coin, true)
+      const algoStr = this.normalizeCsv(this.form.algorithmsInput, true)
+      this.confirmData = {
+        coin: coinStr || '-',
+        algorithm: algoStr || '-',
+        maxLeaseDays: this.form.maxLeaseDays,
+        saleNumbers: this.form.sellCount,
+        priceList: this.buildPriceList()
+      }
       this.confirmVisible = true
     }
     ,
     async doSubmit() {
-      const [user, coin] = ['','']
       this.saving = true
       try {
-        // 若是多结算币种，组装 priceList；否则沿用单价字段
-        const count = Number(this.form.sellCount)
-        const productMachineURDVos = Array.from({ length: count }).map(() => ({
-          price: this.payTypeDefs && this.payTypeDefs.length ? undefined : (Number(this.form.cost) || 0),
-          priceList: this.payTypeDefs && this.payTypeDefs.length ? this.payTypeDefs.map(d => ({
-            chain: d.chain,
-            coin: d.coin,
-            price: Number(this.form.costMap && this.form.costMap[d.key]) || 0
-          })) : undefined,
-          state: 0,
-          type: this.form.type,
+        // 统一售卖新增接口参数
+        const payload = {
+          // 逗号分隔（中英文逗号都兼容），统一为英文逗号并大写
+          coin: this.normalizeCsv(this.form.coinsInput || this.form.coin, true),
+          algorithm: this.normalizeCsv(this.form.algorithmsInput, true),
           maxLeaseDays: Number(this.form.maxLeaseDays) || 0,
+          name: this.form.type,
           powerDissipation: Number(this.form.powerDissipation) || 0,
           theoryPower: Number(this.form.theoryPower) || 0,
-          unit: this.form.unit
-        }))
-        const payload = {
-          productId: this.form.productId,
-          // 逗号分隔：后台若需要数组可在服务端拆分
-          coin: (this.form.coinsInput || this.form.coin || '').toString(),
-          algorithm: (this.form.algorithmsInput || '').toString(),
-          powerDissipation: this.form.powerDissipation,
-          theoryPower: this.form.theoryPower,
-          type: this.form.type,
           unit: this.form.unit,
-          cost: this.payTypeDefs && this.payTypeDefs.length ? Number(this.form.costMap && this.form.costMap[this.payTypeDefs[0].key]) || 0 : this.form.cost,
-          maxLeaseDays: this.form.maxLeaseDays,
-          productMachineURDVos
+          saleNumbers: Number(this.form.sellCount) || 0,
+          priceList: this.buildPriceList()
         }
+        // 过滤空价目
+        payload.priceList = (payload.priceList || []).filter(p => Number(p.price) > 0)
 
         console.log(payload,"请求参数")
 
-        const res = await addSingleOrBatchMachine(payload)
+        const res = await addAsicMachine(payload)
         if (res && (res.code === 0 || res.code === 200)) {
         
           this.$message({
@@ -979,7 +1152,7 @@ export default {
             type: 'success'
           })
           this.confirmVisible = false
-          this.$router.back()
+          this.$router.push('/account/products')
         } 
       } catch (e) {
         console.error('添加出售机器失败', e)
diff --git a/power_leasing/src/views/account/products.vue b/power_leasing/src/views/account/products.vue
index 200593d..d9b7f89 100644
--- a/power_leasing/src/views/account/products.vue
+++ b/power_leasing/src/views/account/products.vue
@@ -1,14 +1,25 @@
 <template>
-  <div class="account-products">
+  <div class="account-products" >
     <!-- 标题与操作栏 -->
     <div class="toolbar">
       <div class="left-area">
         <h2 class="page-title">商品列表</h2>
       </div>
       <div class="right-area">
+        <el-select
+          v-model="listParams.type"
+          placeholder="矿机种类"
+          size="small"
+          class="mr-12"
+          style="width: 140px"
+          @change="handleTypeChange"
+        >
+          <el-option :label="'ASIC'" :value="0" />
+          <el-option :label="'GPU'" :value="1" />
+        </el-select>
         <el-input
           v-model="searchKeyword"
-          placeholder="输入币种或算法关键字后回车/搜索"
+          :placeholder="searchPlaceholder"
           size="small"
           clearable
           class="mr-12"
@@ -21,69 +32,230 @@
       </div>
     </div>
 
-    <!-- 表格列表 -->
+    <!-- 全局支持结算方式展示 -->
+    <div class="paytypes-bar" v-if="payTypes && payTypes.length">
+      <span class="pt-label">支持结算方式：</span>
+      <div class="pt-icons">
+            <el-tooltip
+          v-for="(pt, idx) in payTypes"
+              :key="idx"
+          :content="formatPayTypeHead(pt)"
+              placement="top"
+              :open-delay="80"
+          
+            >
+          <img :src="getPayImage(pt)" :alt="formatPayTypeHead(pt)" class="paytype-icon" />
+            </el-tooltip>
+          </div>
+    </div>
+
+    <!-- 售价展示币种选择（影响 ASIC 表格“售价”列展示） -->
+    <div
+      v-if="payTypes && payTypes.length"
+      class="price-select-bar"
+      style="margin:8px 0 4px; display:flex; justify-content:flex-end; align-items:center;"
+    >
+      <span style="margin-right:8px;color:#606266;font-size: 14px;">筛选售价：</span>
+      <el-select
+        v-model="selectedPayKey"
+        size="small"
+        style="width: 220px"
+        placeholder="选择价格展示币种"
+        @change="handlePayTypeChange"
+      >
+        <template slot="prefix">
+          <img
+            v-if="getSelectedPayImage()"
+            :src="getSelectedPayImage()"
+            class="paytype-icon"
+             style="width:16px;height:16px;border-radius:3px;margin-right:6px;"
+          />
+        </template>
+        <el-option
+          v-for="(pt, idx) in payTypes"
+          :key="'pt-opt-top-' + idx"
+          :label="formatPayTypeHead(pt)"
+          :value="buildPayKey(pt)"
+        >
+          <span style="display:inline-flex;align-items:center;gap:6px;">
+            <img :src="getPayImage(pt)" class="paytype-icon" />
+            <span>{{ formatPayTypeHead(pt) }}</span>
+          </span>
+        </el-option>
+      </el-select>
+    </div>
+
+    <!-- 表格列表（ASIC） -->
     <el-table
-      :data="tableData"
+      :key="'asic-table'"
+      v-if="listParams.type === 0"
+      :data="shopMachineList || []"
       v-loading="loading"
       border
       stripe
       style="width: 100%"
     >
-      <!-- <el-table-column prop="id" label="ID" width="80" /> -->
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="coin" label="币种"  />
-      <el-table-column label="支持结算方式"  >
+      <!-- 矿机类型：type 0 ASIC / 1 GPU -->
+      <el-table-column label="矿机类型" width="100">
         <template #default="scope">
-          <div class="paytypes">
-            <el-tooltip
-              v-for="(pt, idx) in (scope.row.payTypes || [])"
-              :key="idx"
-              :content="formatPayType(pt)"
-              placement="top"
-              :open-delay="80"
+          <el-tag :type="scope.row.type == 0 ? 'warning' : 'success'">
+            {{ scope.row.type == 0 ? 'ASIC' : 'GPU' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- 币种（过长省略，hover 显示） -->
+      <el-table-column prop="coin" label="币种" min-width="100" show-overflow-tooltip />
+      <!-- 算法（过长省略，hover 显示） -->
+      <el-table-column prop="algorithm" label="算法" min-width="100" show-overflow-tooltip />
+      <!-- 矿机型号 -->
+      <el-table-column prop="name" label="矿机型号" />
+       <!-- 理论算力（附带单位） -->
+       <el-table-column label="理论算力">
+        <template #default="scope">
+          <span>{{ getTheoryText(scope.row) }}</span>
+        </template>
+      </el-table-column>
+      <!-- 功耗(kw/h) -->
+      <el-table-column label="功耗(kw/h)">
+        <template #default="scope">
+          <span>{{ getPowerDissText(scope.row) }}</span>
+        </template>
+      </el-table-column>
+      <!-- 该商品总机器数量 -->
+      <el-table-column prop="saleNumbers" label="总机器数量" />
+      <!-- 已售数量 -->
+      <el-table-column prop="saleOutNumbers" label="已售数量" />
+     
+      <!-- 最大租赁天数 -->
+      <el-table-column prop="maxLeaseDays" label="最大租赁天数" />
+      <!-- 售价（根据选择的结算方式展示对应价格） -->
+      <el-table-column>
+        <template slot="header">
+          <div style="display:flex;align-items:center;gap:8px;">
+            <span>售价</span>
+          </div>
+        </template>
+        <template slot-scope="scope">
+          <span class="price-strong">{{ getRowPriceText(scope.row) }}</span>
+        </template>
+      </el-table-column>
+      <!-- 状态：0 上架 1 下架 -->
+      <el-table-column label="状态" width="80">
+        <template #default="scope">
+          <el-tag :type="scope.row.state === 0 ? 'success' : 'info'">
+            {{ scope.row.state === 0 ? '上架' : '下架' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- 操作：去掉详情与添加出售机器 -->
+      <el-table-column label="操作" fixed="right" width="140">
+        <template #default="scope">
+          <el-button type="text" size="small" @click="handleEdit(scope.row)">修改</el-button>
+          <el-button type="text" size="small" style="color:#f56c6c" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 表格列表（GPU） -->
+    <el-table
+      :key="'gpu-table-' + String(listParams.type)"
+      v-else
+      :data="shopMachineList || []"
+      border
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column label="矿机类型" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.type == 1 ? 'success' : 'warning'">
+            {{ scope.row.type == 1 ? 'GPU' : 'ASIC' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="miner" label="矿机编号">
+        <template #default="scope">
+          <span>{{ scope.row.miner || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="显卡型号">
+        <template #default="scope">
+          <span>{{ scope.row.name || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" width="180">
+        <template #default="scope">
+          <div class="gpu-state">
+            <el-switch
+              :active-value="0"
+              :inactive-value="1"
+              :value="(updateMap[getRowId(scope.row)] && updateMap[getRowId(scope.row)].state) || 0"
+              @change="handleToggleState(scope.row, $event)"
+            />
+            <span
+              class="gpu-state-text"
+              :class="{ on: ((updateMap[getRowId(scope.row)] && updateMap[getRowId(scope.row)].state) === 0) }"
             >
-              <img :src="pt.image" :alt="formatPayType(pt)" class="paytype-icon" />
-            </el-tooltip>
+              {{ ((updateMap[getRowId(scope.row)] && updateMap[getRowId(scope.row)].state) === 0) ? '上架' : '下架' }}
+            </span>
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="算力" min-width="140">
+      <el-table-column label="售价" min-width="300">
         <template #default="scope">
-          <span>{{ scope.row.power }} {{ scope.row.unit }}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column prop="algorithm" label="算法" />
-      <!-- <el-table-column prop="electricityBill" label="电费" width="100" /> -->
-      <!-- <el-table-column prop="incomeRate" label="收益率" width="100" /> -->
-      <el-table-column prop="type" label="商品类型" >
-        <template #default="scope">
-          <el-tag :type="scope.row.type === 1 ? 'success' : 'warning'">
-            {{ scope.row.type === 1 ? '算力套餐' : '挖矿机器' }}
-          </el-tag>
+          <div class="gpu-price-row">
+            <div
+              v-for="(pt, idx) in payTypes"
+              :key="idx"
+              class="gpu-price-item"
+            >
+              <span class="gpu-price-label">{{ formatPayTypeHead(pt) }}</span>
+              <el-input
+                size="small"
+                class="gpu-price-input"
+                :value="getPriceValue(getRowId(scope.row), pt)"
+                placeholder="价格"
+                @input="handlePriceInput(scope.row, pt, $event)"
+                @blur="handlePriceBlur(scope.row, pt)"
+              />
+            </div>
+          </div>
         </template>
       </el-table-column>
-
-      <el-table-column prop="saleNumber" label="已售数量" />
-      <el-table-column prop="totalMachineNumber" label="该商品总机器数量"  />
-      <el-table-column prop="state" label="状态" >
+      <el-table-column label="最大租赁天数" width="160">
         <template #default="scope">
-          <el-tag :type="scope.row.state === 1 ? 'info' : 'success'">
-            {{ scope.row.state === 1 ? '下架' : '上架' }}
-          </el-tag>
+          <el-input
+            size="small"
+            :value="String((updateMap[getRowId(scope.row)] && updateMap[getRowId(scope.row)].maxLeaseDays) || '')"
+            placeholder="1-365"
+            style="width: 120px"
+            @input="handleMaxLeaseDaysInput(scope.row, $event)"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" width="220">
+      <!-- 操作 -->
+      <el-table-column label="操作" fixed="right" width="120">
         <template #default="scope">
-          <el-button type="text" size="small" @click="handleView(scope.row)">详情</el-button>
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">修改</el-button>
           <el-button type="text" size="small" style="color:#f56c6c" @click="handleDelete(scope.row)">删除</el-button>
-          <el-button type="text" size="small" @click="handleAddMachine(scope.row)">添加出售机器</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页 -->
-    <div class="pagination">
+    <div class="pagination" v-if="listParams.type === 0">
+      <el-pagination
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        :current-page.sync="pagination.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="pagination.pageSize"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <!-- GPU 操作 -->
+    <div v-else style="margin-top: 12px; display:flex; justify-content: space-between; align-items: center;">
+      <el-button type="primary" @click="handleUpdateGpu">更新商品信息</el-button>
       <el-pagination
         background
         layout="total, sizes, prev, pager, next, jumper"
@@ -96,31 +268,105 @@
       />
     </div>
 
-    <!-- 编辑弹窗 -->
-    <el-dialog :visible.sync="editDialog.visible"  :close-on-click-modal="false"  width="620px" :title="'编辑商品 - ' + ((editDialog.form && editDialog.form.name) ? editDialog.form.name : '')">
-      <el-form v-if="editDialog.form" :model="editDialog.form" label-width="100px" ref="editForm" class="edit-form">
-   
-        <el-form-item label="名称">
-          <el-input v-model="editDialog.form.name" maxlength="30" show-word-limit />
+    <!-- 编辑弹窗（ASIC 修改） -->
+    <el-dialog
+      :visible.sync="editDialog.visible"
+      :close-on-click-modal="false"
+      width="720px"
+      :title="'编辑商品 - ' + ((editDialog.form && editDialog.form.name) ? editDialog.form.name : '')"
+    >
+      <el-form
+        v-if="editDialog.form"
+        :model="editDialog.form"
+        label-width="120px"
+        ref="editForm"
+        class="edit-form"
+      >
+        <el-form-item label="矿机型号">
+          <el-input v-model.trim="editDialog.form.name" maxlength="60" />
+        </el-form-item>
+        <el-form-item label="币种（逗号隔开）">
+          <el-input
+            v-model.trim="editDialog.form.coin"
+            placeholder="例如：USDT,ETH"
+          />
+        </el-form-item>
+        <el-form-item label="算法（逗号隔开）">
+          <el-input
+            v-model.trim="editDialog.form.algorithm"
+            placeholder="例如：SHA256,ETHASH"
+          />
+        </el-form-item>
+        <el-form-item label="最大租赁天数">
+          <el-input
+            v-model="editDialog.form.maxLeaseDays"
+            placeholder="1-365"
+            @input="editDialog.form.maxLeaseDays = (String(editDialog.form.maxLeaseDays||'').replace(/[^\d]/g,''))"
+            style="width: 200px"
+          />
         </el-form-item>
-        <!-- <el-form-item label="图片路径">
-          <el-input v-model="editDialog.form.image" />
-        </el-form-item> -->
-        
-        
         <el-form-item label="状态" class="align-like-input">
           <el-radio-group v-model="editDialog.form.state">
             <el-radio :label="0">上架</el-radio>
             <el-radio :label="1">下架</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="描述">
-          <el-input type="textarea" :rows="4" v-model="editDialog.form.description" maxlength="100" show-word-limit />
+        <el-form-item label="功耗(kw/h)">
+          <el-input
+            v-model="editDialog.form.powerDissipation"
+            placeholder="功耗"
+            @input="editDialog.form.powerDissipation = (String(editDialog.form.powerDissipation||'').replace(/[^\\d.]/g,''))"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="理论算力">
+          <div style="display:flex; gap:12px; align-items:center;">
+            <el-input
+              v-model="editDialog.form.theoryPower"
+              placeholder="理论算力"
+              @input="editDialog.form.theoryPower = (String(editDialog.form.theoryPower||'').replace(/[^\d.]/g,''))"
+              style="width: 220px"
+            />
+            <el-select v-model="editDialog.form.unit" placeholder="单位" style="width: 120px">
+              <el-option label="H/S" value="H/S" />
+              <el-option label="KH/S" value="KH/S" />
+              <el-option label="MH/S" value="MH/S" />
+              <el-option label="GH/S" value="GH/S" />
+              <el-option label="TH/S" value="TH/S" />
+              <el-option label="PH/S" value="PH/S" />
+            </el-select>
+          </div>
+        </el-form-item>
+        <el-form-item label="出售数量(台)">
+          <el-input
+            v-model="editDialog.form.saleNumbers"
+            placeholder="整数"
+            @input="editDialog.form.saleNumbers = (String(editDialog.form.saleNumbers||'').replace(/[^\d]/g,''))"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="售价（多币种）">
+          <div class="gpu-price-row">
+            <div
+              v-for="(pl, idx) in editDialog.priceList"
+              :key="'ep-' + idx"
+              class="gpu-price-item"
+            >
+              <span class="gpu-price-label">{{ formatPayTypeHead(pl) }}</span>
+              <el-input
+                size="small"
+                class="gpu-price-input"
+                :value="pl.price"
+                placeholder="价格"
+                @input="handleEditPriceInput(idx, $event)"
+              />
+            </div>
+          </div>
         </el-form-item>
       </el-form>
       <template #footer>
         <el-button @click="editDialog.visible = false">取消</el-button>
-        <el-button type="primary" :loading="editDialog.saving" @click="handleSaveEdit">保存</el-button>
+        <el-button type="primary" :loading="editDialog.saving" @click="handleSaveEdit">确认修改</el-button>
       </template>
     </el-dialog>
   </div>
@@ -133,7 +379,10 @@
  * - 表格展示，通过 getProductList 获取数据
  * - 支持查看详情、修改、删除
  */
-import { getProductList, updateProduct, deleteProduct, getMachineInfo} from '../../api/products'
+import { updateProduct,deleteMachine, deleteProduct, getMachineInfo,getShopMachineListForSeller,getPayTypes, updateGpuMachine,updateAsicMachine} from '../../api/products'
+
+// 本页用户偏好存储键：记住矿机种类（ASIC/GPU）
+const MACHINE_TYPE_KEY = 'account_products_machine_type'
 
 export default {
   name: 'AccountProducts',
@@ -142,6 +391,10 @@ export default {
       loading: false,
       searchKeyword: '',
       tableData: [],
+  
+      payTypes: [],
+      selectedPayKey: '',
+      shopMachineList: [],
       pagination: {
         pageNum: 1,
         pageSize: 10,
@@ -152,17 +405,522 @@ export default {
         visible: false,
         saving: false,
         form: null,
+        priceList: []
       },
       total: 0,
       userEmail:"",
+      listParams:{
+        type: 0,  // 0: ASIC, 1: GPU（默认 ASIC）
+        pageNum: 1,
+        pageSize: 10,
+      
+      },
+      // GPU 编辑草稿：数组与映射
+      updateArr: [],
+      updateMap: {},
+      unitCoin: ''
 
     }
   },
   created() {
     this.initOptions()
+    // 读取上次选择（未选择则保持默认 ASIC=0）
+    try {
+      const saved = localStorage.getItem(MACHINE_TYPE_KEY)
+      const t = saved != null ? parseInt(saved, 10) : null
+      if (t === 0 || t === 1) {
+        this.listParams.type = t
+      }
+    } catch (e) {}
+    // 顺序请求，逻辑更简单：先列表，后支付方式
     this.fetchTableData()
+    this.getPayTypesList().then(() => {
+      if (!this.selectedPayKey && Array.isArray(this.payTypes) && this.payTypes.length) {
+        this.selectedPayKey = this.buildPayKey(this.payTypes[0])
+      }
+    })
+  },
+  watch: {
+    'listParams.type'(val) {
+      // 类型切换时清理旧数据，避免残留
+      this.shopMachineList = []
+      this.updateMap = {}
+      this.updateArr = []
+      this.ensureGpuDraft()
+    },
+    payTypes: {
+      handler() {
+        this.ensureGpuDraft()
+        this.computeUnitFromFirstRow()
+      },
+      deep: true
+    },
+    shopMachineList: {
+      handler() {
+        this.ensureGpuDraft()
+        this.computeUnitFromFirstRow()
+      },
+      deep: true
+    },
+    selectedPayKey() {
+      // 选择售价发生变化时，刷新单位：从首行价格推断
+      this.computeUnitFromFirstRow()
+    }
+  },
+  computed: {
+    /** 搜索框占位文案：GPU 与 ASIC 区分 */
+    searchPlaceholder() {
+      return this.listParams.type === 1 ? '输入显卡型号搜索' : '输入币种或算法关键字后回车/搜索'
+    },
+    /** 表头展示用的币种单位（优先从选择的结算方式解析） */
+    headerCoinSymbol() {
+      // 1) 优先从 selectedPayKey 直接解析
+      if (this.selectedPayKey) {
+        const parts = String(this.selectedPayKey).split('|')
+        const coin = (parts[1] || '').trim().toUpperCase()
+        if (coin) return coin
+      }
+      // 2) 其次从支付方式的第一项取
+      if (Array.isArray(this.payTypes) && this.payTypes.length) {
+        const first = this.payTypes[0] || {}
+        const coin = (first.payCoin || first.coin || '').toString().trim().toUpperCase()
+        if (coin) return coin
+      }
+      // 3) 最后从首行价格列表取
+      const rows = Array.isArray(this.shopMachineList) ? this.shopMachineList : []
+      if (rows.length) {
+        const list = Array.isArray(rows[0].priceList) ? rows[0].priceList : []
+        if (list.length) {
+          const first = list[0] || {}
+          const coin = (first.coin || first.payCoin || '').toString().trim().toUpperCase()
+          if (coin) return coin
+        }
+      }
+      return ''
+    }
   },
   methods: {
+    /** 从首行 priceList 推断表头单位（优先按 selectedPayKey 匹配） */
+    computeUnitFromFirstRow() {
+      try {
+        const rows = Array.isArray(this.shopMachineList) ? this.shopMachineList : []
+        if (!rows.length) { this.unitCoin = ''; return }
+        const first = rows[0] || {}
+        const list = Array.isArray(first.priceList) ? first.priceList : []
+        if (!list.length) { this.unitCoin = ''; return }
+        let selChain = '', selCoin = ''
+        if (this.selectedPayKey) {
+          const parts = String(this.selectedPayKey).split('|')
+          selChain = (parts[0] || '').trim().toUpperCase()
+          selCoin = (parts[1] || '').trim().toUpperCase()
+        }
+        let match = null
+        if (selChain || selCoin) {
+          match = list.find(p => {
+            const c1 = String(p.chain || p.payChain || '').trim().toUpperCase()
+            const c2 = String(p.coin || p.payCoin || '').trim().toUpperCase()
+            return (!selChain || c1 === selChain) && (!selCoin || c2 === selCoin)
+          }) || null
+        }
+        if (!match) match = list[0] || null
+        const coin = match ? (match.coin || match.payCoin || '') : ''
+        this.unitCoin = String(coin || '').trim().toUpperCase()
+      } catch (e) {
+        this.unitCoin = ''
+      }
+    },
+    /** 生成 payKey: CHAIN|COIN */
+    buildPayKey(pt) {
+      const chain = (pt && (pt.payChain || pt.chain) ? String(pt.payChain || pt.chain) : '').trim().toUpperCase()
+      const coin = (pt && (pt.payCoin || pt.coin) ? String(pt.payCoin || pt.coin) : '').trim().toUpperCase()
+      return [chain, coin].filter(Boolean).join('|')
+    },
+    /** 选择结算方式变化（无需额外处理，价格随 selectedPayKey 自动变化） */
+    handlePayTypeChange() {},
+    /** 通过 key 找到支付方式对象 */
+    getPayTypeByKey(key) {
+      try {
+        if (!key) return null
+        const parts = String(key).split('|')
+        const chain = (parts[0] || '').trim().toUpperCase()
+        const coin = (parts[1] || '').trim().toUpperCase()
+        return (this.payTypes || []).find(pt =>
+          String(pt.payChain || pt.chain || '').trim().toUpperCase() === chain &&
+          String(pt.payCoin || pt.coin || '').trim().toUpperCase() === coin
+        ) || null
+      } catch (e) {
+        return null
+      }
+    },
+    /** 当前选择的支付方式图标 */
+    getSelectedPayImage() {
+      const obj = this.getPayTypeByKey(this.selectedPayKey)
+      if (!obj) return ''
+      const img = obj.payCoinImage || obj.image || ''
+      return String(img || '').trim()
+    },
+    /** 当前选择的币种符号 */
+    getSelectedCoinSymbol() {
+      try {
+        const obj = this.getPayTypeByKey(this.selectedPayKey)
+        if (obj) {
+          const coin = obj.payCoin || obj.coin || ''
+          return String(coin || '').trim().toUpperCase()
+        }
+        // 兜底：直接从 selectedPayKey 解析
+        if (this.selectedPayKey) {
+          const parts = String(this.selectedPayKey).split('|')
+          const coin = (parts[1] || '').trim().toUpperCase()
+          if (coin) return coin
+        }
+        // 再兜底：默认取第一个支付方式
+        if (Array.isArray(this.payTypes) && this.payTypes.length) {
+          const first = this.payTypes[0]
+          const coin = first && (first.payCoin || first.coin)
+          return String(coin || '').trim().toUpperCase()
+        }
+        return ''
+      } catch (e) {
+        return ''
+      }
+    },
+    /** 根据当前选择的结算方式，获取行的对应价格 */
+    getRowPriceBySelected(row) {
+      try {
+        const list = Array.isArray(row && row.priceList) ? row.priceList : []
+        if (!list.length) return '-'
+        let chain = ''
+        let coin = ''
+        if (this.selectedPayKey) {
+          const parts = String(this.selectedPayKey).split('|')
+          chain = (parts[0] || '').toUpperCase()
+          coin = (parts[1] || '').toUpperCase()
+        }
+        // 若未选择，则默认用第一个
+        if (!chain && !coin) {
+          const first = list[0] || {}
+          const p = first && first.price != null ? String(first.price) : ''
+          return p || '-'
+        }
+        const hit = list.find(p => {
+          const c1 = String(p.chain || p.payChain || '').toUpperCase()
+          const c2 = String(p.coin || p.payCoin || '').toUpperCase()
+          return c1 === chain && c2 === coin
+        })
+        if (hit && hit.price != null) return String(hit.price)
+        return '-'
+      } catch (e) {
+        return '-'
+      }
+    },
+    /** 行内文案：价格 后跟 币种单位（来自行的 priceList；优先匹配已选结算方式，其次取首个） */
+    getRowPriceText(row) {
+      try {
+        const list = Array.isArray(row && row.priceList) ? row.priceList : []
+        if (!list.length) return '-'
+        let selChain = '', selCoin = ''
+        if (this.selectedPayKey) {
+          const parts = String(this.selectedPayKey).split('|')
+          selChain = (parts[0] || '').trim().toUpperCase()
+          selCoin = (parts[1] || '').trim().toUpperCase()
+        }
+        let item = null
+        if (selChain || selCoin) {
+          item = list.find(p => {
+            const c1 = String(p.chain || p.payChain || '').trim().toUpperCase()
+            const c2 = String(p.coin || p.payCoin || '').trim().toUpperCase()
+            return (!selChain || c1 === selChain) && (!selCoin || c2 === selCoin)
+          }) || null
+        }
+        if (!item) item = list[0] || null
+        if (!item) return '-'
+        const price = item.price != null ? String(item.price) : ''
+        const coin = (item.coin || item.payCoin || '').toString().trim().toUpperCase()
+        if (!price) return '-'
+        return coin ? `${price} ${coin}` : price
+      } catch (e) {
+        return '-'
+      }
+    },
+    /** 取 ASIC 行的首个价格文本 */
+    getFirstPriceText(row) {
+      try {
+        const list = Array.isArray(row && row.priceList) ? row.priceList : []
+        if (!list.length) return '-'
+        const first = list[0] || {}
+        const price = first.price != null ? first.price : (first.amount != null ? first.amount : '')
+        if (price === '' || price == null) return '-'
+        return String(price)
+      } catch (e) {
+        return '-'
+      }
+    },
+    /** 展示理论算力（带单位） */
+    getTheoryText(row) {
+      const val = row && row.theoryPower != null ? String(row.theoryPower) : ''
+      if (!val) return '-'
+      const unit = (row && row.unit ? String(row.unit) : '').trim().toUpperCase()
+      return unit ? `${val} ${unit}` : val
+    },
+    /** 展示功耗（kw/h） */
+    getPowerDissText(row) {
+      const val = row && row.powerDissipation != null ? String(row.powerDissipation) : ''
+      return val ? val : '-'
+    },
+    /** 统一取得行唯一ID（兼容多字段） */
+    getRowId(row) {
+      if (!row) return undefined
+      if (row.id != null) return row.id
+      if (row.productMachineId != null) return row.productMachineId
+      if (row.produceMachineId != null) return row.produceMachineId
+      if (row.machineId != null) return row.machineId
+      if (row.__key != null) return row.__key
+      return undefined
+    },
+    /** 提交 GPU 更新 */
+    async updateGpuMachineInfo(params) {
+      const res = await updateGpuMachine(params)
+      if (res && (res.code === 0 || res.code === 200)) {
+        this.$message.success('更新成功')
+        await this.fetchTableData()
+      }
+    },
+    async getPayTypesList() {
+      const res = await getPayTypes()
+      if (res && (res.code === 0 || res.code === 200)) {
+        const list = Array.isArray(res.data) ? res.data : []
+        this.payTypes = list
+        // 初始化默认选择（若未选择）
+        if (!this.selectedPayKey && this.payTypes.length) {
+          this.selectedPayKey = this.buildPayKey(this.payTypes[0])
+        }
+      }
+    },
+    //获取店铺机器列表
+    async fetchShopMachineListForSeller(params) {
+      const res = await getShopMachineListForSeller(params)
+      console.log(res,'res');
+      
+      if (res && (res.code === 0 || res.code === 200)) {
+        this.shopMachineList = Array.isArray(res.rows) ? res.rows : []
+        this.total = Number(res.total || (res.data && res.data.total) || (res.data && res.data.totalCount) || 0)
+        // 立即同步生成/合并 GPU 草稿，避免首屏不展示
+        this.ensureGpuDraft()
+        // 同步根据首行价格推断单位
+        this.computeUnitFromFirstRow()
+      }
+    },
+    /** 切换矿机种类 */
+    handleTypeChange(val) {
+      // 列表联动
+      this.pagination.pageNum = 1
+      this.listParams.type = val
+      this.listParams.pageNum = 1
+      this.listParams.keyword = (this.searchKeyword || '').trim() || undefined
+      // 持久化用户选择
+      try { localStorage.setItem(MACHINE_TYPE_KEY, String(val)) } catch (e) {}
+      // 清理旧状态，防闪烁与残留
+      this.shopMachineList = []
+      this.updateMap = {}
+      this.updateArr = []
+      this.fetchTableData()
+    },
+    /** 保障 GPU 草稿存在且与当前数据一致 */
+    ensureGpuDraft() {
+      if (this.listParams.type !== 1) return
+      if (!Array.isArray(this.shopMachineList) || !this.shopMachineList.length) return
+      if (!Array.isArray(this.payTypes) || !this.payTypes.length) return
+      const nextMap = {}
+      const template = this.payTypes.map(pt => ({
+        chain: (pt.payChain || pt.chain || '').toString(),
+        coin: (pt.payCoin || pt.coin || '').toString()
+      }))
+      const normalizePriceList = (sourceList = [], prevList = []) => {
+        return template.map(t => {
+          const fromSource = (Array.isArray(sourceList) ? sourceList : []).find(p => p.chain === t.chain && p.coin === t.coin)
+          const fromPrev = (Array.isArray(prevList) ? prevList : []).find(p => p.chain === t.chain && p.coin === t.coin)
+          return {
+            chain: t.chain,
+            coin: t.coin,
+            price: fromSource ? (fromSource.price ?? '') : (fromPrev ? (fromPrev.price ?? '') : ''),
+            payTypeId: fromSource ? (fromSource.payTypeId ?? '') : (fromPrev ? (fromPrev.payTypeId ?? '') : '')
+          }
+        })
+      }
+      this.shopMachineList.forEach((m, idx) => {
+        let key = this.getRowId(m)
+        if (key == null) {
+          // 兜底：构造一个稳定 key 并写回行对象
+          key = `k_${idx}_${m && (m.name || m.miner || '')}`
+          this.$set(m, '__key', key)
+        }
+        const exist = this.updateMap[key]
+        if (exist) {
+          const merged = { ...exist }
+          // 覆盖为后端最新状态/天数（若存在）
+          if (m && typeof m.maxLeaseDays !== 'undefined') merged.maxLeaseDays = m.maxLeaseDays
+          if (m && (m.state === 0 || m.state === 1)) merged.state = m.state
+          merged.priceList = normalizePriceList(m && m.priceList, exist.priceList)
+          nextMap[key] = merged
+        } else {
+          nextMap[key] = {
+            id: key,
+            maxLeaseDays: (m && typeof m.maxLeaseDays !== 'undefined') ? m.maxLeaseDays : '',
+            priceList: normalizePriceList(m && m.priceList, []),
+            state: (m && (m.state === 0 || m.state === 1)) ? m.state : 0
+          }
+        }
+      })
+      this.updateMap = nextMap
+      this.updateArr = Object.values(this.updateMap)
+    },
+    /** 获取价格值（表格渲染） */
+    getPriceValue(rowId, pt) {
+      const item = this.updateMap[rowId]
+      if (!item || !Array.isArray(item.priceList)) return ''
+      const chain = (pt.payChain || pt.chain || '').toString()
+      const coin = (pt.payCoin || pt.coin || '').toString()
+      const obj = item.priceList.find(p => p.chain === chain && p.coin === coin)
+      return obj ? obj.price : ''
+    },
+    /** 确保有价格对象 */
+    ensurePriceObj(rowId, chain, coin) {
+      const item = this.updateMap[rowId]
+      if (!item) return null
+      let target = item.priceList.find(p => p.chain === chain && p.coin === coin)
+      if (!target) {
+        target = { chain, coin, price: '', payTypeId: '' }
+        item.priceList.push(target)
+      }
+      return target
+    },
+    /** 规范化 GPU 价格输入：整数最多10位，最多6位小数；移除多余前导0；仅保留首个小数点 */
+    normalizeGpuPrice(val, isBlur = false) {
+      if (val == null) return ''
+      let v = String(val).replace(/[^\d.]/g, '')
+      // 仅保留一个小数点
+      const firstDot = v.indexOf('.')
+      if (firstDot !== -1) {
+        // 移除后续的所有点
+        v = v.slice(0, firstDot + 1) + v.slice(firstDot + 1).replace(/\./g, '')
+      }
+      const hasDot = firstDot !== -1
+      const trailingDot = hasDot && v.endsWith('.')
+      // 拆分整数/小数
+      let [intPart, decPart = ''] = v.split('.')
+      // 移除整数前导零（保留单个0用于 0.xxx 场景）
+      if (intPart.length > 1) intPart = intPart.replace(/^0+/, '')
+      if (intPart === '') intPart = '0'
+      // 限制整数最多10位
+      if (intPart.length > 10) intPart = intPart.slice(0, 10)
+      // 限制小数最多6位
+      if (decPart.length > 6) decPart = decPart.slice(0, 6)
+      // 组装
+      let out
+      if (hasDot) {
+        if (decPart) {
+          out = `${intPart}.${decPart}`
+        } else {
+          // 输入中保留尾随小数点，便于继续输入
+          out = isBlur ? intPart : `${intPart}.`
+        }
+      } else {
+        out = intPart
+      }
+      if (isBlur) {
+        const n = Number(out)
+        // 必须大于0
+        if (!(Number.isFinite(n) && n > 0)) return ''
+        // 不能是以0开头的整数（多位）
+        if (!decPart && String(intPart).length > 1 && String(intPart).startsWith('0')) {
+          const fixedInt = String(intPart).replace(/^0+/, '') || '0'
+          out = fixedInt
+        }
+      }
+      return out
+    },
+    /** 输入 - 售价（GPU） */
+    handlePriceInput(row, pt, val) {
+      const rowId = this.getRowId(row) || row.__key
+      const chain = (pt.payChain || pt.chain || '').toString()
+      const coin = (pt.payCoin || pt.coin || '').toString()
+      const price = this.normalizeGpuPrice(val, false)
+      const obj = this.ensurePriceObj(rowId, chain, coin)
+      if (obj) obj.price = price
+      this.updateArr = Object.values(this.updateMap)
+    },
+    /** 失焦 - 售价（GPU）严格校验（@blur 无值参数，这里从已存储的 price 读取） */
+    handlePriceBlur(row, pt) {
+      const rowId = this.getRowId(row) || row.__key
+      const chain = (pt.payChain || pt.chain || '').toString()
+      const coin = (pt.payCoin || pt.coin || '').toString()
+      const obj = this.ensurePriceObj(rowId, chain, coin)
+      const current = obj ? obj.price : ''
+      const normalized = this.normalizeGpuPrice(current, true)
+      if (obj) obj.price = normalized
+      if (normalized === '') {
+        this.$message.warning('价格需为>0，整数最多10位，小数最多6位，且整数部分不可以0开头')
+      }
+      this.updateArr = Object.values(this.updateMap)
+    },
+    /** 输入 - 最大租赁天数（仅整数 1-365） */
+    handleMaxLeaseDaysInput(row, val) {
+      const rowId = this.getRowId(row) || row.__key
+      const v = String(val || '').replace(/[^\d]/g, '')
+      let num = v ? parseInt(v, 10) : ''
+      if (typeof num === 'number' && !Number.isNaN(num)) {
+        if (num < 1) num = 1
+        if (num > 365) num = 365
+      }
+      if (this.updateMap[rowId]) this.updateMap[rowId].maxLeaseDays = num
+      this.updateArr = Object.values(this.updateMap)
+    },
+    /** 切换状态（0 上架 1 下架） */
+    handleToggleState(row, val) {
+      const rowId = this.getRowId(row) || row.__key
+      if (this.updateMap[rowId]) this.updateMap[rowId].state = val
+      this.updateArr = Object.values(this.updateMap)
+    },
+    /** 提交 GPU 更新（触发按钮） */
+    handleUpdateGpu() {
+      if (this.listParams.type !== 1) return
+      const payload = Object.values(this.updateMap).map(it => ({
+        id: it.id,
+        maxLeaseDays: it.maxLeaseDays,
+        priceList: Array.isArray(it.priceList)
+          ? it.priceList.map(p => ({
+              chain: p.chain,
+              coin: p.coin,
+              price: p.price,
+              payTypeId: p.payTypeId || ''
+            }))
+          : [],
+        state: it.state
+      }))
+      // 校验：售价不能为空（需覆盖所有支付方式）
+      const expectedPriceCount = Array.isArray(this.payTypes) ? this.payTypes.length : 0
+      if (expectedPriceCount > 0) {
+        const priceMissing = payload.some(it => {
+          if (!Array.isArray(it.priceList) || it.priceList.length !== expectedPriceCount) return true
+          return it.priceList.some(p => {
+            const v = (p && p.price != null) ? String(p.price).trim() : ''
+            if (v === '') return true
+            const norm = this.normalizeGpuPrice(v, true)
+            return norm === ''
+          })
+        })
+        if (priceMissing) {
+          this.$message.warning('请填写合法售价（>0，整数最多10位，小数最多6位，且每种支付方式均需填写）')
+          return
+        }
+      }
+      const invalid = payload.some(it => !(Number.isInteger(it.maxLeaseDays) && it.maxLeaseDays >= 1 && it.maxLeaseDays <= 365))
+      if (invalid) {
+        this.$message.warning('请检查最大租赁天数（1-365天的整数）')
+        return
+      }
+      this.updateGpuMachineInfo(payload)
+    },
     /** 格式化支持结算币种的展示，如 TRON-USDT */
     formatPayType(item) {
       try {
@@ -174,6 +932,21 @@ export default {
         return ''
       }
     },
+    /** 顶部结算方式格式：兼容 payChain/payCoin */
+    formatPayTypeHead(item) {
+      try {
+        const chain = (item && (item.payChain || item.chain) ? String(item.payChain || item.chain) : '').toUpperCase()
+        const coin = (item && (item.payCoin || item.coin) ? String(item.payCoin || item.coin) : '').toUpperCase()
+        if (chain && coin) return `${chain}-${coin}`
+        return chain || coin || ''
+      } catch (e) {
+        return ''
+      }
+    },
+    getPayImage(item) {
+      const img = item && (item.payCoinImage || item.image) ? String(item.payCoinImage || item.image) : ''
+      return img.trim()
+    },
     /** 初始化筛选选项 */
     initOptions() {
       try {
@@ -198,58 +971,10 @@ export default {
     async fetchTableData() {
       this.loading = true
       try {
-        // 按“单一关键字”搜索：若关键字命中币种，则只传 coin；否则只传 algorithm
-        const keyword = (this.searchKeyword || '').trim()
-        let coinParam
-        let algorithmParam
-        if (keyword) {
-          const lower = keyword.toLowerCase()
-          const hitCoin = (this.coinOptions || []).some(c =>
-            (c.value && String(c.value).toLowerCase() === lower) ||
-            (c.label && String(c.label).toLowerCase() === lower)
-          )
-          if (hitCoin) {
-            coinParam = keyword
-          } else {
-            algorithmParam = keyword
-          }
-        }
-        try {
-          this.userEmail=JSON.parse(localStorage.getItem('leasEmail'))
+        // 统一使用卖家矿机列表接口，参数仅来自 this.listParams
+        await this.fetchShopMachineListForSeller(this.listParams)
         } catch (error) {
-          console.log(error);
-          
-        } 
-        if ( !this.userEmail) {
-          this.$alert('登录信息异常，请重新返回 m2poll 矿池进入该系统', '提示', {
-            confirmButtonText: '确认',
-            center: true,
-            closeOnClickModal: false,
-            closeOnPressEscape: false,
-            showClose: false,
-            callback: () => {
-              window.location.href = 'https://m2pool.com'
-            }
-          })
-          return
-        }
-        const params = {
-          pageNum: this.pagination.pageNum,
-          pageSize: this.pagination.pageSize,
-          coin: coinParam || undefined,
-          algorithm: algorithmParam || undefined,
-          userEmail: this.userEmail
-        }
-        const res = await getProductList(params)
-        // 兼容不同返回结构
-        const list = res?.data?.records || res?.data?.list || res?.rows || res?.list || res?.data || []
-
-        this.tableData = Array.isArray(list) ? list : []
-        this.total= res.total
-        console.log(this.tableData)
-      } catch (error) {
-        console.error('获取商品列表失败', error)
-        console.log('获取商品列表失败')
+        console.error('获取列表失败', error)
       } finally {
         this.loading = false
       }
@@ -258,6 +983,8 @@ export default {
     /** 搜索 */
     handleSearch() {
       this.pagination.pageNum = 1
+      this.listParams.pageNum = 1
+      this.listParams.keyword = (this.searchKeyword || '').trim() || undefined
       this.fetchTableData()
     },
 
@@ -266,6 +993,7 @@ export default {
       this.searchKeyword = ''
       this.pagination.pageNum = 1
       this.pagination.pageSize = 10
+      this.listParams = { type: this.listParams.type, pageNum: 1, pageSize: 10, keyword: undefined }
       this.fetchTableData()
     },
 
@@ -286,61 +1014,95 @@ export default {
 
     /** 编辑 */
     handleEdit(row) {
-      this.editDialog.form = { ...row }
+      const form = {
+        id: row.id,
+        name: row.name || '',
+        coin: row.coin || '',
+        algorithm: row.algorithm || '',
+        maxLeaseDays: row.maxLeaseDays || '',
+        powerDissipation: row.powerDissipation || row.powerDissipation || '',
+        saleNumbers: row.saleNumbers || '',
+        theoryPower: row.theoryPower || '',
+        unit: row.unit || 'GH/S',
+        state: (row && (row.state === 0 || row.state === 1)) ? row.state : 0
+      }
+      // 构建可编辑的价格列表：以支持的支付方式为模板
+      const srcList = Array.isArray(row.priceList) ? row.priceList : []
+      const template = (this.payTypes || []).map(pt => ({
+        chain: (pt.payChain || pt.chain || '').toString(),
+        coin: (pt.payCoin || pt.coin || '').toString(),
+        payTypeId: pt.payTypeId || pt.id || 0
+      }))
+      this.editDialog.priceList = template.map(t => {
+        const hit = srcList.find(p =>
+          String(p.chain || p.payChain || '') === t.chain &&
+          String(p.coin || p.payCoin || '') === t.coin
+        )
+        return {
+          chain: t.chain,
+          coin: t.coin,
+          price: hit ? (hit.price ?? '') : '',
+          payTypeId: hit ? (hit.payTypeId ?? t.payTypeId ?? 0) : (t.payTypeId ?? 0),
+          productMachineId: row.productMachineId || row.id || 0
+        }
+      })
+      this.editDialog.form = form
       this.editDialog.visible = true
     },
 
     /** 保存编辑 */
+    handleEditPriceInput(idx, val) {
+      const v = String(val || '').replace(/[^\d.]/g, '')
+      if (this.editDialog.priceList && this.editDialog.priceList[idx]) {
+        this.$set(this.editDialog.priceList[idx], 'price', v)
+      }
+    },
     async handleSaveEdit() {
       if (!this.editDialog.form) return
+      const f = this.editDialog.form
+      // 基础校验
+      if (!String(f.name || '').trim()) { this.$message.warning('矿机型号不能为空'); return }
+      if (!String(f.coin || '').trim()) { this.$message.warning('币种不能为空'); return }
+      if (!String(f.algorithm || '').trim()) { this.$message.warning('算法不能为空'); return }
+      const days = parseInt(String(f.maxLeaseDays || '').replace(/[^\d]/g, ''), 10)
+      if (!(Number.isInteger(days) && days >= 1 && days <= 365)) { this.$message.warning('最大租赁天数需为1-365的整数'); return }
+      const sale = parseInt(String(f.saleNumbers || '').replace(/[^\d]/g, ''), 10)
+      if (!Number.isInteger(sale) || sale < 0) { this.$message.warning('出售数量应为非负整数'); return }
+        const payload = {
+        id: f.id,
+        algorithm: String(f.algorithm || '').trim(),
+        coin: String(f.coin || '').trim(),
+        maxLeaseDays: days,
+        name: String(f.name || '').trim(),
+        powerDissipation: Number(String(f.powerDissipation || '0').replace(/[^\d.]/g, '')) || 0,
+        priceList: (this.editDialog.priceList || []).map(p => ({
+          chain: p.chain,
+          coin: p.coin,
+          payTypeId: p.payTypeId || 0,
+          price: Number(String(p.price || '0').replace(/[^\d.]/g, '')) || 0,
+          productMachineId: p.productMachineId || f.id || 0
+        })),
+        saleNumbers: sale,
+        theoryPower: Number(String(f.theoryPower || '0').replace(/[^\d.]/g, '')) || 0,
+        unit: String(f.unit || '').trim() || 'GH/S',
+        state: (f && (f.credentials ? f.state : f.state)) ?? 0
+      }
+      // 价格至少有一个填写
+      const hasAnyPrice = Array.isArray(payload.priceList) && payload.priceList.some(i => i.price > 0)
+      if (!hasAnyPrice) { this.$message.warning('请至少填写一种支付方式的售价'); return }
       this.editDialog.saving = true
       try {
-        // 简单内容校验：不能为空且不能全是空格（不影响其它逻辑）
-        const notEmpty = (v) => typeof v === 'string' && v.trim().length > 0
-        const name = String(this.editDialog.form.name || '')
-        const description = String(this.editDialog.form.description || '')
-        if (!notEmpty(name)) {
-          this.$message.warning('名称不能为空或全是空格')
-          this.editDialog.saving = false
-          return
-        }
-        if (!notEmpty(description)) {
-          this.$message.warning('描述不能为空或全是空格')
-          this.editDialog.saving = false
-          return
-        }
-        // 去除首尾空格后再提交
-        this.editDialog.form.name = name.trim()
-        this.editDialog.form.description = description.trim()
-        // 仅提交指定字段
-        const payload = {
-          id: this.editDialog.form.id,
-          shopId: this.editDialog.form.shopId,
-          name: this.editDialog.form.name,
-          image: this.editDialog.form.image,
-          coin: this.editDialog.form.coin,
-          description: this.editDialog.form.description,
-          state: this.editDialog.form.state,
-        }
-        const res = await updateProduct(payload)
+        const res = await updateAsicMachine(payload)
         if (res && (res.code === 0 || res.code === 200)) {
-          this.$message({
-            message: '保存成功',
-            type: 'success',
-            showClose: true
-          })
+          this.$message.success('修改成功')
           this.editDialog.visible = false
-          this.fetchTableData()
+          await this.fetchTableData()
         } else {
-          this.$message({
-            message: res?.msg || '保存失败',
-            type: 'error',
-            showClose: true
-          })
+          this.$message.error(res?.msg || '修改失败')
         }
       } catch (error) {
-        console.error('保存商品失败', error)
-        console.log('保存失败')
+        console.error('更新失败', error)
+        this.$message.error('修改失败')
       } finally {
         this.editDialog.saving = false
       }
@@ -348,14 +1110,19 @@ export default {
 
     /** 删除 */
     handleDelete(row) {
-      if (!row || !row.id) return
+      if (!row) return
+      const id = this.getRowId(row) || row.id
+      if (id == null || id === '') {
+        this.$message.warning('缺少可删除的ID')
+        return
+      }
       this.$confirm('确认删除该商品吗？删除后不可恢复', '提示', {
         confirmButtonText: '删除',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(async () => {
         try {
-          const res = await deleteProduct(row.id)
+          const res = await deleteMachine({ id })
           if (res && (res.code === 0 || res.code === 200)) {
             this.$message.success('删除成功')
             // 若当前页仅一条且删除后为空，回退一页
@@ -375,12 +1142,15 @@ export default {
     handleSizeChange(size) {
       this.pagination.pageSize = size
       this.pagination.pageNum = 1
+      this.listParams.pageSize = size
+      this.listParams.pageNum = 1
       this.fetchTableData()
     },
 
     /** 分页 - 当前页变化 */
     handleCurrentChange(page) {
       this.pagination.pageNum = page
+      this.listParams.pageNum = page
       this.fetchTableData()
     },
 
@@ -388,6 +1158,8 @@ export default {
     handleClear() {
       this.searchKeyword = ''
       this.pagination.pageNum = 1
+      this.listParams.pageNum = 1
+      this.listParams.keyword = undefined
       this.fetchTableData()
     },
 
@@ -436,6 +1208,26 @@ export default {
   display: flex;
   align-items: center;
 }
+.paytypes-bar {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  background: #f5f7fa;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  padding: 8px 12px;
+  margin-bottom: 8px;
+}
+.pt-label {
+  color: #666;
+  margin-right: 6px;
+  font-size: 12px;
+}
+.pt-icons {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
 .page-title {
   margin: 0;
   font-size: 18px;
@@ -463,5 +1255,52 @@ export default {
 .paytypes { display: inline-flex; align-items: center; gap: 8px; }
 .paytype-icon { width: 22px; height: 22px; border-radius: 4px; display: inline-block; }
 
+.gpu-price-row {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr)); /* 两列并排，减少单元格高度 */
+  gap: 10px 16px;
+}
+.gpu-price-item {
+  display: grid;
+  grid-template-columns: 100px 1fr; /* 左侧标签固定宽度，右侧输入自适应 */
+  align-items: center;
+}
+.gpu-price-label {
+  color: #666;
+  white-space: nowrap;
+  text-align: right;
+  padding-right: 8px;
+}
+.gpu-price-input {
+  width: 100%;
+}
+.gpu-state {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
+.gpu-state-text {
+  color: #909399;
+  user-select: none;
+}
+.gpu-state-text.on {
+  color: #67C23A;
+  font-weight: 600;
+}
+
+/* 售价高亮（加粗标红） */
+.price-strong {
+  color: #f56c6c;
+  font-weight: 700;
+}
+
+::v-deep .el-input__prefix, .el-input__suffix{
+  top:24%;
+}
+
+::v-deep .el-input--mini .el-input__icon{
+  line-height: 0px;
+}
+
 </style>
 
diff --git a/power_leasing/src/views/productDetail/index.js b/power_leasing/src/views/productDetail/index.js
index ccef259..3dc0180 100644
--- a/power_leasing/src/views/productDetail/index.js
+++ b/power_leasing/src/views/productDetail/index.js
@@ -1,8 +1,6 @@
 
 import { getProductById } from '../../utils/productService'
-import { addToCart } from '../../utils/cartManager'
-import { getMachineInfo, getPayTypes } from '../../api/products'
-import { addCart, getGoodsList } from '../../api/shoppingCart'
+import { getMachineInfo, getPayTypes,getShopMachineList,addGoodsV2 } from '../../api/products'
 import { truncateAmountByCoin, truncateTo6 } from '../../utils/amount'
 
 export default {
@@ -142,27 +140,445 @@ export default {
             pageSizes: [10, 20, 50],
             currentPage: 1,
             total: 0,
+            // 动态列表（模拟渲染）
+            dynamicMeta: {},
+            dynamicColumns: [],
+            dynamicRows: [],
+            dynamicSearch: {
+                visible: false,
+                keyword: ''
+            },
+            // 矿机种类：0-ASIC，1-GPU（默认GPU）
+            machineType: 1,
           
 
         }
     },
     mounted() {
-        if (this.$route.params.id) {
-            this.params.id = this.$route.params.id
+      // 读取用户上次选择的矿机种类（0: ASIC, 1: GPU）
+      try{
+        const savedType = Number(window && window.localStorage ? window.localStorage.getItem('pl_machineType') : NaN)
+        if (savedType === 0 || savedType === 1) {
+          this.machineType = savedType
+        }
+      }catch(e){/* noop */}
+      let arr={
+        "meta": {
+          "pageNum": 1,  // 当前页码（后端分页用，可选）
+          "pageSize": 10, // 每页条数（后端分页用，可选）
+          "total": 123    // 总条数（后端分页用，可选）
+        },
+        "columns": [
+          {
+            "key": "model",   // 列字段名：与 rows 中同名字段映射
+            "label": "型号",   // 表头显示文本
+            "type": "text",   // 列类型：text/amount/hashrate/days
+            "fixed": "left",  // 是否左固定列：left/right/不传
+            "width": 100      // 列宽（可选）
+          },
+          {
+            "key": "price",     // 价格列字段名
+            "label": "价格",     // 表头显示文本
+            "type": "amount",   // 金额类型：仅渲染数值；单位来自行级 priceList.coin
+            "width": 100        // 列宽（可选）
+          },
+    
+          // 动态币种/算法算力列（示例：仅第一列带注释，其余同结构）
+          {
+            "key": "XTM",                         // 币种/算法代码作为列 key
+            "label": "XTM",                       // 表头显示名
+            "type": "hashrate",                   // 列类型：算力
+            "unit": "MH/s",                       // 单元格单位（表头不显示单位）
+            "icon": "https://cdn.xxx/coin/xtm.png", // 表头图标（可选）
+           
+          },
+          {
+            "key": "NXNA",
+            "label": "NXNA",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/nxna.png"
+          },
+          {
+            "key": "CLORE",
+            "label": "CLORE",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/clore.png"
+          },
+          {
+            "key": "CFX",
+            "label": "CFX",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/cfx.png"
+          },
+          {
+            "key": "IRON",
+            "label": "IRON",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/iron.png"
+          },
+          {
+            "key": "NEXA",
+            "label": "NEXA",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/nexa.png"
+          },
+          {
+            "key": "KLS",
+            "label": "KLS",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/kls.png"
+          },
+          {
+            "key": "RVN",
+            "label": "RVN",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/rvn.png"
+          },
+          {
+            "key": "ERG",
+            "label": "ERG",
+            "type": "hashrate",
+            "unit": "MH/s",
+            "icon": "https://cdn.xxx/coin/erg.png"
+          },
+          {
+            "key": "XEL",
+            "label": "XEL",
+            "type": "hashrate",
+            "unit": "kH/s",
+            "icon": "https://cdn.xxx/coin/xel.png"
+          },
+    
+          // 尾部汇总列
+          {
+            "key": "monthIncome",
+            "label": "最大月收益",
+            "type": "amount",
+            "currency": "USDT",//固定显示单位
+            "period": "month",           
+            "width": 110
+          },
+          {
+            "key": "maxLeaseDays",
+            "label": "最大租赁天数",
+            "type": "days",
+            "width": 80
+          }
+        ],
+        "rows": [
+          {
+            "id": "gpu_100_hbm3",         // 唯一标识（加入购物车传 id）
+            "model": "H100 80GB HBM3",    // 型号，对应 columns.key = model
+            "price": 142160.54,           // 行价格基准值（当无 priceList 时展示）
+            "priceList": [                // 价格列表：随支付方式变更价格与单位
+              { 
+                "chain": "TRON",          // 支付链
+                "coin": "USDT",           // 币种（价格单位来源）
+                "price": 142160.54        // 该支付方式下的单价
+              },
+              { "chain": "TRON", "coin": "NEXA", "price": 142050.00 },
+              { "chain": "ETH",  "coin": "USDT", "price": 142100.00 },
+              { "chain": "ETH",  "coin": "ETH",  "price": 142000.00 }
+            ],
+            "saleNumbers": 120,   // 总机器数（仅 ASIC 展示，后端只读返回）
+            "saleOutNumbers": 18, // 已售数量（仅 ASIC 展示，后端只读返回）
+    
+            "XTM": 255.0,  // 对应列 key 的算力数值（可为 null）
+            "NXNA": 255.0,
+            "CLORE": 343.0,
+            "CFX": null,
+            "IRON": null,
+            "NEXA": null,
+            "KLS": null,
+            "RVN": 255.0,
+            "ERG": 900.0,
+            "XEL": null,
+    
+            "monthIncome": 425.01, // 最大月收益（列定义 currency=USDT，固定以 USDT 展示）
+            "maxLeaseDays": 10368   // 最大租赁天数（单位：天）
+          },
+          {
+            "id": "gpu_rtx_5090",
+            "model": "RTX 5090",
+            "price": 14216.05,
+            "priceList": [
+              { "chain": "TRON", "coin": "USDT", "price": 14216.05 },
+              { "chain": "TRON", "coin": "NEXA", "price": 14199.00 },
+              { "chain": "ETH",  "coin": "USDT", "price": 14180.00 },
+              { "chain": "ETH",  "coin": "ETH",  "price": 14150.00 }
+            ],
+            "saleNumbers": 80,
+            "saleOutNumbers": 22,
+    
+            "XTM": 28.7,
+            "NXNA": 100.5,
+            "CLORE": 100.5,
+            "CFX": 210.0,
+            "IRON": 133.5,
+            "NEXA": 450.0,
+            "KLS": 133.5,
+            "RVN": 100.5,
+            "ERG": 575.0,
+            "XEL": 120.0,
+    
+            "monthIncome": 267.84,
+            "maxLeaseDays": 1645
+          },
+          {
+            "id": "gpu_rtx_4090",
+            "model": "RTX 4090",
+            "price": 12083.65,
+            "priceList": [
+              { "chain": "TRON", "coin": "USDT", "price": 12083.65 },
+              { "chain": "TRON", "coin": "NEXA", "price": 12050.00 },
+              { "chain": "ETH",  "coin": "USDT", "price": 12020.00 },
+              { "chain": "ETH",  "coin": "ETH",  "price": 11999.00 }
+            ],
+            "saleNumbers": 64,
+            "saleOutNumbers": 9,
+    
+            "XTM": 16.6,
+            "NXNA": 65.0,
+            "CLORE": 65.0,
+            "CFX": 130.0,
+            "IRON": 82.5,
+            "NEXA": 320.0,
+            "KLS": 82.5,
+            "RVN": 65.0,
+            "ERG": 265.0,
+            "XEL": 40.6,
+    
+            "monthIncome": 155.00,
+            "maxLeaseDays": 2418
+          }
+        ]
+      }
+      // 模拟数据写入动态表格（仅演示）
+      try{
+        this.dynamicMeta = arr.meta || {}
+        this.dynamicColumns = Array.isArray(arr.columns) ? arr.columns : []
+        this.dynamicRows = (Array.isArray(arr.rows) ? arr.rows : []).map(r => ({
+          saleNumbers: 0,
+          saleOutNumbers: 0,
+          leaseTime: 1,
+          purchaseQuantity: 0,
+          ...r
+        }))
+        // 根据价格列表设置默认支付方式，确保筛选框与价格展示一致
+        this.ensureDefaultPayFilterFromPrices()
+      }catch(e){/* noop */}
+        // 仅当路由携带 shopId 时，才发起店铺商品请求
+        const routeShopId =
+            (this.$route && this.$route.params && (this.$route.params.shopId || this.$route.params.id)) ||
+            (this.$route && this.$route.query && this.$route.query.shopId)
+        if (routeShopId) {
+            this.params.id = routeShopId
             this.product = true
-            // 默认展开第一行
-            if (this.productListData && this.productListData.length) {
-                this.expandedRowKeys = [this.productListData[0].id]
-            }
-            this.fetchGetMachineInfo(this.params)//priceSort 价格，powerSort 算力，功耗powerDissipationSort   布尔类型，true 升序，false降序
+            this.fetchGetMachineInfo(this.buildQueryParams())
             this.fetchPayTypes()
         } else {
-            this.$message.error('商品不存在')
+            this.$message.warning('缺少店铺ID（shopId），无法加载商品列表')
             this.product = false
         }
-        this.fetchGetGoodsList()
     },
     methods: {
+        // 动态表格单元格格式化（金额/算力/天数/文本）- 统一最多显示6位小数，hover展示完整
+        formatDynamicCell(row, col) {
+            try{
+                let val = row[col.key]
+                if (val === null || val === undefined || val === '') return { text: '—', full: '—', truncated: false }
+                if (col.type === 'amount') {
+                    // 价格列：单位取 priceList 里的 coin；默认取第一条；选择支付方式后按选择展示
+                    if (col.key === 'price') {
+                        if (Array.isArray(row.priceList) && row.priceList.length) {
+                            const pv = this.getDisplayPrice(row)
+                            const pc = this.getDisplayPriceCoin(row)
+                            if (pv !== null && pv !== undefined) val = pv
+                            const nPrice = val
+                            const t = truncateTo6(nPrice)
+                            const coinUnit = (pc || '').toString().toUpperCase()
+                            return {
+                                text: coinUnit ? `${t.text} ${coinUnit}` : t.text,
+                                full: coinUnit ? `${t.full} ${coinUnit}` : t.full,
+                                truncated: t.truncated
+                            }
+                        }
+                        // 无 priceList：仅展示数值，不附加任何单位
+                        const t = truncateTo6(val)
+                        return { text: t.text, full: t.full, truncated: t.truncated }
+                    }
+                    // 列级优先：若列声明 currency=USDT，则固定展示为 "xx.xx USDT"
+                    const colCurrency = (col.currency || '').toString().toUpperCase()
+                    if (colCurrency === 'USDT') {
+                        const t = truncateTo6(val)
+                        return { text: `${t.text} USDT`, full: `${t.full} USDT`, truncated: t.truncated }
+                    }
+                    // 兜底：不再使用 meta 的货币符号，直接返回数值
+                    const t = truncateTo6(val)
+                    return { text: t.text, full: t.full, truncated: t.truncated }
+                }
+                if (col.type === 'hashrate') {
+                    const unit = col.unit ? ` ${col.unit}` : ''
+                    const t = truncateTo6(val)
+                    return { text: `${t.text}${unit}`, full: `${t.full}${unit}`, truncated: t.truncated }
+                }
+                if (col.type === 'days') {
+                    const n = Number(val)
+                    if (!Number.isFinite(n)) return { text: String(val), full: String(val), truncated: false }
+                    const s = `${Math.floor(n)} 天`
+                    return { text: s, full: s, truncated: false }
+                }
+                const s = String(val)
+                return { text: s, full: s, truncated: false }
+            }catch(e){ return { text: '—', full: '—', truncated: false } }
+        },
+        /**
+         * 如果存在 priceList，则用第一条的 chain|coin 作为默认筛选值，
+         * 使“支付方式筛选”与价格列默认展示一致
+         */
+        ensureDefaultPayFilterFromPrices() {
+            try{
+                if (this.payFilterDefaultApplied) return
+                const rows = Array.isArray(this.dynamicRows) ? this.dynamicRows : []
+                const firstWithPriceList = rows.find(r => Array.isArray(r && r.priceList) && r.priceList.length)
+                if (!firstWithPriceList) return
+                const first = firstWithPriceList.priceList[0]
+                const chain = String(first && first.chain || '').trim()
+                const coin = String(first && first.coin || '').trim()
+                if (!chain && !coin) return
+                this.selectedPayKey = `${chain}|${coin}`
+                this.filters.chain = chain
+                this.filters.coin = coin
+                this.payFilterDefaultApplied = true
+            }catch(e){ /* noop */ }
+        },
+        /**
+         * 获取行在当前支付方式下的展示价格
+         * 优先匹配 selectedPayKey（chain|coin），否则回退 priceList[0]；再否则回退 row.price
+         */
+        getDisplayPrice(row){
+            try{
+                const list = Array.isArray(row && row.priceList) ? row.priceList : []
+                if (!list.length) return row && row.price
+                const key = this.selectedPayKey
+                if (key) {
+                    const [chainRaw, coinRaw] = String(key).split('|')
+                    const chain = String(chainRaw || '').toUpperCase().trim()
+                    const coin = String(coinRaw || '').toUpperCase().trim()
+                    const hit = list.find(it =>
+                        String(it && it.chain).toUpperCase().trim() === chain &&
+                        String(it && it.coin).toUpperCase().trim() === coin
+                    )
+                    if (hit && hit.price !== undefined && hit.price !== null) return hit.price
+                }
+                const first = list[0]
+                if (first && first.price !== undefined && first.price !== null) return first.price
+                return row && row.price
+            }catch(e){ return row && row.price }
+        },
+        /**
+         * 获取行在当前支付方式下价格的币种（coin）
+         */
+        getDisplayPriceCoin(row){
+            try{
+                const list = Array.isArray(row && row.priceList) ? row.priceList : []
+                if (!list.length) return ''
+                const key = this.selectedPayKey
+                if (key) {
+                    const [chainRaw, coinRaw] = String(key).split('|')
+                    const chain = String(chainRaw || '').toUpperCase().trim()
+                    const coin = String(coinRaw || '').toUpperCase().trim()
+                    const hit = list.find(it =>
+                        String(it && it.chain).toUpperCase().trim() === chain &&
+                        String(it && it.coin).toUpperCase().trim() === coin
+                    )
+                    if (hit && hit.coin) return String(hit.coin)
+                }
+                const first = list[0]
+                return first && first.coin ? String(first.coin) : ''
+            }catch(e){ return '' }
+        },
+        _truncate(num, decimals=2){
+            try{
+                const f = Math.pow(10, decimals)
+                return (Math.floor(Number(num)*f)/f).toFixed(decimals)
+            }catch(e){ return String(num) }
+        },
+        // 判断是否为“框出来部分”的最后一列（最后一个 hashrate 列）
+        isLastHashrateColumn(colIdx){
+            try{
+                const cols = this.getRenderedColumns()
+                for (let i = cols.length - 1; i >= 0; i--) {
+                    if (String(cols[i] && cols[i].type).toLowerCase() === 'hashrate') {
+                        return i === colIdx
+                    }
+                }
+                return false
+            }catch(e){ return false }
+        },
+        // 仅渲染前 8 个算力列，后接其它非算力列（如收益、回收期）
+        getRenderedColumns(){
+            try{
+                const cols = Array.isArray(this.dynamicColumns) ? this.dynamicColumns : []
+                const hashrate = cols.filter(c => String(c && c.type).toLowerCase() === 'hashrate').slice(0, 8)
+                const others = cols.filter(c => String(c && c.type).toLowerCase() !== 'hashrate')
+                return [...hashrate, ...others]
+            }catch(e){ return [] }
+        },
+        // 打开动态搜索弹窗
+        handleOpenDynamicSearch(){
+            this.dynamicSearch.visible = true
+            this.dynamicSearch.keyword = ''
+        },
+        // 确认搜索：向后端请求新的 columns/rows，替换动态表格
+        async handleConfirmDynamicSearch(){
+            const keyword = (this.dynamicSearch.keyword || '').trim()
+            this.dynamicSearch.visible = false
+            await this.fetchDynamicTable({ shopId: this.params.id, type: 1, keyword })
+        },
+        // 拉取动态表格数据（占位实现：如果后端已就绪，直接替换为真实接口）
+        async fetchDynamicTable(params){
+            try{
+                // 这里预留与后端对接：
+                // 期待返回格式：{ code, data: { meta, columns, rows } }
+                // 示例中用本地 mock 演示：根据 keyword 过滤/调整列
+                // 如果没有 keyword，就还原初始 mock
+                if (!params || !params.keyword) {
+                    return
+                }
+                // 简单模拟：当 keyword 命中 'ERG'，只保留 ERG + 价格/型号/回收期 等少量列
+                const kw = String(params.keyword).toUpperCase()
+                const baseCols = (this.dynamicColumns || []).filter(c => ['model','price','maxLeaseDays','monthIncome'].includes(c.key))
+                const hitCols = (this.dynamicColumns || []).filter(c => String(c.label || c.key).toUpperCase().includes(kw))
+                const nextCols = [...(baseCols.length?baseCols:[this.dynamicColumns[0]||[]]), ...hitCols]
+                if (nextCols.length) {
+                    this.dynamicColumns = nextCols
+                    // 行数据无需特别处理（真实环境后端会按列同步返回），这里保留原 rows
+                }
+            }catch(e){
+                // eslint-disable-next-line no-console
+                console.warn('fetchDynamicTable mock error', e)
+            }
+        },
+        // 切换矿机种类：0-ASIC，1-GPU
+        handleMachineTypeChange(){
+            // 变更类型后，重新请求数据
+            this.fetchGetMachineInfo(this.buildQueryParams())
+            this.fetchPayTypes()
+            // 本地记住用户选择
+            try{
+              if (window && window.localStorage) {
+                window.localStorage.setItem('pl_machineType', String(this.machineType))
+              }
+            }catch(e){/* noop */}
+        },
         // 行币种：优先行内 payCoin > coin，其次取全局表头币种
         getRowCoin(row) {
             try {
@@ -217,9 +633,9 @@ export default {
                 this.fetchGetMachineInfo(params)
             } catch (e) { /* noop */ }
         },
-        // 组合查询参数（带上商品 id 与筛选条件）
+        // 组合查询参数：店铺入口，必须包含 shopId 与 type（0-ASIC，1-GPU）
         buildQueryParams() {
-            const q = { id: this.params.id }
+            const q = { shopId: this.params.id, type: this.machineType }
             // 分页参数始终透传
             try {
                 if (this.params && this.params.pageNum != null) q.pageNum = this.params.pageNum
@@ -251,10 +667,12 @@ export default {
             } catch (e) { /* noop */ }
             return q
         },
-        // 拉取支付方式
+        // 拉取支付方式（兼容 shopId）
         async fetchPayTypes() {
             try {
-                const res = await getPayTypes({ productId: this.params.id })
+                // 现规则：商品详情由店铺入口进入，使用 shopId 查询支付方式
+                // 为兼容后端两种入参，优先传 shopId，后端若仍使用 productId 也能兼容处理
+                const res = await getPayTypes({ shopId: this.params.id, productId: this.params.id })
                 // 接口示例：{ code: 0, data: [ { payChain, payCoin, payCoinImage, shopId } ], msg: '' }
                 if (res && (res.code === 0 || res.code === 200)) {
                     const list = Array.isArray(res.data) ? res.data : []
@@ -270,34 +688,21 @@ export default {
 
         async fetchGetMachineInfo(params) {
             this.productDetailLoading = true
-            const res = await getMachineInfo(params)
+            // 改为使用店铺机器列表接口
+            const res = await getShopMachineList(params)
             console.log(res)
             if (res && res.code === 200) {
                 console.log(res.data, 'res.rows');
                 this.total = res.total||0;
-                // 新数据结构：机器为扁平 rows 列表；仅当后端返回有效支付方式时才覆盖，避免清空 getPayTypes 的结果
+                // 若后端同步返回支付方式，刷新本地支付方式
                 try {
                     const payList = res && res.data && res.data.payConfigList
                     if (Array.isArray(payList) && payList.length) {
                         this.paymentMethodList = payList
                     }
-                } catch (e) { /* keep existing paymentMethodList */ }
-                const rows = (res && res.data && (res.data.rows || res.data.list)) || (res && res.rows) || []
-                const normalized = (Array.isArray(rows) ? rows : []).map((m, idx) => ({
-                    ...m,
-                    id: m && (m.id !== undefined && m.id !== null) ? m.id : `m-${idx}`,
-                    leaseTime: (m && m.leaseTime && Number(m.leaseTime) > 0) ? Number(m.leaseTime) : 1,
-                    _selected: false
-                }))
-                this.machineList = normalized
-                // 清空旧的两层结构数据，避免误用
-                this.productListData = []
-                this.expandedRowKeys = []
-                // 机器加载后尝试设置默认筛选
-                this.ensureDefaultPayFilterSelection()
-                this.$nextTick(() => {
-                    this.machinesLoaded = true
-                })
+                } catch (e) { /* noop */ }
+                // 动态表格数据（如后端有对应 rows/columns，可在此接入）
+                // 此处保留现有动态表格的模拟/替换逻辑，不再维护旧表格数据结构
             }
 
             this.productDetailLoading = false
@@ -552,88 +957,56 @@ export default {
 
             }
         },
-        // 打开确认弹窗：以当前界面勾选(_selected)为准，并在打开后清空左侧勾选状态
+        // 打开确认弹窗（基于动态表格的勾选行）
         handleOpenAddToCartDialog() {
-            // 扫描当前所有系列下被勾选的机器
-            const groups = Array.isArray(this.productListData) ? this.productListData : []
-            const pickedAll = groups.flatMap(g => Array.isArray(g.productMachines) ? g.productMachines.filter(m => !!m && !!m._selected) : [])
-            const picked = pickedAll.filter(m => m && (m.saleState === 0 || m.saleState === undefined || m.saleState === null))
+            const rows = Array.isArray(this.dynamicRows) ? this.dynamicRows : []
+            const picked = rows.filter(r => !!r && !!r._selected)
             if (!picked.length) {
                 this.$message.warning('请先勾选至少一台矿机')
                 return
             }
-            if (picked.length < pickedAll.length) {
-                this.$message.warning('部分机器已售出或售出中，已自动为您排除')
-            }
-            // 使用弹窗中的固定快照，避免后续清空勾选影响弹窗显示
-            this.confirmAddDialog.items = picked.slice()
+            this.confirmAddDialog.items = picked.map(r => ({
+                ...r,
+                leaseTime: Number(r.leaseTime || 1),
+                purchaseQuantity: Number(r.purchaseQuantity || 0)
+            }))
             this.confirmAddDialog.visible = true
-            // 打开后立即把左侧复选框清空，避免“勾选了两个但弹窗只有一条”的不一致问题
-            this.$nextTick(() => {
-                try { this.clearAllSelections() } catch (e) { /* noop */ }
-            })
         },
-        // 确认加入：调用后端购物车接口，传入裸数组 [{ productId, productMachineId }]
+        // 确认加入：调用 addGoodsV2（按条提交），GPU 不传 numbers
         async handleConfirmAddSelectedToCart() {
-            // 以弹窗中的列表为准，避免与左侧勾选状态不一致
-            const allSelected = Array.isArray(this.confirmAddDialog.items) ? this.confirmAddDialog.items.filter(Boolean) : []
-            if (!allSelected.length) {
+            const items = Array.isArray(this.confirmAddDialog.items) ? this.confirmAddDialog.items.filter(Boolean) : []
+            if (!items.length) {
                 this.$message.warning('请先勾选至少一台矿机')
                 return
             }
-
-            const productId = this.params && this.params.id ? this.params.id : (this.$route && this.$route.params && this.$route.params.id)
-            if (!productId) {
-                this.$message.error('商品ID缺失，无法加入购物车')
-                return
-            }
-
-            // 裸数组，仅包含后端要求的两个字段
-            const payload = allSelected.map(item => ({
-                productId: productId,
-                productMachineId: item.id,
-                leaseTime: Number(item.leaseTime || 1)
-            }))
-
             try {
-                const res = await this.fetchAddCart(payload)
-                // 若后端返回码存在，这里做一下兜底提示
-                if (!res || (res.code && Number(res.code) !== 200)) {
-                    this.$message.error(res && res.msg ? res.msg : '加入购物车失败，请稍后重试')
-                    return
+                // 按接口要求：一次性传数组，每个对象代表一个勾选商品
+                const payload = items.map(it => {
+                    const obj = {
+                        id: it.id,
+                        leaseTime: Number(it.leaseTime || 1)
+                    }
+                    if (this.machineType === 0) {
+                        obj.numbers = Number(it.purchaseQuantity || 1)
+                    }
+                    return obj
+                })
+                const res = await addGoodsV2(payload)
+                if (!res || !(res.code === 0 || res.code === 200)) {
+                    this.$message.error('部分商品加入购物车失败，请重试')
+                } else {
+                    this.$message.success(`已加入 ${items.length} 台矿机到购物车`)
                 }
-                // 立即本地更新禁用状态：把刚加入的机器ID合并进本地集合
-                try {
-                    allSelected.forEach(item => {
-                        if (item && item.id) this.cartMachineIdSet.add(item.id)
-                        this.$set(item, '_selected', false)
-                        this.$set(item, '_inCart', true)
-                        if (!item.leaseTime || Number(item.leaseTime) <= 0) this.$set(item, 'leaseTime', 1)
-                    })
-                    this.$nextTick(() => this.autoSelectAndDisable())
-                } catch (e) { /* noop */ }
-
-                this.$message({
-                    message: `已加入 ${allSelected.length} 台矿机到购物车`,
-                    type: 'success',
-                    duration: 3000,
-                    showClose: true,
-                });
-
                 this.confirmAddDialog.visible = false
-                // 清空选中映射，然后重新加载数据（数据加载时会自动设置 _selected: false）
-                this.selectedMap = {}
-                // 重新加载机器信息和购物车数据
-                this.fetchGetMachineInfo(this.params)
-                this.fetchGetGoodsList()
-                // 通知头部刷新服务端购物车数量
+                // 清空勾选
                 try {
-                    // 如果没有传数量，header 会主动拉取服务端数量
-                    window.dispatchEvent(new CustomEvent('cart-updated'))
+                    (this.dynamicRows || []).forEach(r => { if (r) this.$set(r, '_selected', false) })
                 } catch (e) { /* noop */ }
-
+                // 通知头部刷新
+                try { window.dispatchEvent(new CustomEvent('cart-updated')) } catch (e) { /* noop */ }
             } catch (e) {
-                console.error('加入购物车失败: ', e)
+                // eslint-disable-next-line no-console
+                console.error('addGoodsV2 error:', e)
                 this.$message.error('加入购物车失败，请稍后重试')
             }
         },
diff --git a/power_leasing/src/views/productDetail/index.vue b/power_leasing/src/views/productDetail/index.vue
index d7e8959..f3bbfd2 100644
--- a/power_leasing/src/views/productDetail/index.vue
+++ b/power_leasing/src/views/productDetail/index.vue
@@ -35,6 +35,16 @@
       <!-- 筛选栏 -->
       <section class="filter-bar" aria-label="筛选条件">
         <div class="filter-grid">
+          <!-- 矿机种类：放在支付方式筛选前面 -->
+          <div class="filter-cell">
+            <label class="filter-title">矿机种类</label>
+            <div style="display:inline-flex;align-items:center;">
+              <el-radio-group v-model="machineType" size="small" @change="handleMachineTypeChange">
+                <el-radio-button :label="1">GPU</el-radio-button>
+                <el-radio-button :label="0">ASIC</el-radio-button>
+              </el-radio-group>
+            </div>
+          </div>
           <!-- 支付方式筛选：选择即触发查询 -->
           <div class="filter-cell">
             <label class="filter-title" for="payFilter">支付方式筛选</label>
@@ -47,6 +57,7 @@
               size="small"
               class="filter-control"
               @change="handlePayFilterChange"
+              style="max-width: 260px;"
             >
               <template #prefix>
                 <img
@@ -80,292 +91,148 @@
             </div>
           </div>
 
-          <!-- 实际算力区间 -->
-          <div class="filter-cell center-title">
-            <label class="filter-title">实际算力</label>
-            <div class="range-controls">
-              <el-input-number v-model="filters.minPower" :min="0" :step="0.1" :precision="2" :controls="false" size="small" class="filter-control" />
-              <span class="filter-sep">-</span>
-              <el-input-number v-model="filters.maxPower" :min="0" :step="0.1" :precision="2" :controls="false" size="small" class="filter-control" />
-              <el-select v-model="filters.unit" placeholder="单位" size="small" class="filter-control" style="max-width: 140px;">
-                <el-option v-for="u in powerUnitOptions" :key="u" :label="u" :value="u" />
-              </el-select>
-            </div>
-          </div>
-
-          <!-- 功耗区间：第二行左侧，占两列 -->
-          <div class="filter-cell filter-cell--span-2 center-title">
-            <label class="filter-title">功耗(kw/h)</label>
-            <div class="range-controls">
-              <el-input-number v-model="filters.minPowerDissipation" :min="0" :step="0.1" :precision="2" :controls="false" size="small" class="filter-control" />
-              <span class="filter-sep">-</span>
-              <el-input-number v-model="filters.maxPowerDissipation" :min="0" :step="0.1" :precision="2" :controls="false" size="small" class="filter-control" />
-              <div class="filter-actions-inline">
+          <!-- 操作按钮 -->
+          <div class="filter-cell filter-actions">
+            <div class="action-row">
                 <el-button type="primary" size="small" @click="handleSearchFilters" aria-label="执行筛选">筛选查询</el-button>
                 <el-button size="small" @click="handleResetFilters" aria-label="重置筛选">重置</el-button>
               </div>
             </div>
           </div>
-
-          <!-- 操作区已合并到功耗区间后面 -->
-        </div>
       </section>
-      <section class="productList">
-        <!-- 单层产品列表 -->
+      <!-- 动态表格（基于后端返回的 columns/rows 渲染） -->
+      <section v-if="dynamicColumns && dynamicColumns.length" class="dynamic-hashrate" aria-label="动态收益表">
         <el-table
-          ref="machineTable"
-          class="series-table"
-          :data="machineList"
-          row-key="id"
-          :row-class-name="handleGetRowClass"
+          :data="dynamicRows"
+          border
+          stripe
+          size="small"
+          class="dynamic-table"
           :header-cell-style="{ textAlign: 'left' }"
           :cell-style="{ textAlign: 'left' }"
-          style="width: 100%"
         >
-          <el-table-column width="46">
-            <template #default="scope">
+          <!-- 勾选框列（首列） -->
+          <el-table-column width="46" fixed="left">
+            <template #default="{ row }">
               <el-checkbox
-                v-model="scope.row._selected"
-                :disabled="scope.row.saleState === 1 || scope.row.saleState === 2"
-                :title="(scope.row.saleState === 1 || scope.row.saleState === 2) ? '该机器已售出或售出中，无法选择' : ''"
-                @change="checked => handleManualSelectFlat(scope.row, checked)"
+                v-model="row._selected"
+                :title="'选择该矿机'"
+                @change="checked => handleManualSelectFlat(row, checked)"
               />
             </template>
           </el-table-column>
-
-    
-
-          <el-table-column prop="theoryPower" label="理论算力"  header-align="left" align="left" show-overflow-tooltip>
-            <template #default="scope">
+          <el-table-column
+            v-for="(col, colIdx) in getRenderedColumns()"
+            :key="col.key || colIdx"
+            :prop="col.key"
+            :label="col.label"
+            :fixed="col.fixed || false"
+            show-overflow-tooltip
+          >
+            <template #header>
+              <div class="col-header" :title="col.label">
+                <img v-if="col.icon" :src="col.icon" class="col-icon" alt="" />
+                <span>{{ col.label }}</span>
+                <!-- 算力列标题不再展示单位，仅展示图标和名称 -->
+                <el-button
+                  v-if="isLastHashrateColumn(colIdx)"
+                  type="text"
+                  class="more-action"
+                  @click.stop="handleOpenDynamicSearch"
+                >更多</el-button>
+              </div>
+            </template>
+            <template #default="{ row }">
               <span class="num-strong">
                 <el-tooltip
-                  v-if="formatNum6(scope.row.theoryPower).truncated"
-                  :content="formatNum6(scope.row.theoryPower).full"
+                  v-if="formatDynamicCell(row, col).truncated"
+                  :content="formatDynamicCell(row, col).full"
                   placement="top"
                 >
-                  <span>
-                    {{ formatNum6(scope.row.theoryPower).text }}
-                    <i class="el-icon-more amount-more"></i>
-                  </span>
+                  <span>{{ formatDynamicCell(row, col).text }}</span>
                 </el-tooltip>
-                <span v-else>{{ formatNum6(scope.row.theoryPower).text }}</span>
+                <span v-else>{{ formatDynamicCell(row, col).text }}</span>
               </span>
-              {{ scope.row.unit }}
             </template>
           </el-table-column>
-
-          <el-table-column  header-align="left" align="left" show-overflow-tooltip>
-            <template #header>
-              <span class="sortable" :class="{ active: activeSortField==='powerSort' }" @click="handleToggleSort('powerSort')">
-                实际算力
-                <i class="sort-arrow" :class="[(sortStates && sortStates.powerSort) ? 'asc' : 'desc', activeSortField==='powerSort' ? 'active' : '']"></i>
-              </span>
-            </template>
+          <!-- 仅在 ASIC 时显示：总机器数量、已售数量 -->
+          <el-table-column v-if="machineType === 0" prop="saleNumbers" label="总机器数">
             <template #default="scope">
-              <span class="num-strong">
-                <el-tooltip
-                  v-if="formatNum6(scope.row.computingPower).truncated"
-                  :content="formatNum6(scope.row.computingPower).full"
-                  placement="top"
-                >
-                  <span>
-                    {{ formatNum6(scope.row.computingPower).text }}
-                    <i class="el-icon-more amount-more"></i>
-                  </span>
-                </el-tooltip>
-                <span v-else>{{ formatNum6(scope.row.computingPower).text }}</span>
-              </span>
-              {{ scope.row.unit }}
+              <span>{{ scope.row.saleNumbers != null ? scope.row.saleNumbers : '—' }}</span>
             </template>
           </el-table-column>
-
-          <el-table-column prop="powerDissipation"  header-align="left" align="left">
-            <template #header>
-              <span class="sortable" :class="{ active: activeSortField==='powerDissipationSort' }" @click="handleToggleSort('powerDissipationSort')">
-                功耗(kw/h)
-                <i class="sort-arrow" :class="[(sortStates && sortStates.powerDissipationSort) ? 'asc' : 'desc', activeSortField==='powerDissipationSort' ? 'active' : '']"></i>
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="algorithm" label="算法"  header-align="left" align="left" />
-
-          <el-table-column prop="theoryIncome"  header-align="left" align="left" show-overflow-tooltip>
-            <template #header>
-              单机理论收入(每日)
-              <span v-if="getFirstCoinSymbol()">（{{ getFirstCoinSymbol() }}）</span>
-            </template>
+          <el-table-column v-if="machineType === 0" prop="saleOutNumbers" label="已售数量">
             <template #default="scope">
-              <span class="num-strong">
-                <el-tooltip
-                  v-if="formatNum6(scope.row.theoryIncome).truncated"
-                  :content="formatNum6(scope.row.theoryIncome).full"
-                  placement="top"
-                >
-                  <span>
-                    {{ formatNum6(scope.row.theoryIncome).text }}
-                    <i class="el-icon-more amount-more"></i>
-                  </span>
-                </el-tooltip>
-                <span v-else>{{ formatNum6(scope.row.theoryIncome).text }}</span>
-              </span>
+              <span>{{ scope.row.saleOutNumbers != null ? scope.row.saleOutNumbers : '—' }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="theoryUsdtIncome" label="单机理论收入(每日/USDT)"  header-align="left" align="left">
+      
+          <!-- 租赁天数：始终显示，用户手动填写 -->
+          <el-table-column prop="leaseTime" label="租赁天数(天)">
             <template #default="scope">
-              <span class="num-strong">
-                <el-tooltip
-                  v-if="formatNum6(scope.row.theoryUsdtIncome).truncated"
-                  :content="formatNum6(scope.row.theoryUsdtIncome).full"
-                  placement="top"
-                >
-                  <span>
-                    {{ formatNum6(scope.row.theoryUsdtIncome).text }}
-                    <i class="el-icon-more amount-more"></i>
-                  </span>
-                </el-tooltip>
-                <span v-else>{{ formatNum6(scope.row.theoryUsdtIncome).text }}</span>
-              </span>
+              <el-input-number class="input-full" v-model="scope.row.leaseTime" :min="1" :precision="0" :step="1" :controls="false" size="mini" />
             </template>
           </el-table-column>
-
-          <el-table-column prop="type" label="矿机型号" header-align="left" align="left"  />
-          <el-table-column label="最大可租赁(天)"  header-align="left" align="left">
-            <template #default="scope">{{ getRowMaxLeaseDays(scope.row) }}</template>
-          </el-table-column>
-          <el-table-column label="租赁天数(天)"  header-align="left" align="left">
+              <!-- ASIC 专用：购买数量，用户输入 -->
+              <el-table-column v-if="machineType === 0" prop="purchaseQuantity" label="购买数量">
             <template #default="scope">
-              <el-input-number
-                v-model="scope.row.leaseTime"
-                :min="1"
-                :max="getRowMaxLeaseDays(scope.row)"
-                :step="1"
-                :precision="0"
-                size="mini"
-                :disabled="scope.row.saleState === 1 || scope.row.saleState === 2"
-                controls-position="right"
-                @change="val => handleLeaseDaysChange(scope.row, val)"
-              />
-            </template>
-          </el-table-column >
-          <el-table-column  prop="price" header-align="left" align="center" >
-            <template #header>
-              <span class="sortable" :class="{ active: activeSortField==='priceSort' }" @click="handleToggleSort('priceSort')">
-                单价 <span v-if="getPriceCoinSymbol()">（{{ getPriceCoinSymbol() }}）</span>
-                <i class="sort-arrow" :class="[(sortStates && sortStates.priceSort) ? 'asc' : 'desc', activeSortField==='priceSort' ? 'active' : '']"></i>
-              </span>
-            </template>
-            <template #default="scope">
-              <span class="price-strong">
-                <el-tooltip
-                  v-if="formatAmount(scope.row.price, getRowCoin(scope.row)).truncated"
-                  :content="formatAmount(scope.row.price, getRowCoin(scope.row)).full"
-                  placement="top"
-                >
-                  <span>
-                    {{ formatAmount(scope.row.price, getRowCoin(scope.row)).text }}
-                    <i class="el-icon-more amount-more"></i>
-                  </span>
-                </el-tooltip>
-                <span v-else>{{ formatAmount(scope.row.price, getRowCoin(scope.row)).text }}</span>
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="saleState" label="售出状态" width="110" header-align="left" align="left" >
-            <template #default="scope">
-              <el-tag :type="scope.row.saleState === 0 ? 'info' : (scope.row.saleState === 1 ? 'danger' : 'warning')">
-                {{ scope.row.saleState === 0 ? '未售出' : (scope.row.saleState === 1 ? '已售出' : '售出中') }}
-              </el-tag>
+              <el-input-number class="input-full" v-model="scope.row.purchaseQuantity" :min="0" :precision="0" :step="1" :controls="false" size="mini" />
             </template>
           </el-table-column>
         </el-table>
+
+        <!-- 动态表格 - 搜索弹窗 -->
+        <el-dialog
+          title="搜索币种/算法"
+          :visible.sync="dynamicSearch.visible"
+          width="420px"
+        >
+          <div style="display:flex;gap:10px;align-items:center;">
+            <el-input
+              v-model="dynamicSearch.keyword"
+              placeholder="输入币种代码或算法关键词"
+              clearable
+              @keyup.enter.native="handleConfirmDynamicSearch"
+            />
+            <el-button type="primary" @click="handleConfirmDynamicSearch">搜索</el-button>
+        </div>
+          <template #footer>
+            <el-button @click="dynamicSearch.visible=false">取消</el-button>
+            <el-button type="primary" @click="handleConfirmDynamicSearch">确定</el-button>
+          </template>
+        </el-dialog>
       </section>
 
+
       <div style="margin: 18px; text-align: right;">
         <el-button type="primary" size="small" @click="handleOpenAddToCartDialog">加入购物车</el-button>
       </div>
 
       <!-- 确认加入购物车弹窗 -->
-      <el-dialog :visible.sync="confirmAddDialog.visible" width="80vw" :title="`确认加入购物车（共 ${confirmAddDialog.items.length} 台）`">
+      <el-dialog :visible.sync="confirmAddDialog.visible" width="50vw" :title="`确认加入购物车（共 ${confirmAddDialog.items.length} 台）`">
         <div>
           <el-table :data="confirmAddDialog.items" height="360" border stripe :header-cell-style="{ textAlign: 'left' }" :cell-style="{ textAlign: 'left' }">
-            <el-table-column prop="theoryPower" label="理论算力" header-align="left" align="left">
-              <template #default="scope">
-                <span class="num-strong">
-                  <el-tooltip
-                    v-if="formatNum6(scope.row.theoryPower).truncated"
-                    :content="formatNum6(scope.row.theoryPower).full"
-                    placement="top"
-                  >
-                    <span>
-                      {{ formatNum6(scope.row.theoryPower).text }}
-                      <i class="el-icon-more amount-more"></i>
-                    </span>
-                  </el-tooltip>
-                  <span v-else>{{ formatNum6(scope.row.theoryPower).text }}</span>
-                </span>
-                {{ scope.row.unit }}
-              </template>
-            </el-table-column>
-            <el-table-column label="实际算力"  header-align="left" align="left">
-              <template #default="scope">
-                <span class="num-strong">
-                  <el-tooltip
-                    v-if="formatNum6(scope.row.computingPower).truncated"
-                    :content="formatNum6(scope.row.computingPower).full"
-                    placement="top"
-                  >
-                    <span>
-                      {{ formatNum6(scope.row.computingPower).text }}
-                      <i class="el-icon-more amount-more"></i>
-                    </span>
-                  </el-tooltip>
-                  <span v-else>{{ formatNum6(scope.row.computingPower).text }}</span>
-                </span>
-                {{ scope.row.unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="algorithm" label="算法" width="120" header-align="left" align="left" />
-            <el-table-column prop="powerDissipation" label="功耗(kw/h)"  header-align="left" align="left">
-              <template #default="scope">
-                <span class="num-strong">
-                  <el-tooltip
-                    v-if="formatNum6(scope.row.powerDissipation).truncated"
-                    :content="formatNum6(scope.row.powerDissipation).full"
-                    placement="top"
-                  >
-                    <span>
-                      {{ formatNum6(scope.row.powerDissipation).text }}
-                      <i class="el-icon-more amount-more"></i>
-                    </span>
-                  </el-tooltip>
-                  <span v-else>{{ formatNum6(scope.row.powerDissipation).text }}</span>
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column label="租赁天数(天)"  header-align="left" align="left">
-              <template #default="scope">{{ Number(scope.row.leaseTime || 1) }}</template>
-            </el-table-column>
-            <el-table-column prop="price" header-align="left" align="left">
-              <template #header>
-                单价 <span v-if="getPriceCoinSymbol()">（{{ getPriceCoinSymbol() }}）</span>
-              </template>
+            <el-table-column prop="model" label="型号" header-align="left" align="left" />
+            <el-table-column prop="price" label="价格" header-align="left" align="left">
               <template #default="scope">
                 <span class="price-strong">
                   <el-tooltip
-                    v-if="formatAmount(scope.row.price, getRowCoin(scope.row)).truncated"
-                    :content="formatAmount(scope.row.price, getRowCoin(scope.row)).full"
+                    v-if="formatDynamicCell(scope.row, { key: 'price', type: 'amount' }).truncated"
+                    :content="formatDynamicCell(scope.row, { key: 'price', type: 'amount' }).full"
                     placement="top"
                   >
-                    <span>
-                      {{ formatAmount(scope.row.price, getRowCoin(scope.row)).text }}
-                      <i class="el-icon-more amount-more"></i>
-                    </span>
+                    <span>{{ formatDynamicCell(scope.row, { key: 'price', type: 'amount' }).text }}</span>
                   </el-tooltip>
-                  <span v-else>{{ formatAmount(scope.row.price, getRowCoin(scope.row)).text }}</span>
+                  <span v-else>{{ formatDynamicCell(scope.row, { key: 'price', type: 'amount' }).text }}</span>
                 </span>
               </template>
             </el-table-column>
-          
+            <el-table-column prop="leaseTime" label="租赁天数(天)" header-align="left" align="left">
+              <template #default="scope">{{ Number(scope.row.leaseTime || 1) }}</template>
+            </el-table-column>
+            <el-table-column v-if="machineType === 0" prop="purchaseQuantity" label="购买数量" header-align="left" align="left">
+              <template #default="scope">{{ Number(scope.row.purchaseQuantity || 0) }}</template>
+            </el-table-column>
           </el-table>
         </div>
         <template #footer>
@@ -593,21 +460,18 @@ export default {
      * 覆盖 mixin 的多层版本：基于单层勾选打开确认弹窗
      */
     handleOpenAddToCartDialog() {
-      const list = Array.isArray(this.machineList) ? this.machineList : []
-      const pickedAll = list.filter(it => !!it && !!it._selected)
-      const picked = pickedAll.filter(m => m && (m.saleState === 0 || m.saleState === undefined || m.saleState === null))
+      const list = Array.isArray(this.dynamicRows) ? this.dynamicRows : []
+      const picked = list.filter(it => !!it && !!it._selected)
       if (!picked.length) {
         this.$message.warning('请先勾选至少一台矿机')
         return
       }
-      if (picked.length < pickedAll.length) {
-        this.$message.warning('部分机器已售出或售出中，已自动为您排除')
-      }
-      this.confirmAddDialog.items = picked.slice()
+      this.confirmAddDialog.items = picked.map(r => ({
+        ...r,
+        leaseTime: Number(r.leaseTime || 1),
+        purchaseQuantity: Number(r.purchaseQuantity || 0)
+      }))
       this.confirmAddDialog.visible = true
-      this.$nextTick(() => {
-        try { (this.machineList || []).forEach(m => this.$set(m, '_selected', false)) } catch (e) { /* noop */ }
-      })
     }
   }
 }
@@ -802,10 +666,11 @@ export default {
   margin: 0 10px 16px 10px;
 }
 .filter-grid {
-  display: grid;
-  grid-template-columns: repeat(3, minmax(260px, 1fr));
-  gap: 14px 18px;
-  align-items: end;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px 16px;
+  align-items: flex-end;
+  justify-content: flex-start;
 }
 .filter-cell {
   display: flex;
@@ -837,11 +702,11 @@ export default {
   color: #9aa4b2;
 }
 .filter-actions {
-  display: flex;
+  display: inline-flex;
   align-items: center;
   gap: 10px;
-  grid-column: 2 / 3; /* 放到中间这一格 */
 }
+.action-row { display: inline-flex; align-items: center; gap: 10px; }
 
 .filter-actions-inline {
   display: inline-flex;
@@ -850,6 +715,24 @@ export default {
   margin-left: 12px;
 }
 
+/* 动态表格样式 */
+.dynamic-hashrate { 
+  margin: 10px; 
+  background: #fff; 
+  border: 1px solid #eef2f7; 
+  border-radius: 8px; 
+  padding: 10px; 
+}
+.dynamic-table :deep(.el-table__header th) {
+  background: #fafcff;
+}
+.col-header { display: inline-flex; align-items: center; gap: 6px; }
+.col-icon { width: 16px; height: 16px; border-radius: 3px; }
+.col-unit { color: #94a3b8; font-size: 12px; }
+.more-action { margin-left: 8px; color: #2563eb; font-weight: 600; }
+.input-full { width: 100%; }
+:deep(.el-input-number.input-full) { width: 100%; }
+
 @media (max-width: 1200px) {
   .filter-grid { grid-template-columns: repeat(2, minmax(220px, 1fr)); }
   .filter-cell--span-2 { grid-column: 1 / span 1; }
diff --git a/power_leasing/src/views/productList/index.js b/power_leasing/src/views/productList/index.js
index bf5c2ff..d8dff9e 100644
--- a/power_leasing/src/views/productList/index.js
+++ b/power_leasing/src/views/productList/index.js
@@ -1,4 +1,4 @@
-import { getProductList } from '../../api/products'
+import { getShopList } from '../../api/products'
 export default {
   name: 'ProductList',
   data() {
@@ -172,134 +172,60 @@ export default {
       screenCurrency: "",
       searchAlgorithm: "",
       params:{
-        coin: "",
-        algorithm: ""
+        pageNum: "1",
+        pageSize: "10",
+        keyword:""
       },
       productListLoading:false,
     }
   },
   mounted() {
-    this.fetchGetList()
+    this.fetchShopList()
   },
   methods: {
-  /**
-   * 价格裁剪为两位小数（不四舍五入）
-   * 兼容区间字符串："min-max" 或 单值
-   */
-  formatPriceRange(input) {
-    try {
-      if (input === null || input === undefined) return '0.00'
-      const raw = String(input)
-      if (raw.includes('-')) {
-        const [lo, hi] = raw.split('-')
-        return `${this._truncate2(lo)}-${this._truncate2(hi)}`
-      }
-      return this._truncate2(raw)
-    } catch (e) {
-      return '0.00'
-    }
-  },
-  /**
-   * 将任意数字字符串截断为 2 位小数（不四舍五入）。
-   */
-  _truncate2(val) {
-    if (val === null || val === undefined) return '0.00'
-    const str = String(val).trim()
-    if (!str) return '0.00'
-    const [intPart, decPart = ''] = str.split('.')
-    const two = decPart.slice(0, 2)
-    return `${intPart}.${two.padEnd(2, '0')}`
-  },
-  handleCurrencyChange(val){
-    try{
-      // 清空时（el-select 的 clear 同时触发 change），避免重复请求，交由 handleCurrencyClear 处理
-      if (val === undefined || val === null || val === '') return
-      // 选择具体币种时，合并算法关键词一起查询
-      this.params.coin = val
-      const keyword = (this.searchAlgorithm || '').trim()
-      const req = keyword ? { coin: val, algorithm: keyword } : { coin: val }
-      this.fetchGetList(req)
-     
-     
-      // 可在此发起接口：getProductList({ coin: val })
-      // this.fetchGetList({ coin: val })
-    }catch(e){
-      console.error('处理币种变更失败', e)
-    }
-  },
-
-  async fetchGetList(params) {
-    this.productListLoading = true
-    try {
-      const res = await getProductList(params)
-      console.log('API响应:', res)
-      if (res && res.code === 200) {
-        this.products = res.rows || []
-        console.log('商品数据:', this.products)
-      } else {
-        console.error('API返回错误:', res)
+    // 获取商场页面的店铺列表
+    async fetchShopList(params) {
+      this.productListLoading = true
+      try{
+        // 仅允许 pageNum、pageSize、keyword 三个参数
+        const payload = {
+          pageNum: this.params.pageNum,
+          pageSize: this.params.pageSize
+        }
+        const kw = params && typeof params === 'object' ? params.keyword : this.params.keyword
+        if (kw) payload.keyword = kw
+        const res = await getShopList(payload)
+        if (res && (res.code === 0 || res.code === 200)) {
+          // 这里直接将店铺列表赋值到 products，用于页面渲染
+          this.products = Array.isArray(res.rows) ? res.rows : []
+        } else {
+          this.products = []
+        }
+      }catch(e){
+        console.error('获取店铺列表失败:', e)
         this.products = []
       }
-    } catch (error) {
-      console.error('获取商品列表失败:', error)
-      this.products = []
-      // 添加一些测试数据，避免页面空白
-      this.products = [
-        // {
-        //   id: 1,
-        //   name: "测试商品1",
-        //   algorithm: "测试算法1",
-        //   priceRange: "100-200",
-        //   image: "https://img.yzcdn.cn/vant/apple-1.jpg"
-        // },
-        // {
-        //   id: 2,
-        //   name: "测试商品2", 
-        //   algorithm: "测试算法2",
-        //   priceRange: "200-300",
-        //   image: "https://img.yzcdn.cn/vant/apple-1.jpg"
-        // }
-      ]
-    }
-    this.productListLoading = false
-  },
+      this.productListLoading = false
+    },
+ 
     // 算法搜索（使用同一接口，传入 algorithm 参数）
     handleAlgorithmSearch() {
       const keyword = (this.searchAlgorithm || '').trim()
-      const next = { ...this.params }
-      if (keyword) {
-        next.algorithm = keyword
-        this.params.algorithm = keyword
-      } else {
-        delete next.algorithm
-        this.params.algorithm = ""
-      }
-      // 不重置下拉，只根据算法关键词查询
-      if (next.algorithm) this.fetchGetList({ ...next, coin: this.screenCurrency || undefined })
-      else this.fetchGetList(this.screenCurrency ? { coin: this.screenCurrency } : undefined)
+      this.params.keyword = keyword
+      this.fetchShopList(keyword ? { keyword } : undefined)
      
     },
-    // 清空下拉时：只清 coin，保留算法条件
-    handleCurrencyClear() {
-      this.screenCurrency = ""
-      this.params.coin = ""
-      const keyword = (this.searchAlgorithm || '').trim()
-      if (keyword) this.fetchGetList({ algorithm: keyword })
-      else this.fetchGetList()
-    },
-    // 清空算法时：只清 algorithm，保留下拉 coin
+    // 清空搜索关键字
     handleAlgorithmClear() {
       this.searchAlgorithm = ""
-      this.params.algorithm = ""
-      const coin = this.screenCurrency
-      if (coin) this.fetchGetList({ coin })
-      else this.fetchGetList()
+      this.params.keyword = ""
+      this.fetchShopList()
     },
     handleProductClick(product) {
 
-      if (product.id || product.id == 0) {
-          
-        this.$router.push(`/product/${product.id}`);  
+      const id = (product && (product.shopId != null ? product.shopId : product.id)) 
+      if (id !== undefined && id !== null) {
+        this.$router.push(`/product/${id}`);  
       }  
 
      
diff --git a/power_leasing/src/views/productList/index.vue b/power_leasing/src/views/productList/index.vue
index db480d7..8bfb9bc 100644
--- a/power_leasing/src/views/productList/index.vue
+++ b/power_leasing/src/views/productList/index.vue
@@ -3,41 +3,15 @@
     <section class="container"> 
       <h1 class="page-title">商品列表</h1>
       <section class="filter-section">
-        <label class="required" style="margin-bottom: 10px">币种选择：</label>
         <div class="filter-row">
-          <!-- 币种下拉 -->
-          <el-select
-            class="input"
-            size="middle"
-            ref="screen"
-            v-model="screenCurrency"
-            placeholder="请选择"
-            @change="handleCurrencyChange"
-            @clear="handleCurrencyClear"
-            clearable
-          >
-            <el-option
-              v-for="item in currencyList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-              <div style="display: flex; align-items: center">
-                <img :src="item.imgUrl" style="float: left; width: 20px" />
-                <span style="float: left; margin-left: 5px">{{ item.label }}</span>
-              </div>
-            </el-option>
-          </el-select>
-
-          <!-- 算法搜索框 -->
           <el-input
             v-model="searchAlgorithm"
             size="middle"
-            placeholder="输入算法关键词"
+            placeholder="输入币种或算法搜索"
             clearable
             @clear="handleAlgorithmClear"
             @keyup.enter.native="handleAlgorithmSearch"
-            style="width: 240px;"
+            class="search-input"
           >
             <template #append>
               <el-button type="primary" @click="handleAlgorithmSearch">搜索</el-button>
@@ -47,8 +21,8 @@
       </section>
       <div class="product-list-grid">
         <div
-          v-for="product in products"
-          :key="product.id"
+          v-for="(product, idx) in products"
+          :key="product.shopId || product.id || idx"
           class="product-item"
           @click="handleProductClick(product)"
           tabindex="0"
@@ -57,8 +31,22 @@
           <!-- <img :src="product.image || 'https://img.yzcdn.cn/vant/apple-1.jpg'" :alt="product.name" class="product-image" /> -->
           <img src="../../assets/imgs/commodity.png" :alt="product.name" class="product-image" />
           <div class="product-info">
-            <h4>商品: {{ product.name }}</h4>
-            <p style="font-size: 16px;margin-top: 10px;font-weight: bold;">算法: {{ product.algorithm }}</p>
+            <h4 class="title-line">
+              <span class="label">店铺：</span>
+              <span class="value ellipsis" :title="product.shopName || product.name">{{ product.shopName || product.name }}</span>
+            </h4>
+            <p class="info-line coin-line">
+              <span class="label">币种：</span>
+              <el-tooltip :content="product.coin" placement="top" :open-delay="80">
+                <span class="value ellipsis" tabindex="0" :aria-label="`币种 ${product.coin}`">{{ product.coin }}</span>
+              </el-tooltip>
+            </p>
+            <p class="info-line algorithm-line">
+              <span class="label">算法：</span>
+              <el-tooltip :content="product.algorithm" placement="top" :open-delay="80">
+                <span class="value ellipsis" tabindex="0" :aria-label="`算法 ${product.algorithm}`">{{ product.algorithm }}</span>
+              </el-tooltip>
+            </p>
             <div class="product-footer">
               <div class="paytypes">
                 <span class="paytypes-label">支付方式：</span>
@@ -74,7 +62,6 @@
               </div>
               <div class="right-meta">
                 <span class="product-sold" aria-label="已售数量">已售：{{ product && product.saleNumber != null ? product.saleNumber : 0 }}</span>
-                <span class="shop-name">店铺：{{ product && (product.shopName || product.name) }}</span>
               </div>
             </div>
           </div>
@@ -90,7 +77,6 @@
 </template>
 
 <script>
-import { listProducts } from "../../utils/productService";
 import { addToCart } from "../../utils/cartManager";
 import Index from "./index";
 
@@ -194,20 +180,70 @@ export default {
   height: 40vh;
 }
 .product-image {
-  width: 68%;
-  height:65%;
+  width: 57%;
+  height:55%;
   object-fit: cover;
   margin-bottom: 12px;
 }
 .product-info {
   width: 100%;
 }
+.title-line{
+  display: flex;
+  align-items: baseline;
+  gap: 6px;
+  font-size: 14px;
+  margin: 0 0 4px 0;
+  font-weight: normal;
+}
+.title-line .label{
+  font-weight: 700;
+}
+.info-line {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.info-line .label { color: #334155; font-weight: 700; }
+.info-line .value {
+  flex: 1;
+  min-width: 0;
+}
+.ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.coin-line { font-size: 14px; margin-top: 8px; }
+.algorithm-line { font-size: 14px; margin-top: 6px; }
+.algorithm-line .value.bold { font-weight: bold; }
 .product-footer {
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin-top: 8px;
 }
+.search-input{
+  width: 420px;
+}
+/* 轻度统一高度与圆角，保留 Element 默认视觉 */
+::v-deep .search-input .el-input__inner{
+  height: 40px;
+  line-height: 40px;
+  border-radius: 6px 0 0 6px;
+  padding: 0 14px;
+}
+::v-deep .search-input .el-input__inner::placeholder{
+  color: #9aa4b2; /* 略浅的占位符 */
+}
+::v-deep .search-input .el-input__inner:focus{
+  box-shadow: 0 0 0 2px rgba(64,158,255,.12);
+}
+::v-deep .search-input .el-input-group__append .el-button{
+  height: 40px;
+  border-radius: 0 6px 6px 0;
+  padding: 0 16px;
+}
 .right-meta{
   display: flex;
   flex-direction: column;