Skip to content

E
ElectricitySheep
Commit deda7c89 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 4061348e 373302de
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 18 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ deda7c89
......@@ -334,7 +334,7 @@
<el-input v-model="scope.row.InventoryNum" size="small"></el-input>
</template>
</el-table-column>
<el-table-column :render-header="renderHeader" label="成本价">
<el-table-column :render-header="renderHeader" label="成本价" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.CostMoney" size="small"></el-input>
</template>
......@@ -344,7 +344,7 @@
<el-input v-model="scope.row.Commission" size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="重量(克)">
<el-table-column label="重量(克)" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.GoodsWeight" size="small"></el-input>
</template>
......
src/components/UserMan/buyRecords.vue
View file @ deda7c89
......@@ -4,7 +4,7 @@
会员购买记录
</div>
<div class="content">
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0;color:#303133">
<el-table-column prop="UserName" label="会员名称">
</el-table-column>
<el-table-column prop="Money" label="支付金额">
......
src/components/UserMan/customSet.vue
View file @ deda7c89
......@@ -657,8 +657,8 @@
<div></div>
</div>
<div class="content">
<div class="vipImgDiv" :style="{backgroundImage:'url(' + getIconLink(vipMsg.BackImage) + ')',backgroundColor:vipMsg.BackColor}">
<div class="vip_kaitong">
<div class="vipImgDiv" :style="{backgroundImage:'url(' + getIconLink(vipMsg.BackImage) + ')'}">
<div class="vip_kaitong" :style="{backgroundColor:vipMsg.BackColor}">
<div class="vip_yue">
<div class="vipIcon">
<img :src="getIconLink(vipMsg.VipICO)" alt=""/>
......@@ -1112,9 +1112,10 @@
width:90%;
bottom:50px;
height:150px;
left:20px;
border-radius:4px;
background-color: #cf65cd;
left:50%;
margin-left:-45%;
/* background-color: #cf65cd; */
}
.customSet .vip_yue{
width:70%;
......
src/components/UserMan/distributors.vue
View file @ deda7c89
......@@ -41,7 +41,7 @@
<span @click="msg.pageIndex=1,getList()" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<el-button @click="plSet" size="small" type="primary" style="margin-bottom:20px;">批量设置</el-button>
<el-button @click="plSet" size="small" type="primary" v-if="this.fxEnabled!=1" style="margin-bottom:20px;">批量设置</el-button>
<el-button @click="addUserBtn" style="float:right" size="small" type="primary">添加分销商</el-button>
</div>
......@@ -178,7 +178,10 @@
<img @click="OpenczjfDig(scope.row,2)" style="width:32px;height:32px"
src="../../assets/img/userman/balance.png" alt=""> -->
</template>
<el-tooltip class="item" effect="dark" content="修改可提现佣金" placement="top-start">
<img @click="openYongjin(scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/edit.png" alt="">
</el-tooltip>
</template>
</el-table-column>
</el-table>
......@@ -346,7 +349,24 @@
<el-button v-if="hpUserInfo.Status==1 || SuperiorNum==1" size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 修改可提现佣金 -->
<el-dialog title="提示" :visible.sync="yjDialog" width="400px">
<el-form style="margin-top:10px">
<el-form-item label-width="100px" label="用户">
{{yjNickName}}
</el-form-item>
<el-form-item label-width="100px" label="累计佣金">
{{TotalCommission}}
</el-form-item>
<el-form-item label-width="100px" label="可提现佣金">
<el-input v-model="yjMsg.Money" @keyup.native="checkInteger(yjMsg,'Money')" style="width:210px;"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="yjDialog = false">取 消</el-button>
<el-button size="small" type="primary" @click="setCommission">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -450,7 +470,15 @@
SuperiorNum:0,
//粉象返佣下拉列表
GradeList:[],
fxDialog:false
fxDialog:false,
yjDialog:false,
//可提现佣金msg
yjMsg:{
DistributorId:0,
Money:0
},
yjNickName:'',
TotalCommission:''
};
},
created() {
......@@ -468,6 +496,24 @@
},
methods: {
//修改
openYongjin(row){
this.TotalCommission=row.TotalCommission;
this.yjNickName=row.NickName;
this.yjMsg.DistributorId=row.Id;
this.yjMsg.Money=row.CommissionWithdrawal;
this.yjDialog=true;
},
//修改佣金
setCommission(){
this.apipost("/api/user/SetDistributorCommission",this.yjMsg, res => {
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getList();
this.yjDialog=false;
}
})
},
openReasonNew(num,row){
this.addMsg.Type = num;
this.addMsg.UserIds = row.UserId;
......
src/components/UserMan/fxDistribution.vue
View file @ deda7c89
<template>
<div class="fxDistribution PdistributorLevel">
<div class="head-title">
粉象返佣等级
粉象分销等级
<el-button @click="AddDig" style="float:right;margin-top: -5px;" size="small" type="primary">
新增
</el-button>
......@@ -146,6 +146,23 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年份">
<el-select v-model="addMsg.Year" placeholder="请选择">
<el-option label="1" :value="1"></el-option>
<el-option label="2" :value="2"></el-option>
<el-option label="3" :value="3"></el-option>
<el-option label="4" :value="4"></el-option>
<el-option label="5" :value="5"></el-option>
<el-option label="6" :value="6"></el-option>
<el-option label="7" :value="7"></el-option>
<el-option label="8" :value="8"></el-option>
<el-option label="9" :value="9"></el-option>
<el-option label="10" :value="10"></el-option>
</el-select>
<span>年</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否可以升级">
<el-select v-model="addMsg.IsUpgrade" placeholder="请选择">
......@@ -154,6 +171,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="小数类型">
<el-select v-model="addMsg.DecimalType" placeholder="请选择">
......@@ -162,8 +181,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="升级所需下级等级">
<el-select v-model="addMsg.UpgradeId" placeholder="请选择">
......@@ -172,12 +189,16 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="升级所需下级等级数量">
<el-input v-model="addMsg.UpgradeNum" style="width:218px;"
@keyup.native="checkInteger(addMsg,'UpgradeNum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
......@@ -239,7 +260,8 @@
UpgradeNum: 0, //升级所需下级等级数量
UpgradeId: 1, //升序所需下级等级id
DecimalType:1, //小数类型
Description:'' //描述
Description:'', //描述
Year:1 //年份
},
//分销商选择等级
numList: [],
......@@ -292,7 +314,6 @@
}
})
})
}
})
},
......@@ -324,7 +345,8 @@
UpgradeNum: 0, //升级所需下级等级数量
UpgradeId: 1, //升序所需下级等级id
DecimalType:1, //小数类型
Description:'' //描述
Description:'', //描述
Year:1 //年份
}
},
//修改
......@@ -359,6 +381,7 @@
if (valid) {
this.apipost("/api/user/SetFXDistributorGradeInfo", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.dialogVisible = false;
} else {
......
src/components/UserMan/vipbuySales.vue
View file @ deda7c89
......@@ -34,7 +34,7 @@
<span style="margin-left:20px;">分销用户id：</span>
<el-input type="text" class="w160" v-model="msg.DistributionUserId" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</div>
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0;color:#303133">
<el-table-column prop="OrderNo" label="订单号">
</el-table-column>
<el-table-column prop="UserName" label="购买用户">
......
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