Commit 5093f373 authored by 黄奎's avatar 黄奎

页面修改

parent a689cf1b
This diff is collapsed.
...@@ -378,7 +378,6 @@ export default { ...@@ -378,7 +378,6 @@ export default {
getOrderStatus(){ getOrderStatus(){
this.apipost("/api/order/GetOrderStatusEnumList",{}, res => { this.apipost("/api/order/GetOrderStatusEnumList",{}, res => {
this.orderStatusList=res.data.data; this.orderStatusList=res.data.data;
console.log("this.orderStatusList",this.orderStatusList)
}) })
}, },
getDelivery(){ getDelivery(){
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<template> <template>
<div class="setMember usersList usersListEdit"> <div class="setMember usersList usersListEdit">
<div class="head-title"> <div class="head-title">
...@@ -12,31 +11,20 @@ ...@@ -12,31 +11,20 @@
<el-form-item label="会员等级"> <el-form-item label="会员等级">
<el-select style="width:293px;" size="small" v-model="userInfo.MemberGrade" placeholder="请选择活动区域"> <el-select style="width:293px;" size="small" v-model="userInfo.MemberGrade" placeholder="请选择活动区域">
<el-option label="普通用户" :value="0"></el-option> <el-option label="普通用户" :value="0"></el-option>
<el-option <el-option v-for="(item,index) in 100" :key="index" :label="`等级${index+1}`" :value="index+1">
v-for="(item,index) in 100"
:key="index"
:label="`等级${index+1}`"
:value="index+1">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上级"> <el-form-item label="上级">
<el-select size="small" v-model="userInfo.SuperiorId" :filter-method="ChangeListName" filterable placeholder="请选择"> <el-select size="small" v-model="userInfo.SuperiorId" :filter-method="ChangeListName" filterable
placeholder="请选择">
<el-option label="总部" :value="0"></el-option> <el-option label="总部" :value="0"></el-option>
<el-option <el-option v-for="item in tableData" :key="item.Id" :label="item.Name" :value="item.Id">
v-for="item in tableData"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="加入黑名单"> <el-form-item label="加入黑名单">
<el-switch <el-switch v-model="userInfo.Blacklist" active-color="#409EFF" :active-value="1" :inactive-value="0">
v-model="userInfo.Blacklist"
active-color="#409EFF"
:active-value="1"
:inactive-value="0">
</el-switch> </el-switch>
<span class="tip">加入黑名单后,用户将无法下单</span> <span class="tip">加入黑名单后,用户将无法下单</span>
</el-form-item> </el-form-item>
...@@ -67,92 +55,88 @@ ...@@ -67,92 +55,88 @@
export default { export default {
data() { data() {
return { return {
addMsg:{ addMsg: {
Id:'', Id: '',
SuperiorId:'', SuperiorId: '',
MemberGrade:'', MemberGrade: '',
ContactWay:'', ContactWay: '',
Remark:'', Remark: '',
AliasName:'', AliasName: '',
}, },
val:'', val: '',
value:'', value: '',
total:0, total: 0,
rules: { rules: {
name: [ name: [{
{ required: true, message: '新手机号', trigger: 'blur' } required: true,
], message: '新手机号',
trigger: 'blur'
}],
}, },
restaurants: [], restaurants: [],
UserId:'', UserId: '',
userInfo:{}, userInfo: {},
msg:{ msg: {
pageIndex:1, pageIndex: 1,
pageSize:20, pageSize: 20,
Name:'', Name: '',
Source:0, Source: 0,
MemberGrade:0, MemberGrade: 0,
Id:0, Id: 0,
Moblie:'' Moblie: ''
}, },
tableData:[], tableData: [],
}; };
}, },
created() { created() {
if(this.$route.query.UserId){ if (this.$route.query.UserId) {
this.UserId=this.$route.query.UserId; this.UserId = this.$route.query.UserId;
this.getData() this.getData()
this.getList(); this.getList();
} }
}, },
methods: { methods: {
Save(){ Save() {
let userInfo=this.userInfo; let userInfo = this.userInfo;
this.addMsg={ this.addMsg = {
Id:userInfo.Id, Id: userInfo.Id,
SuperiorId:userInfo.SuperiorId, SuperiorId: userInfo.SuperiorId,
MemberGrade:userInfo.MemberGrade, MemberGrade: userInfo.MemberGrade,
ContactWay:userInfo.ContactWay, ContactWay: userInfo.ContactWay,
Remark:userInfo.Remark, Remark: userInfo.Remark,
AliasName:userInfo.AliasName, AliasName: userInfo.AliasName,
} }
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) {
this.goUrl(); this.goUrl();
}else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}) })
}, },
handleSelect(item) { handleSelect(item) {},
console.log(item); ChangeListName(val) {
}, this.msg.Name = val;
ChangeListName(val){
this.msg.Name=val;
this.getList(); this.getList();
}, },
getList(){ getList() {
this.loading=true; this.loading = true;
this.apipost("/api/user/GetMemberUserDropDownList", this.msg, res => { this.apipost("/api/user/GetMemberUserDropDownList", this.msg, res => {
this.loading=false; this.loading = false;
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.total=res.data.data.count; this.total = res.data.data.count;
let pageData=res.data.data.pageData; let pageData = res.data.data.pageData;
this.tableData=pageData; this.tableData = pageData;
} }
}) })
}, },
querySearch(queryString, cb) { querySearch(queryString, cb) {
}, },
openChangeDig(){ openChangeDig() {
this.changeState=true; this.changeState = true;
}, },
goUrl(){ goUrl() {
this.$router.push({ this.$router.push({
name: 'usersList', name: 'usersList',
query: { query: {
...@@ -160,22 +144,21 @@ ...@@ -160,22 +144,21 @@
} }
}); });
}, },
getData() {
getData(){ this.apipost("/api/user/GetMemberUserInfo", {
this.apipost("/api/user/GetMemberUserInfo",{UserId:this.UserId}, res => { UserId: this.UserId
this.userInfo=res.data.data; }, res => {
this.userInfo = res.data.data;
}) })
}, },
}, },
mounted() { mounted() {
} }
}; };
</script> </script>
<style> <style>
.usersListEdit .tip { .usersListEdit .tip {
margin-left: 10px; margin-left: 10px;
display: inline-block; display: inline-block;
height: 30px; height: 30px;
...@@ -184,39 +167,51 @@ ...@@ -184,39 +167,51 @@
background-color: #FEF0F0; background-color: #FEF0F0;
padding: 0 20px; padding: 0 20px;
border-radius: 5px; border-radius: 5px;
} }
.usersListEdit .app-image{
background-size: cover; background-position: center center; width: 80px; height: 80px; border-radius: 0%; .usersListEdit .app-image {
} background-size: cover;
.setMember .setTable .el-table__body .cell{ background-position: center center;
width: 80px;
height: 80px;
border-radius: 0%;
}
.setMember .setTable .el-table__body .cell {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.setMember .commonLabel .el-form-item__label{
.setMember .commonLabel .el-form-item__label {
margin-top: -4px; margin-top: -4px;
} }
.setMember .discount .el-form-item__label{
.setMember .discount .el-form-item__label {
padding-right: 30px; padding-right: 30px;
margin-top: -4px; margin-top: -4px;
} }
.setMember .el-form-item .elzk{
.setMember .el-form-item .elzk {
position: absolute; position: absolute;
left: -25px; left: -25px;
top:8px; top: 8px;
} }
.setMember .el-form-item{
.setMember .el-form-item {
position: relative; position: relative;
} }
.usersList .blue{
color:#409EFF; .usersList .blue {
color: #409EFF;
} }
.usersList .content{
.usersList .content {
background: #fff; background: #fff;
margin-top:10px; margin-top: 10px;
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
</style> </style>
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
console.log(this.dataList,'datalist');
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
getList() { getList() {
this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => { this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'res');
this.total=res.data.data.count; this.total=res.data.data.count;
this.dataList=res.data.data.pageData; this.dataList=res.data.data.pageData;
} else { } else {
......
This diff is collapsed.
This diff is collapsed.
...@@ -173,7 +173,6 @@ ...@@ -173,7 +173,6 @@
this.UserList[i].Id = this.UserList[i].UserId this.UserList[i].Id = this.UserList[i].UserId
} }
} }
console.log(this.UserList)
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
......
...@@ -382,7 +382,6 @@ ...@@ -382,7 +382,6 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr, 'ddd');
this.data.list = this.data.list.concat(ckedArr); this.data.list = this.data.list.concat(ckedArr);
this.isShowGoods = false; this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection(); this.$refs.choiceGood.toggleSelection();
...@@ -469,7 +468,6 @@ ...@@ -469,7 +468,6 @@
} }
}, },
cButtonStyle() { cButtonStyle() {
console.log(this.data.buyBtnStyle);
let style = let style =
`background: ${this.data.buttonColor};border-color: ${this.data.buttonColor};height:48px;line-height:50px;padding: 0 20px;`; `background: ${this.data.buttonColor};border-color: ${this.data.buttonColor};height:48px;line-height:50px;padding: 0 20px;`;
if (this.data.buyBtnStyle === 3 || this.data.buyBtnStyle === 4) { if (this.data.buyBtnStyle === 3 || this.data.buyBtnStyle === 4) {
......
...@@ -374,7 +374,6 @@ ...@@ -374,7 +374,6 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr, 'ddd');
this.data.list = this.data.list.concat(ckedArr); this.data.list = this.data.list.concat(ckedArr);
this.isShowGoods = false; this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection(); this.$refs.choiceGood.toggleSelection();
......
...@@ -354,7 +354,6 @@ ...@@ -354,7 +354,6 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr, 'ddd');
this.data.list = this.data.list.concat(ckedArr); this.data.list = this.data.list.concat(ckedArr);
this.isShowGoods = false; this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection(); this.$refs.choiceGood.toggleSelection();
......
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
this.$emit('comDelPlugin', this.index); this.$emit('comDelPlugin', this.index);
}, },
showGoodsChange(e) { showGoodsChange(e) {
console.log(e)
} }
}, },
computed: { computed: {
......
...@@ -413,7 +413,6 @@ ...@@ -413,7 +413,6 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr, 'ddd');
this.data.list = this.data.list.concat(ckedArr); this.data.list = this.data.list.concat(ckedArr);
this.isShowGoods = false; this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection(); this.$refs.choiceGood.toggleSelection();
......
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
this.$emit('comDelPlugin', this.index); this.$emit('comDelPlugin', this.index);
}, },
showGoodsChange(e) { showGoodsChange(e) {
console.log(e)
} }
}, },
computed: { computed: {
......
...@@ -358,7 +358,6 @@ ...@@ -358,7 +358,6 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr, 'ddd');
this.data.list = this.data.list.concat(ckedArr); this.data.list = this.data.list.concat(ckedArr);
this.isShowGoods = false; this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection(); this.$refs.choiceGood.toggleSelection();
......
...@@ -335,7 +335,6 @@ ...@@ -335,7 +335,6 @@
//选择商品 //选择商品
getGoodsChoice(){ getGoodsChoice(){
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr,'ddd');
this.data.list=this.data.list.concat(ckedArr); this.data.list=this.data.list.concat(ckedArr);
this.isShowGoods=false; this.isShowGoods=false;
this.$refs.choiceGood.toggleSelection(); this.$refs.choiceGood.toggleSelection();
......
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
this.apipost("/api/Tenant/GetPlugInList", {}, res => { this.apipost("/api/Tenant/GetPlugInList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.allComponents = res.data.data; this.allComponents = res.data.data;
console.log(this.allComponents, 'allcom');
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
...@@ -1257,7 +1257,6 @@ ...@@ -1257,7 +1257,6 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var jsonData = res.data.data; var jsonData = res.data.data;
console.log("jsonData", jsonData);
this.addMsg.Id = jsonData.Id; this.addMsg.Id = jsonData.Id;
this.addMsg.TemplateName = jsonData.TemplateName; this.addMsg.TemplateName = jsonData.TemplateName;
this.addMsg.ComponentDataList = jsonData.ComponentDataList; this.addMsg.ComponentDataList = jsonData.ComponentDataList;
......
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
this.apipost("/api/Template/GetMiniTemplatePageList", this.qMsg, res => { this.apipost("/api/Template/GetMiniTemplatePageList", this.qMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log("this.dataList",this.dataList);
this.total = res.data.data.count; this.total = res.data.data.count;
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
......
...@@ -1036,7 +1036,7 @@ ...@@ -1036,7 +1036,7 @@
}, },
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
// console.log(tab, event);
}, },
handleClick2(tab, event){ handleClick2(tab, event){
...@@ -1048,7 +1048,6 @@ ...@@ -1048,7 +1048,6 @@
this.apipost("/api/MallBase/GetMallBaseInfo", {}, res => { this.apipost("/api/MallBase/GetMallBaseInfo", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg = res.data.data; this.msg = res.data.data;
// this.checkbox.PayWay= this.msg.PayWay.split(',');
this.checkbox.PayWay= this.checkboxfor(this.msg.PayWay) this.checkbox.PayWay= this.checkboxfor(this.msg.PayWay)
this.checkbox.DeliverWay= this.checkboxfor(this.msg.DeliverWay); this.checkbox.DeliverWay= this.checkboxfor(this.msg.DeliverWay);
this.checkbox.ConsultWay= this.checkboxfor(this.msg.ConsultWay); this.checkbox.ConsultWay= this.checkboxfor(this.msg.ConsultWay);
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
}, },
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
// console.log(tab, event);
}, },
AddRule(){ AddRule(){
this.$router.push('/addFreightRule'); this.$router.push('/addFreightRule');
......
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