Skip to content

O
op-web-service
Commit bbcf523a authored by liwenhong's avatar liwenhong
Browse files
Options

Merge branch 'master' of https://git.yidian-inc.com:8021/bp/op-web-service... 

Merge branch 'master' of https://git.yidian-inc.com:8021/bp/op-web-service into lwh/head-distribution
parents e6f89bb2 6c270262
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 367 additions and 189 deletions
server/controllers/withdrawal.js
View file @ bbcf523a
......@@ -114,6 +114,27 @@ exports.getReblackList = async ctx => {
}
ctx.body = await req(ctx, opts)
}
// 获取钱包账户余额状态
exports.getWalletAccountStatus = async ctx=>{
const url = `${WITHDRAWAL_URI}/wallet/background/get_wallet_account_status`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
}
ctx.body = await req(ctx,opts)
}
// 钱包账户余额状态
exports.resetAccountStatus = async ctx=>{
const url = `${WITHDRAWAL_URI}/wallet/background/reset_wallet_account_status`;
const opts = {
url,
method:"POST",
json:true,
body:ctx.request.body
}
ctx.body = await req(ctx,opts)
}
const getUserPermission = async (ctx) => {
const url = `${WITHDRAWAL_URI}/merchant/authority/get_role_list`;
......
server/router.js
View file @ bbcf523a
......@@ -132,5 +132,7 @@ router.get(`${API_VERSION}/get_account_list`, withdrawal.getAccountList)
router.get(`${API_VERSION}/get_record_list`, withdrawal.getRecordList)
router.post(`${API_VERSION}/get_account_black_list`, withdrawal.getAccountBlackList)
router.post(`${API_VERSION}/get_reblack_list`, withdrawal.getReblackList)
router.get(`${API_VERSION}/get_wallet_account_status`, withdrawal.getWalletAccountStatus)
router.post(`${API_VERSION}/reset_wallet_account_status`, withdrawal.resetAccountStatus)
module.exports = router;
\ No newline at end of file
src/pages/Groupmeal/newOrderManagement/index.vue
View file @ bbcf523a
......@@ -201,10 +201,10 @@
>退款</el-button
>
<el-button-group v-show="scope.row.order_status == '3'">
<el-button type="text" size="small" @click="agree(scope.row)"
<el-button type="text" @click="agree(scope.row)"
>同意</el-button
>
<el-button type="text" size="small" @click="refuse(scope.row)"
<el-button type="text" @click="refuse(scope.row)"
>拒绝</el-button
>
</el-button-group>
......@@ -292,10 +292,10 @@
>退款</el-button
>
<el-button-group v-show="scope.row.order_status == '3'">
<el-button type="text" size="small" @click="agree(scope.row)"
<el-button type="text" @click="agree(scope.row)"
>同意</el-button
>
<el-button type="text" size="small" @click="refuse(scope.row)"
<el-button type="text" @click="refuse(scope.row)"
>拒绝</el-button
>
</el-button-group>
......
src/pages/Groupmeal/orderManagement/index.less
View file @ bbcf523a
......@@ -7,6 +7,10 @@
margin-bottom:10px;
}
.el-button-group>.el-button:first-child {
margin-right: 10px;
}
.exportForm,.exportBtn{
text-align:center;
}
......
src/pages/Groupmeal/orderManagement/index.vue
View file @ bbcf523a
......@@ -336,7 +336,7 @@
</el-form-item>
</el-dialog>
<!-- 退款弹窗 -->
<el-dialog title="退款" width="30%" top="10%" v-model="refundShow">
<el-dialog title="退款" width="50%" top="10%" v-model="refundShow">
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
......
src/pages/Withdrawal/Examine/h5.vue
View file @ bbcf523a
<template>
<!-- 提现失败页 -->
<!-- <auditTab v-if="status_text == 'fourth'"></auditTab> -->
<!-- <el-card class="goods-h5"> -->
<div class="goods-h5">
<el-table :data="goodsList" border max-height="700">
<el-table-column
label="登录地点"
prop="withdraw_address"
align="center"
></el-table-column>
<el-table-column
label="申请用户"
prop="user_id"
align="center"
></el-table-column>
<el-table-column
label="提现金额"
prop="amount"
align="center"
></el-table-column>
<el-table-column
label="申请时间"
prop="create_time"
align="center"
></el-table-column>
<!-- 操作快捷键 -->
<el-table-column label="操作" align="center">
<template v-slot:default="scope">
<el-button
type="text"
v-show="searchProps.status == '0' && isAllowedToAudit"
@click="handleDetail(scope.row.id)"
>审核</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 提现失败页 -->
<!-- <auditTab v-if="status_text == 'fourth'"></auditTab> -->
<!-- <el-card class="goods-h5"> -->
<div class="goods-h5">
<el-table :data="goodsList" border max-height="700">
<el-table-column
label="登录地点"
prop="withdraw_address"
align="center"
></el-table-column>
<el-table-column
label="风控等级"
prop="risk_level_text"
align="center"
></el-table-column>
<el-table-column
label="申请用户"
prop="user_id"
align="center"
></el-table-column>
<el-table-column
label="提现金额"
prop="amount"
align="center"
></el-table-column>
<el-table-column
label="申请时间"
prop="create_time"
align="center"
></el-table-column>
<!-- 操作快捷键 -->
<el-table-column label="操作" align="center">
<template v-slot:default="scope">
<el-button
type="text"
v-show="searchProps.status == '0' && isAllowedToAudit"
@click="handleDetail(scope.row.id)"
>审核</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 页码区 -->
<el-pagination
class="pagination"
@current-change="handleCurrentChange"
v-model:currentPage="searchProps.page"
:page-size="searchProps.page_size"
layout="total,prev, pager, next, jumper"
:total="searchProps.count"
>
</el-pagination>
</div>
<!-- </el-card> -->
<!-- 页码区 -->
<el-pagination
class="pagination"
@current-change="handleCurrentChange"
v-model:currentPage="searchProps.page"
:page-size="searchProps.page_size"
layout="total,prev, pager, next, jumper"
:total="searchProps.count"
>
</el-pagination>
</div>
<!-- </el-card> -->
</template>
<script>
import {
......@@ -168,7 +173,7 @@ export default {
},
// 提现申请审核详情
async handleDetail(id) {
this.$router.push({ name: 'withdrawDetail', query: {id: id} })
this.$router.push({ name: "withdrawDetail", query: { id: id } });
// try {
// const res = await getApplyDetail({ id });
// const showData = res.info || {};
......@@ -307,7 +312,9 @@ export default {
const WITHDRAWAL_PERMISSION_ID1 = 10000005;
let withdrawlPermission = this.permissions.filter(
(item) => (item.id === WITHDRAWAL_PERMISSION_ID || item.id === WITHDRAWAL_PERMISSION_ID1)
(item) =>
item.id === WITHDRAWAL_PERMISSION_ID ||
item.id === WITHDRAWAL_PERMISSION_ID1
);
// 无此模块权限
if (withdrawlPermission.length === 0) {
......@@ -317,7 +324,8 @@ export default {
const AUDIT_PERMSSION_ID = 14;
const AUDIT_PERMSSION_ID1 = 10000014;
const auditPermission = withdrawlPermission[0].sub_permissions.filter(
(item) => (item.id === AUDIT_PERMSSION_ID || item.id === AUDIT_PERMSSION_ID1)
(item) =>
item.id === AUDIT_PERMSSION_ID || item.id === AUDIT_PERMSSION_ID1
);
return auditPermission.length !== 0;
......@@ -327,28 +335,27 @@ export default {
</script>
<style lang="less" src="./index.less" scope>
.goods-h5 {
width: 90%;
margin: 20px auto;
.dialog-footer {
display: flex;
justify-content: center;
align-items: center;
}
.apply-list {
li {
width: 70%;
display: flex;
justify-content: space-between;
span {
width: 70px;
text-align: left;
}
}
}
width: 90%;
margin: 20px auto;
.dialog-footer {
display: flex;
justify-content: center;
align-items: center;
}
.apply-list {
li {
width: 70%;
display: flex;
justify-content: space-between;
span {
width: 70px;
text-align: left;
}
}
}
}
.el-message-box {
width: 80vw;
margin: 0 auto;
width: 80vw;
margin: 0 auto;
}
</style>
src/pages/Withdrawal/Examine/index.less
View file @ bbcf523a
......@@ -52,7 +52,7 @@
padding-right: 10px;
}
.list-right {
display:inline-block;
// display:inline-block;
width: 70%;
}
}
......@@ -93,11 +93,11 @@
}
.apply-list {
li {
width: 70%;
width: 90%;
display: flex;
justify-content: space-between;
span {
width: 70px;
width: 150px;
text-align: left;
}
}
......@@ -108,3 +108,12 @@
width: 20vw;
margin: 0 auto;
}
.shell {
float: right;
width: 550px;
margin-top: -20px;
}
.open {
float: right;
margin-bottom: 10px;
}
src/pages/Withdrawal/Examine/index.vue
View file @ bbcf523a
This diff is collapsed.
src/pages/Withdrawal/Examine/withdrawDetail.vue
View file @ bbcf523a
......@@ -2,13 +2,34 @@
<div class="goods-h5">
<el-form>
<ul class="apply-list">
<li><span>登录地点:</span><span>{{ dialogData.showData.withdraw_address }}</span></li>
<li> 提现用户:<span>{{ dialogData.showData.user_id }}</span></li>
<li> 提现金额:<span>{{ dialogData.showData.amount }}</span></li>
<li> 最近24小时收入:<span>{{ dialogData.showData.lately_amount }}</span></li>
<li> 近两天分享增长:<span>{{ dialogData.showData.lately_share }}</span></li>
<li> 近两天分享下载量:<span>{{ dialogData.showData.lately_download }}</span></li>
<li> 历史分享增长: <span>{{ dialogData.showData.history_share }}</span></li>
<li>
<span>登录地点:</span
><span>{{ dialogData.showData.withdraw_address }}</span>
</li>
<li>
<span>风控等级:</span
><span>{{ dialogData.showData.risk_level_text }}</span>
</li>
<li>
提现用户:<span>{{ dialogData.showData.user_id }}</span>
</li>
<li>
提现金额:<span>{{ dialogData.showData.amount }}</span>
</li>
<li>
最近24小时收入:<span>{{ dialogData.showData.lately_amount }}</span>
</li>
<li>
近两天分享增长:<span>{{ dialogData.showData.lately_share }}</span>
</li>
<li>
近两天分享下载量:<span>{{
dialogData.showData.lately_download
}}</span>
</li>
<li>
历史分享增长: <span>{{ dialogData.showData.history_share }}</span>
</li>
</ul>
<el-form-item label="奖励明细:">
<el-table
......@@ -17,61 +38,41 @@
align="center"
max-height="300"
size="small"
>
<el-table-column
align="center"
prop="create_time"
label="流水时间"
>
<el-table-column align="center" prop="create_time" label="流水时间">
</el-table-column>
<el-table-column
align="center"
prop="amount"
label="分享用户量"
>
<el-table-column align="center" prop="amount" label="分享用户量">
<template v-slot:default="scope">
<span>{{ scope ? "+" + scope.row.amount : null }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
prop="third_order_desc"
label="说明"
>
<el-table-column align="center" prop="third_order_desc" label="说明">
</el-table-column>
</el-table>
</el-form-item>
</el-form>
<div class="dialog-footer">
<div v-if="!showBackBtn">
<el-button
type="primary"
size="small"
@click="handleAdoptRefuse('通过')"
>通过</el-button
>
<el-button
type="danger"
size="small"
@click="handleAdoptRefuse('拒绝')"
>拒绝</el-button
>
<el-button
type="primary"
size="small"
@click="handleBlackList('黑名单')"
>黑名单</el-button
>
</div>
<div class="dialog-footer">
<div v-if="!showBackBtn">
<el-button
type="primary"
size="small"
@click="handleAdoptRefuse('通过')"
>通过</el-button
>
<el-button type="danger" size="small" @click="handleAdoptRefuse('拒绝')"
>拒绝</el-button
>
<el-button
type="primary"
v-else
@click="$router.go(-1)"
>返回</el-button
size="small"
@click="handleBlackList('黑名单')"
>黑名单</el-button
>
</div>
<el-button size="small" type="primary" v-else @click="$router.go(-1)"
>返回</el-button
>
</div>
</div>
</template>
<script>
......@@ -118,9 +119,7 @@ export default {
const showData = res.info || {};
this.dialogData = { ...this.dialogData, showData };
},
async mounted() {
},
async mounted() {},
methods: {
async getPermissionsAll() {
// 不能够信赖 store 中的 email，无法知道全局中的 fetchCurrentUser 处理完毕
......@@ -157,7 +156,7 @@ export default {
})
.catch(async () => {
const res = await urlObj[action](params);
if(+res.code === 0) {
if (+res.code === 0) {
this.$message({
type: "success",
message: "操作成功",
......@@ -167,8 +166,8 @@ export default {
this.$message({
type: "error",
message: res.reason,
});
}
});
}
});
},
......@@ -205,7 +204,9 @@ export default {
const WITHDRAWAL_PERMISSION_ID1 = 10000005;
let withdrawlPermission = this.permissions.filter(
(item) => (item.id === WITHDRAWAL_PERMISSION_ID || item.id === WITHDRAWAL_PERMISSION_ID1)
(item) =>
item.id === WITHDRAWAL_PERMISSION_ID ||
item.id === WITHDRAWAL_PERMISSION_ID1
);
// 无此模块权限
if (withdrawlPermission.length === 0) {
......@@ -215,7 +216,8 @@ export default {
const AUDIT_PERMSSION_ID = 14;
const AUDIT_PERMSSION_ID1 = 10000014;
const auditPermission = withdrawlPermission[0].sub_permissions.filter(
(item) => (item.id === AUDIT_PERMSSION_ID || item.id === AUDIT_PERMSSION_ID1)
(item) =>
item.id === AUDIT_PERMSSION_ID || item.id === AUDIT_PERMSSION_ID1
);
return auditPermission.length !== 0;
......
src/service/Withdrawal/withdrawal.js
View file @ bbcf523a
......@@ -67,4 +67,14 @@ export async function getAccountBlackList(params) {
export async function getReblackList(params) {
const res = await axios.post("/api/v1/get_reblack_list",params)
return res;
}
// 获取钱包账户余额状态
export async function getWalletAccountStatus(params) {
const res = await axios.get("/api/v1/get_wallet_account_status",{params})
return res;
}
// 钱包账户余额状态（开启按钮）
export async function resetAccountStatus(params) {
const res = await axios.post("/api/v1/reset_wallet_account_status",params)
return res;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment