Skip to content

E
ElectricitySheep
Commit a16f63c1 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 8fd15647 80dbab89
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 2 deletions
src/components/CommodityMan/goodsList.vue
View file @ a16f63c1
......@@ -518,6 +518,9 @@ export default {
},
Export(){
let msg = this.msg;
if( msg.Id==''){
msg.Id=0
}
msg = JSON.parse(JSON.stringify(msg));
msg.pageSize=999;
this.GetLocalFile(
......
src/components/UserMan/tinyMerchant/wdExamine.vue 0 → 100644
View file @ a16f63c1
<template>
<div class="usersList PeaceDistribution">
<div class="head-title">
和平分销商等级
<el-button @click="CommonJump('PeaceDistributionSet')" style="float:right;margin-top: -5px;" size="small" type="primary">
添加分销商等级
</el-button>
</div>
<div class="content">
<div>
<el-select class="w120" @change="msg.pageIndex=1,getList()" style="margin-right: 10px;" filterable v-model="msg.CategoryId" size="small" placeholder="请选择">
<el-option label="全部分类" :value="0"></el-option>
<el-option
v-for="item in cateList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<div class="searchInput" style="width:230px">
<el-input style="display:inline-block;width:205px;height:30px"
placeholder="请输入名称查询"
@keyup.enter.native="msg.pageIndex=1,getList()"
@clear="msg.pageIndex=1,getList()"
v-model="msg.Name"
size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
</div>
<div style="margin-top:20px">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部" name="first" :dataId="0"></el-tab-pane>
<el-tab-pane v-for="(item,index) in AuditStatusList" :dataId="item.Id" :key="index" :label="item.Name"
:name="item.Name"></el-tab-pane>
</el-tabs>
</div>
<el-table
:data="tableData"
v-loading="loading"
border
style="width: 100%;margin:20px 0">
<el-table-column prop="Id" width="80" label="ID"></el-table-column>
<el-table-column prop="Name" width="150" label="微店名称"></el-table-column>
<el-table-column prop="Logo" width="150" label="用户logo">
<template slot-scope="scope">
<img class="app-order-icon" style="width: 50px;height: 50px;"
:src="scope.row.Logo" alt="">
</template>
</el-table-column>
<el-table-column prop="UserName" label="用户名称"> </el-table-column>
<el-table-column prop="Commission" label="可提现佣金">
<el-table-column prop="Moblie" label="总佣金">
<template slot-scope="scope">
<p>{{scope.row.Commission?scope.row.Commission.toFixed(2):'0.00'}}</p>
<p>{{scope.row.TotalCommission?scope.row.TotalCommission.toFixed(2):'0.00'}}</p>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="AuditStatusName" label="申请状态"> </el-table-column>
<el-table-column prop="AuditDate" label="审核时间"> </el-table-column>
<el-table-column prop="Remark" label="备注"> </el-table-column>
<el-table-column prop="CreateDate" label="操作时间"> </el-table-column>
<el-table-column
prop="address"
label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="scope.row.AuditStatus==1">
<img @click="pending(item,1)" v-if="scope.row.AuditStatus==1" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="scope.row.AuditStatus==1">
<img @click="pending(item,2)" v-if="scope.row.AuditStatus==1" class="app-order-icon"
src="../../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="openRemark(5,scope.row)" style="width:32px;height:32px" src="../../../assets/img/userman/add_remark.png" alt="" v-if="scope.row.AuditStatus==2">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="Delete(3,scope.row)" style="width:32px;height:32px" src="../../../assets/img/userman/del.png" alt="" v-if="scope.row.AuditStatus==2">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改可提现佣金" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="openYongjin(scope.row)" style="width:32px;height:32px" src="../../../assets/img/userman/edit.png" alt="" v-if="scope.row.AuditStatus==2">
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="total">
</el-pagination>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading:false,
value:'',
options:[],
tableData:[],
msg:{
pageIndex:1,
pageSize:15,
UserId:0,
AuditStatus:0,
Name:'',
NickName:'',
},
total:0,
cateList:[],
AuditStatusList: [],
activeName: 'first',
};
},
created() {
this.getList();
this.GetAuditStatus()
},
methods: {
GetAuditStatus() {
this.apipost("/api/user/GetDistributorAuditStatusEnumList", {}, res => {
this.AuditStatusList = res.data.data;
})
},
handleClick(val) {
this.msg.AuditStatus = val.$attrs.dataId;
this.getList();
},
getList(){
this.loading=true;
this.apipost("/api/SmallShops/GetSmallShopsPageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.total=res.data.data.count;
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
},
mounted() {
}
};
</script>
<style>
.usersList .remark_name {
color: #888888;
font-size: 12px;
margin-left: 10px;
float: right;
}
.usersList .app-image{
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
float: left;
margin-right: 8px;
}
.usersList .blue{
color:#409EFF;
}
.usersList .content .searchInput{
border: 1px solid #DCDFE6;
border-radius: 4px;
}
.usersList .content .searchInput .el-input__inner{
border:none;outline:none;
height: 30px;
line-height: 30px;
}
.usersList .content .searchInput{
line-height: normal;
display: inline-table;
width: 100%;
border-collapse: separate;
border-spacing: 0;
width:250px;
margin-right: 20px;
}
.usersList .content{
background: #fff;
margin-top:10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/UserMan/usersList.vue
View file @ a16f63c1
......@@ -40,6 +40,9 @@
<span @click="msg.pageIndex=1,getList()" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table-column prop="Id" label="ID" width="100">
......@@ -199,7 +202,9 @@
Source: 0,
MemberGrade: 0,
Id: '',
Moblie: ''
Moblie: '',
StartTime:'',
EndTime:'',
},
total: 0,
platList: [],
......@@ -225,6 +230,7 @@
Description: '',
},
imgurl: '',
dateList:[],
};
},
......@@ -318,6 +324,16 @@
if(!msg.Id ||msg.Id==''){
msg.Id=0;
}
if(this.dateList && this.dateList.length>0){
console.log(this.dateList)
msg.StartTime=this.dateList[0];
msg.EndTime=this.dateList[1];
}else{
msg.StartTime='';
msg.EndTime='';
}
this.apipost("/api/user/GetMemberUserPageList", msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
......
src/components/statistics/grantStatistics.vue
View file @ a16f63c1
<template>
<div class="grantStatistics" v-loading="loading">
<div class="el-card__header">
<span>积分收支</span>
<span>优惠券统计</span>
<div style="display: flex;flex-direction: row;align-items: center">
<el-button type="primary" class="el-button--small" @click="Export">导出全部</el-button>
</div>
......
src/router/index.js
View file @ a16f63c1
......@@ -316,6 +316,12 @@ export default new Router({
path: '/wdCustomSet',
name: 'wdCustomSet',
component: resolve => require(['@/components/UserMan/tinyMerchant/wdCustomSet'], resolve),
},
// 用户管理 微店审核
{
path: '/wdExamine',
name: 'wdExamine',
component: resolve => require(['@/components/UserMan/tinyMerchant/wdExamine'], resolve),
},
// 商品管理 素材管理
{
......
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