Skip to content

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

修改内容

parent 03e8958a
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 7 deletions
src/components/UserMan/RecommendRebate.vue
View file @ 686ae57b
...@@ -154,20 +154,21 @@ ...@@ -154,20 +154,21 @@
</div> </div>
<div class="goods-item" style="width: 10%;"> <div class="goods-item" style="width: 10%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" flex="main:center cross:center" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 "> <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" flex="main:center cross:center" >
<div v-if="list.OrderIntroduction.CommissionState==1">待结算</div> <div v-if="list.OrderIntroduction.CommissionState==1&&list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0">待结算</div>
<div v-if="list.OrderIntroduction.CommissionState==2">已结算</div> <div v-if="list.OrderIntroduction.CommissionState==2&&list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0">已结算</div>
</div> </div>
</div> </div>
<div class="goods-item" style="width: 20%;"> <div class="goods-item" style="width: 20%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 "> <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods">
<div class="share-title" style="margin-bottom: 10px; font-size: 15px;"> <div class="share-title" style="margin-bottom: 10px; font-size: 15px;" v-if="list.OrderIntroduction.UserName!=null && list.OrderIntroduction.UserName!=''">
<span style='color: #999999;margin-right: 10px;'>昵称:</span>
<span>{{list.OrderIntroduction.UserName}}</span> <span>{{list.OrderIntroduction.UserName}}</span>
</div> </div>
<div flex="dir:left cross:center" style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Name!=null && list.OrderIntroduction.Name!='' " > <div flex="dir:left cross:center" style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Name!=null && list.OrderIntroduction.Name!='' " >
...@@ -178,6 +179,8 @@ ...@@ -178,6 +179,8 @@
<div flex="dir:left cross:center" class=" share-price" style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 " > <div flex="dir:left cross:center" class=" share-price" style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 " >
<span style='color: #999999;margin-right: 10px;'>佣金:</span> <span style='color: #999999;margin-right: 10px;'>佣金:</span>
<div>￥{{list.OrderIntroduction.Commission}}</div> <div>￥{{list.OrderIntroduction.Commission}}</div>
<img v-if='list.OrderIntroduction.CommissionState==1' @click="EditCommission(list)"
src="../../assets/img/userman/edit1.png" alt="">
</div> </div>
</div> </div>
...@@ -230,6 +233,22 @@ ...@@ -230,6 +233,22 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="佣金修改" :visible.sync="priceDig" width="600px">
<el-form :model="editCommissionMsg" ref="costMsg" label-width="80px">
<el-form-item label="昵称">
<span>{{editUserName}}</span>
</el-form-item>
<el-form-item label="佣金修改">
<el-input size="small" v-model="editCommissionMsg.Commission" step="1" min="0" type="number">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="priceDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="costForm()">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -289,7 +308,13 @@ export default { ...@@ -289,7 +308,13 @@ export default {
moresendtips:'', moresendtips:'',
hszDig:false, hszDig:false,
hszMsg:{}, hszMsg:{},
commonNum:0 commonNum:0,
editCommissionMsg:{
OrderDetailId:0,
Commission:0
},
editUserName:'',
priceDig: false
} }
}, },
created(){ created(){
...@@ -476,6 +501,28 @@ export default { ...@@ -476,6 +501,28 @@ export default {
this.platList=res.data.data; this.platList=res.data.data;
}) })
}, },
EditCommission(item){
console.log(item)
this.editCommissionMsg.OrderDetailId = item.Id;
this.editCommissionMsg.Commission = item.OrderIntroduction.Commission;
this.editUserName= item.OrderIntroduction.UserName;
this.priceDig = true
},
costForm(){
if(this.editCommissionMsg.Commission==''){
this.Error('佣金不能为空');
return
}
this.apipost("/api/order/SetRecommendOrdersCommission", this.editCommissionMsg, res => {
this.priceDig = false
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
})
}
}, },
}; };
......
src/components/UserMan/baseSet.vue
View file @ 686ae57b
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<el-radio v-model="addMsg.IsEnableFXGrade" :label="1">开启</el-radio> <el-radio v-model="addMsg.IsEnableFXGrade" :label="1">开启</el-radio>
<el-radio v-model="addMsg.IsEnableFXGrade" :label="2">不开启</el-radio> <el-radio v-model="addMsg.IsEnableFXGrade" :label="2">不开启</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="无上级是否开启返佣"> <el-form-item label="无上级是否开启返佣" v-if="addMsg.IsEnableFXGrade==1">
<el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="1">开启</el-radio> <el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="1">开启</el-radio>
<el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="2">不开启</el-radio> <el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="2">不开启</el-radio>
</el-form-item> </el-form-item>
...@@ -344,6 +344,9 @@ ...@@ -344,6 +344,9 @@
Save(formName) { Save(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
if(this.addMsg.IsEnableFXGrade==2){
this.addMsg.IsEnableNoSuperiorFY=2
}
let cmd = "/api/user/SetDistributorBasicsInfo"; let cmd = "/api/user/SetDistributorBasicsInfo";
this.apipost(cmd, this.addMsg, this.apipost(cmd, this.addMsg,
res => { res => {
......
src/components/orderMan/RecommendBill.vue
View file @ 686ae57b
...@@ -300,6 +300,7 @@ ...@@ -300,6 +300,7 @@
}, },
//保存选择 //保存选择
saveOrderChoice() { saveOrderChoice() {
this.addOrderMsg.IntroductionIds = []; this.addOrderMsg.IntroductionIds = [];
this.IntroductionIds.forEach(x => { this.IntroductionIds.forEach(x => {
this.addOrderMsg.IntroductionIds.push(x.OrderIntroduction.IntroductionId); this.addOrderMsg.IntroductionIds.push(x.OrderIntroduction.IntroductionId);
...@@ -314,7 +315,14 @@ ...@@ -314,7 +315,14 @@
this.Error('请选择返佣订单'); this.Error('请选择返佣订单');
return; return;
} }
const loading = this.$loading({
lock: true,
text: '正在生成账单中...',
spinner: 'el-icon-loading',
});
this.apipost("/api/user/SetRecommendOrdersBillInfo", this.addOrderMsg, res => { this.apipost("/api/user/SetRecommendOrdersBillInfo", this.addOrderMsg, res => {
loading.close();
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.choiceOrder = false; this.choiceOrder = false;
......
src/components/setup/mailRulesSet.vue
View file @ 686ae57b
...@@ -32,6 +32,11 @@ ...@@ -32,6 +32,11 @@
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="跳转链接" prop="FreeShippingUrl" class="is-required">
<el-input v-model="addMsg.FreeShippingUrl" placeholder="请输入链接" >
</el-input>
</el-form-item>
<el-form-item label="是否启用" prop="IsEnable"> <el-form-item label="是否启用" prop="IsEnable">
<el-radio v-model="addMsg.IsEnable" :label="1">是</el-radio> <el-radio v-model="addMsg.IsEnable" :label="1">是</el-radio>
<el-radio v-model="addMsg.IsEnable" :label="0">否</el-radio> <el-radio v-model="addMsg.IsEnable" :label="0">否</el-radio>
...@@ -124,6 +129,7 @@ ...@@ -124,6 +129,7 @@
IsEnable: 0, IsEnable: 0,
Name:'', Name:'',
CategoryList: [], CategoryList: [],
FreeShippingUrl:'',
}, },
rules: { rules: {
FullNumPinkage: [{ FullNumPinkage: [{
...@@ -146,8 +152,15 @@ ...@@ -146,8 +152,15 @@
message: '请选择是否启用', message: '请选择是否启用',
trigger: 'change' trigger: 'change'
}], }],
FreeShippingUrl: [{
required: true,
message: '请选择跳转链接',
trigger: 'blur'
}],
}, },
loading: false, loading: false,
fenleiData:[],
childList2: [], childList2: [],
childList3: [], childList3: [],
keepCategoryList: [], keepCategoryList: [],
......
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