Skip to content

E
ElectricitySheep
Commit 2568f422 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 97514dd1
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 55 deletions
src/components/pintuan/pintuanActive.vue
View file @ 2568f422
......@@ -391,11 +391,11 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="阶梯团设置">
<ladderGroup :Goods="addMsg" :GroupList="GroupList" :SpecList="SpecificationList"
<ladderGroup :Goods="addMsg" :GroupList="GroupList" @getGroup="getGroup" :SpecList="SpecificationList"
:PriceList="SpecificationPriceList"></ladderGroup>
</el-tab-pane>
<el-tab-pane label="分销价设置">
<distributePrice></distributePrice>
<distributePrice :shareGroup_list="shareGroup_list"></distributePrice>
</el-tab-pane>
<el-tab-pane label="会员价设置">
<memberPrice></memberPrice>
......@@ -545,6 +545,7 @@
formName: '',
imgDialog: false,
rules: {},
shareGroup_list:[]
};
},
created() {},
......@@ -672,6 +673,10 @@
this.addMsg.App_share_pic = that.getIconLink(msg[0].url);
this.imgDialog = false;
},
//获取子组件group_list
getGroup(group_list){
this.shareGroup_list=group_list
}
}
};
......
src/components/pintuan/pintuanPlugin/distributePrice.vue
View file @ 2568f422
......@@ -9,18 +9,18 @@
</style>
<template>
<div>
<el-form-item label="是否开启分销佣金" prop="individual_share" size="small">
<el-switch :active-value="1" :inactive-value="0" v-model="msg.individual_share">
<el-form-item label="是否开启分销佣金" size="small">
<el-switch :active-value="1" :inactive-value="0" v-model="msg.SeparateDistribution">
</el-switch>
</el-form-item>
<template v-if="msg.individual_share == 1">
<!-- <el-form-item label="分销类型" prop="attr_setting_type" v-if="cForm.use_attr == 1 && ruleForm.type == 'goods'">
<el-radio v-model="ruleForm.attr_setting_type" :label="0">普通设置</el-radio>
<el-radio v-model="ruleForm.attr_setting_type" :label="1">详细设置</el-radio>
</el-form-item> -->
<el-form-item label="分销佣金类型" prop="share_type" size="small">
<el-radio v-model="msg.share_type" :label="0">固定金额</el-radio>
<el-radio v-model="msg.share_type" :label="1">百分比</el-radio>
<template v-if="msg.SeparateDistribution == 1">
<el-form-item label="分销类型">
<el-radio v-model="msg.SeparateDistributionType" :label="0">普通设置</el-radio>
<el-radio v-model="msg.SeparateDistributionType" :label="1">详细设置</el-radio>
</el-form-item>
<el-form-item label="分销佣金类型" size="small">
<el-radio v-model="msg.SeparateDistributionMoneyType" :label="0">固定金额</el-radio>
<el-radio v-model="msg.SeparateDistributionMoneyType" :label="1">百分比</el-radio>
</el-form-item>
<!-- <template v-if="sign !== 'pintuan'">
<app-goods-share v-model="ruleForm" :is_mch="is_mch" :attr-groups="attrGroups"
......@@ -34,24 +34,28 @@
</template> -->
<el-form-item>
<div class="pintuan-share">
<el-card>
<el-card v-for="(item,index) in shareGroup_list" :key="index">
<div slot="header" class="clearfix">
<div class="box">
<div style="display:inline-block;">
<el-tag type="danger">3人团</el-tag>
<el-tag type="danger">{{item.people_num}}人团</el-tag>
</div>
<label style="margin-bottom:0;padding:18px 10px;">批量设置</label>
<el-select placeholder="请选择层级" v-model="fenxiao" style="width:130px;" size="small">
<el-option label="一级分销" :value="1"></el-option>
<el-option label="二级分销" :value="2"></el-option>
<el-select placeholder="请选择层级" v-model="fxVal" style="width:130px;" size="small">
<el-option v-for="(item, index) in butorInt" :label="`${index + 1}级分销`" :value="index + 1"
:key="index+'12'">
</el-option>
</el-select>
<el-input type="text" size="small" style="width:150px;margin-top:5px;">
<el-button slot="append">元</el-button>
<el-button slot="append">
<span v-if="msg.SeparateDistributionMoneyType == 2">元</span>
<span v-if="msg.SeparateDistributionMoneyType == 1">%</span>
</el-button>
</el-input>
<el-button size="small" type="primary">设置</el-button>
</div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%;border:1px solid #E8EAEE"
@selection-change="handleSelectionChange">
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark"
style="width: 100%;border:1px solid #E8EAEE" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="等级名称" prop="leval" width="100">
......@@ -60,14 +64,14 @@
<template slot-scope="scope">
<el-input type="text" size="small" v-model="scope.row.yiji">
<el-button slot="append">元</el-button>
</el-input>
</el-input>
</template>
</el-table-column>
<el-table-column label="二级分销" width="575">
<template slot-scope="scope">
<el-input type="text" size="small" v-model="scope.row.erji">
<el-button slot="append">元</el-button>
</el-input>
</el-input>
</template>
</el-table-column>
</el-table>
......@@ -80,35 +84,43 @@
</template>
<script>
export default {
props: {
},
props: ["shareGroup_list"],
data() {
return {
fenxiao:0,
fxVal: '',
butorInt: 0,
msg: {
individual_share: 1,
share_type: 0
SeparateDistribution: 0, //是否开启分销佣金
SeparateDistributionType: 1, //分销类型
SeparateDistributionMoneyType: 1, //分销佣金类型
},
tableData:[
{
leval:'默认等级',
yiji:0,
erji:3
}
]
tableData: [{
leval: '默认等级',
yiji: 0,
erji: 3
}]
};
},
created() {
},
methods: {
handleSelectionChange(){
handleSelectionChange() {
}
},
getDistributor() {
this.apipost("/api/user/GetDistributorBasicsInfo", {}, res => {
if (res.data.resultCode == 1) {
console.log(res,'resss');
this.butorInt = res.data.data.DistributorTier;
}
});
},
},
mounted() {
console.log(this.shareGroup_list, 'shareGroup_list');
this.getDistributor();
},
computed: {
......
src/components/pintuan/pintuanPlugin/ladderGroup.vue
View file @ 2568f422
......@@ -162,10 +162,12 @@
goods_id: 0,
attr: JSON.parse(JSON.stringify(this.new_PriceList))
});
 this.$emit('getGroup',this.group_list); //params是传递的参数
},
//删除拼团
destroyPintuan(index) {
this.group_list.splice(index, 1);
 this.$emit('getGroup',this.group_list); //params是传递的参数
}
},
mounted() {
......
src/components/pintuan/pintuanPlugin/priceAndGroup.vue
View file @ 2568f422
......@@ -63,20 +63,19 @@
<div class="app-attr">
<div class="box">
<el-form label-width="180px">
<el-checkbox v-model="attrBatch" @change="selectClick" :disabled="!cData || cData.length == 0"
<el-checkbox v-model="attrBatch" @change="selectClick"
style="position:absolute">全选
</el-checkbox>
<el-form-item label="批量设置" size="small" style="margin-bottom:0;padding:18px 0;display:inline-block;">
<el-input @keyup.enter.native="batchAttr(selectData)" size="small"
:type="selectData == 'no' ? 'text' : 'number'" v-model="batch">
<el-input @keyup.enter.native="batchAttr()" size="small" type="number" v-model="batchNum">
<el-select v-model="selectData" slot="prepend">
<el-option v-for="(item, index) in cList" :value="index" :key="item" v-if="index!='pic_url'"
:label="item">
{{item}}
<!-- <el-option label="不限" :value="0"></el-option> -->
<el-option v-for="(item, index) in cList" :value="index" :key="item.Id" :label="item.namwe">
{{item.name}}
</el-option>
</el-select>
<template slot="append">
<el-button @click="batchAttr(selectData)">
<el-button @click="batchAttr()">
确定
</el-button>
</template>
......@@ -91,9 +90,9 @@
<td style="width:55px;">
<el-checkbox></el-checkbox>
</td>
<td v-for="(headerItem,headerIndex) in attrGroups" :key="headerIndex">{{headerItem.Name}}</td>
<template v-for="headerItem in attrGroups">
<td>{{headerItem.Name}}</td>
</template>
<td>
<div class="header-require">拼团价</div>
</td>
......@@ -103,20 +102,21 @@
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in pinTuanPriceList" :key="index">
<tr v-for="item in pinTuanPriceList">
<td>
<el-checkbox></el-checkbox>
</td>
<template v-for="(attrItem, attrIndex) in attrGroups">
<td v-if="attrIndex == index2" v-for="(item2, index2) in item.AttrList" :key="index2+6">
<td v-if="attrIndex == index2" v-for="(item2, index2) in item.AttrList" :key="index2+'6'">
{{ item.AttrList[index2].SVName }}
</td>
</template>
<td>
<el-input v-model="item.PintuanPrice" />
<el-input type="number" v-model="item.PintuanPrice" size="small" style="padding:0 10px" />
</td>
<td>
<el-input v-model="item.PintuanStock" />
<el-input type="number" v-model="item.PintuanStock" size="small" style="padding:0 10px" />
</td>
</tr>
</tbody>
......@@ -128,7 +128,17 @@
props: ["pinTuanPriceList", "attrGroups"],
data() {
return {
attrBatch:false, //是否全选
cList:[{
Id:0,
name:'拼团价'
},{
Id:1,
name:'拼团库存'
}],
selectData:'',
//批量设置价格
batchNum:''
};
},
created() {
......@@ -138,10 +148,19 @@
},
methods: {
//点击全选
selectClick(){
},
//点击批量设置确定
batchAttr(){
// if(this.){
// }
}
},
mounted() {
console.log(this.attrGroups,'attrgrop');
},
computed: {
......
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