Skip to content

E
ElectricitySheep
Commit d72f9867 authored by Mac's avatar Mac
Browse files
Options

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

parents 01f3c2d8 06050ba4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 911 additions and 140 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ d72f9867
...@@ -144,6 +144,11 @@ ...@@ -144,6 +144,11 @@
<span class="point" @click="imgDig = true">查看图例</span> <span class="point" @click="imgDig = true">查看图例</span>
</p> </p>
</el-form-item> </el-form-item>
<el-form-item label="直播商品">
<el-switch v-model="addMsg.IsLiveGoods" active-color="#409EFF" :active-value="1"
:inactive-value="2">
</el-switch>
</el-form-item>
<el-form-item label="上架状态"> <el-form-item label="上架状态">
<el-switch v-model="addMsg.GoodsStatus" active-color="#409EFF" :active-value="1" <el-switch v-model="addMsg.GoodsStatus" active-color="#409EFF" :active-value="1"
:inactive-value="2"> :inactive-value="2">
...@@ -1085,6 +1090,7 @@ ...@@ -1085,6 +1090,7 @@
CustomShareTitles: "", CustomShareTitles: "",
CustomShareImage: "", CustomShareImage: "",
CustomShareImagePath: "", CustomShareImagePath: "",
IsLiveGoods:2, //直播商品
GoodsStatus: 0, GoodsStatus: 0,
InventoryNum: 0, InventoryNum: 0,
DefaultSpecificationName: "", DefaultSpecificationName: "",
......
src/components/FShareMain.vue 0 → 100644
View file @ d72f9867
<style>
.pintuanMain {
height: 100%;
display: flex;
-webkit-box-orient: horizontal;
-ms-flex-direction: row;
flex-direction: row;
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1;
-ms-flex-preferred-size: auto;
flex-basis: auto;
-webkit-box-sizing: border-box;
box-sizing: border-box;
min-width: 0;
font-size: 14px;
}
.pintuanMain .mainLeftMenu {
position: relative;
display: flex;
flex-direction: row;
color: #fff;
}
.pintuanMain .leftMenu1 {
background: #444444;
cursor: pointer;
width: 200px;
height: 100%;
overflow-y: auto;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.pintuanMain .asideInner {
background: rgba(0, 0, 0, 0.15);
padding: 6px 6px;
width: 100%;
border-radius: 3px;
font-weight: bold;
}
.pintuanMain .F_Logo {
height: 60px;
background: #464d54;
color: #f2f2f2;
cursor: pointer;
font-weight: bold;
text-align: center;
padding: 0 15px;
display: flex;
align-items: center;
}
.pintuanMain .mainRightContent {
width: 100%;
height: 100%;
background-color: #f3f3f3;
}
.pintuanMain .mainRightTop {
width: 100%;
height: 60px;
background: #fff;
display: flex;
justify-content: space-between;
color: #909399;
}
.pintuanMain .mainRightLeft {
width: 110px;
height: 60px;
line-height: 62px;
text-align: center;
margin-left: 30px;
cursor: pointer;
position: relative;
top: -2px;
}
.pintuanMain .marinRightList {
display: flex;
flex-wrap: wrap;
align-items: center;
width: 300px;
float: right;
}
.pintuanMain .marinRightList ul {
display: flex;
width: 100%;
justify-content: space-around;
}
.pintuanMain .marinRightList ul li {
display: block;
list-style-type: none;
cursor: pointer;
color: #909399;
outline: none;
border: none;
}
.pintuanMain .main_routerPage {
padding: 20px;
overflow-y: scroll;
}
.pintuanMain .pintuanSetUU{
position: fixed;
width: 200px;
height: 100%;
position: fixed;
top: 60px;
left: 0;
overflow: auto;
z-index: 5;
background-color: rgb(84, 92, 100);
}
.pintuanMain .pintuanSetUU .menu_item{
font-size: 14px;
color: #303133;
padding: 0 20px;
cursor: pointer;
-webkit-transition: border-color .3s,background-color .3s,color .3s;
transition: border-color .3s,background-color .3s,color .3s;
box-sizing: border-box;
height:56px;
line-height: 56px;
list-style: none;
white-space: nowrap;
color:#fff;
display: flex;
align-items: center;
}
.pintuanMain .pintuanSetUU .menu_item i {
margin-right: 5px;
width: 24px;
text-align: center;
font-size: 18px;
vertical-align: middle;
color:#909399;
}
.pintuanMain .menu_item:hover{
background-color: rgba(67,74,80);
}
.pintuanMain .F_Logo:hover{
background-color: #30353a;
color:#fff;
}
.pintuanMain .Fchecked{
color:rgb(255, 208, 75)!important;
}
.pintuanMain .Fchecked i{
color:rgb(255, 208, 75)!important;
}
</style>
<template>
<div class="pintuanMain">
<div class="mainLeftMenu">
<div class="leftMenu1">
<div class="F_Logo">
<div class="asideInner" @click="CommonJump('mallIndex')">{{currentUser.MallName}}
</div>
</div>
<ul class="pintuanSetUU">
<li class="menu_item" :class="{'Fchecked':isChecked=='/shareCategory'}" @click="isChecked='/shareCategory',CommonJump('shareCategory')">
<i class="el-icon-menu"></i><span>发圈素材分类</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/shareFriend'}" @click="isChecked='/shareFriend',CommonJump('shareFriend')">
<i class="el-icon-menu"></i><span>发圈素材管理</span>
</li>
</ul>
</div>
</div>
<div class="mainRightContent">
<div class="mainRightTop">
<div class="mainRightLeft">微信小程序</div>
<div class="marinRightList">
<ul>
<li style="display:none">缓存</li>
<li style="display:none"> title="教程管理">
<el-dropdown trigger="click">
<span class="el-dropdown-link">
教程管理<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>操作教程</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
<li :title="currentUser.MallName">
<el-dropdown trigger="click">
<span class="el-dropdown-link">
{{currentUser.MallName}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item disabled>{{currentUser.MallName}}</el-dropdown-item>
<el-dropdown-item disabled>{{currentUser.Account}}({{currentUser.MobilePhone}})</el-dropdown-item>
<el-dropdown-item @click.native="CommonJump('index')">返回系统</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
</ul>
</div>
</div>
<div class="main_routerPage" :style="{height: Height+'px'}">
<router-view />
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
currentUser: {},
isChecked:'',
Height:0
};
},
created() {
this.currentUser = this.getLocalStorage();
this.isChecked=this.$route.path;
if(this.$route.query.FIndex){
this.CommonJump('shareFriend');
this.isChecked='/shareFriend'
}
},
methods: {
},
mounted() {
this.Height = document.documentElement.clientHeight - 60;
//监听浏览器窗口变化　
window.onresize = () => {
this.Height = document.documentElement.clientHeight - 60
}
}
};
</script>
src/components/Share/shareCategory.vue 0 → 100644
View file @ d72f9867
<template>
<div class="shareCategory">
<template v-if="IsShowCategory">
<div class="head-title">
发圈素材分类
<el-button @click="IsShowCategory=false" style="float:right;margin-top: -5px;" size="small" type="primary">
新增分类
</el-button>
</div>
<div class="content">
<div class="searchInput">
<el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入分类名称" v-model="msg.Name"
size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()">
</el-input>
<span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
@click="msg.pageIndex=1,getList()"> </span>
</div>
<br>
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0" row-key="Id"
default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column prop="Id" label="ID" width="100">
</el-table-column>
<el-table-column prop="Name" label="分类名称">
</el-table-column>
<el-table-column label="操作" width="180">
<template slot-scope="scope">
<img @click="getCategory(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png" alt="">
<img @click="removeCategory(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="">
</template>
</el-table-column>
</el-table>
</div>
</template>
<template v-else>
<div class="head-title">
<span @click="IsShowCategory=true" style="color:rgb(64, 158, 255);cursor:pointer;">发圈素材分类</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>编辑</span>
</div>
<div class="content">
<div class="conten_indder">
<el-form label-width="150px">
<el-form-item label="分类名称">
<el-input type="text" size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="选择分类级别">
<el-radio v-model="addMsg.Level" :label="1">一级分类</el-radio>
<el-radio v-model="addMsg.Level" :label="2">二级分类</el-radio>
<el-radio v-model="addMsg.Level" :label="3">三级分类</el-radio>
</el-form-item>
</el-form>
</div>
</div>
<el-button size="small" style="margin-top:20px;padding:9px 25px;" type="primary" @click="submitform()">保存
</el-button>
</template>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
//是否显示新增分类
IsShowCategory: true,
dataList: [],
msg: {
Name: "", //页面名称
pageIndex: 1,
pageSize: 10,
},
addMsg: {
Id: 0,
Name: '', //分类名称
Level: 1, //层级
ParentId: 0, //父节点编号
},
};
},
methods: {
//获取分类列表
getList() {
this.loading = true;
this.apipost("/api/Share/GetShareCategoryList", this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log("this.dataList", this.dataList);
}
},
null
);
},
//新增修改分类
submitform() {
this.apipost("/api/Share/SetShareCategory", this.addMsg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message);
this.IsShowCategory = true;
this.clearMsg();
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取分类
getCategory(Id) {
this.apipost("/api/Share/GetShareCategory", {
Id: Id
},
res => {
if (res.data.resultCode === 1) {
var tempObj = res.data.data;
if (tempObj) {
this.addMsg.Id = tempObj.Id;
this.addMsg.Name = tempObj.Name;
this.addMsg.Level = tempObj.Level;
this.addMsg.ParentId = tempObj.ParentId;
this.IsShowCategory=false;
}
} else {
this.Error(res.data.message);
}
},
null
);
},
//删除分类
removeCategory(Id) {
let that = this;
that.Confirm("确定要删除分类吗?", function () {
that.apipost("/api/Share/RemoveShareCategory", {
Id: Id
},
res => {
if (res.data.resultCode === 1) {
that.getList();
} else {
that.Error(res.data.message);
}
},
null
);
});
},
clearMsg() {
this.addMsg.Id = 0;
this.addMsg.Name = "";
this.addMsg.Level = 1;
this.addMsg.ParentId = 0;
},
},
mounted() {
this.getList();
}
};
</script>
<style>
.shareCategory .templat-list {
border: 1px solid #EBEEF5;
}
.shareCategory .templat-item {
line-height: 40px;
height: 40px;
display: flex;
font-size: 13px;
}
.templat-item:nth-child(odd) {
background-color: #f7f7f7;
}
.templat-item:nth-child(even) {
background-color: #fff;
}
.shareCategory .templat-item div {
width: 50%;
padding-left: 20px;
}
.shareCategory .Custom_item {
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
-webkit-transition: .3s;
transition: .3s;
margin-bottom: 10px;
}
.shareCategory .Custom_item>div {
padding: 20px;
}
.shareCategory .content {
background: #fff;
margin-top: 10px;
padding: 20px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.shareCategory .conten_indder {
padding: 20px;
background-color: #fff;
padding-right: 50%;
min-width: 1100px;
}
</style>
src/components/Share/shareFriend.vue 0 → 100644
View file @ d72f9867
<template>
<div class="shareCategory">
<template v-if="IsShowCategory">
<div class="head-title">
发圈素材管理
<el-button @click="IsShowCategory=false" style="float:right;margin-top: -5px;" size="small" type="primary">
新增
</el-button>
</div>
<div class="content">
<div class="searchInput">
<el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入分类名称" v-model="msg.Name"
size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()">
</el-input>
<span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
@click="msg.pageIndex=1,getList()"> </span>
</div>
<br>
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0" row-key="Id"
default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column prop="Id" label="ID" width="100">
</el-table-column>
<el-table-column prop="Name" label="分类名称">
</el-table-column>
<el-table-column label="操作" width="180">
<template slot-scope="scope">
<img @click="getCategory(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png" alt="">
<img @click="removeCategory(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="">
</template>
</el-table-column>
</el-table>
</div>
</template>
<template v-else>
<div class="head-title">
<span @click="IsShowCategory=true" style="color:rgb(64, 158, 255);cursor:pointer;">发圈素材分类</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>编辑</span>
</div>
<div class="content">
<div class="conten_indder">
<el-form label-width="150px">
<el-form-item label="分类名称">
<el-input type="text" size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="选择分类级别">
<el-radio v-model="addMsg.Level" :label="1">一级分类</el-radio>
<el-radio v-model="addMsg.Level" :label="2">二级分类</el-radio>
<el-radio v-model="addMsg.Level" :label="3">三级分类</el-radio>
</el-form-item>
</el-form>
</div>
</div>
<el-button size="small" style="margin-top:20px;padding:9px 25px;" type="primary" @click="submitform()">保存
</el-button>
</template>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
//是否显示新增分类
IsShowCategory: true,
dataList: [],
msg: {
Name: "", //页面名称
pageIndex: 1,
pageSize: 10,
},
addMsg: {
Id: 0, //编号
CateId: 0, //分类编号
GoodsId: 0, //商品编号
CoverImg: "", //封面图
MaterialImg: "", //素材图片
MaterialInfo: "", //素材文案
LinkUrl: "", //链接地址
IsTop: 0, //是否置顶
SortNum: 0, //排序
},
};
},
methods: {
//获取分类列表
getList() {
this.loading = true;
this.apipost("/api/Share/GetShareFriendPageList", this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log("this.dataList", this.dataList);
}
},
null
);
},
//新增修改分类
submitform() {
this.apipost("/api/Share/SetShareFriend", this.addMsg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message);
this.IsShowCategory = true;
this.clearMsg();
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取实体
getShareFriend(Id) {
this.apipost("/api/Share/GetShareFriend", {
Id: Id
},
res => {
if (res.data.resultCode === 1) {
var tempObj = res.data.data;
if (tempObj) {
this.addMsg.Id = tempObj.Id;
this.addMsg.CateId = tempObj.CateId;
this.addMsg.GoodsId = tempObj.GoodsId;
this.addMsg.CoverImg = tempObj.CoverImg;
this.addMsg.MaterialImg = tempObj.MaterialImg;
this.addMsg.MaterialInfo = tempObj.MaterialInfo;
this.addMsg.LinkUrl = tempObj.LinkUrl;
this.addMsg.IsTop = tempObj.IsTop;
this.addMsg.SortNum = tempObj.SortNum;
}
} else {
this.Error(res.data.message);
}
},
null
);
},
//删除素材
removeShareFriend(Id) {
let that = this;
that.Confirm("确定要删除分类吗?", function () {
that.apipost("/api/Share/RemoveShareFriend", {
Id: Id
},
res => {
if (res.data.resultCode === 1) {
that.getList();
} else {
that.Error(res.data.message);
}
},
null
);
});
},
clearMsg() {
this.addMsg.Id = 0;
this.addMsg.CateId = 0;
this.addMsg.GoodsId = 0;
this.addMsg.CoverImg = "";
this.addMsg.MaterialImg = "";
this.addMsg.MaterialInfo = "";
this.addMsg.LinkUrl = "";
this.addMsg.IsTop = 1;
this.addMsg.SortNum = 1;
},
},
mounted() {
this.getList();
}
};
</script>
<style>
.shareCategory .templat-list {
border: 1px solid #EBEEF5;
}
.shareCategory .templat-item {
line-height: 40px;
height: 40px;
display: flex;
font-size: 13px;
}
.templat-item:nth-child(odd) {
background-color: #f7f7f7;
}
.templat-item:nth-child(even) {
background-color: #fff;
}
.shareCategory .templat-item div {
width: 50%;
padding-left: 20px;
}
.shareCategory .Custom_item {
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
-webkit-transition: .3s;
transition: .3s;
margin-bottom: 10px;
}
.shareCategory .Custom_item>div {
padding: 20px;
}
.shareCategory .content {
background: #fff;
margin-top: 10px;
padding: 20px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.shareCategory .conten_indder {
padding: 20px;
background-color: #fff;
padding-right: 50%;
min-width: 1100px;
}
</style>
src/components/mallIndex.vue
View file @ d72f9867
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
} }
.text-omit { .text-omit {
width: 380px; min-width: 180px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
...@@ -251,11 +251,15 @@ ...@@ -251,11 +251,15 @@
text-align: center; text-align: center;
} }
.UserInfoContent{
display: flex;
justify-content: flex-start;
}
.Zheader_image { .Zheader_image {
width: 32px; width: 32px;
height: 32px; height: 32px;
margin-right: 10px; margin-right: 10px;
float: left;
} }
.Zheader_image img { .Zheader_image img {
...@@ -266,8 +270,7 @@ ...@@ -266,8 +270,7 @@
.nameList { .nameList {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
display: inline-block; width:80%;
width: 280px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
...@@ -422,7 +425,7 @@ ...@@ -422,7 +425,7 @@
</div> </div>
<div class="table_Inner"> <div class="table_Inner">
<el-table :data="saleIncomeData" style="width: 100%" @sort-change='getSort'> <el-table :data="saleIncomeData" style="width: 100%" @sort-change='getSort'>
<el-table-column label="排名"> <el-table-column label="排名" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="rankIng" style="text-align:center;"> <div class="rankIng" style="text-align:center;">
<template v-if="scope.$index+1<4"> <template v-if="scope.$index+1<4">
...@@ -436,21 +439,21 @@ ...@@ -436,21 +439,21 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="GoodsName" label="商品" width="400"> <el-table-column prop="GoodsName" label="商品" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="text-omit"> <div class="text-omit">
{{scope.row.GoodsName}} {{scope.row.GoodsName}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Income" label="销售额" sortable width="150"> <el-table-column prop="Income" label="销售额" sortable width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="padding-left:10px;"> <div style="padding-left:10px;">
{{scope.row.Income}} {{scope.row.Income}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="SaleCount" sortable label="销量" width="150"> <el-table-column prop="SaleCount" sortable label="销量" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="padding-left:10px;"> <div style="padding-left:10px;">
{{scope.row.SaleCount}} {{scope.row.SaleCount}}
...@@ -467,7 +470,7 @@ ...@@ -467,7 +470,7 @@
</div> </div>
<div class="table_Inner table2"> <div class="table_Inner table2">
<el-table :data="saleUserData" style="width: 100%" @sort-change='getSort'> <el-table :data="saleUserData" style="width: 100%" @sort-change='getSort'>
<el-table-column label="排名"> <el-table-column label="排名" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="rankIng"> <div class="rankIng">
<template v-if="scope.$index+1<4"> <template v-if="scope.$index+1<4">
...@@ -481,8 +484,9 @@ ...@@ -481,8 +484,9 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="UserName" label="用户" width="400"> <el-table-column prop="UserName" label="用户" min-width="190">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="UserInfoContent">
<div class="Zheader_image"> <div class="Zheader_image">
<template v-if="scope.row.Photo"> <template v-if="scope.row.Photo">
<img :src="scope.row.Photo" alt="" /> <img :src="scope.row.Photo" alt="" />
...@@ -491,17 +495,18 @@ ...@@ -491,17 +495,18 @@
<img src="../assets/img/id-card.png" alt="" /> <img src="../assets/img/id-card.png" alt="" />
</template> </template>
</div> </div>
<span class="nameList"> {{scope.row.UserName}}</span> <div class="nameList"> {{scope.row.UserName}}</div>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Income" label="支付金额" sortable width="150"> <el-table-column prop="Income" label="支付金额" sortable width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="padding-left:10px;"> <div style="padding-left:10px;">
{{scope.row.Income}} {{scope.row.Income}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="SaleCount" sortable label="支付件数" width="150"> <el-table-column prop="SaleCount" sortable label="支付件数" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="padding-left:10px;"> <div style="padding-left:10px;">
{{scope.row.SaleCount}} {{scope.row.SaleCount}}
......
src/components/orderMan/LiveOrder.vue
View file @ d72f9867
This diff is collapsed.
src/components/pintuan/pintuanActive.vue
View file @ d72f9867
...@@ -151,8 +151,7 @@ ...@@ -151,8 +151,7 @@
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<goodsSpe v-show="IsShowSpec" v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0" <goodsSpe v-show="IsShowSpec" :addMsg="addMsg"></goodsSpe>
:addMsg="addMsg"></goodsSpe>
</el-form-item> </el-form-item>
<el-form-item label="商品货号"> <el-form-item label="商品货号">
<el-input v-model="addMsg.Goods_no" size="small" :disabled="true" placeholder="请输入商品货号" <el-input v-model="addMsg.Goods_no" size="small" :disabled="true" placeholder="请输入商品货号"
...@@ -310,7 +309,6 @@ ...@@ -310,7 +309,6 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
...@@ -412,7 +410,8 @@ ...@@ -412,7 +410,8 @@
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="阶梯团设置"> <el-tab-pane label="阶梯团设置">
<groupStep v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0" :addMsg="addMsg"> <groupStep ref="groupStep" v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0"
:addMsg="addMsg">
</groupStep> </groupStep>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分销价设置"> <el-tab-pane label="分销价设置">
...@@ -565,6 +564,9 @@ ...@@ -565,6 +564,9 @@
SeparateDistributionMoneyType: 1, //分销佣金类型 2固定金额 1百分比 SeparateDistributionMoneyType: 1, //分销佣金类型 2固定金额 1百分比
EnjoyMember: 2, // 是否享受会员功能 1是 2否 EnjoyMember: 2, // 是否享受会员功能 1是 2否
SeparateSetMember: 2, //是否单独设置会员价 1是 2否 SeparateSetMember: 2, //是否单独设置会员价 1是 2否
SpecificationList: [], //规格和规格值
SpecificationPriceList: [], //规格价格
GroupList: [], //阶梯团价格
}, },
IsShowSpec: false, //是否显示规格 IsShowSpec: false, //是否显示规格
...@@ -863,7 +865,18 @@ ...@@ -863,7 +865,18 @@
} }
this.$forceUpdate(); this.$forceUpdate();
} }
},
watch: {
'addMsg.SpecificationPriceList': {
handler(newVal, oldVal) {
if (newVal != oldVal) {
if (this.$refs.groupStep) {
this.$refs.groupStep.addPintuan()
}
} }
},
},
},
}; };
</script> </script>
src/components/pintuan/pintuanPlugin/goodsSpecifica.vue
View file @ d72f9867
...@@ -190,27 +190,32 @@ ...@@ -190,27 +190,32 @@
</template> </template>
<el-table-column :render-header="renderHeader" label="价格"> <el-table-column :render-header="renderHeader" label="价格">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.SellingPrice" @keyup.native="checkPrice(scope.row,'SellingPrice')" size="small"></el-input> <el-input v-model="scope.row.SellingPrice" @keyup.native="checkPrice(scope.row,'SellingPrice')"
size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" label="库存"> <el-table-column :render-header="renderHeader" label="库存">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.InventoryNum" @keyup.native="checkPrice(scope.row,'InventoryNum')" size="small"></el-input> <el-input v-model="scope.row.InventoryNum" @keyup.native="checkPrice(scope.row,'InventoryNum')"
size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" label="成本价" width="90"> <el-table-column :render-header="renderHeader" label="成本价" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.CostMoney" @keyup.native="checkPrice(scope.row,'CostMoney')" size="small"></el-input> <el-input v-model="scope.row.CostMoney" @keyup.native="checkPrice(scope.row,'CostMoney')" size="small">
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" v-if="FxState==1" width="120" label="返佣总金额"> <el-table-column :render-header="renderHeader" v-if="FxState==1" width="120" label="返佣总金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.Commission" @keyup.native="checkPrice(scope.row,'Commission')" size="small"></el-input> <el-input v-model="scope.row.Commission" @keyup.native="checkPrice(scope.row,'Commission')" size="small">
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量(克)" width="90"> <el-table-column label="重量(克)" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.GoodsWeight" @keyup.native="checkPrice(scope.row,'GoodsWeight')" size="small"></el-input> <el-input v-model="scope.row.GoodsWeight" @keyup.native="checkPrice(scope.row,'GoodsWeight')"
size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="货号"> <el-table-column prop="address" label="货号">
...@@ -330,7 +335,10 @@ ...@@ -330,7 +335,10 @@
this.calcList(this.skuList, this.addMsg.SpecificationList); this.calcList(this.skuList, this.addMsg.SpecificationList);
}, },
calcList(tempSkuList, calist) { calcList(tempSkuList, calist) {
let oldArr = JSON.parse(JSON.stringify(this.addMsg.SpecificationPriceList)) let oldArr = [];
if (this.addMsg.SpecificationPriceList) {
oldArr = JSON.parse(JSON.stringify(this.addMsg.SpecificationPriceList));
}
this.addMsg.SpecificationPriceList = []; this.addMsg.SpecificationPriceList = [];
var tempArray = []; var tempArray = [];
tempSkuList.forEach(item => { tempSkuList.forEach(item => {
...@@ -381,9 +389,6 @@ ...@@ -381,9 +389,6 @@
DeleteggModule(item, index) { DeleteggModule(item, index) {
let that = this; let that = this;
that.Confirm("是否确认删除?", function () { that.Confirm("是否确认删除?", function () {
if (item.Id > 0) {
//that.getDeleteSpec(item.Id);
}
that.ComTreeList = []; that.ComTreeList = [];
that.memberList2 = []; that.memberList2 = [];
that.addMsg.SpecificationList.splice(index, 1); that.addMsg.SpecificationList.splice(index, 1);
...@@ -399,9 +404,6 @@ ...@@ -399,9 +404,6 @@
Deleteggz(item, index, index2) { Deleteggz(item, index, index2) {
let that = this; let that = this;
that.Confirm("是否确认删除?", function () { that.Confirm("是否确认删除?", function () {
if (item.Id > 0) {
//that.getDeleteSpecValue(item.Id);
}
that.addMsg.SpecificationList[index].SpecificationValueList.splice(index2, 1); that.addMsg.SpecificationList[index].SpecificationValueList.splice(index2, 1);
that.$forceUpdate(); that.$forceUpdate();
if (that.addMsg.SpecificationList[index].SpecificationValueList.length == 0) { if (that.addMsg.SpecificationList[index].SpecificationValueList.length == 0) {
...@@ -411,6 +413,7 @@ ...@@ -411,6 +413,7 @@
that.getSkuData([], 0, that.addMsg.SpecificationList); that.getSkuData([], 0, that.addMsg.SpecificationList);
}); });
}, },
//选择图片
openggImg(item, index, item2, index2) { openggImg(item, index, item2, index2) {
this.changeState = true; this.changeState = true;
this.imgType = 3; this.imgType = 3;
...@@ -585,33 +588,6 @@ ...@@ -585,33 +588,6 @@
}); });
} }
}); });
},
//删除规格后调用
getDeleteSpec(Id) {
let msg = {
Id: Id
}
this.apipost("/api/GroupBuy/DeleteSpec", msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Error(res.data.message);
}
})
},
//删除规格值过后调用
getDeleteSpecValue(Id) {
let msg = {
Id: Id
}
this.apipost("/api/GroupBuy/DeleteSpecValue", msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Error(res.data.message);
}
})
} }
}, },
mounted() { mounted() {
......
src/components/sallCenter/pluginCenter.vue
View file @ d72f9867
...@@ -10,13 +10,15 @@ ...@@ -10,13 +10,15 @@
} }
.plugin-list { .plugin-list {
margin: 0 0 0 -20px; flex-wrap:wrap;
margin-left:-20px;
} }
.plugin-item { .plugin-item {
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
background: #fff; background: #fff;
padding: 20px; padding: 20px;
width:252px;
margin: 0 0 20px 20px; margin: 0 0 20px 20px;
transition: 250ms; transition: 250ms;
position: relative; position: relative;
...@@ -71,10 +73,8 @@ ...@@ -71,10 +73,8 @@
<div flex="cross:center"> <div flex="cross:center">
<h3 class="plugin_ListTitle">已安装</h3> <h3 class="plugin_ListTitle">已安装</h3>
</div> </div>
<div class="plugin-list el-row"> <div class="plugin-list" flex="dir:left">
<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" <div flex="dir:left box:first" class="plugin-item" @click="goDiyCenter('Fsetting')">
@click="goDiyCenter('Fsetting')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/icon.png" <div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/icon.png"
style="width: 50px; height: 50px; display: block;"></div> style="width: 50px; height: 50px; display: block;"></div>
<div> <div>
...@@ -84,10 +84,7 @@ ...@@ -84,10 +84,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div flex="dir:left box:first" class="plugin-item" @click="goDiyCenter('Ftemplate')">
<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" <div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/Diy.png"
style="width: 50px; height: 50px; display: block;"></div> style="width: 50px; height: 50px; display: block;"></div>
<div> <div>
...@@ -97,10 +94,7 @@ ...@@ -97,10 +94,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div flex="dir:left box:first" class="plugin-item" @click="goDiyCenter('authorize')">
<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" <div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/em.png"
style="width: 50px; height: 50px; display: block;"></div> style="width: 50px; height: 50px; display: block;"></div>
<div> <div>
...@@ -110,8 +104,18 @@ ...@@ -110,8 +104,18 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="isShow==1" flex="dir:left box:first" class="plugin-item" @click="goDiyCenter('FShareMain')">
<div style="margin-right: 12px;background:rgb(51, 153, 255);height:50px;"><img src="../../assets/img/sallCenter/circle.png"
style="width: 50px; height: 50px; display: block;"></div>
<div>
<div class="display-name">一键发圈</div>
<div flex="box:last">
<div class="name">一键保存，高效发圈</div>
</div> </div>
</div> </div>
</div>
</div>
<div style="display:none"> <div style="display:none">
<div flex="cross:center" style="margin-top:20px;"> <div flex="cross:center" style="margin-top:20px;">
<h3 class="plugin_ListTitle">营销工具</h3> <h3 class="plugin_ListTitle">营销工具</h3>
...@@ -143,7 +147,8 @@ ...@@ -143,7 +147,8 @@
return { return {
currentUser: {}, currentUser: {},
isChecked: 1, isChecked: 1,
Height: 0 Height: 0,
isShow:0,
}; };
}, },
created() { created() {
......
src/router/index.js
View file @ d72f9867
...@@ -874,6 +874,26 @@ export default new Router({ ...@@ -874,6 +874,26 @@ export default new Router({
component: resolve => require(['@/components/pintuan/ActiveDataDetail'], resolve), component: resolve => require(['@/components/pintuan/ActiveDataDetail'], resolve),
} }
] ]
},
//一键发圈
{
path: "/FShareMain",
name: 'FShareMain',
component: resolve => require(['@/components/FShareMain'], resolve),
children: [
//一键发圈=>分类
{
path: '/shareCategory',
name: 'shareCategory',
component: resolve => require(['@/components/Share/shareCategory'], resolve),
},
//一键发圈
{
path: '/shareFriend',
name: 'shareFriend',
component: resolve => require(['@/components/Share/shareFriend'], 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