Skip to content

E
ElectricitySheep
Commit 12b62593 authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

1

parents 8c56261d 9b1240ae
Show whitespace changes
Inline Side-by-side
Showing with 1551 additions and 202 deletions
src/assets/css/zkcss.css
View file @ 12b62593
...@@ -10,9 +10,16 @@ ...@@ -10,9 +10,16 @@
font-size: 14px; font-size: 14px;
margin-top: 15px; margin-top: 15px;
} }
input, textarea, select{
outline: none !important;
box-shadow: none;
}
.w120{ .w120{
width:120px; width:120px;
} }
.w160{ .w160{
width:160px; width:160px;
} }
.w400{
width:400px;
}
\ No newline at end of file
src/components/CommodityMan/materialMan.vue
View file @ 12b62593
...@@ -6,8 +6,11 @@ ...@@ -6,8 +6,11 @@
<el-button @click="SelectRecycled(2)" style="float:right;margin-top: -5px;" size="small" type="primary">回收站</el-button> <el-button @click="SelectRecycled(2)" style="float:right;margin-top: -5px;" size="small" type="primary">回收站</el-button>
</div> </div>
<div v-loading="loading" style="margin-top:10px;background:#fff;padding:20px"> <div v-loading="loading" style="margin-top:10px;background:#fff;padding:20px">
<el-tabs v-model="activeName" @tab-click="handleClick"> <div class="TabDiv">
<el-tab-pane label="图片" name="first"> <span :class="commonType==1?'spanActive':''" @click="handleClick(1)">图片</span>
<span :class="commonType==2?'spanActive':''" @click="handleClick(2)">视频</span>
</div>
<div>
<div style="height: 718px;" flex="box:first"> <div style="height: 718px;" flex="box:first">
<div style="margin-right: 15px;width: auto;-webkit-box-flex: 0;flex-shrink: 0;flex-grow: 0;"> <div style="margin-right: 15px;width: auto;-webkit-box-flex: 0;flex-shrink: 0;flex-grow: 0;">
<el-button @click="addGroup" style="margin-bottom: 12px;" type="primary" size="small">添加分组</el-button> <el-button @click="addGroup" style="margin-bottom: 12px;" type="primary" size="small">添加分组</el-button>
...@@ -49,16 +52,20 @@ ...@@ -49,16 +52,20 @@
<span>全部</span> <span>全部</span>
<div style="display:inline-block;float:right"> <div style="display:inline-block;float:right">
<div style="margin-left: 20px;display:inline-block;" class="appendInput"> <div style="margin-left: 20px;display:inline-block;" class="appendInput">
<el-input size="small" style="width:250px" placeholder="请输入内容" v-model="val"> <el-input size="small" style="width:250px" placeholder="请输入内容" v-model="PageMsg.Name">
<el-button @click="GetPageList" slot="append" icon="el-icon-search"></el-button> <el-button @click="GetPageList" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
<el-checkbox style="margin-left:12px" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox> <el-checkbox style="margin-left:12px" :indeterminate="isIndeterminate" v-model="checkAll" @change="CheckAllChange">全选</el-checkbox>
<el-button style="margin:0 12px" size="small">删除</el-button> <el-button v-if="PageMsg.Recycled==1" @click="HsPage" style="margin:0 12px" size="small">删除</el-button>
<el-button v-if="PageMsg.Recycled==2" @click="HYPage" style="margin-left:12px" size="small">还原</el-button>
<el-button v-if="PageMsg.Recycled==2" @click="DeletePage" size="small">删除11</el-button>
<el-dropdown v-if="scgroupMsg.Recycled==1" size="small" split-button> <el-dropdown v-if="scgroupMsg.Recycled==1" size="small" split-button>
移动至 移动至
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item,index) in groupList" :key="index">{{item.Name}}</el-dropdown-item> <el-dropdown-item v-for="(item,index) in groupList" :key="index">
<div @click="SelectPageId(item)">{{item.Name}}</div>
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -66,6 +73,7 @@ ...@@ -66,6 +73,7 @@
</div> </div>
<div style="border: 1px solid rgb(227, 227, 227);height:674px"> <div style="border: 1px solid rgb(227, 227, 227);height:674px">
<div class="basefix app-attachment-list"> <div class="basefix app-attachment-list">
<template v-if="PageMsg.Type==1">
<div class="material-item material-upload"> <div class="material-item material-upload">
<div class="app-upload" flex="main:center cross:center" style="width: 140px; height: 140px;"> <div class="app-upload" flex="main:center cross:center" style="width: 140px; height: 140px;">
<el-upload class="avatar-uploader" action="" <el-upload class="avatar-uploader" action=""
...@@ -90,9 +98,37 @@ ...@@ -90,9 +98,37 @@
</div> </div>
</div> </div>
</el-tooltip> </el-tooltip>
</template>
<template v-if="PageMsg.Type==2">
<div class="material-item material-upload">
<div class="app-upload" flex="main:center cross:center" style="width: 140px; height: 140px;">
<el-upload class="avatar-uploader" action=""
accept="video/mp4,video/ogg,video/webm"
:show-file-list="false" :http-request="UploadImage">
<i class="el-icon-upload"></i>
</el-upload>
</div> </div>
</div>
<el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark" :content="item.Name" placement="top-start">
<div @click="PageSelect(item,index)" :class="item.Selected ? 'selected' :''" class="el-tooltip item material-item ">
<img :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+item.Path+'?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast'" class="material-img" style="width: 140px; height: 140px;">
<div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{item.VideoTime}}</span></div>
<div flex="dir:left" style="margin-top: 5px;">
<div class="material-name">{{item.Name}}</div>
<div style="margin: 0px 5px;">|</div>
<div> <div>
<button type="button" class="el-button el-button--text" style="padding: 0px;">
<span @click="EditPage(item)">编辑</span>
</button>
</div>
</div>
</div>
</el-tooltip>
</template>
</div>
<div style="padding-right:10px">
<el-pagination style="text-align:right" <el-pagination style="text-align:right"
background background
:current-page="currentPage4" :current-page="currentPage4"
...@@ -107,9 +143,8 @@ ...@@ -107,9 +143,8 @@
</div> </div>
</div> </div>
</el-tab-pane> </div>
<el-tab-pane label="视频" name="second">配置管理</el-tab-pane> <input type="text" ref="dur" name='0'/>
</el-tabs>
</div> </div>
<!-- 新增分组 --> <!-- 新增分组 -->
<el-dialog title="分组管理" :visible.sync="addGroupMsgDig" width="400px"> <el-dialog title="分组管理" :visible.sync="addGroupMsgDig" width="400px">
...@@ -231,12 +266,111 @@ export default { ...@@ -231,12 +266,111 @@ export default {
}, },
methods:{ methods:{
SelectPageId(item){
this.PageList.forEach(item=>{
if(item.Selected){
this.checkList.push(item.Id)
}
})
if(this.checkList.length==0){
this.Error("至少选择一项！");
return;
}
let MaterialIds= this.checkList.join(",");
let msg={
MaterialIds:MaterialIds,
GroupId:item.Id,
Type:this.commonType
}
this.apipost("/api/product/SetMaterialInfoTransfer",msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.GetPageList();
this.checkList=[];
}
})
},
// 全选
CheckAllChange(val){
this.PageList.forEach(item=>{
if(val){
item.Selected=true;
}else{
item.Selected=false;
}
})
},
// 删除
DeletePage(){
this.checkList=[];
this.PageList.forEach(item=>{
if(item.Selected){
this.checkList.push(item.Id)
}
})
if(this.checkList.length==0){
this.Error("至少选择一项！");
return;
}
let MaterialIds= this.checkList.join(",");
this.loading=true;
this.apipost("/api/product/DelMaterialInfo",{MaterialIds:MaterialIds}, res => {
this.loading=false;
if(res.data.resultCode==1){
this.GetPageList();
this.checkList=[];
}
})
},
// 还原
HYPage(){
this.checkList=[];
this.PageList.forEach(item=>{
if(item.Selected){
this.checkList.push(item.Id)
}
})
if(this.checkList.length==0){
this.Error("至少选择一项！");
return;
}
let MaterialIds= this.checkList.join(",");
this.loading=true;
this.apipost("/api/product/SetMaterialInfoRestore",{MaterialIds:MaterialIds}, res => {
this.loading=false;
if(res.data.resultCode==1){
this.GetPageList();
this.checkList=[];
}
})
},
// 回收
HsPage(){
this.checkList=[];
this.PageList.forEach(item=>{
if(item.Selected){
this.checkList.push(item.Id)
}
})
if(this.checkList.length==0){
this.Error("至少选择一项！");
return;
}
let MaterialIds= this.checkList.join(",");
this.loading=true;
this.apipost("/api/product/SetMaterialInfoRecycled",{MaterialIds:MaterialIds}, res => {
this.loading=false;
if(res.data.resultCode==1){
this.GetPageList();
this.checkList=[];
}
})
},
// 单个删除 // 单个删除
PageSelect(item,index){ PageSelect(item,index){
item.Selected=!item.Selected; item.Selected=!item.Selected;
if(item.Selected){
this.checkList.push(item.Id);
}
}, },
// 数组去重 // 数组去重
unique(arr) { unique(arr) {
...@@ -245,10 +379,7 @@ export default { ...@@ -245,10 +379,7 @@ export default {
return arr.indexOf(item, 0) === index; return arr.indexOf(item, 0) === index;
}); });
}, },
// 全选
handleCheckAllChange(){
},
SelectGroup(id){ SelectGroup(id){
this.PageMsg.GroupId=id; this.PageMsg.GroupId=id;
this.GetPageList(); this.GetPageList();
...@@ -290,6 +421,10 @@ export default { ...@@ -290,6 +421,10 @@ export default {
UploadImage(file) { UploadImage(file) {
this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => { this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
if(this.addpageMsg.Type==2){
this.addpageMsg.Image = res.FileUrl;
}
console.log(" this.addpageMsg.Image", this.addpageMsg.Image)
this.addpageMsg.Path = res.FileUrl; this.addpageMsg.Path = res.FileUrl;
this.addpageMsg.Name = res.FileName; this.addpageMsg.Name = res.FileName;
this.addPageList(); this.addPageList();
...@@ -309,6 +444,7 @@ export default { ...@@ -309,6 +444,7 @@ export default {
this.scgroupMsg.Recycled=num; this.scgroupMsg.Recycled=num;
this.PageMsg.Recycled=num; this.PageMsg.Recycled=num;
this.GetMemberGradeList(); this.GetMemberGradeList();
this.GetPageList();
}, },
EditGroup(item){ EditGroup(item){
this.addGroupMsgDig=true; this.addGroupMsgDig=true;
...@@ -443,7 +579,12 @@ export default { ...@@ -443,7 +579,12 @@ export default {
}) })
}, },
handleClick(val){ handleClick(val){
this.commonType=Number(val.index)+1; this.commonType=val;
this.scgroupMsg.Type=val;
this.PageMsg.Type=val;
this.addpageMsg.Type=val;
this.GetMemberGradeList();
this.GetPageList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -456,6 +597,32 @@ export default { ...@@ -456,6 +597,32 @@ export default {
</script> </script>
<style> <style>
.materialMan .material-video-info {
background: rgba(0, 0, 0, .35);
color: #fff;
position: absolute;
left: 10px;
bottom: 31px;
padding: 1px 3px;
font-size: 14px;
}
.materialMan .TabDiv .spanActive{
border-bottom: 2px solid #409EFF;
color:#409EFF;
}
.materialMan .TabDiv span{
font-size: 14px;
margin-right: 20px;
display: inline-block;
height: 100%;
cursor: pointer;
}
.materialMan .TabDiv{
height: 40px;
line-height: 40px;
border-bottom: 2px solid #f3f3f3;
margin-bottom: 20px;
}
.materialMan .selectActive .el-icon-tickets{ .materialMan .selectActive .el-icon-tickets{
color: #409EFF; color: #409EFF;
} }
......
src/components/StoreDesign/navigationIcon.vue 0 → 100644
View file @ 12b62593
<template>
<div class="navigation">
<template v-if="isShowAdd">
<div class="head-title">
导航图标列表
<el-button @click="isShowAdd=false" style="float:right;margin-top: -5px;" size="small" type="primary">添加导航图标</el-button>
</div>
<div class="content">
<div>
<div class="searchInput">
<el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入搜索内容"
v-model="value"
size="small"
clearable>
</el-input>
<span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
</div>
<el-table
:data="tableData"
v-loading="loading"
border
style="width: 100%;margin:20px 0">
<el-table-column
prop="ID"
label="ID"
width="100">
</el-table-column>
<el-table-column
prop="address"
width="120"
label="名称">
</el-table-column>
<el-table-column
prop="name"
label="导航图标"
width="80">
</el-table-column>
<el-table-column
prop="name"
label="导航链接">
</el-table-column>
<el-table-column
prop="name"
label="排序"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="是否显示"
width="120">
</el-table-column>
<el-table-column
prop="address"
width="220"
label="操作">
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</template>
<template v-else>
<div class="head-title">
<span @click="isShowAdd=true" style="color:rgb(64, 158, 255);cursor:pointer;">导航图标列表</span><span style="margin:0 9px;color:#C0C4CC">/</span><span>导航图标编辑</span>
</div>
<div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="80px" style="padding:0 20px;">
<el-form-item label="名称" prop="name">
<el-input v-model="addMsg.name" class="w400" size="small" placeholder="请输入名称" maxlength="20" />
</el-form-item>
<el-form-item label="排序" prop="Sort">
<el-input type="text" v-model="addMsg.Sort" size="small" class="w400" placeholder="请输入排序" maxlength="20" />
</el-form-item>
<el-form-item label="导航图标" prop="img">
<div>
<el-tooltip class="item" effect="dark" content="建议尺寸:88*88" placement="top-start">
<el-upload class="avatar-uploader" action="" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" :http-request="UploadImage">
<el-button size="small">选择文件</el-button>
</el-upload>
</el-tooltip>
</div>
<div class="navImg">
<img v-if="addMsg.img" :src="addMsg.img" alt="" />
<img v-else src="../../assets/img/default.png" alt=""/>
</div>
</el-form-item>
<el-form-item label="导航链接" prop="link">
<el-input type="password" v-model="addMsg.link" class="w400" size="small" maxlength="100" />
<el-button plain size="small">选择链接</el-button>
</el-form-item>
<el-form-item label="是否显示">
<el-switch v-model="addMsg.isShow" ></el-switch>
</el-form-item>
</el-form>
</div>
<el-button size="small" style="margin-top:20px;padding:9px 25px;" type="primary" @click="submitform('addMsg')">保存</el-button>
</template>
</div>
</template>
<script>
export default {
data() {
let validataImg = (rule, value, callback) => {
if (this.addMsg.img == '') {
return callback(new Error('请选择导航图标'));
} else {
callback();
}
}
return {
loading:false,
dialogVisible:false,
value:'',
options:[],
tableData:[
{ID:'111'}
],
msg:{
pageIndex:1,
pageSize:15,
},
total:0,
isShowAdd:true,
addMsg:{
name:'',
Sort:100,
img:'',
link:'',
isShow:true
},
rules: {
name: [{
required: true,
message: "请输入导航名称",
trigger: "blur"
}],
Sort: [{
required: true,
message: "请输入导航排序",
trigger: "blur"
}],
img:[{
validator: validataImg,
trigger: "blur",
required: true
}],
link: [{
required: true,
message: "请选择导航链接",
trigger: "blur"
}]
},
};
},
created() {
},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
},
//上传图片
UploadImage(file) {
this.UploadFileToTencent(this.FileType().UserImg, file.file, res => {
if (res.resultCode == 1) {
this.addMsg.img = res.FileUrl;
}
})
},
submitform(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.saveMsg();
} else {
return false;
}
});
},
//保存
saveMsg(){
}
},
mounted() {
}
};
</script>
<style>
.navImg{
width:80px;
height:80px;
}
.navImg img{
width:100%;
height:100%;
}
.navigation .blue{
color:#409EFF;
}
.navigation .content .searchInput{
border: 1px solid #DCDFE6;
border-radius: 4px;
}
.navigation .content .searchInput .el-input__inner{
border:none;outline:none;
height: 30px;
line-height: 30px;
}
.navigation .content .searchInput{
line-height: normal;
display: inline-table;
width: 100%;
border-collapse: separate;
border-spacing: 0;
width:250px;
margin-right: 20px;
}
.navigation .content{
background: #fff;
margin-top:10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/UserMan/MembershipGrade.vue
View file @ 12b62593
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
width="200" width="200"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<img style="width:32px;height:32px" src="../../assets/img/userman/edit.png" alt=""> <img @click="Edit(scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/edit.png" alt="">
<img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt=""> <img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
<!-- <img style="width:32px;height:32px" src="../../assets/img/userman/balance.png" alt=""> --> <!-- <img style="width:32px;height:32px" src="../../assets/img/userman/balance.png" alt=""> -->
</template> </template>
...@@ -110,6 +110,15 @@ ...@@ -110,6 +110,15 @@
this.getList(); this.getList();
}, },
methods: { methods: {
Edit(row){
this.$router.push({
name: 'setMember',
query: {
GradeId:row.Id,
blank: "y"
}
});
},
Delete(row){ Delete(row){
let that=this; let that=this;
that.Confirm("是否删除?", function () { that.Confirm("是否删除?", function () {
......
src/components/UserMan/baseSet.vue
View file @ 12b62593
...@@ -2,10 +2,34 @@ ...@@ -2,10 +2,34 @@
<template> <template>
<div class="baseSet"> <div class="baseSet">
<div class="head-title"> <div class="head-title">
<span @click="goUrl" class="blue point">会员等级</span> / 会员设置 <span @click="goUrl" class="point">基础设置</span>
</div> </div>
<div class="content"> <div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>分销设置</span>
</div>
<div>
<el-form-item label="分销层级" prop="name">
<el-radio v-model="val" label="1">关闭</el-radio>
<el-radio v-model="val" label="2">一级分销</el-radio>
<el-radio v-model="val" label="2">二级分销</el-radio>
<el-radio v-model="val" label="2">三级分销</el-radio>
</el-form-item>
<el-form-item class="discount commonLabel" label="分销内购" prop="name">
<el-tooltip class="item" effect="dark" content="开启分销内购，分销商自己购买商品，享受一级佣金，上级享受二级佣金，上上级享受三级佣金" placement="top">
<i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip>
<el-switch
v-model="addMsg.name"
active-color="#409EFF"
active-value="100"
inactive-value="0">
</el-switch>
</el-form-item>
</div>
</el-card>
<el-form-item label="会员等级" prop="name"> <el-form-item label="会员等级" prop="name">
<el-select style="width:293px;" size="small" v-model="addMsg.name" placeholder="请选择活动区域"> <el-select style="width:293px;" size="small" v-model="addMsg.name" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai"></el-option> <el-option label="区域一" value="shanghai"></el-option>
...@@ -205,7 +229,6 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -205,7 +229,6 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
.baseSet .content{ .baseSet .content{
background: #fff; background: #fff;
margin-top:10px; margin-top:10px;
padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
......
src/components/UserMan/setMember.vue
View file @ 12b62593
<template> <template>
<div class="setMember usersList"> <div v-loading="loading" class="setMember usersList">
<div class="head-title"> <div class="head-title">
<span @click="goUrl" class="blue point">会员等级</span> / 会员设置 <span @click="goUrl" class="blue point">会员等级</span> / 会员设置
</div> </div>
<div class="content"> <div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
<el-form-item label="会员等级" prop="name"> <el-form-item label="会员等级" prop="Grade">
<el-select style="width:293px;" size="small" v-model="addMsg.name" placeholder="请选择活动区域"> <el-select style="width:293px;" size="small" v-model="addMsg.Grade" placeholder="请选择">
<el-option label="区域一" value="shanghai"></el-option> <el-option
<el-option label="区域二" value="beijing"></el-option> v-for="(item,index) in 100"
:key="index"
:label="`等级${index+1}`"
:value="index+1">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="等级名称" prop="name"> <el-form-item label="等级名称" prop="Name">
<el-input style="width:293px;" size="small" v-model="addMsg.name"></el-input> <el-input style="width:293px;" size="small" v-model="addMsg.Name" placeholder="请输入等级名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="discount commonLabel" label="折扣" prop="name"> <el-form-item class="discount commonLabel" label="折扣" prop="Discount">
<el-tooltip class="item" effect="dark" content="请输入0.1~10之间的数字" placement="top-start"> <el-tooltip class="item" effect="dark" content="请输入0.1~10之间的数字" placement="top-start">
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input style="width:293px;" type="number" min="0.1" size="small" placeholder="请输入内容" v-model="addMsg.name" class="input-with-select"> <el-input style="width:293px;" type="number" min="0.1" size="small" placeholder="请输入内容" v-model="addMsg.Discount" class="input-with-select">
<el-button slot="append">折</el-button> <el-button slot="append">折</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="会员状态" prop="name"> <el-form-item label="会员状态" prop="Enabled">
<el-switch <el-switch
v-model="addMsg.name" v-model="addMsg.Enabled"
active-color="#409EFF" active-color="#409EFF"
active-value="100" :active-value="1"
inactive-value="0"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="会员图标" prop="name"> <el-form-item label="会员图标" prop="Icon">
<el-button @click="openChangeDig" size="small">选择文件</el-button> <el-button @click="openChangeDig('Icon')" size="small">选择文件</el-button>
<div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div> <div>
<img v-if="addMsg.IconPath==''" style="width:80px;height:80px" src="../../assets/img/default.png" alt="">
<img v-else style="width:80px;height:80px" :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+addMsg.IconPath" alt="">
</div>
</el-form-item> </el-form-item>
<el-form-item label="会员背景色" prop="name"> <el-form-item label="会员背景色" prop="BackgroundImage">
<el-button @click="openChangeDig" size="small">选择文件</el-button> <el-button @click="openChangeDig('BackgroundImage')" size="small">选择文件</el-button>
<div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div> <div>
<img v-if="addMsg.BackgroundImagePath==''" style="width:80px;height:80px" src="../../assets/img/default.png" alt="">
<img v-else style="width:80px;height:80px" :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+addMsg.BackgroundImagePath" alt="">
</div>
</el-form-item> </el-form-item>
<el-form-item label="累计金额自动升级"> <el-form-item label="累计金额自动升级">
<el-switch <el-switch
v-model="addMsg.name" v-model="addMsg.IsAutoUpGrade"
active-color="#409EFF" active-color="#409EFF"
active-value="100" :active-value="1"
inactive-value="0"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item class="commonLabel" label="升级条件" prop="name"> <el-form-item class="commonLabel" label="升级条件" prop="UpGradeMoney">
<el-input style="width:293px;" type="number" min="0.1" size="small" placeholder="请输入内容" v-model="addMsg.name" class="input-with-select"> <el-input style="width:293px;" type="number" min="0.1" size="small" placeholder="请输入内容" v-model="addMsg.UpGradeMoney" class="input-with-select">
<template slot="prepend">累计完成订单金额满</template> <template slot="prepend">累计完成订单金额满</template>
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="会员是否可购买"> <el-form-item label="会员是否可购买">
<el-switch <el-switch
v-model="addMsg.name" v-model="addMsg.IsMemberBuy"
active-color="#409EFF" active-color="#409EFF"
active-value="100" :active-value="1"
inactive-value="0"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item class="commonLabel" label="购买价格" prop="name"> <el-form-item class="commonLabel" label="购买价格" prop="MemberBuyMoney">
<el-input style="width:293px;" type="number" min="0.1" size="small" placeholder="请输入购买价格" v-model="addMsg.name" class="input-with-select"> <el-input style="width:293px;" type="number" min="0.1" size="small" placeholder="请输入购买价格" v-model="addMsg.MemberBuyMoney" class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="h会员权益(多条)"> <el-form-item label="h会员权益(多条)">
<div style="width:700px;"> <div v-if="addMsg.EquityList.length>0" style="width:700px;">
<el-table class="setTable" <el-table class="setTable"
:data="tableData" :data="addMsg.EquityList"
border border
style="margin-bottom:20px"> style="margin-bottom:20px">
<el-table-column <el-table-column
...@@ -77,7 +88,7 @@ ...@@ -77,7 +88,7 @@
width="180px" width="180px"
label="权益标题"> label="权益标题">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="width:159px" size="small" v-model="val" placeholder="请输入内容"></el-input> <el-input style="width:159px" size="small" v-model="scope.row.Title" placeholder="请输入内容"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -85,8 +96,9 @@ ...@@ -85,8 +96,9 @@
width="180px" width="180px"
label="权益图标"> label="权益图标">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="openChangeDig" size="small">选择图片</el-button> <el-button @click="openChangeDig('qy',scope.$index)" size="small">选择图片</el-button>
<img style="margin-left: 10px;width:50px;height:50px" src="../../assets/img/default.png" alt=""> <img v-if="scope.row.ImagePath==''" style="margin-left: 10px;width:50px;height:50px" src="../../assets/img/default.png" alt="">
<img v-else style="margin-left: 10px;width:50px;height:50px" :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+scope.row.ImagePath" alt="">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -98,40 +110,39 @@ ...@@ -98,40 +110,39 @@
type="textarea" type="textarea"
:rows="2" :rows="2"
placeholder="请输入内容" placeholder="请输入内容"
v-model="val"> v-model="scope.row.Content">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
width="80px" width="80px"
label="操作"> label="操作">
<template> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="删除" placement="top-start"> <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<img style="width:32px;height:32px" src="../../assets/img/userman/del.png" alt=""> <img @click.prevent="Delete(scope.$index)" style="width:32px;height:32px" src="../../assets/img/userman/del.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div class="point">
<i class="el-icon-plus" style="font-weight: bolder;margin-left:5px;color:#409EFF"></i> <i class="el-icon-plus" style="font-weight: bolder;margin-left:5px;color:#409EFF"></i>
<span style="color: rgb(53, 53, 53);font-size: 14px;">新增权益</span> <span @click="addEquityList" style="color: rgb(53, 53, 53);font-size: 14px;">新增权益</span>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="会员规则" prop="name"> <el-form-item label="会员规则" prop="MemberSpecification">
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div style="margin-top:20px"> <div style="margin-top:20px">
<el-button size="small" type="primary" @click="dialogVisible = false">保存</el-button> <el-button size="small" type="primary" @click="Save('addMsg')">保存</el-button>
</div> </div>
<!-- 选择文件 --> <!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px"> <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg></ChooseImg> <ChooseImg @SelectId="SelectId" ref="mychild"></ChooseImg>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -143,10 +154,28 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -143,10 +154,28 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
}, },
data() { data() {
return { return {
icon1:'',
icon2:'',
icon3:'',
currentPage4:3, currentPage4:3,
changeState:false, changeState:false,
val:'', val:'',
addMsg:{}, addMsg:{
EquityList:[],
Id:0,
Grade:'',
Name:'',
Discount:0,
Enabled:2,
Icon:'',
BackgroundImage:'',
IsAutoUpGrade:1,
UpGradeMoney:'',
IsMemberBuy:1,
MemberBuyMoney:'',
MemberSpecification:'',
MallBaseId:this.getLocalStorage().MallBaseId,
},
dialogVisible:false, dialogVisible:false,
value:'', value:'',
options:[], options:[],
...@@ -159,21 +188,90 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -159,21 +188,90 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
}, },
total:0, total:0,
rules: { rules: {
name: [ Grade: [
{ required: true, message: '新手机号', trigger: 'blur' } { required: true, message: '请选择会员等级', trigger: 'change' }
],
Name: [
{ required: true, message: '请输入等级名称', trigger: 'blur' }
],
Discount:[
{ required: true, message: '请输入折扣', trigger: 'blur' }
],
UpGradeMoney:[
{ required: true, message: '请输入金额', trigger: 'blur' }
],
MemberBuyMoney:[
{ required: true, message: '请输入金额', trigger: 'blur' }
], ],
}, },
imgType:'',
imgIndex:-1,
GradeId:0,
}; };
}, },
created() { created() {
if(this.$route.query.GradeId){
this.GradeId=this.$route.query.GradeId;
this.getData()
}
}, },
methods: { methods: {
openChangeDig(){ openChangeDig(str,index){
this.imgType=str;
this.changeState=true; this.changeState=true;
this.imgIndex=index;
}, },
SelectId(msg){
this.changeState=false;
if(this.imgType=='Icon'){
this.addMsg.Icon=msg.selectId;
this.addMsg.IconPath=msg.url;
}
if(this.imgType=='BackgroundImage'){
this.addMsg.BackgroundImage=msg.selectId;
this.addMsg.BackgroundImagePath=msg.url;
}
if(this.imgType=='qy'){
let imgIndex=this.imgIndex;
this.addMsg.EquityList[imgIndex].Image=msg.selectId;
this.addMsg.EquityList[imgIndex].ImagePath=msg.url;
}
},
addEquityList(){
let obj={
Id:0,
Title:'',
Content:'',
Image:'',
ImagePath:'',
};
this.addMsg.EquityList.push(obj)
},
Delete(index){
this.addMsg.EquityList.splice(index, 1);
},
Save(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
let cmd="/api/user/SetMemberGradeInfo";
this.apipost(cmd,this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.goUrl();
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
goUrl(){ goUrl(){
this.$router.push({ this.$router.push({
name: 'MembershipGrade', name: 'MembershipGrade',
...@@ -182,12 +280,16 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -182,12 +280,16 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
} }
}); });
}, },
handleCurrentChange(val) { getData(){
this.msg.pageIndex = val; this.loading=true;
this.getList(); this.apipost("/api/user/GetMemberGradeInfo", {GradeId:this.GradeId}, res => {
}, this.loading=false;
getList(){ if(res.data.resultCode==1){
this.addMsg=res.data.data;
this.addMsg.MallBaseId=this.getLocalStorage().MallBaseId
}
})
}, },
}, },
......
src/components/UserMan/usersList.vue
View file @ 12b62593
...@@ -68,7 +68,10 @@ ...@@ -68,7 +68,10 @@
label="头像"> label="头像">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.Photo + ')',backgroundSize:'cover'}"></div> <div class="app-image" :style="{backgroundImage:'url(' + scope.row.Photo + ')',backgroundSize:'cover'}"></div>
<div flex="dir:left cross:center">{{scope.row.Name}}</div> <div flex="dir:left cross:center">
{{scope.row.Name}}
<span v-if="scope.row.AliasName!=''" class="remark_name">备注名：{{scope.row.AliasName}}</span>
</div>
<img v-if="scope.row.Source==1" style="width:24px;height:24px" src="../../assets/img/userman/wx.png" alt="" class="platform-img"> <img v-if="scope.row.Source==1" style="width:24px;height:24px" src="../../assets/img/userman/wx.png" alt="" class="platform-img">
<button type="button" class="el-button el-button--success" style="float: right; padding: 5px !important;"> <button type="button" class="el-button el-button--success" style="float: right; padding: 5px !important;">
<span @click="ChangeOpenidState(scope.$index, scope.row)">显示OpenId</span> <span @click="ChangeOpenidState(scope.$index, scope.row)">显示OpenId</span>
...@@ -166,7 +169,7 @@ ...@@ -166,7 +169,7 @@
</el-dialog> </el-dialog>
<!-- 选择文件 --> <!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px"> <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg></ChooseImg> <ChooseImg @SelectId="SelectId" ref="mychild"></ChooseImg>
</el-dialog> </el-dialog>
<!-- 充值积分 --> <!-- 充值积分 -->
<el-dialog title="充值" :visible.sync="czjfDig" width="600px"> <el-dialog title="充值" :visible.sync="czjfDig" width="600px">
...@@ -184,8 +187,8 @@ ...@@ -184,8 +187,8 @@
<el-form-item label="充值图片"> <el-form-item label="充值图片">
<el-button @click="openChangeDig" size="small">选择文件</el-button> <el-button @click="openChangeDig" size="small">选择文件</el-button>
<div> <div>
<img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""> <img v-if="imgurl==''" style="width:80px;height:80px" src="../../assets/img/default.png" alt="">
<img style="width:80px;height:80px" :src="addMsg.Image" alt=""> <img v-else style="width:80px;height:80px" :src="imgurl" alt="">
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
...@@ -249,6 +252,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -249,6 +252,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
Image:'', Image:'',
Description:'', Description:'',
}, },
imgurl:'',
}; };
}, },
...@@ -257,12 +261,19 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -257,12 +261,19 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
this.getplat(); this.getplat();
this.getDown(); this.getDown();
this.GetMemberGradeList(); this.GetMemberGradeList();
this.addMsg.MallBaseId=this.getLocalStorage().MallBaseId;
}, },
methods: { methods: {
SelectId(msg){
this.changeState=false;
this.addMsg.Image=msg.id;
this.imgurl="http://viitto-1301420277.cos.ap-chengdu.myqcloud.com"+msg.url;
},
EditgoUrl(row){ EditgoUrl(row){
this.$router.push({ this.$router.push({
name: 'usersListEdit', name: 'usersListEdit',
query: { query: {
UserId:row.Id,
blank: "y" blank: "y"
} }
}); });
...@@ -298,7 +309,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -298,7 +309,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
this.czType=index; this.czType=index;
this.czjfDig=true; this.czjfDig=true;
this.addMsg={ this.addMsg={
MallBaseId:0, MallBaseId:this.getLocalStorage().MallBaseId,
Type:1, Type:1,
UserId:row.Id, UserId:row.Id,
Integral:'', Integral:'',
...@@ -306,9 +317,14 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -306,9 +317,14 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
Description:'', Description:'',
Balance:'', Balance:'',
} }
this.imgurl='';
}, },
openChangeDig(){ openChangeDig(){
this.changeState=true; this.changeState=true;
setTimeout(()=>{
this.$refs.mychild.InitData(this.czType);
},10)
}, },
Export(){ Export(){
this.msg.ExcelEnumIds=this.checkedCities; this.msg.ExcelEnumIds=this.checkedCities;
...@@ -386,6 +402,12 @@ import ChooseImg from "@/components/global/ChooseImg.vue"; ...@@ -386,6 +402,12 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
</script> </script>
<style> <style>
.usersList .remark_name {
color: #888888;
font-size: 12px;
margin-left: 10px;
float: right;
}
.usersList .app-image{ .usersList .app-image{
background-position: center center; background-position: center center;
width: 50px; width: 50px;
......
src/components/UserMan/usersListEdit.vue
View file @ 12b62593
...@@ -7,26 +7,33 @@ ...@@ -7,26 +7,33 @@
<div class="content"> <div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
<el-form-item label="用户"> <el-form-item label="用户">
<div class="app-image" style="background-image: url(https://wx.qlogo.cn/mmopen/vi_32/oGIVrPVN31icEqGbm2lHxwnutS3mD9xx40ZRx2E7U8cFicdY2YFAlZtfSXwjYvQicA9ggpSf5BtdPfoIreCialklKg/132); "></div> <div class="app-image" :style="{backgroundImage:'url(' + userInfo.Photo + ')',backgroundSize:'cover'}"></div>
</el-form-item> </el-form-item>
<el-form-item label="会员等级"> <el-form-item label="会员等级">
<el-select style="width:293px;" size="small" v-model="addMsg.name" placeholder="请选择活动区域"> <el-select style="width:293px;" size="small" v-model="userInfo.MemberGrade" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai"></el-option> <el-option label="普通用户" :value="0"></el-option>
<el-option label="区域二" value="beijing"></el-option> <el-option
v-for="(item,index) in 100"
:key="index"
:label="`等级${index+1}`"
:value="index+1">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上级"> <el-form-item label="上级">
<el-autocomplete <el-select size="small" v-model="userInfo.SuperiorId" :filter-method="ChangeListName" filterable placeholder="请选择">
size="small" <el-option label="总部" :value="0"></el-option>
v-model="val" <el-option
:fetch-suggestions="querySearch" v-for="item in tableData"
placeholder="请输入内容" :key="item.Id"
@select="handleSelect" :label="item.Name"
></el-autocomplete> :value="item.Id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="加入黑名单"> <el-form-item label="加入黑名单">
<el-switch <el-switch
v-model="addMsg.name" v-model="userInfo.Blacklist"
active-color="#409EFF" active-color="#409EFF"
active-value="100" active-value="100"
inactive-value="0"> inactive-value="0">
...@@ -34,25 +41,25 @@ ...@@ -34,25 +41,25 @@
<span class="tip">加入黑名单后，用户将无法下单</span> <span class="tip">加入黑名单后，用户将无法下单</span>
</el-form-item> </el-form-item>
<el-form-item label="联系方式"> <el-form-item label="联系方式">
<el-input v-model="val" style="width:478px" size="small"></el-input> <el-input v-model="userInfo.ContactWay" style="width:478px" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model="val" style="width:478px" size="small"></el-input> <el-input v-model="userInfo.Moblie" style="width:478px" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="val" style="width:478px" size="small"></el-input> <el-input v-model="userInfo.Remark" style="width:478px" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="修改备注名"> <el-form-item label="修改备注名">
<el-input v-model="val" style="width:478px" size="small"></el-input> <el-input v-model="userInfo.AliasName" style="width:478px" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="注册时间"> <el-form-item label="注册时间">
<span>2020-04-23 13:37:53</span> <span>{{userInfo.CreateDate}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div style="margin-top:20px"> <div style="margin-top:20px">
<el-button size="small" type="primary" @click="dialogVisible = false">保存</el-button> <el-button size="small" type="primary" @click="Save">保存</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -60,51 +67,87 @@ ...@@ -60,51 +67,87 @@
export default { export default {
data() { data() {
return { return {
currentPage4:3, addMsg:{
changeState:false, Id:'',
SuperiorId:'',
MemberGrade:'',
ContactWay:'',
Remark:'',
AliasName:'',
},
val:'', val:'',
addMsg:{},
dialogVisible:false,
value:'', value:'',
options:[],
tableData:[
{ID:'111'}
],
msg:{
pageIndex:1,
pageSize:15,
},
total:0, total:0,
rules: { rules: {
name: [ name: [
{ required: true, message: '新手机号', trigger: 'blur' } { required: true, message: '新手机号', trigger: 'blur' }
], ],
}, },
restaurants: [ restaurants: [],
{ "value": "三全鲜食（北新泾店）", "address": "长宁区新渔路144号" }, UserId:'',
{ "value": "Hot honey 首尔炸鸡（仙霞路）", "address": "上海市长宁区淞虹路661号" }, userInfo:{},
{ "value": "新旺角茶餐厅", "address": "上海市普陀区真北路988号创邑金沙谷6号楼113" }, msg:{
{ "value": "泷千家(天山西路店)", "address": "天山西路438号" }, pageIndex:1,
{ "value": "胖仙女纸杯蛋糕（上海凌空店）", "address": "上海市长宁区金钟路968号1幢18号楼一层商铺18-101" }, pageSize:20,
{ "value": "贡茶", "address": "上海市长宁区金钟路633号" }, Name:'',
{ "value": "豪大大香鸡排超级奶爸", "address": "上海市嘉定区曹安公路曹安路1685号" }, Source:0,
], MemberGrade:0,
Id:0,
Moblie:''
},
tableData:[],
}; };
}, },
created() { created() {
if(this.$route.query.UserId){
this.UserId=this.$route.query.UserId;
this.getData()
this.getList();
}
}, },
methods: { methods: {
Save(){
let userInfo=this.userInfo;
this.addMsg={
Id:userInfo.Id,
SuperiorId:userInfo.SuperiorId,
MemberGrade:userInfo.MemberGrade,
ContactWay:userInfo.ContactWay,
Remark:userInfo.Remark,
AliasName:userInfo.AliasName,
}
this.apipost("/api/user/SetMemberUserInfoForHT",this.addMsg, res => {
if(res.data.resultCode==1){
this.goUrl();
}else {
this.Error(res.data.message);
}
})
},
handleSelect(item) { handleSelect(item) {
console.log(item); console.log(item);
}, },
ChangeListName(val){
this.msg.Name=val;
this.getList();
},
getList(){
this.loading=true;
this.apipost("/api/user/GetMemberUserDropDownList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.total=res.data.data.count;
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
querySearch(queryString, cb) { querySearch(queryString, cb) {
var restaurants = this.restaurants;
var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
// 调用 callback 返回建议列表的数据
cb(results);
}, },
openChangeDig(){ openChangeDig(){
this.changeState=true; this.changeState=true;
...@@ -117,12 +160,12 @@ ...@@ -117,12 +160,12 @@
} }
}); });
}, },
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
getData(){
this.apipost("/api/user/GetMemberUserInfo",{UserId:this.UserId}, res => {
console.log("res,res",res);
this.userInfo=res.data.data;
})
}, },
}, },
......
src/components/global/ChooseImg.vue
View file @ 12b62593
<template> <template>
<div class="ChooseImg"> <div class="ChooseImg">
<el-row style="border: 1px solid rgb(227, 227, 227);"> <el-row v-loading="loading" style="border: 1px solid rgb(227, 227, 227);">
<el-col :span="6" style="border-right: 1px solid rgb(227, 227, 227);"> <el-col :span="6" style="border-right: 1px solid rgb(227, 227, 227);">
<el-button style="margin-top: 12px;margin-left: 5%;" type="primary" size="small">添加分组</el-button> <el-button @click="addGroup" style="margin-top: 12px;margin-left: 5%;" type="primary" size="small">添加分组</el-button>
<div style="margin:20px 0"> <div style="margin:20px 0">
<el-input v-model="val" style="width:90%;margin:0 5%" placeholder="请输入分类名称搜索" size="small"></el-input> <el-input v-model="searchVal" style="width:90%;margin:0 5%" placeholder="请输入分类名称搜索" size="small"></el-input>
</div> </div>
<div class="el-scrollbar" style="height: 450px; width: 100%;"> <div class="el-scrollbar" style="height: 450px; width: 100%;">
<div class="el-scrollbar__wrap" style="margin-bottom: -8px; margin-right: -8px;"> <div class="el-scrollbar__wrap" style="margin-bottom: -8px; margin-right: -8px;">
<div class="el-scrollbar__view"> <div class="el-scrollbar__view">
<li class="el-menu-item" style="padding-left: 10px;padding-right: 10px;"> <li :class="PageMsg.GroupId==0?'selectActive' : ''" @click="SelectGroup(0)" class="el-menu-item" style="padding-left: 10px;padding-right: 10px;">
<i class="el-icon-tickets"></i> <i class="el-icon-tickets"></i>
<span>全部</span> <span >全部</span>
</li> </li>
<li v-for="item in 9" class="el-menu-item" style="padding-left: 10px;padding-right: 10px;"> <li :class="PageMsg.GroupId==item.Id?'selectActive' : ''" @click="SelectGroup(item.Id)" v-for="(item,index) in NewItems" :key="index" class="el-menu-item" style="padding-left: 10px;padding-right: 10px;">
<div flex="dir:left box:last"> <div flex="dir:left box:last">
<el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;"> <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
<i class="el-icon-tickets"></i> <i class="el-icon-tickets"></i>
<span>羊肚菌</span> <span>{{item.Name}}</span>
</el-col> </el-col>
<el-col class="blue" :span="6"> <el-col class="blue" :span="6">
<span>编辑</span> | <span>删除</span> <span v-if="scgroupMsg.Recycled==1" @click.prevent="EditGroup(item)">编辑</span>
| <span v-if="scgroupMsg.Recycled==1" @click.prevent="HsGroup(item)">删除</span>
</el-col> </el-col>
</div> </div>
</li> </li>
...@@ -30,26 +31,29 @@ ...@@ -30,26 +31,29 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<div style="margin-top: 10px;margin-left: 20px;" class="appendInput"> <div style="margin-top: 10px;margin-left: 20px;" class="appendInput">
<el-input size="small" style="width:250px" placeholder="请输入内容" v-model="val"> <el-input size="small" style="width:250px" placeholder="请输入内容" v-model="PageMsg.Name">
<el-button slot="append" icon="el-icon-search"></el-button> <el-button @click="GetPageList" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
<div class="basefix app-attachment-list"> <div class="basefix app-attachment-list">
<div class="app-attachment-item app-attachment-upload"> <div class="app-attachment-item app-attachment-upload">
<div class="app-upload" flex="main:center cross:center" style="width: 100px; height: 100px;"> <div class="app-upload" flex="main:center cross:center" style="width: 100px; height: 100px;">
<el-upload class="avatar-uploader" action=""
accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" :http-request="UploadImage">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<input type="file" accept="image/*" multiple="multiple" style="display: none;"> </el-upload>
</div> </div>
</div> </div>
<el-tooltip class="item" effect="dark" content="Top Left 提示文字" placement="top-start"> <el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark" :content="item.Name" placement="top-start">
<div class="el-tooltip item app-attachment-item" > <div @click="PageSelect(item,index)" :class="selectId==item.Id ? 'selected' :''" class="el-tooltip item app-attachment-item" >
<img src="https://cdnimg.iotweixin.com/uploads/mall1285/20200422/58aac71950e2d86e6d7138484a3f7f7e.jpg" class="app-attachment-img" style="width: 100px; height: 100px;"> <img :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+item.Path" class="app-attachment-img" style="width: 100px; height: 100px;">
<div class="app-attachment-name">微信图片_20200422125658.jpg</div> <div class="app-attachment-name">{{item.Name}}</div>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
<div> <div style="padding-right:10px">
<el-pagination style="text-align:right" <el-pagination style="text-align:right"
background background
:current-page="currentPage4" :current-page="currentPage4"
...@@ -62,9 +66,31 @@ ...@@ -62,9 +66,31 @@
</el-col> </el-col>
</el-row> </el-row>
<div style="margin-top:20px;text-align:right"> <div style="margin-top:20px;text-align:right">
<el-button size="small" type="primary" @click="changeState = false">选定</el-button> <el-button size="small" type="primary" @click="SelectImgId">选定</el-button>
</div> </div>
<!-- 新增分组 -->
<el-dialog :modal="false" :modal-append-to-body='false' title="分组管理" :visible.sync="addGroupMsgDig" width="400px">
<el-form :model="addGroupMsg" :rules="addGroupMsgrules" ref="addGroupMsg" label-width="100px">
<el-form-item label="分组名称" prop="Name">
<el-input
size="small"
type="text"
placeholder="请输入内容"
v-model="addGroupMsg.Name"
maxlength="8"
show-word-limit
>
</el-input>
</el-form-item>
<el-form-item label="排序" prop="Sort">
<el-input @keyup.native="checkInteger(addGroupMsg,'Sort')" size="small" v-model="addGroupMsg.Sort"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="addGroupMsgDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="GroupsubmitForm('addGroupMsg')">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -73,6 +99,8 @@ export default { ...@@ -73,6 +99,8 @@ export default {
name: 'ChooseImg', name: 'ChooseImg',
data(){ data(){
return{ return{
czType:0,
searchVal:'',
val:'', val:'',
Id:'', Id:'',
currentPage4:1, currentPage4:1,
...@@ -81,24 +109,201 @@ export default { ...@@ -81,24 +109,201 @@ export default {
pageSize:15, pageSize:15,
}, },
total:0, total:0,
loading:false,
scgroupMsg:{
Id:0,
Name:'',
Type:1,
Recycled:1,
},
groupList:[],
PageMsg:{
Id:0,
Name:'',
Type:1,
Recycled:1,
pageIndex:1,
pageSize:15,
GroupId:0,
},
PageList:[],
addGroupMsgDig:false,
pageMsgDig:false,
addGroupMsg:{
Id:0,
Name:'',
Type:'',
Sort:'',
},
addGroupMsgrules:{
Name: [{
required: true,
message: '请填写分组名称',
trigger: 'blur'
}],
Sort: [{
required: true,
message: '请填写排序',
trigger: 'blur'
}],
},
addpageMsg:{
Id:0,
Name:'',
Type:1,
GroupId:0,
Path:'',
Image:'',
VideoTime:0,
WithHeight:0,
},
selectId:-1,
emitmsg:{},
} }
}, },
created(){ created(){
}, },
computed: {
NewItems() {
var _this = this;
var NewItems = [];
this.groupList.map(function(item) {
if (item.Name.search(_this.searchVal) != -1) {
NewItems.push(item);
}
});
return NewItems;
}
},
mounted(){ mounted(){
this.GetMemberGradeList();
this.GetPageList();
}, },
methods:{ methods:{
InitData(id){ InitData(Type){
this.Id=id; this.czType=Type;
this.msg.Id=id; this.selectId=-1;
// this.getOperation();
// this.getDataInfo(); },
SelectImgId(){
this.$emit('SelectId',this.emitmsg)
this.selectId=-1;
},
UploadImage(file) {
this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
if (res.resultCode == 1) {
this.addpageMsg.Path = res.FileUrl;
this.addpageMsg.Name = res.FileName;
this.addPageList();
}
})
},
// 新增素材信息
addPageList(){
this.apipost("/api/product/SetMaterialInfo",this.addpageMsg, res => {
if(res.data.resultCode==1){
this.GetPageList();
}
})
},
PageSelect(item){
this.emitmsg={
selectId:item.Id,
url:item.Path
}
this.selectId=item.Id;
},
addGroup(){
this.addGroupMsgDig=true;
this.addGroupMsg={
Id:0,
Name:'',
Type:1,
Sort:'',
}
},
HsGroup(item){
let that=this;
that.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/product/SetMaterialGroupRecycled',{GroupId:item.Id},
res => {
if (res.data.resultCode === 1) {
this.GetMemberGradeList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
EditGroup(item){
this.addGroupMsgDig=true;
this.addGroupMsg={
Id:item.Id,
Name:item.Name,
Type:item.Type,
Sort:item.Sort,
}
},
GroupsubmitForm (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/product/SetMaterialGroupInfo',this.addGroupMsg,
res => {
if (res.data.resultCode === 1) {
this.GetMemberGradeList();
this.Success(res.data.message)
this.addGroupMsgDig=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
SelectGroup(id){
this.PageMsg.GroupId=id;
this.GetPageList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
// this.getList(); this.GetPageList();
},
GetMemberGradeList(){
this.loading=true;
this.apipost("/api/product/GetMaterialGroupList",this.scgroupMsg, res => {
this.loading=false;
this.groupList=res.data.data;
})
},
GetPageList(){
this.loading=true;
this.apipost("/api/product/GetMaterialInfoPageList",this.PageMsg, res => {
this.loading=false;
this.total=res.data.data.count;
let data=res.data.data.pageData;
this.PageList=data;
})
}, },
}, },
...@@ -106,6 +311,20 @@ export default { ...@@ -106,6 +311,20 @@ export default {
</script> </script>
<style> <style>
.ChooseImg .el-input.is-active .el-input__inner, .ChooseImg .el-input__inner:focus{
border-color: #DCDFE6;
}
.ChooseImg .app-attachment-list .selected {
box-shadow: 0 0 0 1px #1ed0ff;
background: #daf5ff;
border-radius: 5px;
}
.ChooseImg .selectActive .el-icon-tickets{
color: #409EFF;
}
.ChooseImg .selectActive{
color: #409EFF;
}
.ChooseImg .app-attachment-name { .ChooseImg .app-attachment-name {
color: #666666; color: #666666;
margin-top: 5px; margin-top: 5px;
......
src/components/mall.vue
View file @ 12b62593
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
width: 300px; width: 300px;
float:right;
} }
.marinRightList ul { .marinRightList ul {
...@@ -284,7 +285,7 @@ ...@@ -284,7 +285,7 @@
<div class="is-show-menu-2" v-if="isShowOne" @click="showTwo=true,isShowOne=false">>></div> <div class="is-show-menu-2" v-if="isShowOne" @click="showTwo=true,isShowOne=false">>></div>
<div class="leftMenu1"> <div class="leftMenu1">
<div class="aside-logo"> <div class="aside-logo">
<div class="asideInner">{{currentUser.MallName}}</div> <div class="asideInner" @click="CommonJump('zanIndex'),firstCked=0,showTwo=false">{{currentUser.MallName}}</div>
</div> </div>
<ul> <ul>
<li class="menu-item" @mouseover="mouseOver(item)" @mouseout="mouseOutMenu()" v-for="(item,index) in MenuList" <li class="menu-item" @mouseover="mouseOver(item)" @mouseout="mouseOutMenu()" v-for="(item,index) in MenuList"
...@@ -411,7 +412,7 @@ ...@@ -411,7 +412,7 @@
mouseOutMenu() { mouseOutMenu() {
this.MenuList.forEach(item => { this.MenuList.forEach(item => {
if (item.MenuId == this.firstCked) { if (item.MenuId == this.firstCked) {
//this.secondItem = item; this.secondItem = item;
} }
}) })
}, },
......
src/components/zanIndex.vue
View file @ 12b62593
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
display:flex; display:flex;
flex-direction: row; flex-direction: row;
padding:15px; padding:15px;
overflow: hidden;
}
.searchDiv .el-date-editor .el-range-separator{
width:6%;
} }
.zanIndex .el-input__inner{ .zanIndex .el-input__inner{
height:32px; height:32px;
...@@ -27,11 +31,11 @@ ...@@ -27,11 +31,11 @@
.searchDiv>div{ .searchDiv>div{
margin-right:5px; margin-right:5px;
} }
.zanIndex .el-tabs__nav-scroll{ .zanIndex .zanIndex_Second .el-tabs__nav-scroll{
width:120px; width:120px;
margin-left:30px; margin-left:30px;
} }
.zanIndex .el-tabs__nav-wrap::after { .zanIndex .zanIndex_Second .el-tabs__nav-wrap::after {
content: ""; content: "";
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -78,6 +82,172 @@ ...@@ -78,6 +82,172 @@
width: 20%; width: 20%;
border-left: 1px dashed #EFF1F7; border-left: 1px dashed #EFF1F7;
} }
.zanIndexThrid{
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
-webkit-transition: .3s;
transition: .3s;
border-radius:4px;
overflow: hidden;
}
.el-card_header{
position: relative;
padding: 18px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.tab-pay {
position: absolute;
bottom: -15px;
right: 50px;
}
.tab-pay .el-tabs__item {
height: 56px;
line-height: 56px;
}
.el-tabs__nav-wrap::after{
background-color: transparent;
}
.zanIndex .el-card__body{
padding:20px;
}
.pay-info {
padding: 40px 0;
display: flex;
justify-content: space-between;
}
.pay-info .pay-info-item.active {
border: 1px solid #3399FF;
}
.info-item-name {
font-size: 16px;
color: #92959B;
}
.pay-info .pay-info-item {
padding-top: 45px;
width: 22%;
margin: 0 1.5%;
text-align: center;
font-size: 26px;
border: 1px solid #EBEEF5;
border-radius: 10px;
height: 150px;
position: relative;
cursor: pointer;
}
.pay-info .pay-info-item.active img {
position: absolute;
top: 0;
left: 0;
display: block;
}
.pay-info .pay-info-item img {
display: none;
}
.zantable-area{
margin-top: 20px;
display: flex;
justify-content: space-between;
}
.zantable-area .el-card {
width: 49.5%;
color: #303133;
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
-webkit-transition: .3s;
transition: .3s;
border-radius: 4px;
overflow: hidden;
}
.el-card__header{
padding: 14px 20px;
}
.el-card__header span{
/* float:left; */
height: 32px;
line-height: 32px;
}
.ZexportBtn{
padding:0 10px;
float:right;
}
.table_Inner{
padding:20px;
}
.rankIng{
padding:0 10px;
text-align: center;
}
.table_Inner table th{
background: rgb(243, 245, 246);
color:rgb(48, 49, 51);
padding-left:10px;
border-bottom:1px solid #EBEEF5;
}
.text-omit {
width: 380px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.table_Inner .el-table .cell {
-webkit-box-sizing: border-box;
box-sizing: border-box;
white-space: normal;
word-break: break-all;
line-height: 23px;
}
.table_Inner .el-table_1_column_1{
text-align: center;
}
.table_Inner .el-table_1_column_2{
padding-left:0;
}
.table2 .is-leaf:first-child{
text-align: center;
}
.Zheader_image{
width: 32px;
height: 32px;
margin-right: 10px;
float: left;
}
.Zheader_image img{
width:100%;
height:100%;
}
.nameList{
height: 32px;
line-height: 32px;
display: inline-block;
width: 280px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.zantable-area .el-table__row{
height:63px;
}
.echarts-title {
color: #92959B;
display: flex;
font-size: 16px;
margin-left: 45px;
}
.echarts-title-item {
margin-right: 45px;
display: flex;
align-items: center;
}
.echarts-title-item .echarts-title-icon {
height: 16px;
width: 16px;
margin-right: 10px;
background-color: #3399ff;
}
</style> </style>
<template> <template>
<div class="zanIndex"> <div class="zanIndex">
...@@ -101,8 +271,8 @@ ...@@ -101,8 +271,8 @@
<div style="margin-right:50px;"> <div style="margin-right:50px;">
<el-date-picker <el-date-picker
class="indataPicker" class="indataPicker"
v-model="dateArr"
type="daterange" type="daterange"
v-model="searchMsg.dateArr"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -123,10 +293,207 @@ ...@@ -123,10 +293,207 @@
<div>1094</div> <div>1094</div>
<div class="info-item-name"> <div class="info-item-name">
<span>用户数</span> <span>用户数</span>
<el-tooltip class="item" effect="dark" content="统计全平台用户数，不随店铺的更改而更改" placement="bottom">
<i class="el-icon-question"></i>
</el-tooltip>
</div>
</div>
<div class="num-info-item">
<div>103</div>
<div class="info-item-name">商品数</div>
</div>
<div class="num-info-item">
<div>477</div>
<div class="info-item-name">订单数</div>
</div>
<div class="num-info-item">
<div>41</div>
<div class="info-item-name">待发货订单数</div>
</div>
<div class="num-info-item">
<div>0</div>
<div class="info-item-name">维权订单数</div>
</div>
</div>
</div>
<div class="zanIndexThrid">
<div class="el-card_header">
<div>
<span>销售情况</span>
</div>
<div class="tab-pay">
<el-tabs v-model="activeSell">
<el-tab-pane label="昨日" name="first"></el-tab-pane>
<el-tab-pane label="7日" name="second"></el-tab-pane>
</el-tabs>
</div>
</div>
<div class="el-card__body">
<div class="pay-info">
<div class="pay-info-item" :class="{'active':isShowOrder}" @click="filterOrder()">
<img src="../assets/img/active.png" alt=""/>
<div>24</div>
<div class="info-item-name">支付订单数</div>
</div>
<div class="pay-info-item" :class="{'active':isShowMoney}" @click="filterMoney()">
<img src="../assets/img/active.png" alt=""/>
<div>5456.00</div>
<div class="info-item-name">支付金额</div>
</div>
<div class="pay-info-item" :class="{'active':isShowPay}" @click="filterPay()">
<img src="../assets/img/active.png" alt=""/>
<div>24</div>
<div class="info-item-name">支付人数</div>
</div>
<div class="pay-info-item" :class="{'active':isShowPayNum}" @click="filterPayNum()">
<img src="../assets/img/active.png" alt=""/>
<div>24</div>
<div class="info-item-name">支付件数</div>
</div>
</div>
<div class="echarts-title">
<div class="echarts-title-item" v-if="isShowOrder">
<div class="echarts-title-icon"></div>
<div>支付订单数</div>
</div>
<div class="echarts-title-item" v-if="isShowMoney">
<div class="echarts-title-icon" style="background-color: rgb(255, 163, 96);"></div>
<div>支付金额</div>
</div>
<div class="echarts-title-item" v-if="isShowPay">
<div class="echarts-title-icon" style="background-color: rgb(75, 194, 130);"></div>
<div>支付人数</div>
</div>
<div class="echarts-title-item" v-if="isShowPayNum">
<div class="echarts-title-icon" style="background-color: rgb(255, 133, 133);"></div>
<div>支付件数</div>
</div>
</div>
<div class="myecharts" ref="myecharts" style="height:300px;">
</div>
</div>
</div>
<div class="zantable-area">
<div class="el-card">
<div class="el-card__header">
<span>商品购买力TOP排行</span>
<el-button type="primary" class="ZexportBtn" size="mini">导出TOP100</el-button>
</div>
<div class="table_Inner">
<el-table :data="tableData" style="width: 100%">
<el-table-column
label="排名"
width="120">
<template slot-scope="scope">
<div class="rankIng">
<template v-if="scope.$index+1<4">
<img v-if="scope.$index==0" src="../assets/img/first.png"/>
<img v-if="scope.$index==1" src="../assets/img/sec.png"/>
<img v-if="scope.$index==2" src="../assets/img/third.png"/>
</template>
<template v-else>
<span>{{getNumber(scope.$index+1)}}</span>
</template>
</div>
</template>
</el-table-column>
<el-table-column
prop="name"
label="商品"
width="400">
<template slot-scope="scope">
<div class="text-omit">
{{scope.row.name}}
</div>
</template>
</el-table-column>
<el-table-column
prop="sales"
label="销售额"
sortable
width="150">
<template slot-scope="scope">
<div style="padding-left:10px;">
{{scope.row.sales}}
</div>
</template>
</el-table-column>
<el-table-column
prop="Numer"
sortable
label="销量"
width="150">
<template slot-scope="scope">
<div style="padding-left:10px;">
{{scope.row.Numer}}
</div> </div>
</template>
</el-table-column>
</el-table>
</div> </div>
</div> </div>
<div class="el-card">
<div class="el-card__header">
<span>用户购买力TOP排行</span>
<el-button type="primary" class="ZexportBtn" size="mini">导出TOP100</el-button>
</div> </div>
<div class="table_Inner table2">
<el-table :data="tableData" style="width: 100%">
<el-table-column
label="排名"
width="120">
<template slot-scope="scope">
<div class="rankIng">
<template v-if="scope.$index+1<4">
<img v-if="scope.$index==0" src="../assets/img/first.png"/>
<img v-if="scope.$index==1" src="../assets/img/sec.png"/>
<img v-if="scope.$index==2" src="../assets/img/third.png"/>
</template>
<template v-else>
<span>{{getNumber(scope.$index+1)}}</span>
</template>
</div>
</template>
</el-table-column>
<el-table-column
prop="name"
label="用户"
width="400">
<template slot-scope="scope">
<div class="Zheader_image">
<img src="../assets/img/id-card.png" alt=""/>
</div>
<span class="nameList">印象日本地接～谢军</span>
</template>
</el-table-column>
<el-table-column
prop="sales"
label="支付金额"
sortable
width="150">
<template slot-scope="scope">
<div style="padding-left:10px;">
{{scope.row.sales}}
</div>
</template>
</el-table-column>
<el-table-column
prop="Numer"
sortable
label="支付件数"
width="150">
<template slot-scope="scope">
<div style="padding-left:10px;">
{{scope.row.Numer}}
</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -134,11 +501,62 @@ ...@@ -134,11 +501,62 @@
data() { data() {
return { return {
activeName:'first', activeName:'first',
activeSell:'first',
//过滤支付订单数
isShowOrder:true,
//过滤支付金额
isShowMoney:true,
//过滤支付人数
isShowPay:true,
//过滤支付件数
isShowPayNum:true,
searchMsg: { searchMsg: {
plat:0, plat:0,
plat2:0, plat2:0,
dateArr:'' dateArr:[]
}, },
//商品购买力data
tableData:[{
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23450.00',
Numer:'109',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23440.00',
Numer:'108',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23420.00',
Numer:'105',
},{
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
},{
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
}, {
name: '1KG新鲜羊肚菌 顺丰省内包邮 48小时内发货 每日新鲜采摘 赞羊严选 【湖北暂不发货】',
sales: '23430.00',
Numer:'107',
}]
}; };
}, },
created() { created() {
...@@ -147,10 +565,108 @@ ...@@ -147,10 +565,108 @@
methods: { methods: {
handleClick(){ handleClick(){
},
//数字加0
getNumber(num){
let str='';
if(num<10){
str = '0'+num
}else{
str=num;
} }
return str;
},
//过滤支付订单数
filterOrder(){
this.isShowOrder=!this.isShowOrder;
},
//过滤支付金额
filterMoney(){
this.isShowMoney=!this.isShowMoney
},
//过滤支付人数
filterPay(){
this.isShowPay=!this.isShowPay
},
//过滤支付件数
filterPayNum(){
this.isShowPayNum=!this.isShowPayNum
}, },
mounted() {
//初始化图标
initMap(){
var myChart = this.$echarts.init(this.$refs.myecharts);
var option = {
title: {
text: ''
},
tooltip: {
trigger: 'axis'
},
grid: {
left: '0',
right: '1%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
},
yAxis: {
            axisLine:{ //y轴
show:false,
},
axisLabel : {
formatter: function(){
return "";
}
},
type: 'value',
splitLine :{ //网格线
lineStyle:{
type:'dashed' //设置网格线类型 dotted：虚线 solid:实线
},
show:true //隐藏或显示
}
},
series: [
{
name: '支付订单数',
type: 'line',
stack: '总量',
color: '#3399ff',
data: [120, 132, 101, 134, 90, 230, 210]
},
{
name: '支付金额',
type: 'line',
stack: '总量',
color: 'rgb(255, 163, 96)',
data: [220, 182, 191, 234, 290, 330, 310]
},
{
name: '支付人数',
type: 'line',
stack: '总量',
color: 'rgb(75, 194, 130)',
data: [150, 232, 201, 154, 190, 330, 410]
},
{
name: '支付件数',
type: 'line',
stack: '总量',
color:'rgb(255, 133, 133)',
data: [320, 332, 301, 334, 390, 330, 320]
},
]
};
myChart.setOption(option, true);
}
},
mounted() {
this.initMap();
} }
}; };
......
src/main.js
View file @ 12b62593
...@@ -7,6 +7,8 @@ import router from './router' ...@@ -7,6 +7,8 @@ import router from './router'
import ajaxPlug from './plug/index' import ajaxPlug from './plug/index'
import ElementUI from 'element-ui'; import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; import 'element-ui/lib/theme-chalk/index.css';
import echarts from 'echarts'
Vue.use(ElementUI); Vue.use(ElementUI);
import commonUtils from './assets/utils/commonUtils' import commonUtils from './assets/utils/commonUtils'
...@@ -14,6 +16,8 @@ Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils ...@@ -14,6 +16,8 @@ Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.http = Vue.prototype.$http = axios Vue.http = Vue.prototype.$http = axios
Vue.prototype.$echarts = echarts
Vue.use(ajaxPlug) Vue.use(ajaxPlug)
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({
......
src/router/index.js
View file @ 12b62593
...@@ -100,18 +100,12 @@ export default new Router({ ...@@ -100,18 +100,12 @@ export default new Router({
name: 'basicSetUp', name: 'basicSetUp',
component: resolve => require(['@/components/setup/basicSetUp'], resolve), component: resolve => require(['@/components/setup/basicSetUp'], resolve),
}, },
// 物流设置 规则设置 //店铺管理 导航图标
{ {
path: '/ruleSetup', path: '/navigationIcon',
name: 'ruleSetup', name: 'navigationIcon',
component: resolve => require(['@/components/setup/ruleSetup'], resolve), component: resolve => require(['@/components/StoreDesign/navigationIcon'], resolve),
}, }
// 物流设置 新增运费规则
{
path: '/addFreightRule',
name: 'addFreightRule',
component: resolve => require(['@/components/setup/addFreightRule'], 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