Skip to content

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

页面修改

parent 852c4c4f
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 41 deletions
src/components/UserMan/usersList.vue
View file @ 8dfa6d4e
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
<div v-show="scope.row.OpenIdState">{{scope.row.OpenId}}</div> <div v-show="scope.row.OpenIdState">{{scope.row.OpenId}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Moblie" label="手机号"> <el-table-column prop="PostName" label="职位">
</el-table-column> </el-table-column>
<el-table-column prop="MemberGradeName" label="会员类型"> <el-table-column prop="MemberGradeName" label="会员类型">
</el-table-column> </el-table-column>
......
src/components/UserMan/usersListEdit.vue
View file @ 8dfa6d4e
...@@ -26,6 +26,13 @@ ...@@ -26,6 +26,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="职位">
<el-select size="small" v-model="userInfo.PostId"
placeholder="请选择">
<el-option label="无" :value="0"></el-option>
<el-option label="领队导游" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="加入黑名单"> <el-form-item label="加入黑名单">
<el-switch v-model="userInfo.Blacklist" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="userInfo.Blacklist" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
...@@ -65,6 +72,7 @@ ...@@ -65,6 +72,7 @@
ContactWay: '', ContactWay: '',
Remark: '', Remark: '',
AliasName: '', AliasName: '',
PostId: 0, //职位
}, },
val: '', val: '',
value: '', value: '',
...@@ -89,7 +97,7 @@ ...@@ -89,7 +97,7 @@
Moblie: '' Moblie: ''
}, },
tableData: [], tableData: [],
options:[], options: [],
}; };
}, },
created() { created() {
...@@ -110,6 +118,7 @@ ...@@ -110,6 +118,7 @@
ContactWay: userInfo.ContactWay, ContactWay: userInfo.ContactWay,
Remark: userInfo.Remark, Remark: userInfo.Remark,
AliasName: userInfo.AliasName, AliasName: userInfo.AliasName,
PostId: userInfo.PostId,
} }
this.apipost("/api/user/SetMemberUserInfoForHT", this.addMsg, res => { this.apipost("/api/user/SetMemberUserInfoForHT", this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -135,9 +144,13 @@ ...@@ -135,9 +144,13 @@
} }
}) })
}, },
getMemberGradeList(){ getMemberGradeList() {
this.loading = true; this.loading = true;
this.apipost("/api/user/GetMemberGradeList", {Grade:0,Name:'',Enabled:1}, res => { this.apipost("/api/user/GetMemberGradeList", {
Grade: 0,
Name: '',
Enabled: 1
}, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.options = res.data.data this.options = res.data.data
...@@ -172,6 +185,7 @@ ...@@ -172,6 +185,7 @@
} }
}; };
</script> </script>
<style> <style>
.usersListEdit .tip { .usersListEdit .tip {
......
src/components/mallIndex.vue
View file @ 8dfa6d4e
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,8 @@
.table2 .is-leaf:first-child { .table2 .is-leaf:first-child {
text-align: center; text-align: center;
} }
.UserInfoContent{ .UserInfoContent {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
} }
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
.nameList { .nameList {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
width:80%; width: 80%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
...@@ -300,6 +300,11 @@ ...@@ -300,6 +300,11 @@
background-color: #3399ff; background-color: #3399ff;
} }
.el-mallIndex_btmheader .el-radio__inner {
height: 14px !important;
line-height: 14px !important;
}
</style> </style>
<template> <template>
<div class="mallIndex" v-loading="loading"> <div class="mallIndex" v-loading="loading">
...@@ -466,6 +471,11 @@ ...@@ -466,6 +471,11 @@
<div class="el-card"> <div class="el-card">
<div class="el-mallIndex_btmheader"> <div class="el-mallIndex_btmheader">
<span>用户购买力TOP排行</span> <span>用户购买力TOP排行</span>
&nbsp;&nbsp;
<el-radio v-model="basicQMsg.UserType" @change="getChange" :label="0">普通用户
</el-radio>
<el-radio v-model="basicQMsg.UserType" @change="getChange" :label="1">领队导游
</el-radio>
<el-button type="primary" class="ZexportBtn" size="mini" @click="DownLoadSalesUser">导出TOP100</el-button> <el-button type="primary" class="ZexportBtn" size="mini" @click="DownLoadSalesUser">导出TOP100</el-button>
</div> </div>
<div class="table_Inner table2"> <div class="table_Inner table2">
...@@ -545,6 +555,7 @@ ...@@ -545,6 +555,7 @@
EndDate: "", //结束时间 EndDate: "", //结束时间
SalesTimeType: 0, //默认今日 SalesTimeType: 0, //默认今日
OrderBy: '', OrderBy: '',
UserType: 0, //0-普通用户,1-领队导游
}, },
basicData: {}, //基础数据 basicData: {}, //基础数据
salesData: {}, //销售数据 salesData: {}, //销售数据
...@@ -578,7 +589,6 @@ ...@@ -578,7 +589,6 @@
else if (tab.name == "second") { else if (tab.name == "second") {
this.dateStr.push(this.$commonUtils.AddDay('', -30)) this.dateStr.push(this.$commonUtils.AddDay('', -30))
} }
this.dateStr.push(this.$commonUtils.AddDay('', -0)); this.dateStr.push(this.$commonUtils.AddDay('', -0));
this.getChange(); this.getChange();
}, },
...@@ -605,7 +615,7 @@ ...@@ -605,7 +615,7 @@
if (saleGoodsArray.length <= 2) { if (saleGoodsArray.length <= 2) {
this.saleIncomeData = saleGoodsArray; this.saleIncomeData = saleGoodsArray;
} else { } else {
this.saleIncomeData = saleGoodsArray.slice(0, 10); this.saleIncomeData = saleGoodsArray.slice(0, 15);
} }
} }
//用户购买力TOP排行 //用户购买力TOP排行
...@@ -614,7 +624,7 @@ ...@@ -614,7 +624,7 @@
if (saleUserArray.length <= 2) { if (saleUserArray.length <= 2) {
this.saleUserData = saleUserArray; this.saleUserData = saleUserArray;
} else { } else {
this.saleUserData = saleUserArray.slice(0, 10); this.saleUserData = saleUserArray.slice(0, 15);
} }
} }
this.initMap(); this.initMap();
...@@ -678,22 +688,22 @@ ...@@ -678,22 +688,22 @@
var goodArray = []; //商品件数 var goodArray = []; //商品件数
//今日 //今日
var now = new Date(); var now = new Date();
var year = now.getFullYear(); //年 var year = now.getFullYear(); //年
var month = now.getMonth() + 1; //月 var month = now.getMonth() + 1; //月
var day = now.getDate(); //日 var day = now.getDate(); //日
var nowDay = year+'-'+month+'-'+day; var nowDay = year + '-' + month + '-' + day;
//昨日 //昨日
now.setTime(now.getTime()-24*60*60*1000); now.setTime(now.getTime() - 24 * 60 * 60 * 1000);
var yesDay = now.getFullYear()+"-" + (now.getMonth()+1) + "-" + now.getDate(); var yesDay = now.getFullYear() + "-" + (now.getMonth() + 1) + "-" + now.getDate();
if (this.salesData && this.salesData.subList && this.salesData.subList.length > 0) { if (this.salesData && this.salesData.subList && this.salesData.subList.length > 0) {
this.salesData.subList.forEach(item => { this.salesData.subList.forEach(item => {
if(this.activeSell=='today'){ if (this.activeSell == 'today') {
xData.push(nowDay+' '+item.TimeStr+'时'); xData.push(nowDay + ' ' + item.TimeStr + '时');
} }
if(this.activeSell=='first'){ if (this.activeSell == 'first') {
xData.push(yesDay+' '+item.TimeStr+'时'); xData.push(yesDay + ' ' + item.TimeStr + '时');
} }
xDataList.push(item.TimeStr); xDataList.push(item.TimeStr);
orderArray.push(item.OrderCount); orderArray.push(item.OrderCount);
...@@ -746,7 +756,7 @@ ...@@ -746,7 +756,7 @@
data: goodArray data: goodArray
}); });
} }
var option = { var option = {
title: { title: {
text: '' text: ''
...@@ -759,28 +769,28 @@ ...@@ -759,28 +769,28 @@
// color: "#999" // color: "#999"
// }, // },
// }, // },
axisPointer:'none', axisPointer: 'none',
formatter:function(params){ formatter: function (params) {
// var res=params[0].name; // var res=params[0].name;
var res='' var res = ''
if(params.length>4){ if (params.length > 4) {
for(var i=0;i<params.length;i++){ for (var i = 0; i < params.length; i++) {
if(i==0){ if (i == 0) {
if(params[i].data==0){ if (params[i].data == 0) {
res+='<br/>'+params[i].name; res += '<br/>' + params[i].name;
}else{ } else {
res+='<br/>'+params[i].data; res += '<br/>' + params[i].data;
}
}else{
res+='<br/>'+params[i].marker+params[i].seriesName+'：'+params[i].data
} }
} else {
res += '<br/>' + params[i].marker + params[i].seriesName + '：' + params[i].data
} }
}else{
for(var i=0;i<params.length;i++){
res+='<br/>'+params[i].marker+params[i].seriesName+'：'+params[i].data
}
} }
return res; } else {
for (var i = 0; i < params.length; i++) {
res += '<br/>' + params[i].marker + params[i].seriesName + '：' + params[i].data
}
}
return res;
}, },
}, },
grid: { grid: {
......
src/components/sallCenter/plugin/shopinfo.vue
View file @ 8dfa6d4e
...@@ -62,7 +62,10 @@ ...@@ -62,7 +62,10 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="背景颜色" style="display:none"> <el-form-item label="背景颜色" >
<el-color-picker v-model="data.backgroundColor"></el-color-picker>
</el-form-item>
<el-form-item label="字体颜色" >
<el-color-picker v-model="data.backgroundColor"></el-color-picker> <el-color-picker v-model="data.backgroundColor"></el-color-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
src/components/sallCenter/templateEdit.vue
View file @ 8dfa6d4e
...@@ -1250,6 +1250,7 @@ ...@@ -1250,6 +1250,7 @@
backgroundPicUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shopinfo.jpg', //背景图片 backgroundPicUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shopinfo.jpg', //背景图片
backgroundColor: '#ffffff', //背景颜色 backgroundColor: '#ffffff', //背景颜色
bottonImg:"",//按钮图片 bottonImg:"",//按钮图片
fontColor:"",//字体颜色
} }
}; };
this.dataList.push(shopInfoObj); this.dataList.push(shopInfoObj);
......
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