From bea1aa8e4c42db4991b9f75e3ca3d37a592e0aa7 Mon Sep 17 00:00:00 2001 From: yaoqin <497681109@qq.com> Date: Fri, 7 Nov 2025 16:30:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E4=BA=94=E5=9B=BA=E5=AE=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- power_leasing/src/api/products.js | 10 + power_leasing/src/api/shops.js | 58 +-- power_leasing/src/api/wallet.js | 22 + power_leasing/src/views/account/OrderList.vue | 11 +- .../src/views/account/productDetail.vue | 152 +++++-- .../src/views/account/productMachineAdd.vue | 271 ++++++++++-- power_leasing/src/views/account/products.vue | 65 ++- .../src/views/account/shopConfig.vue | 205 ++++++++- power_leasing/src/views/cart/index.vue | 2 +- .../src/views/productDetail/index.js | 101 +++-- .../src/views/productDetail/index.vue | 416 ++++++++++++++---- power_leasing/src/views/productList/index.vue | 30 +- 12 files changed, 1122 insertions(+), 221 deletions(-) diff --git a/power_leasing/src/api/products.js b/power_leasing/src/api/products.js index 0794fdd..e126562 100644 --- a/power_leasing/src/api/products.js +++ b/power_leasing/src/api/products.js @@ -87,3 +87,13 @@ export function getMachineInfoById(data) { } +// 查获取商城商品支持的支付方式 +export function getPayTypes(data) { + return request({ + url: `/lease/product/getPayTypes`, + method: 'post', + data + }) +} + + diff --git a/power_leasing/src/api/shops.js b/power_leasing/src/api/shops.js index 1a15d0a..a8c465d 100644 --- a/power_leasing/src/api/shops.js +++ b/power_leasing/src/api/shops.js @@ -56,43 +56,43 @@ export function closeShop(id) { // 根据 店铺id 查询店铺商品配置信息列表 export function getShopConfig(id) { - return request({ - url: `/lease/shop/getShopConfig`, - method: 'post', - data: { id } - }) - } + return request({ + url: `/lease/shop/getShopConfig`, + method: 'post', + data: { id } + }) +} - // 新增商铺配置 +// 新增商铺配置 export function addShopConfig(data) { - return request({ - url: `/lease/shop/addShopConfig`, - method: 'post', - data - }) - } + return request({ + url: `/lease/shop/addShopConfig`, + method: 'post', + data + }) +} - // 根据配置id 修改配置 +// 根据配置id 修改配置 export function updateShopConfig(data) { - return request({ - url: `/lease/shop/updateShopConfig`, - method: 'post', - data - }) - } + return request({ + url: `/lease/shop/updateShopConfig`, + method: 'post', + data + }) +} - // 根据配置id 删除配置 +// 根据配置id 删除配置 export function deleteShopConfig(data) { - return request({ - url: `/lease/shop/deleteShopConfig`, - method: 'post', - data - }) - } + return request({ + url: `/lease/shop/deleteShopConfig`, + method: 'post', + data + }) +} - - // 钱包配置(用于修改卖家钱包地址)----获取链(一级)和币(二级) 下拉列表(获取本系统支持的链和币种) + +// 钱包配置(用于修改卖家钱包地址)----获取链(一级)和币(二级) 下拉列表(获取本系统支持的链和币种) export function getChainAndCoin(data) { return request({ url: `/lease/shop/getChainAndCoin`, diff --git a/power_leasing/src/api/wallet.js b/power_leasing/src/api/wallet.js index c159175..5f29af5 100644 --- a/power_leasing/src/api/wallet.js +++ b/power_leasing/src/api/wallet.js @@ -106,6 +106,28 @@ export function getRecentlyTransaction(data) { }) } +//绑定钱包前查询商品列表 +export function getProductListForShopWalletConfig(data) { + return request({ + url: `/lease/product/getProductListForShopWalletConfig`, + method: 'post', + data + }) +} + + +//设置之前商品列表的新链的机器价格 +export function updateProductListForShopWalletConfig(data) { + return request({ + url: `/lease/product/updateProductListForShopWalletConfig`, + method: 'post', + data + }) +} + + + + diff --git a/power_leasing/src/views/account/OrderList.vue b/power_leasing/src/views/account/OrderList.vue index e5f22f4..ddeb15e 100644 --- a/power_leasing/src/views/account/OrderList.vue +++ b/power_leasing/src/views/account/OrderList.vue @@ -204,16 +204,7 @@ export default { }); return } - try { - const curPath = (this.$route && this.$route.path) || '' - const from = curPath.indexOf('/account/orders') === 0 ? 'buyer' : (curPath.indexOf('/account/seller-orders') === 0 ? 'seller' : '') - try { if (from) sessionStorage.setItem('orderDetailFrom', from) } catch (e) {} - if (from) { - this.$router.push({ path: `/account/order-detail/${id}`, query: { from } }) - } else { - this.$router.push(`/account/order-detail/${id}`) - } - } catch (e) { + try { this.$router.push(`/account/order-detail/${id}`) } catch (e) { this.$message({ message: '无法跳转到详情页', type: 'error', diff --git a/power_leasing/src/views/account/productDetail.vue b/power_leasing/src/views/account/productDetail.vue index da36bd5..2c0e55a 100644 --- a/power_leasing/src/views/account/productDetail.vue +++ b/power_leasing/src/views/account/productDetail.vue @@ -37,21 +37,22 @@ - + + + + + - + - + - +