diff --git a/yudao-mall-uniapp-master/pages/commission/components/account-type-select.vue b/yudao-mall-uniapp-master/pages/commission/components/account-type-select.vue index e79e417..3b6bd6e 100644 --- a/yudao-mall-uniapp-master/pages/commission/components/account-type-select.vue +++ b/yudao-mall-uniapp-master/pages/commission/components/account-type-select.vue @@ -56,26 +56,26 @@ }); const typeList = [ - { - // icon: '/static/img/shop/pay/wechat.png', // TODO 芋艿:后续给个 icon - title: '钱包余额', - value: '1', - }, + // { + // // icon: '/static/img/shop/pay/wechat.png', // TODO 芋艿:后续给个 icon + // title: '钱包余额', + // value: '1', + // }, { icon: '/static/img/shop/pay/wechat.png', title: '微信零钱', - value: '2', - }, - { - icon: '/static/img/shop/pay/alipay.png', - title: '支付宝账户', value: '3', }, - { - icon: '/static/img/shop/pay/bank.png', - title: '银行卡转账', - value: '4', - }, + // { + // icon: '/static/img/shop/pay/alipay.png', + // title: '支付宝账户', + // value: '3', + // }, + // { + // icon: '/static/img/shop/pay/bank.png', + // title: '银行卡转账', + // value: '4', + // }, ]; function onChange(e) { diff --git a/yudao-mall-uniapp-master/pages/commission/wallet.vue b/yudao-mall-uniapp-master/pages/commission/wallet.vue index fcae035..1f6fb27 100644 --- a/yudao-mall-uniapp-master/pages/commission/wallet.vue +++ b/yudao-mall-uniapp-master/pages/commission/wallet.vue @@ -12,11 +12,11 @@ {{ state.showMoney ? fen2yuan(state.summary.withdrawPrice || 0) : '*****' }} - + diff --git a/yudao-mall-uniapp-master/pages/commission/withdraw.vue b/yudao-mall-uniapp-master/pages/commission/withdraw.vue index 34bd702..9e67713 100644 --- a/yudao-mall-uniapp-master/pages/commission/withdraw.vue +++ b/yudao-mall-uniapp-master/pages/commission/withdraw.vue @@ -15,9 +15,9 @@ 可提现金额(元) {{ fen2yuan(state.brokerageInfo.brokeragePrice) }} - diff --git a/yudao-mall-uniapp-master/sheep/api/trade/brokerage.js b/yudao-mall-uniapp-master/sheep/api/trade/brokerage.js index bc948cf..a8e200c 100644 --- a/yudao-mall-uniapp-master/sheep/api/trade/brokerage.js +++ b/yudao-mall-uniapp-master/sheep/api/trade/brokerage.js @@ -2,18 +2,18 @@ import request from '@/sheep/request'; const BrokerageApi = { // 绑定推广员 - bindBrokerageUser: (data)=>{ + bindBrokerageUser: (data) => { return request({ url: '/trade/brokerage-user/bind', method: 'PUT', - data + data, }); }, // 获得个人分销信息 getBrokerageUser: () => { return request({ url: '/trade/brokerage-user/get', - method: 'GET' + method: 'GET', }); }, // 获得个人分销统计 @@ -24,12 +24,12 @@ const BrokerageApi = { }); }, // 获得分销记录分页 - getBrokerageRecordPage: params => { + getBrokerageRecordPage: (params) => { if (params.status === undefined) { - delete params.status + delete params.status; } const queryString = Object.keys(params) - .map(key => encodeURIComponent(key) + '=' + params[key]) + .map((key) => encodeURIComponent(key) + '=' + params[key]) .join('&'); return request({ url: `/trade/brokerage-record/page?${queryString}`, @@ -37,23 +37,31 @@ const BrokerageApi = { }); }, // 创建分销提现 - createBrokerageWithdraw: data => { + createBrokerageWithdraw: (data) => { return request({ url: '/trade/brokerage-withdraw/create', method: 'POST', data, }); }, + // 余额提现 + createBrokerageWithdraw1: (data) => { + return request({ + url: '/trade/brokerage-withdraw/create1', + method: 'POST', + data, + }); + }, // 获得商品的分销金额 - getProductBrokeragePrice: spuId => { + getProductBrokeragePrice: (spuId) => { return request({ url: '/trade/brokerage-record/get-product-brokerage-price', method: 'GET', - params: { spuId } + params: { spuId }, }); }, // 获得分销用户排行(基于佣金) - getRankByPrice: params => { + getRankByPrice: (params) => { const queryString = `times=${params.times[0]}×=${params.times[1]}`; return request({ url: `/trade/brokerage-user/get-rank-by-price?${queryString}`, @@ -61,9 +69,9 @@ const BrokerageApi = { }); }, // 获得分销用户排行分页(基于佣金) - getBrokerageUserChildSummaryPageByPrice: params => { + getBrokerageUserChildSummaryPageByPrice: (params) => { const queryString = Object.keys(params) - .map(key => encodeURIComponent(key) + '=' + params[key]) + .map((key) => encodeURIComponent(key) + '=' + params[key]) .join('&'); return request({ url: `/trade/brokerage-user/rank-page-by-price?${queryString}`, @@ -71,9 +79,9 @@ const BrokerageApi = { }); }, // 获得分销用户排行分页(基于用户量) - getBrokerageUserRankPageByUserCount: params => { + getBrokerageUserRankPageByUserCount: (params) => { const queryString = Object.keys(params) - .map(key => encodeURIComponent(key) + '=' + params[key]) + .map((key) => encodeURIComponent(key) + '=' + params[key]) .join('&'); return request({ url: `/trade/brokerage-user/rank-page-by-user-count?${queryString}`, @@ -81,13 +89,13 @@ const BrokerageApi = { }); }, // 获得下级分销统计分页 - getBrokerageUserChildSummaryPage: params => { + getBrokerageUserChildSummaryPage: (params) => { return request({ url: '/trade/brokerage-user/child-summary-page', method: 'GET', params, - }) - } -} + }); + }, +}; export default BrokerageApi diff --git a/yudao-mall-uniapp-master/sheep/components/s-goods-card/s-goods-card.vue b/yudao-mall-uniapp-master/sheep/components/s-goods-card/s-goods-card.vue index 59f2bf1..2854acb 100644 --- a/yudao-mall-uniapp-master/sheep/components/s-goods-card/s-goods-card.vue +++ b/yudao-mall-uniapp-master/sheep/components/s-goods-card/s-goods-card.vue @@ -4,24 +4,11 @@ - - + +