Skip to content

E
ElectricitySheep
Commit db880faf authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

1111

parent 1257af99
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 39 deletions
src/App.vue
View file @ db880faf
...@@ -12,6 +12,7 @@ export default { ...@@ -12,6 +12,7 @@ export default {
<style> <style>
@import "//at.alicdn.com/t/font_1769104_qg9btfnng5.css"; @import "//at.alicdn.com/t/font_1769104_qg9btfnng5.css";
@import "./assets/css/common.css";
html, html,
body { body {
margin: 0; margin: 0;
...@@ -21,6 +22,7 @@ body { ...@@ -21,6 +22,7 @@ body {
*{ *{
margin:0; margin:0;
padding:0; padding:0;
box-sizing: border-box;
} }
#app { #app {
height: 100%; height: 100%;
......
src/assets/css/common.css
View file @ db880faf
...@@ -32,5 +32,11 @@ ...@@ -32,5 +32,11 @@
background: #fff; background: #fff;
} }
.w100{ .w100{
width:100px; width:100px!important;
}
.el-icon-search{
cursor: pointer;
}
.el-table img{
cursor: pointer;
} }
src/components/UserMan/MembershipGrade.vue
View file @ db880faf
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<div class="searchInput"> <div class="searchInput">
<el-input style="display:inline-block;width:225px;height:30px" <el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入会员名称搜索" placeholder="请输入会员名称搜索"
v-model="value" v-model="msg.Name"
size="small" size="small"
clearable> clearable>
</el-input> </el-input>
<span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span> <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div> </div>
</div> </div>
<el-table <el-table
...@@ -22,51 +22,41 @@ ...@@ -22,51 +22,41 @@
border border
style="width: 100%;margin:20px 0"> style="width: 100%;margin:20px 0">
<el-table-column <el-table-column
prop="ID" prop="Id"
label="ID"> label="ID">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="Name"
width="280"
label="会员等级"> label="会员等级">
<template slot-scope="scope">
<div class="app-image" style="background-image: url('https://wx.qlogo.cn/mmopen/vi_32/HO8Q9ibH7UtSFzHs67f0MH6VWjftiboELYLBya5OxpZkHDlicLMq39gxRHS4NhOG1AUepQ13JdUyrT7eM52u6hAsg/132');
background-size: cover; background-position: center center; width: 50px; height: 50px; border-radius: 0%; float: left; margin-right: 8px;"></div>
<div flex="dir:left cross:center">易飞易&港中旅小李15351281772</div>
<img 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;">
<span>显示OpenId</span>
</button>
<div>ow_7I5dE_g9Fe1BuBPKdk8RNtEj0</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="会员名称"> label="会员名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="Discount"
label="折扣"> label="折扣">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="购买价格(元)"> label="购买价格(元)">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="blue">0</span> <span class="blue">{{scope.row.MemberBuyMoney}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="累计金额升级条件(元)"> label="累计金额升级条件(元)">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="blue">0</span> <span class="blue">{{scope.row.UpGradeMoney}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="启用状态"> label="启用状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="blue">0</span> <span v-if="scope.row.Enabled==1">是</span>
<span v-if="scope.row.Enabled==2">否</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -75,8 +65,8 @@ ...@@ -75,8 +65,8 @@
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<img style="width:32px;height:32px" src="../../assets/img/userman/edit.png" alt=""> <img style="width:32px;height:32px" src="../../assets/img/userman/edit.png" alt="">
<img style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/integral.png" alt=""> <img 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>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -98,12 +88,13 @@ ...@@ -98,12 +88,13 @@
dialogVisible:false, dialogVisible:false,
value:'', value:'',
options:[], options:[],
tableData:[ tableData:[],
{ID:'111'}
],
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:15, pageSize:15,
Grade:0,
Name:'',
Enabled:0,
}, },
total:0, total:0,
rules: { rules: {
...@@ -116,9 +107,21 @@ ...@@ -116,9 +107,21 @@
}; };
}, },
created() { created() {
this.getList();
}, },
methods: { methods: {
getList(){
this.loading=true;
this.apipost("/api/user/GetMemberGradePageList", 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;
}
})
},
goUrl(){ goUrl(){
this.$router.push({ this.$router.push({
name: 'setMember', name: 'setMember',
...@@ -131,9 +134,6 @@ ...@@ -131,9 +134,6 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
getList(){
},
}, },
mounted() { mounted() {
......
src/components/UserMan/setMember.vue
View file @ db880faf
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="会员图标" prop="name"> <el-form-item label="会员图标" prop="name">
<el-button size="small">选择文件</el-button> <el-button @click="openChangeDig" size="small">选择文件</el-button>
<div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div> <div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div>
</el-form-item> </el-form-item>
<el-form-item label="会员背景色" prop="name"> <el-form-item label="会员背景色" prop="name">
<el-button size="small">选择文件</el-button> <el-button @click="openChangeDig" size="small">选择文件</el-button>
<div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div> <div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div>
</el-form-item> </el-form-item>
<el-form-item label="累计金额自动升级"> <el-form-item label="累计金额自动升级">
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
width="180px" width="180px"
label="权益图标"> label="权益图标">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small">选择图片</el-button> <el-button @click="openChangeDig" size="small">选择图片</el-button>
<img style="margin-left: 10px;width:50px;height:50px" src="../../assets/img/default.png" alt=""> <img style="margin-left: 10px;width:50px;height:50px" src="../../assets/img/default.png" alt="">
</template> </template>
</el-table-column> </el-table-column>
...@@ -129,12 +129,81 @@ ...@@ -129,12 +129,81 @@
<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="dialogVisible = false">保存</el-button>
</div> </div>
<!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<el-row style="border: 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>
<div style="margin:20px 0">
<el-input v-model="val" style="width:90%;margin:0 5%" placeholder="请输入分类名称搜索" size="small"></el-input>
</div>
<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__view">
<li class="el-menu-item" style="padding-left: 10px;padding-right: 10px;">
<i class="el-icon-tickets"></i>
<span>全部</span>
</li>
<li v-for="item in 9" class="el-menu-item" style="padding-left: 10px;padding-right: 10px;">
<div flex="dir:left box:last">
<el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
<i class="el-icon-tickets"></i>
<span>羊肚菌</span>
</el-col>
<el-col class="blue" :span="6">
<span>编辑</span> | <span>删除</span>
</el-col>
</div>
</li>
</div>
</div>
</div>
</el-col>
<el-col :span="18">
<div style="margin-top: 10px;margin-left: 20px;" class="appendInput">
<el-input size="small" style="width:250px" placeholder="请输入内容" v-model="val">
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</div>
<div class="basefix app-attachment-list">
<div class="app-attachment-item app-attachment-upload">
<div class="app-upload" flex="main:center cross:center" style="width: 100px; height: 100px;">
<i class="el-icon-upload"></i>
<input type="file" accept="image/*" multiple="multiple" style="display: none;">
</div>
</div>
<el-tooltip class="item" effect="dark" content="Top Left 提示文字" placement="top-start">
<div 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;">
<div class="app-attachment-name">微信图片_20200422125658.jpg</div>
</div>
</el-tooltip>
</div>
<div>
<el-pagination style="text-align:right"
background
:current-page="currentPage4"
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next,jumper"
:total="total">
</el-pagination>
</div>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="changeState = false">选定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
currentPage4:3,
changeState:false,
val:'', val:'',
addMsg:{}, addMsg:{},
dialogVisible:false, dialogVisible:false,
...@@ -161,6 +230,9 @@ ...@@ -161,6 +230,9 @@
}, },
methods: { methods: {
openChangeDig(){
this.changeState=true;
},
goUrl(){ goUrl(){
this.$router.push({ this.$router.push({
name: 'MembershipGrade', name: 'MembershipGrade',
...@@ -185,6 +257,55 @@ ...@@ -185,6 +257,55 @@
</script> </script>
<style> <style>
.setMember .app-attachment-name {
color: #666666;
margin-top: 5px;
font-size: 13px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.setMember .app-attachment-item .app-attachment-img {
display: block;
}
.setMember .app-attachment-upload i {
font-size: 30px;
color: #909399;
}
.setMember .app-attachment-item {
display: inline-block;
cursor: pointer;
position: relative;
float: left;
width: 120px;
height: 140px;
margin: 7.5px;
text-align: center;
padding: 10px 10px 0;
}
.setMember .app-attachment-upload {
box-shadow: none;
border: 1px dashed #b2b6bd;
height: 100px;
width: 100px;
margin: 17.5px;
padding: 0;
}
.setMember .app-attachment-list{
padding: 5px;
}
.setMember .appendInput .el-input__inner{
border-right: none;
}
.setMember .appendInput .el-input-group__append{
background-color: #fff!important;
border-left: none;
padding: 0 15px;
}
.setMember .setTable .el-table__body .cell{ .setMember .setTable .el-table__body .cell{
display: flex; display: flex;
align-items: center; align-items: center;
......
src/components/UserMan/usersList.vue
View file @ db880faf
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
</div> </div>
<div class="content"> <div class="content">
<div> <div>
<el-select class="w100" style="margin-right: 10px;" v-model="msg.MemberGrade" size="small" placeholder="请选择"> <el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.MemberGrade" size="small" placeholder="请选择">
<el-option label="全部会员" :value="0"></el-option> <el-option label="全部会员" :value="0"></el-option>
<el-option <el-option
v-for="item in options" v-for="item in memberGradeList"
:key="item.value" :key="item.Id"
:label="item.label" :label="item.Name"
:value="item.value"> :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<el-select class="w100" style="margin-right: 10px;" v-model="msg.Source" size="small" placeholder="请选择"> <el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.Source" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option> <el-option label="全部平台" :value="0"></el-option>
<el-option <el-option
v-for="item in platList" v-for="item in platList"
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
}, },
total:0, total:0,
platList:[], platList:[],
memberGradeList:[],
}; };
}, },
...@@ -199,6 +200,7 @@ ...@@ -199,6 +200,7 @@
this.getList(); this.getList();
this.getplat(); this.getplat();
this.getDown(); this.getDown();
this.GetMemberGradeList();
}, },
methods: { methods: {
Export(){ Export(){
...@@ -240,6 +242,16 @@ ...@@ -240,6 +242,16 @@
}) })
}, },
GetMemberGradeList(){
let msg={
Grade:0,
Name:'',
Enabled:0,
};
this.apipost("/api/user/GetMemberGradeList",{msg}, res => {
this.memberGradeList=res.data.data;
})
},
getplat(){ getplat(){
this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => { this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
this.platList=res.data.data; this.platList=res.data.data;
......
src/plug/index.js
View file @ db880faf
...@@ -137,7 +137,11 @@ export default { ...@@ -137,7 +137,11 @@ export default {
var index = filename.lastIndexOf("."); var index = filename.lastIndexOf(".");
var suffix = filename.substr(index); var suffix = filename.substr(index);
var timestamp1 = Date.parse(new Date()); var timestamp1 = Date.parse(new Date());
var newFileName = '/Upload/' + path +"/"+ timestamp1 + "" + suffix; let str='';
if(this.isOnline()){
str="/Test"
}
var newFileName =str +'/Upload/' + path +"/"+ timestamp1 + "" + suffix;
var uploadMsg = { var uploadMsg = {
Bucket: "viitto-1301420277", Bucket: "viitto-1301420277",
Region: "ap-chengdu", Region: "ap-chengdu",
......
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