Skip to content

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

页面修改

parent 852c4c4f
Show 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 @@
<div v-show="scope.row.OpenIdState">{{scope.row.OpenId}}</div>
</template>
</el-table-column>
<el-table-column prop="Moblie" label="手机号">
<el-table-column prop="PostName" label="职位">
</el-table-column>
<el-table-column prop="MemberGradeName" label="会员类型">
</el-table-column>
......
src/components/UserMan/usersListEdit.vue
View file @ 8dfa6d4e
......@@ -26,6 +26,13 @@
</el-option>
</el-select>
</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-switch v-model="userInfo.Blacklist" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
......@@ -65,6 +72,7 @@
ContactWay: '',
Remark: '',
AliasName: '',
PostId: 0, //职位
},
val: '',
value: '',
......@@ -89,7 +97,7 @@
Moblie: ''
},
tableData: [],
options:[],
options: [],
};
},
created() {
......@@ -110,6 +118,7 @@
ContactWay: userInfo.ContactWay,
Remark: userInfo.Remark,
AliasName: userInfo.AliasName,
PostId: userInfo.PostId,
}
this.apipost("/api/user/SetMemberUserInfoForHT", this.addMsg, res => {
if (res.data.resultCode == 1) {
......@@ -135,9 +144,13 @@
}
})
},
getMemberGradeList(){
getMemberGradeList() {
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;
if (res.data.resultCode == 1) {
this.options = res.data.data
......@@ -172,6 +185,7 @@
}
};
</script>
<style>
.usersListEdit .tip {
......
src/components/mallIndex.vue
View file @ 8dfa6d4e
......@@ -251,7 +251,7 @@
text-align: center;
}
.UserInfoContent{
.UserInfoContent {
display: flex;
justify-content: flex-start;
}
......@@ -270,7 +270,7 @@
.nameList {
height: 32px;
line-height: 32px;
width:80%;
width: 80%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
......@@ -300,6 +300,11 @@
background-color: #3399ff;
}
.el-mallIndex_btmheader .el-radio__inner {
height: 14px !important;
line-height: 14px !important;
}
</style>
<template>
<div class="mallIndex" v-loading="loading">
......@@ -466,6 +471,11 @@
<div class="el-card">
<div class="el-mallIndex_btmheader">
<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>
</div>
<div class="table_Inner table2">
......@@ -545,6 +555,7 @@
EndDate: "", //结束时间
SalesTimeType: 0, //默认今日
OrderBy: '',
UserType: 0, //0-普通用户,1-领队导游
},
basicData: {}, //基础数据
salesData: {}, //销售数据
......@@ -578,7 +589,6 @@
else if (tab.name == "second") {
this.dateStr.push(this.$commonUtils.AddDay('', -30))
}
this.dateStr.push(this.$commonUtils.AddDay('', -0));
this.getChange();
},
......@@ -605,7 +615,7 @@
if (saleGoodsArray.length <= 2) {
this.saleIncomeData = saleGoodsArray;
} else {
this.saleIncomeData = saleGoodsArray.slice(0, 10);
this.saleIncomeData = saleGoodsArray.slice(0, 15);
}
}
//用户购买力TOP排行
......@@ -614,7 +624,7 @@
if (saleUserArray.length <= 2) {
this.saleUserData = saleUserArray;
} else {
this.saleUserData = saleUserArray.slice(0, 10);
this.saleUserData = saleUserArray.slice(0, 15);
}
}
this.initMap();
......@@ -681,19 +691,19 @@
var year = now.getFullYear(); //年
var month = now.getMonth() + 1; //月
var day = now.getDate(); //日
var nowDay = year+'-'+month+'-'+day;
var nowDay = year + '-' + month + '-' + day;
//昨日
now.setTime(now.getTime()-24*60*60*1000);
var yesDay = now.getFullYear()+"-" + (now.getMonth()+1) + "-" + now.getDate();
now.setTime(now.getTime() - 24 * 60 * 60 * 1000);
var yesDay = now.getFullYear() + "-" + (now.getMonth() + 1) + "-" + now.getDate();
if (this.salesData && this.salesData.subList && this.salesData.subList.length > 0) {
this.salesData.subList.forEach(item => {
if(this.activeSell=='today'){
xData.push(nowDay+' '+item.TimeStr+'时');
if (this.activeSell == 'today') {
xData.push(nowDay + ' ' + item.TimeStr + '时');
}
if(this.activeSell=='first'){
xData.push(yesDay+' '+item.TimeStr+'时');
if (this.activeSell == 'first') {
xData.push(yesDay + ' ' + item.TimeStr + '时');
}
xDataList.push(item.TimeStr);
orderArray.push(item.OrderCount);
......@@ -759,25 +769,25 @@
// color: "#999"
// },
// },
axisPointer:'none',
formatter:function(params){
axisPointer: 'none',
formatter: function (params) {
// var res=params[0].name;
var res=''
if(params.length>4){
for(var i=0;i<params.length;i++){
if(i==0){
if(params[i].data==0){
res+='<br/>'+params[i].name;
}else{
res+='<br/>'+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
var res = ''
if (params.length > 4) {
for (var i = 0; i < params.length; i++) {
if (i == 0) {
if (params[i].data == 0) {
res += '<br/>' + params[i].name;
} else {
res += '<br/>' + 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;
......
src/components/sallCenter/plugin/shopinfo.vue
View file @ 8dfa6d4e
......@@ -62,7 +62,10 @@
</div>
</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-form-item>
</el-form>
......
src/components/sallCenter/templateEdit.vue
View file @ 8dfa6d4e
......@@ -1250,6 +1250,7 @@
backgroundPicUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shopinfo.jpg', //背景图片
backgroundColor: '#ffffff', //背景颜色
bottonImg:"",//按钮图片
fontColor:"",//字体颜色
}
};
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