Skip to content

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

新增页面

parent b5dab22e
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 145 deletions
src/components/pintuan/pintuanActive.vue
View file @ a73e55c8
......@@ -150,8 +150,8 @@
<i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<goodsSpe v-show="IsShowSpec" @getSpecList="getSpecList" @getSpecPriceList="getSpecPriceList" :SpecList="SpecificationList"
:SpecPriceList="SpecificationPriceList"></goodsSpe>
<goodsSpe v-show="IsShowSpec" @getSpecList="getSpecList" @getSpecPriceList="getSpecPriceList" :SpecList="TempSpecList"
:SpecPriceList="TempSpecPriceList"></goodsSpe>
</el-form-item>
<el-form-item label="商品货号">
<el-input v-model="addMsg.Goods_no" size="small" :disabled="true" placeholder="请输入商品货号"
......@@ -392,8 +392,8 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="阶梯团设置">
<ladderGroup :Goods="addMsg" :GroupList="GroupList" @getGroup="getGroup" :SpecList="SpecificationList"
:PriceList="SpecificationPriceList"></ladderGroup>
<groupStep :Goods="addMsg" :GroupList="GroupList" @getGroup="getGroup" :SpecList="TempSpecList"
:GroupPriceList="TempGroupPriceList" :SpecPriceList="TempSpecPriceList"></groupStep>
</el-tab-pane>
<el-tab-pane label="分销价设置">
<distributePrice :shareGroup_list="shareGroup_list"></distributePrice>
......@@ -472,7 +472,7 @@
import ChooseImg from "@/components/global/ChooseImg.vue";
import goodsSpe from "@/components/pintuan/pintuanPlugin/goodsSpecifica.vue"
import choiceGood from "@/components/common/choiceGood.vue";
import ladderGroup from "@/components/pintuan/pintuanPlugin/ladderGroup.vue"
import groupStep from "@/components/pintuan/pintuanPlugin/groupStep.vue"
import distributePrice from "@/components/pintuan/pintuanPlugin/distributePrice.vue"
import memberPrice from "@/components/pintuan/pintuanPlugin/memberPrice.vue"
......@@ -481,7 +481,7 @@
ChooseImg,
goodsSpe,
choiceGood,
ladderGroup,
groupStep,
distributePrice,
memberPrice
},
......@@ -529,8 +529,9 @@
},
IsShowSpec: false, //是否显示规格
GroupList: [], //阶梯价格列表
SpecificationList: [], //规格列表
SpecificationPriceList: [], //规格价格列表
TempSpecList: [], //规格列表
TempSpecPriceList: [], //规格价格列表
TempGroupPriceList:[],//阶梯团价
serviceDig: false,
serviceList: [], //新增服务弹出数据
......@@ -605,12 +606,13 @@
if(Mydata.SpecificationList&&Mydata.SpecificationList.length>0){
this.addMsg.SpecificationList = Mydata.SpecificationList; //规格赋值
this.SpecificationList = Mydata.SpecificationList;
this.TempSpecList = Mydata.SpecificationList;
}
if(this.addMsg.SpecificationPriceList&&this.addMsg.SpecificationPriceList.length>0){
if(Mydata.SpecificationPriceList&&Mydata.SpecificationPriceList.length>0){
this.addMsg.SpecificationPriceList = Mydata.SpecificationPriceList; //规格列表赋值
this.SpecificationPriceList = Mydata.SpecificationPriceList
this.TempSpecPriceList = JSON.parse(JSON.stringify(Mydata.SpecificationPriceList));
}
this.IsShowSpec=true;
} else {
this.Error(res.data.message);
}
......@@ -633,7 +635,7 @@
this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
console.log("res", res);
if (res.data.resultCode == 1) {
this.CommonJump("/pintuanList", {});
this.CommonJump("pintuanList", {});
this.Success(res.data.message);
} else {
this.Info(res.data.message);
......@@ -645,7 +647,6 @@
this.isShowGoods = false;
this.IsShowSpec = false;
var chooseGoods = this.$refs.choiceGood.getChoicedGoods();
console.log("chooseGoods", chooseGoods);
if (chooseGoods && chooseGoods.length > 0) {
this.addMsg.GoodId = chooseGoods[0].Id;
this.addMsg.name = chooseGoods[0].Name;
......@@ -667,14 +668,14 @@
}
})
}
this.SpecificationList = tempSpecArray;
this.TempSpecList = JSON.parse(JSON.stringify(tempSpecArray));
var tempPriceArray = chooseGoods[0].SpecificationPriceList;
if (tempPriceArray && tempPriceArray.length > 0) {
tempPriceArray.forEach(item => {
item.Id = 0;
});
}
this.SpecificationPriceList = chooseGoods[0].SpecificationPriceList;
this.TempSpecPriceList = JSON.parse(JSON.stringify(tempPriceArray));
this.IsShowSpec = true;
}
this.$refs.choiceGood.toggleSelection();
......
src/components/pintuan/pintuanPlugin/goodsSpecifica.vue
View file @ a73e55c8
......@@ -267,7 +267,7 @@
data() {
return {
SpecificationList: [], //规格数组
SpecificationPriceList: [],//规格+值 价格列表
SpecificationPriceList: [], //规格+值 价格列表
ComTreeList: [],
memberList2: [],
skuList: [],
......@@ -300,16 +300,18 @@
this.SpecificationPriceList = JSON.parse(JSON.stringify(val));
},
},
'SpecificationList':{
'SpecificationList': {
handler: function (val, oldval) {
this.$emit('getSpecList',this.SpecificationList);
this.$emit('getSpecList', this.SpecificationList);
},
},
'SpecificationPriceList':{
'SpecificationPriceList': {
handler: function (val, oldval) {
this.$emit('getSpecPriceList',this.SpecificationPriceList);
this.$emit('getSpecPriceList', this.SpecificationPriceList);
},
}
},
created() {
},
methods: {
......@@ -325,7 +327,6 @@
};
this.SpecificationList.push(obj);
},
// 修改规格值
ggzChange() {
this.$forceUpdate();
......
src/components/pintuan/pintuanPlugin/priceAndGroup.vue → src/components/pintuan/pintuanPlugin/groupPrice.vue
View file @ a73e55c8
......@@ -59,17 +59,17 @@
}
</style>
<!--阶梯团价格库存设置-->
<template>
<div class="app-attr">
<div class="box">
<el-form label-width="180px">
<el-checkbox v-model="attrBatch" @change="selectClick"
style="position:absolute">全选
<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()" size="small" type="number" v-model="batchNum">
<el-select v-model="selectData" slot="prepend">
<!-- <el-option label="不限" :value="0"></el-option> -->
<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>
......@@ -90,9 +90,8 @@
<td style="width:55px;">
<el-checkbox></el-checkbox>
</td>
<template v-for="headerItem in attrGroups">
<td>{{headerItem.Name}}</td>
</template>
<td v-for="(headerItem,headerIndex) in attrGroups" :key="headerIndex">{{headerItem.Name}}</td>
<td>
<div class="header-require">拼团价</div>
</td>
......@@ -102,21 +101,20 @@
</tr>
</thead>
<tbody>
<tr v-for="item in pinTuanPriceList">
<tr v-for="(rootItem,rootIndex) in groupPriceList" :key="rootIndex">
<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'">
{{ item.AttrList[index2].SVName }}
<td v-if="attrIndex == index2" v-for="(item2, index2) in rootItem.AttrList" :key="index2">
{{ rootItem.AttrList[index2].SVName }}
</td>
</template>
<td>
<el-input type="number" v-model="item.PintuanPrice" size="small" style="padding:0 10px" />
<el-input type="number" v-model="rootItem.PinTuanPrice" size="small" style="padding:0 10px" />
</td>
<td>
<el-input type="number" v-model="item.PintuanStock" size="small" style="padding:0 10px" />
<el-input type="number" v-model="rootItem.PinTuanStock" size="small" style="padding:0 10px" />
</td>
</tr>
</tbody>
......@@ -125,42 +123,38 @@
</template>
<script>
export default {
props: ["pinTuanPriceList", "attrGroups"],
props: ["groupPriceList", "attrGroups"],
data() {
return {
attrBatch:false, //是否全选
cList:[{
Id:0,
name:'拼团价'
},{
Id:1,
name:'拼团库存'
attrBatch: false, //是否全选
cList: [{
Id: 0,
name: '拼团价'
}, {
Id: 1,
name: '拼团库存'
}],
selectData:'',
selectData: '',
//批量设置价格
batchNum:''
batchNum: ''
};
},
created() {
},
watch: {
},
methods: {
//点击全选
selectClick(){
selectClick() {
},
//点击批量设置确定
batchAttr(){
// if(this.){
batchAttr() {
// }
}
},
mounted() {
console.log(this.attrGroups,'attrgrop');
},
computed: {
......
src/components/pintuan/pintuanPlugin/ladderGroup.vue → src/components/pintuan/pintuanPlugin/groupStep.vue
View file @ a73e55c8
......@@ -6,6 +6,7 @@
}
</style>
<!--阶梯团基础信息设置-->
<template>
<div>
<el-form>
......@@ -68,32 +69,33 @@
</div>
<el-form-item>
<div>价格与库存</div>
<priceAndGroup :attrGroups="new_attr_groups" :pinTuanPriceList="item.attr">
</priceAndGroup>
<groupPrice :attrGroups="new_attr_groups" :groupPriceList="item.StepPriceList">
</groupPrice>
</el-form-item>
</el-card>
</el-form>
</div>
</template>
<script>
import priceAndGroup from "@/components/pintuan/pintuanPlugin/priceAndGroup.vue"
import groupPrice from "@/components/pintuan/pintuanPlugin/groupPrice.vue"
export default {
props: ['SpecList', "GroupList", "PriceList"],
props: ['SpecList', "GroupPriceList", "SpecPriceList"],
components: {
priceAndGroup //拼团与库存组件
groupPrice //拼团与库存组件
},
data() {
return {
group_list: [],
new_PriceList: [],
new_attr_groups: []
new_attr_groups: [],
new_SpecPriceList: [],
};
},
watch: {
'GroupList': {
handler: function (val, oldval) {
this.group_list = JSON.parse(JSON.stringify(val));
console.log("this.group_list",this.group_list);
},
},
'SpecList': {
......@@ -101,15 +103,13 @@
this.new_attr_groups = JSON.parse(JSON.stringify(val));
},
},
'PriceList': {
'SpecPriceList': {
handler: function (val, oldval) {
this.new_PriceList = JSON.parse(JSON.stringify(val));
this.new_SpecPriceList = JSON.parse(JSON.stringify(val));
},
},
},
created() {
},
created() {},
methods: {
//表头提示样式
delegation(h, {
......@@ -155,19 +155,30 @@
if (!this.group_list) {
this.group_list = [];
}
var attr = [];
if (this.new_SpecPriceList && this.new_SpecPriceList.length > 0) {
this.new_SpecPriceList.forEach(item => {
var obj = {
AttrList: item.AttrList,
PinTuanPrice: 0,
PinTuanStock: 0
}
attr.push(obj);
})
}
this.group_list.push({
people_num: 2,
preferential_price: 1,
pintuan_time: 1,
goods_id: 0,
attr: JSON.parse(JSON.stringify(this.new_PriceList))
StepPriceList: attr
});
 this.$emit('getGroup',this.group_list); //params是传递的参数
this.$emit('getGroup', this.group_list); //params是传递的参数
},
//删除拼团
destroyPintuan(index) {
this.group_list.splice(index, 1);
 this.$emit('getGroup',this.group_list); //params是传递的参数
this.$emit('getGroup', this.group_list); //params是传递的参数
}
},
mounted() {
......
src/components/sallCenter/pluginCenter.vue
View file @ a73e55c8
<style>
.pluginCenter{
padding:20px 0;
}
.plugin_ListTitle{
.pluginCenter {
padding: 20px 0;
}
.plugin_ListTitle {
font-weight: 400;
font-size: 18px;
margin-bottom:24px;
}
.plugin-list{
margin:0 0 0 -20px;
}
.plugin-item {
margin-bottom: 24px;
}
.plugin-list {
margin: 0 0 0 -20px;
}
.plugin-item {
border: 1px solid #ebebeb;
background: #fff;
padding: 20px;
......@@ -18,107 +21,129 @@
transition: 250ms;
position: relative;
height: 97px;
}
.plugin-item .display-name {
}
.plugin-item .display-name {
margin-bottom: 10px;
transition: 250ms;
}
.plugin-item:hover{
}
.plugin-item:hover {
border-color: #bfddff;
cursor: pointer;
}
.plugin-item:hover .display-name {
}
.plugin-item:hover .display-name {
color: #409EFF;
}
.plugin-icon-bg{
}
.plugin-icon-bg {
background: rgb(250, 163, 34);
border-radius: 10px;
font-size: 0;
display: inline-block;
}
.plugin-icon{
width:50px;
height:50px;
}
.plugin-name{
}
.plugin-icon {
width: 50px;
height: 50px;
}
.plugin-name {
font-size: 14px;
margin-bottom: 4px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.plugin-desc{
}
.plugin-desc {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #999999;
font-size: 12px;
}
}
</style>
<template>
<div class="pluginCenter">
<div flex="cross:center">
<h3 class="plugin_ListTitle">已安装</h3>
</div>
<div class="plugin-list el-row">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter('Fsetting')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/icon.png" style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">微信小程序</div>
<div flex="box:last"><div class="name">wxapp</div>
</div>
</div>
</div>
</div>
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter('Ftemplate')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/Diy.png" style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">DIY装修</div>
<div flex="box:last"><div class="name">diy</div>
</div>
</div>
</div>
<div class="pluginCenter">
<div flex="cross:center">
<h3 class="plugin_ListTitle">已安装</h3>
</div>
<div class="plugin-list el-row">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4"
@click="goDiyCenter('Fsetting')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/icon.png"
style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">微信小程序</div>
<div flex="box:last">
<div class="name">wxapp</div>
</div>
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter('authorize')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/em.png" style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">资产管理</div>
<div flex="box:last"><div class="name">authorize</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4"
@click="goDiyCenter('Ftemplate')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/Diy.png"
style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">DIY装修</div>
<div flex="box:last">
<div class="name">diy</div>
</div>
</div>
</div>
<div flex="cross:center" style="margin-top:20px;display:none">
<h3 class="plugin_ListTitle">营销工具</h3>
</div>
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4"
@click="goDiyCenter('authorize')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/em.png"
style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">资产管理</div>
<div flex="box:last">
<div class="name">authorize</div>
</div>
</div>
</div>
<div flex="dir:left" class="plugin-list el-row" style="display:none">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter('pintuanMain')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;">
<div class="plugin-icon-bg">
<img src="../../assets/img/sallCenter/pintuan.png" style="width: 50px; height: 50px; display: block;"></div>
</div>
<div>
<div class="plugin-name">拼团</div>
<div flex="box:last"><div class="plugin-desc">邀请朋友一起拼团购买</div>
</div>
</div>
</div>
</div>
</div>
<div style="display:block">
<div flex="cross:center" style="margin-top:20px;">
<h3 class="plugin_ListTitle">营销工具</h3>
</div>
<div flex="dir:left" class="plugin-list el-row">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4"
@click="goDiyCenter('pintuanMain')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;">
<div class="plugin-icon-bg">
<img src="../../assets/img/sallCenter/pintuan.png" style="width: 50px; height: 50px; display: block;">
</div>
</div>
<div>
<div class="plugin-name">拼团</div>
<div flex="box:last">
<div class="plugin-desc">邀请朋友一起拼团购买</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
currentUser: {},
isChecked:1,
Height:0
isChecked: 1,
Height: 0
};
},
created() {
......@@ -126,11 +151,11 @@
},
methods: {
//跳转微信小程序
goDiyCenter(path){
goDiyCenter(path) {
let routeData = this.$router.resolve({
name: path,
query: {
FIndex:1
FIndex: 1
}
});
window.open(routeData.href, "_blank");
......
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