Skip to content

O
op-web-service
Commit 475b0aaf authored by pengyunqian's avatar pengyunqian
Browse files
Options

update:bugfile

parent cd26d2b6
Show whitespace changes
Inline Side-by-side
Showing with 549 additions and 83 deletions
server/config.js
View file @ 475b0aaf
......@@ -18,5 +18,6 @@ module.exports = {
port: port,
API_INTERNAL_URI: API_INTERNAL_URI[env],
PANDORA_URI: PANDORA_URI[env],
GOODS_URI: API_INTERNAL_URI[env]
GOODS_URI: API_INTERNAL_URI[env],
WITHDRAWAL_URI: API_INTERNAL_URI[env]
};
server/controllers/withdrawal.js 0 → 100644
View file @ 475b0aaf
// const WITHDRAWAL_URI = require("../config.js").WITHDRAWAL_URI;
// const req = require("../utils/request").httpReq;
/**
* 示例
* exports.方法名 = async ctx => {
* const url = `${设置好的域名}/向服务端发送的请求地址`;
* const opts = {
* url,
* method:"发送什么请求"，
* qs: ctx.request.query （get请求的参数）
* body：ctx.request.body （post请求的参数）
* json：boolean (是否转换为json)
* };
* ctx.body = await req(ctx,opts); 将发送请求后的数据传递给前端页面
* };
*/
\ No newline at end of file
server/router.js
View file @ 475b0aaf
......@@ -6,6 +6,7 @@ const enterprise = require("./controllers/enterprise");
const role = require('./controllers/role')
const life = require('./controllers/life-no');
const goods = require('./controllers/goods');
const withdrawal = require('./controllers/withdrawal');
const router = Router();
const API_VERSION = "/api/v1";
......
src/pages/Goods/Retail/index.vue
View file @ 475b0aaf
<template>
<layout>
<el-card
class="container"
style="width: 100%; height: 100%"
>
<el-card class="container" style="width: 100%; height: 100%">
<div class="retail">
<el-form
inline
:model="retailActivitie"
ref="retailActivitie"
>
<el-form inline :model="retailActivitie" ref="retailActivitie">
<!-- 查询 -->
<el-row>
<el-form-item
label="分销活动id"
prop="marketing_id"
>
<el-form-item label="分销活动id" prop="marketing_id">
<!-- :rules="[{ type: 'number', message: '活动id必须为数字值' }]" -->
<el-input
onkeyup="value=value.replace(/[^\d]/g,'')"
......@@ -44,10 +34,7 @@
</el-form-item>
<!-- 按钮操作 -->
<el-form-item class="search_button">
<el-button
type="primary"
@click="toSearch"
>搜索</el-button>
<el-button type="primary" @click="toSearch">搜索</el-button>
<el-button @click="reset('retailActivitie')">重置</el-button>
</el-form-item>
</el-row>
......@@ -55,14 +42,10 @@
type="primary"
style="margin-bottom: 10px"
@click="createDtb"
>创建分销活动</el-button>
<!-- Tab -->
<el-table
:data="tableData"
type="index"
align="center"
border
>创建分销活动</el-button
>
<!-- Tab -->
<el-table :data="tableData" type="index" align="center" border>
<el-table-column
align="center"
prop="marketing_id"
......@@ -108,13 +91,11 @@
</span>
</template>
</el-table-column>
<el-table-column
align="center"
prop="online_status"
label="状态"
>
<el-table-column align="center" prop="online_status" label="状态">
<template #default="scope">
<span :style="{ color: scope.row.online_status == 3 ? 'red' : '' }">
<span
:style="{ color: scope.row.online_status == 3 ? 'red' : '' }"
>
{{
scope.row.online_status == 2
? "关闭"
......@@ -131,17 +112,9 @@
label="创建人"
>
</el-table-column>
<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="update_time"
label="更新时间"
>
<el-table-column align="center" prop="update_time" label="更新时间">
</el-table-column>
<el-table-column
align="center"
......@@ -149,17 +122,14 @@
label="分销到期时间"
>
</el-table-column>
<el-table-column
fixed="right"
align="center"
label="操作"
>
<el-table-column fixed="right" align="center" label="操作">
<template #default="scope">
<el-button
@click="handleClick(scope.row)"
type="text"
size="mini"
>查看</el-button>
>查看</el-button
>
<el-button
type="text"
size="mini"
......@@ -179,7 +149,8 @@
scope.row.online_status !== 3
"
@click.stop="handelEnable(scope.row, 1)"
>启用</el-button>
>启用</el-button
>
</template>
</el-table-column>
</el-table>
......@@ -226,10 +197,7 @@
:disabled="shopStart !== 0"
></el-input>
</el-form-item>
<el-form-item
label="一级佣金:"
prop="first_commission_value"
>
<el-form-item label="一级佣金:" prop="first_commission_value">
<el-input
v-model="ruleForm.first_commission_value"
@input="changeValue($event, 'first_commission_value')"
......@@ -238,10 +206,7 @@
<template #append>%</template>
</el-input>
</el-form-item>
<el-form-item
label="二级佣金: "
prop="second_commission_value"
>
<el-form-item label="二级佣金: " prop="second_commission_value">
<el-input
v-model="ruleForm.second_commission_value"
@input="changeValue($event, 'second_commission_value')"
......@@ -273,10 +238,7 @@
ref="ruleIdForm"
size="mini"
>
<div
class="queryBox"
v-show="shopStart == 0"
>
<div class="queryBox" v-show="shopStart == 0">
<el-form-item label="关联商品:"> </el-form-item>
<el-form-item label="商品id:">
<el-input
......@@ -295,7 +257,8 @@
size="mini"
style="margin-bottom: 30px"
@click="findProducts"
>查询</el-button>
>查询</el-button
>
</div>
<div :class="shopStart == 0 ? 'newTab' : 'readTab'">
<el-table
......@@ -308,10 +271,7 @@
style="width: 100%"
@selection-change="selectGoodsChange"
>
<el-table-column
align="center"
type="selection"
>
<el-table-column align="center" type="selection">
</el-table-column>
<el-table-column
align="center"
......@@ -373,7 +333,7 @@ import {
} from "@/service/Goods/goods";
import { ElMessage } from "element-plus";
// 开启关闭防抖
function debounce (callback, delay) {
function debounce(callback, delay) {
let timer = null;
return function (...args) {
if (timer) {
......@@ -483,7 +443,7 @@ export default {
else this.ruleForm[level] = "";
},
// 查看详情列表
async handleClick (row) {
async handleClick(row) {
this.dialogFormVisible = true;
this.shopStart = 1;
this.disabled = true;
......@@ -499,13 +459,13 @@ export default {
}
},
// 页码变化
handleCurrentChange (e) {
handleCurrentChange(e) {
this.retailActivitie.page = e;
this.getMarketingList();
},
// 营销活动列表
async getMarketingList () {
async getMarketingList() {
try {
const res = await getMarketingList(this.retailActivitie);
this.tableData = res.result;
......@@ -533,12 +493,12 @@ export default {
}
}, 300),
// 创建分销活动
createDtb () {
createDtb() {
this.dialogFormVisible = true;
this.shopStart = 0;
},
// 重置
reset (retailActivitie) {
reset(retailActivitie) {
(this.retailActivitie = {
marketing_id: "",
marketing_name: "",
......@@ -551,11 +511,11 @@ export default {
this.getMarketingList({});
},
// 搜索
toSearch () {
toSearch() {
this.getMarketingList();
console.log(this.retailActivitie);
},
selectTime (e) {
selectTime(e) {
let date = new Date();
if (e && e[1] < date) {
ElMessage(`'活动结束时间不能早于当前时间'`);
......@@ -563,9 +523,9 @@ export default {
}
},
// 获取时间格式
formatTime (date) {
formatTime(date) {
// 封装函数判断是否要在目标前边加 ’0‘
function getStr (target) {
function getStr(target) {
return ("" + target).length === 1 ? "0" + target : target;
}
// 获取月
......@@ -586,7 +546,7 @@ export default {
return timeStr;
},
// 查询商品列表
async findProducts () {
async findProducts() {
// 获取参数
const { goods_sku_id, life_account_id } = this.ruleIdForm;
let [start_time, end_time] = this.timeSelect;
......@@ -615,10 +575,10 @@ export default {
ElMessage.error("请求查询商品列表失败");
}
},
selectGoodsChange (e) {
selectGoodsChange(e) {
this.ruleForm.goods_sku_id = e.map((item) => item.goods_sku_id);
},
async getAllList () {
async getAllList() {
let all = await getMarketingList({
page: 1,
page_size: this.retailActivitie.count,
......@@ -680,7 +640,7 @@ export default {
},
// 清空
resetDate () {
resetDate() {
(this.ruleForm = {
marketing_name: "",
first_commission_value: "",
......@@ -699,13 +659,13 @@ export default {
});
},
// 取消
cancel () {
cancel() {
this.dialogFormVisible = false;
this.resetDate();
this.getMarketingList();
},
},
created () {
created() {
this.getMarketingList();
this.getAllList();
},
......
src/pages/Withdrawal/Audit/index.less 0 → 100644
View file @ 475b0aaf
.tab-show {
width: 100%;
height: 100%;
padding: 0px 55px;
background-color: white;
.el-tabs__nav-wrap::after {
background-color: transparent;
}
.el-tabs__header {
margin: 0;
}
}
.goods {
width: 100%;
height: 100%;
padding: 0px 30px;
.search_condition {
display: flex;
flex-wrap: wrap;
align-items: center;
.search_button {
display: flex;
align-items: center;
justify-self: flex-end;
.el-form-item__content {
display: flex;
justify-content: space-around;
}
}
}
.commodity_list {
margin-top: 30px;
}
.pagination {
margin-top: 30px;
}
}
.listShow {
padding-left: 120px;
}
.text-area {
width: 100%;
padding-left: 120px;
.el-form-item__label {
width: 100%;
text-align: left;
}
}
.dialog-footer {
// display: flex;
// justify-content: center;
// align-items: center;
text-align: center;
}
\ No newline at end of file
src/pages/Withdrawal/Audit/index.vue 0 → 100644
View file @ 475b0aaf
<template>
<layout>
<div class="tab-show">
<!-- 审核状态 -->
<el-tabs
class="tab_list"
v-model="activeName"
>
<el-tab-pane label="待审核" name="first"></el-tab-pane>
<el-tab-pane label="审核通过" name="second"></el-tab-pane>
<el-tab-pane label="审核驳回" name="third"></el-tab-pane>
<el-tab-pane label="提现失败" name="fourth">
</el-tab-pane>
</el-tabs>
</div>
<!-- 提现失败页 -->
<auditTab v-if="activeName=='fourth'"></auditTab>
<el-card class="goods" v-else>
<!-- 筛选区 -->
<el-form inline class="search_condition" >
<!-- 用户id -->
<el-form-item label="用户id">
<el-input value="value"></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px;margin-bottom:22px">查询</el-button>
<!-- <el-form-item label="审核状态">
<el-select
value="value"
multiple
collapse-tags
@change="handleStatusChange"
>
<el-option
v-for="item in stateOption"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item> -->
<!-- 按钮操作 -->
<!-- <el-form-item style="justify-self: flex-end;">
<el-button
@click="searchList"
type="primary"
>搜索</el-button>
<el-button @click="resetList">重置</el-button>
</el-form-item> -->
</el-form>
<!-- 列表区 -->
<el-table class="goods_list" :data="goodsList" border stripe>
<el-table-column
label="提现用户"
prop=""
align="center"
></el-table-column>
<el-table-column
label="所在圈"
prop=""
align="center"
></el-table-column>
<el-table-column
label="提现金额"
prop=""
align="center"
></el-table-column>
<el-table-column
label="最近4小时收入"
prop=""
align="center"
></el-table-column>
<el-table-column
label="近两天分享增长"
prop=""
align="center"
></el-table-column>
<el-table-column
label="历史分享增长"
prop=""
align="center"
></el-table-column>
<el-table-column
label="历史分享留存"
prop=""
align="center"
></el-table-column>
<el-table-column
label="申请时间"
prop=""
align="center"
></el-table-column>
<el-table-column label="状态" align="center">
<template #default="scope">
<span v-if="scope.row.audit_status == 0" style="color: #ff982c"
>待审核</span
>
<span v-if="scope.row.audit_status == 1" style="color: #5cc247"
>审核通过</span
>
<span v-if="scope.row.audit_status == 2" style="color: #fd6b6f"
>审核驳回</span
>
</template>
</el-table-column>
<el-table-column
label="审核时间"
prop=""
align="center"
></el-table-column>
<el-table-column
label="审核人"
prop=""
align="center"
></el-table-column>
<!-- 操作快捷键 -->
<el-table-column label="操作" align="center" fixed="right" width="200">
<template #default="scope">
<el-button
type="text"
>查看</el-button
>
<el-button
v-if="
scope.row.audit_status === 0 && scope.row.audit_status !== 2
"
type="text"
@change="outerVisible = true"
@click="goDetail(`AUDIT`, scope.row.goods_spu_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="totalCount"
>
</el-pagination> -->
</el-card>
</layout>
<!-- 提现申请审核 -->
<!-- Form -->
<el-button type="text" @click="outerVisible = true"
>点击打开外层 Dialog</el-button
>
<el-dialog title="提现申请审核" v-model="outerVisible" width="35%">
<el-form inline :model="form">
<el-form-item label="提现用户" label-width="120px">
<el-input autocomplete="off"></el-input>
</el-form-item>
<el-button type="info">黑名单</el-button>
<el-button>白名单</el-button>
<!-- <el-row>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
<el-col :span="8"><div class="grid-content bg-purple-light">提现金额:</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
</el-row>
<el-row>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
<el-col :span="8"><div class="grid-content bg-purple-light">最近24小时收入:</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
</el-row>
<el-row>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
<el-col :span="8"><div class="grid-content bg-purple-light">近两天分享增长:</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
</el-row>
<el-row>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
<el-col :span="8"><div class="grid-content bg-purple-light">历史分享增长:</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
</el-row> -->
<ul class="listShow">
<li>提现金额:</li>
<li>最近24小时收入:</li>
<li>近两天分享增长:</li>
<li>历史分享增长:</li>
</ul>
<el-form-item class="text-area" label="奖励明细:">
<el-table :data="data" border align="center" style="width: 100%" size="small">
<el-table-column align="center" prop="prop" label="流水时间" width="120">
</el-table-column>
<el-table-column align="center" prop="prop" label="分享用户量" width="120">
</el-table-column>
<el-table-column align="center" prop="prop" label="分享额外奖励x.xx元" width="150">
</el-table-column>
</el-table>
</el-form-item>
</el-form>
<el-dialog
width="15%"
title="再次确认"
v-model="innerVisible"
append-to-body
>
<p>确认执行此操作？</p>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="innerVisible = true"
>确认</el-button
>
<el-button @click="outerVisible = false">取 消</el-button>
</div>
</template>
</el-dialog>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="innerVisible = true">通过</el-button>
<el-button type="danger" @click="outerVisible = false">拒绝</el-button>
<el-button @click="outerVisible = false">取 消</el-button>
</div>
</template>
</el-dialog>
</template>
<script>
import auditTab from '../../Withdrawal/auditTab/index.vue';
export default {
name: "Audit",
components:{auditTab},
data() {
return {
activeName: "first", //tab
award: "", //奖励明细
outerVisible: false, //外层弹框
innerVisible: false, //二次确认
};
},
methods: {
}
};
</script>
<style lang="less" src="./index.less" scope></style>
\ No newline at end of file
src/pages/Withdrawal/auditTab/index.less 0 → 100644
View file @ 475b0aaf
.goods {
width: 100%;
height: 100%;
padding: 0px 30px;
.search_condition {
display: flex;
flex-wrap: wrap;
align-items: center;
.search_button {
display: flex;
align-items: center;
justify-self: flex-end;
.el-form-item__content {
display: flex;
justify-content: space-around;
}
}
}
.commodity_list {
margin-top: 30px;
}
.pagination {
margin-top: 30px;
}
}
.listShow {
padding-left: 120px;
}
.text-area {
width: 100%;
padding-left: 120px;
.el-form-item__label {
width: 100%;
text-align: left;
}
}
src/pages/Withdrawal/auditTab/index.vue 0 → 100644
View file @ 475b0aaf
<template>
<layout>
<el-card class="goods">
提现失败页
<!-- 筛选区 -->
<el-form inline class="search_condition">
<!-- 用户id -->
<el-form-item label="用户id">
<el-input value="value">提现失败页</el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px;margin-bottom:22px">查询</el-button>
</el-form>
<!-- 列表区 -->
<el-table class="goods_list" :data="goodsList" border stripe>
<el-table-column
label="提现用户"
prop=""
align="center"
></el-table-column>
<el-table-column
label="所在圈"
prop=""
align="center"
></el-table-column>
<el-table-column
label="提现金额"
prop=""
align="center"
></el-table-column>
<el-table-column
label="最近4小时收入"
prop=""
align="center"
></el-table-column>
<el-table-column
label="近两天分享增长"
prop=""
align="center"
></el-table-column>
<el-table-column
label="历史分享增长"
prop=""
align="center"
></el-table-column>
<el-table-column
label="历史分享留存"
prop=""
align="center"
></el-table-column>
<el-table-column
label="申请时间"
prop=""
align="center"
></el-table-column>
<el-table-column label="状态" align="center">
<template #default="scope">
<span v-if="scope.row.audit_status == 0" style="color: #ff982c"
>待审核</span
>
<span v-if="scope.row.audit_status == 1" style="color: #5cc247"
>审核通过</span
>
<span v-if="scope.row.audit_status == 2" style="color: #fd6b6f"
>审核驳回</span
>
</template>
</el-table-column>
<el-table-column
label="审核时间"
prop=""
align="center"
></el-table-column>
<el-table-column
label="审核人"
prop=""
align="center"
></el-table-column>
<!-- 操作快捷键 -->
<el-table-column label="操作" align="center" fixed="right" width="200">
<template #default="scope">
<el-button
type="text"
@click="goDetail(`EDIT`, scope.row.goods_spu_id)"
>查看</el-button
>
<el-button
v-if="
scope.row.audit_status === 0 && scope.row.audit_status !== 2
"
type="text"
@change="outerVisible = true"
@click="goDetail(`AUDIT`, scope.row.goods_spu_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="totalCount"
>
</el-pagination> -->
</el-card>
</layout>
</template>
<script>
export default {
name: "auditTab",
}
</script>
<style lang="less" src="./index.less" scope></style>
\ No newline at end of file
src/router/Withdrawal/index.js 0 → 100644
View file @ 475b0aaf
// 提现审核
const withdrawalRoutes = [
{
path: "/op/withdrawal",
redirect: "/op/withdrawal/audit"
},
{
path: "/op/withdrawal/audit",
name: "Audit",
component: () => import(/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Audit"),
},
{
path: "/op/withdrawal/audittab",
name: "auditTab",
component: () => import(/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/auditTab"),
}
];
export default withdrawalRoutes;
\ No newline at end of file
src/router/index.js
View file @ 475b0aaf
......@@ -10,7 +10,7 @@ import AddRole from "../pages/Role/add-role.vue";
import ManageRole from "../pages/Role/manage-role.vue";
import RoleDetail from "../pages/Role/role-detail.vue";
import goodsRouter from "./Goods/index";
import withdrawalRoutes from "./Withdrawal/index";
const routes = [
{
path: "/op/enterprise",
......@@ -113,7 +113,9 @@ const routes = [
}
},
// 商品管理路由
...goodsRouter
...goodsRouter,
// 钱包审核
...withdrawalRoutes
];
console.log(routes);
......
src/service/Withdrawal/withdrawal.js 0 → 100644
View file @ 475b0aaf
// import axios from "@/utils/request";
\ 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