Skip to content

M
marketing
Commit 5c1507ca by zhangmeng
Options

迭代2bug

parent 215bf44d
Showing with 256 additions and 194 deletions
config/index.js
......@@ -11,13 +11,13 @@ module.exports = {
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {
'/dmApi/':{
target:'http://gicdev.demogic.com/',
changeOrigin:true,
pathRewrite:{
'^/dmApi':''
}
}
// '/dmApi/':{
// target:'http://gicdev.demogic.com/',
// changeOrigin:true,
// pathRewrite:{
// '^/dmApi':''
// }
// }
},
// Various Dev Server settings
......
dist.zip
No preview for this file type
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.32ab4f80edc423c54d1cfab32b46a84d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.131eaee23561dd7a1016.js></script><script type=text/javascript src=/marketing/static/js/app.b19dd642d78bafb6f280.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.6e58334193fe4195f2bf858939dd6b36.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0b7daa8af8fb2f5148e.js></script><script type=text/javascript src=/marketing/static/js/app.0b5aa3efaab6ebeddb13.js></script></body></html>
\ No newline at end of file
dist/static/css/app.32ab4f80edc423c54d1cfab32b46a84d.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.6e58334193fe4195f2bf858939dd6b36.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/common.css
......@@ -159,8 +159,8 @@ li {
html,
body {
width: 100%;
min-height: 100%;
height: 100%;
/* min-height: 100%;
height: 100%; */
/*background-color: #ffffff;*/
background-color: #fff;
box-sizing: border-box;
......
dist/static/js/app.0b5aa3efaab6ebeddb13.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.b19dd642d78bafb6f280.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/index.scss
......@@ -129,14 +129,14 @@
width: 60px;
height: 60px;
border-radius: 4px;
margin-right:8px;
margin-right:4px;
display: inline-block;
}
.table__avatar--40{
width: 40px;
height: 40px;
border-radius: 4px;
margin-right:8px;
margin-right:4px;
display: inline-block;
}
......
src/assets/style/components/index.scss
......@@ -68,9 +68,9 @@
min-width: 95px;
}
.el-select-dropdown__wrap {
max-height: 310px!important;
}
// .el-select-dropdown__wrap {
// max-height: 310px!important;
// }
.dm-tabs {
.el-tabs__header {
......
src/assets/theme/index.css
......@@ -31813,8 +31813,8 @@
padding-left: 35px;
padding-right: 35px; }
.el-input-number.is-without-controls .el-input__inner {
padding-left: 15px;
padding-right: 15px; }
padding-left: 12px;
padding-right: 12px; }
.el-input-number.is-controls-right .el-input__inner {
padding-left: 15px;
padding-right: 42px; }
......@@ -42411,22 +42411,24 @@
color: #fcce72;
background-color: #fff7e8;
border-color: #feefd0; }
.el-button--danger {
color: #fff;
background-color: #f5222d;
border-color: #f5222d; }
.el-button--danger {
color: #F5222D;
background-color: #F5F7FA;
border-color: #DCDFE6;
}
.el-button--danger:hover, .el-button--danger:focus {
background: #f74e57;
border-color: #f74e57;
background: #F5222D;
border-color: #F5222D;
color: #fff; }
.el-button--danger:active {
background: #dd1f29;
border-color: #dd1f29;
background: #CF1322;
border-color: #CF1322;
color: #fff;
outline: none; }
.el-button--danger.is-active {
background: #dd1f29;
border-color: #dd1f29;
background: #CF1322;
border-color: #CF1322;
color: #fff; }
/* .el-button--danger.is-disabled, .el-button--danger.is-disabled:hover, .el-button--danger.is-disabled:focus, .el-button--danger.is-disabled:active {
color: #fff;
src/components/layout/index.vue
<template>
<div class="layout-container">
<div class="layout-container" :style="{height:bodyHeight+'px'}">
<vue-gic-header class="user-header-pop" style="z-index: 1999;" :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTagHandler" @toRouterView="toRouterView"></vue-gic-header>
<div class="layout">
<vue-gic-aside-menu class="layout-left" v-if="asideShow" :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag.sync="collapseFlag"></vue-gic-aside-menu>
......@@ -32,6 +32,7 @@
collapseFlag: false,
projectName: "marketing",
leftModulesName: '公众号配置',
bodyHeight:0
}
},
created(){
......@@ -39,6 +40,9 @@
this.leftMenuRouter = val
})
},
mounted(){
this.bodyHeight = document.body.clientHeight || document.documentElement.clientHeight;
},
destroyed() {
$bus.$off('aside-menu');
},
......@@ -184,13 +188,14 @@
overflow-y: auto;
position: relative;
top:-1px;
min-height: calc(100% - 200px);
&::-webkit-scrollbar {
display: none;
}
}
&-content {
// margin-top: 100px;
min-height: calc(100% - 200px);
// min-height: calc(100% - 200px);
min-width: 1400px;
&.asideShow{
min-width: 1200px;
......
src/components/member-info/index.vue
......@@ -2,7 +2,7 @@
<el-popover placement="top-start" width="400" height="180" trigger="hover" @show="getSingleInfo">
<div class="pointer" @click="linkDetail">
<div class="singelinfo">
<div class="singelinfo-img"><img width="100" height="100" :src="filterAvatar(row.imageUrl)" alt=""></div>
<div class="singelinfo-img"><img width="100" height="100" :src="filterAvatar(singleInfo.photoUrl)" alt=""></div>
<div class="singelinfo-content pl10 pr10">
<span class="lheigt">{{ singleInfo.memberName }}
<img :title="singleInfo.status == 0 ? '取消关注公众号' : singleInfo.status == 1 ? '已关注公众号' : '未关注公众号'" class="fr"
......
src/components/ueditorWrap/index.vue
......@@ -6,9 +6,9 @@
import {formateDateTimeByType} from '@/utils/index.js'
import config from '@/config'
let baseUrl = (window.location.protocol + '//' + window.location.host) || '';
if (config.api === '/dmApi/') {
baseUrl = 'http://gicdev.demogic.com/';
}
// if (config.api === '') {
// baseUrl = 'http://gicdev.demogic.com/';
// }
// 一个简单的事件订阅发布的实现,取代原始Event对象,提升IE下的兼容性
class LoadEvent {
constructor () {
......
src/config/index.js
const config = {
development: {
api: '/dmApi/'
// api: '/dmApi/'
api:'http://gicdev.demogic.com/'
},
production: {
// api: 'https://hope.demogic.com/',
api: (window.location.protocol + '//' + window.location.host +'/') || ''
}
}
......
src/test/component/dm-card/index.vue
<template>
<div class="attention-textAndImg-wrap">
<el-dialog
title="选择卡券"
:visible.sync="dialogCard"
width="800px"
:before-close="handleCardClose"
>
<el-dialog title="选择卡券" :visible.sync="dialogCard" width="800px" :before-close="handleCardClose">
<div>
<div class="text-img-search clearfix">
<span>选择卡券（共{{total}}条）</span>
......@@ -17,8 +12,7 @@
v-model="searchText"
@keyup.native="(value) => toSearchInput(value)" clearable @clear="clearInput">
</el-input>
<!-- <el-button class="search-btn" type="primary">查询</el-button> -->
<p class="limit-text">领取限制 < 100的卡券不支持选择，系统已自动过滤</p>
<p class="limit-text">{{ cardLimit | filterCardTips }}</p>
</div>
</div>
<div class="pic-list-box">
......@@ -80,7 +74,6 @@
</el-table>
<div class="pagination" v-if="total>0">
<el-pagination
@size-change="cardSizeChange"
@current-change="cardCurrentChange"
:current-page="cardCurrentPage"
small
......@@ -104,7 +97,29 @@
import qs from 'qs';
export default {
name: 'vue-gic-card',
props: ['showCardDialog','projectName','cardLimit', 'cardType','disabledList'],
props:{
disabledList:{
type:Array,
default:[],
},
showCardDialog:{
type:Boolean,
default:false,
},
projectName:{
type:String,
default:'',
},
cardLimit:{
type:[String,Number],
default:0,
},
cardType:{
type:[String,Number],
default:null,
}
},
data () {
return {
repProjectName: 'gic-web', // 项目名
......@@ -113,7 +128,6 @@
currentRow: null,
radio: null,
dialogCard: false,
cardCurrentPage: 1,
cardPageSize: 5,
total: 0,
......@@ -125,98 +139,71 @@
}
},
beforeMount() {
var that = this
var host = window.location.origin;
// console.log("当前host:",host)
console.log("当前host:",host)
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
this.baseUrl = 'http://gicdev.demogic.com';
}else {
that.baseUrl = host
this.baseUrl = host
}
},
methods:{
handleCurrentChangeTable(val) { // 当前格发生变化时触发
var that = this
// console.log("table: ",val);
if (!val.disabled) {
that.radio = val.coupCardId;
that.currentRow = val;
this.radio = val.coupCardId;
this.currentRow = val;
}
},
// 页码变化
cardSizeChange(val){ // 选择分页符
// console.log(`每页 ${val} 条`);
},
// 当前页变化
cardCurrentChange(val) {
console.log(`当前页: ${val}`);
var that = this;
that.cardCurrentPage = val;
that.getCardList();
this.cardCurrentPage = val;
this.getCardList();
},
// 设置接收参数
setNewData(cardFlag) {
var that = this;
that.dialogCard = cardFlag;
console.log("弹框是否显示: ",cardFlag)
this.dialogCard = cardFlag;
},
// 搜索输入
toSearchInput: function(value) {
var that = this;
console.log("搜索值: ",that.searchText,value)
// 搜索重置当前页 为 1
that.cardCurrentPage = 1;
that.getCardList();
toSearchInput(value) {
this.cardCurrentPage = 1;
this.getCardList();
},
// 清空输入
clearInput: function(e) {
var that = this;
console.log(e,that.searchText);
// 搜索重置当前页 为 1
that.cardCurrentPage = 1;
that.getCardList();
clearInput(e) {
this.cardCurrentPage = 1;
this.getCardList();
},
// 确认
dialogCardConfirm() {
var that = this;
if (!that.currentRow||!Object.keys(that.currentRow).length||!Object.values(that.currentRow).length) {
that.$message.error({
duration: 1000,
message: "请选择卡券"
})
if (!this.currentRow||!Object.keys(this.currentRow).length||!Object.values(this.currentRow).length) {
this.$message.error({duration: 1000,message: "请选择卡券"})
return;
}
that.$emit('selectCard',that.currentRow)
that.currentRow = {};
that.radio = null;
this.$emit('selectCard',this.currentRow)
this.currentRow = {};
this.radio = null;
},
handleCardClose() {
var that = this;
that.dialogCardcancel();
this.dialogCardcancel();
},
// 取消
dialogCardcancel() {
var that = this;
that.$confirm('确认关闭?', '', {
this.$confirm('确认关闭?', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: ''
}).then(() => {
console.log("点击确认")
that.currentRow = {};
that.radio = null;
that.$emit('selectCard')
this.currentRow = {};
this.radio = null;
this.$emit('selectCard')
}).catch(() => {
console.log("取消 取消关闭")
});
......@@ -224,57 +211,48 @@
// 获取卡券列表
getCardList() {
var that = this
var para = {
currentPage: that.cardCurrentPage,
pageSize: that.cardPageSize,
searchParam: that.searchText || '',
requestProject: that.repProjectName,
cardLimitType: that.cardLimitType,
cardTypes: that.cardTypes,
var param = {
currentPage: this.cardCurrentPage,
pageSize: this.cardPageSize,
searchParam: this.searchText || '',
requestProject: this.repProjectName,
cardLimitType: this.cardLimitType,
cardTypes: this.cardTypes,
}
that.axios.post(that.baseUrl+'/api-plug/get-coupon-list',qs.stringify(para))
this.axios.post(this.baseUrl+'/api-plug/get-coupon-list',qs.stringify(param))
.then((res) => {
console.log(res,res.data,res.data.errorCode)
var resData = res.data
if (resData.errorCode == 0) {
if (!!resData.result) {
if (!!resData.result.result) {
resData.result.result.forEach(function(ele,index){
resData.result.result.forEach((ele,index) => {
if (!!ele.beginDate) {
ele.beginDate = that.formatDate(ele.beginDate,'.')
ele.beginDate = this.formatDate(ele.beginDate,'.')
}
if (!!ele.endDate) {
ele.endDate = that.formatDate(ele.endDate,'.')
ele.endDate = this.formatDate(ele.endDate,'.')
}
console.log(ele)
ele.disabled = that.disabledList.indexOf(ele.coupCardId) >= 0;
ele.disabled = this.disabledList.indexOf(ele.coupCardId) >= 0;
})
that.cardData = resData.result.result
this.cardData = resData.result.result
}
that.total = resData.result.totalCount
this.total = resData.result.totalCount
}
return;
} else {
this.$message.error({duration: 1000,message: resData.message})
}
that.$message.error({
duration: 1000,
message: resData.message
})
})
.catch(function (error) {
console.log(error);
// that.toLogin()
that.$message.error({
duration: 1000,
.catch( (error) => {
this.$message.error({
duration: 10000,
message: error.message
})
});
},
formatDate(time,flag) {
var that = this
// (0-9)年月数字的显示
function formatDig(num) {
return num > 9 ? '' + num : '0' + num;
......@@ -303,19 +281,34 @@
/* 接收数据 */
mounted(){
console.log("传递的参数对象:",this.showCardDialog)
var that = this;
// 项目名
that.repProjectName = that.projectName || 'gic-web';
that.cardLimitType = that.cardLimit;
that.cardTypes = that.cardType;
that.getCardList()
that.setNewData(that.showCardDialog)
this.repProjectName = this.projectName || 'gic-web';
this.cardLimitType = this.cardLimit;
this.cardTypes = this.cardType;
this.getCardList()
this.setNewData(this.showCardDialog)
},
filters: {
filterCardTips(value) {
let result = '';
switch(value) {
case 1:
result = '限制领取1张的卡券,系统已自动过滤';
break;
case 2:
result = '限制领取1~100的卡券,系统已自动过滤';
break;
case 3:
result = '限制领取>=100的卡券,系统已自动过滤';
break;
case -1:
result = '卡券领取无限制';
break;
default:
result = '卡券领取无限制';
break;
}
return result;
}
}
}
</script>
......
src/test/component/dmStore/index.vue
......@@ -27,6 +27,11 @@ const leftList = [{label:'所有门店',value:0},
{label:'门店分组',value:4},
{label:'部分门店',value:5}
];
const typeList = [{label:'自营',value:'0'},
{label:'联营',value:'1'},
{label:'代理',value:'2'},
{label:'代销',value:'3'},
{label:'托管',value:'4'}];
export default {
name:'vue-gic-store-new',
props:{
......@@ -91,18 +96,46 @@ export default {
this.$emit('update:uuid',this.newUuid);
this.saveInit();
} else {
this.getStoreConfig();
}
},
//获取配置
getStoreConfig() {
return new Promise((resolve,reject) => {
let params = {
key:this.newUuid,
currentPage:1,
pageSize:20
}
this.axios.post(baseUrl + '/api-plug/get-store-widget-config?requestProject=gic-web',qs.stringify(params)).then(res => {
this.comList = res.data.result.config.result || [];
this.storeType = res.data.result.selectType || 0;
if (res.data.errorCode === 0) {
this.storeType = res.data.result.selectType || 0;
let list = res.data.result.config.result || [];
let computedList = [];
let name = '';
if (this.storeType === 1) {
list.map(v => {
typeList.map(w => {
if (v.id == w.value) {
computedList.push({id:v.id,name:w.label})
}
})
})
}
leftList.map(v => {
if (this.storeType === v.value) {
name = v.label;
}
})
resolve({list:this.storeType === 1?computedList:list,type:res.data.result.selectType || 0,name:name});
} else {
reject('接口错误');
}
}).catch(err => {
reject(err);
console.log(err)
})
}
})
},
// 保存
saveInit() {
......@@ -138,8 +171,6 @@ export default {
})
})
},
}
}
</script>
......
src/test/component/dmStore/store-card.vue
......@@ -3,7 +3,7 @@
<!-- 左边 -->
<div class="dm-store__left">
<div class="dm-store__state">
<el-select v-model="storeType" placeholder="请选择" class="w100" @change="selectStoreType">
<el-select v-model="storeType" placeholder="请选择" class="w100" @input="selectStoreType">
<el-option v-for="(v,i) in storeTypeOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<span class="fz13">{{computedLeftCount}}/{{leftTotal}}</span>
......@@ -54,10 +54,10 @@
<!-- 弹出框 -->
<el-dialog title="门店选择" :visible.sync="dialogVisible" width="400px" :before-close="handleClose">
<div style="margin:0 auto;position:relative;">
<option-type v-if="storeType === 1" :uuid="newUuid"></option-type>
<option-tags v-if="storeType === 2" :uuid="newUuid"></option-tags>
<option-area v-if="storeType === 3" :uuid="newUuid"></option-area>
<option-group v-if="storeType === 4" :uuid="newUuid"></option-group>
<option-type v-if="storeType === 1" :uuid="dialogUuid"></option-type>
<option-tags v-if="storeType === 2" :uuid="dialogUuid"></option-tags>
<option-area v-if="storeType === 3" :uuid="dialogUuid"></option-area>
<option-group v-if="storeType === 4" :uuid="dialogUuid"></option-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
......@@ -112,6 +112,7 @@ export default {
isAll:0, // 是 int 是否勾选全部 1是 0否
value:'', //否 string isAll=0时，必填，选中项id，多个逗号分隔
removeItems:'', //否 string isAll=1，取消选中项的id，多个逗号分隔
_key:'',
},
leftParams:{
searchParam:'',
......@@ -130,6 +131,7 @@ export default {
rightTotal:0,
leftTotal:0,
newUuid:uuidv1().replace(/-/g,''), // 生成uuid
dialogUuid:uuidv1().replace(/-/g,''),
dialogVisible:false,
leftMoreShow:false,
leftMoreLoading:false,
......@@ -231,7 +233,7 @@ export default {
return new Promise((resolve,reject) => {
this.rightMoreLoading = true;
let params = {
key:this.newUuid,
key:this.dialogUuid,
search:this.leftValue,
currentPage:this.leftParams.currentPage,
pageSize:this.leftParams.pageSize,
......@@ -323,8 +325,14 @@ export default {
// 左侧数据移动到右侧
saveToRight() {
this.saveParams.key = this.newUuid;
if (this.saveParams.isAll) {
if (this.storeType !== 0) {
this.saveParams._key = this.dialogUuid;
console.log(this.saveParams.key, this.saveParams._key)
}
this.saveParams.removeItems = this.leftList.filter(v => {
return this.leftCheckList.indexOf(v.storeId) < 0;
}).map(v => v.storeId).join(',');
......@@ -379,6 +387,7 @@ export default {
},
// 选择门店类型
selectStoreType() {
if (this.storeType) {
this.dialogVisible = true
} else {
......
src/test/component/member-info/index.vue
......@@ -30,7 +30,7 @@
</div>
<span slot="reference">
<a :href="'/member/#/wechatmemberDetail?memberId='+ row.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="filterAvatar(row.photoUrl)" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(row.photoUrl)" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{row.memberName || '--'}}</p>
<p class="table-name--ellipsis fz13">{{row.cardNum || '--'}}</p>
......@@ -43,7 +43,7 @@
<script>
const host = window.location.origin;
export const baseUrl = host.indexOf('localhost') !== -1 ? 'http://localhost:8888/dmApi/' : host
export const baseUrl = host.indexOf('localhost') !== -1 ? 'http://gicdev.demogic.com/' : host
import qs from 'qs';
export default {
name:'vue-gic-member-info',
......
src/test/example/card.vue
......@@ -2,6 +2,8 @@
<div>
<el-button type="primary" @click="showCard">点击弹窗</el-button>
<vue-gic-card :projectName="projectName" :disabledList="disabledList" :showCardDialog="showCardDialog" :cardLimit="cardLimit" :cardType="cardType" @selectCard="selectCard"></vue-gic-card>
数据：{{value}}
</div>
</template>
<script>
......@@ -17,21 +19,20 @@ import vueGicCard from '../component/dm-card'
showCardDialog: false,
cardLimit: 1, //卡券限制类型 1-限制领取1张的卡券 2- 限制领取 1~100的卡券 3-限制领取>=100 的卡券
cardType: null, //卡券类型集合（0：抵金券，1：折扣券，2：兑换券）null-为全部类型 逗号分隔
disabledList:['00000000645a09d40164686a901800c0','00000000645a09d40164686ffcf500ca']
disabledList:['00000000645a09d40164686a901800c0','00000000645a09d40164686ffcf500ca'],
value:{},
value1:''
}
},
methods: {
// 显示卡券弹窗
showCard() {
var that = this
that.showCardDialog = true;
this.showCardDialog = true;
},
// 子组件触发方法
selectCard(val) {
// 模拟检查数据
console.log(val)
var that = this
that.showCardDialog = false;
this.value = val;
this.showCardDialog = false;
}
},
};
......
src/test/example/store-new.vue
......@@ -3,6 +3,7 @@
<div style="margin:40px;">
<vue-gic-store-new class="inline-block" ref="storeNew" :options="options" :uuid.sync="uuid" :isAdd="isAdd"></vue-gic-store-new>
<el-button @click="isSaveFun" type="primary">检查是否保存</el-button> {{isSave}}
<el-button @click="getStoreConfig" type="primary">获取保存的数据</el-button> {{storeConfig}}
</div>
<div style="margin:40px;">
<vue-gic-store-card ref="storeCard" :uuid.sync="uuid"></vue-gic-store-card>
......@@ -28,7 +29,8 @@ import gicStoreCard from '../component/dmStore/store-card.vue'
options:[0,1,2,3,4,5],
isAdd:false,
isSave:false,
isEmpty:0
isEmpty:0,
storeConfig:{}
}
},
mounted() {
......@@ -41,10 +43,16 @@ import gicStoreCard from '../component/dmStore/store-card.vue'
this.isSave = res;
})
},
getStoreConfig() {
this.$refs.storeNew.getStoreConfig().then(data => {
this.storeConfig = data;
})
},
isStoreEmpty() {
this.$refs.storeCard.getRightList().then(res => {
this.$tips({type:'warning',message:res?'有数据':'没有数据'});
this.isEmpty = res;
this.$tips({type:'warning',message:res.length?'有数据':'没有数据'});
console.log(res)
this.isEmpty = res.length;
})
}
}
......
src/test/index.vue
......@@ -26,8 +26,8 @@
<el-dropdown>
<i class="el-icon-setting" style="margin-right: 15px"></i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>退出登录</el-dropdown-item>
<el-dropdown-item>重新登录</el-dropdown-item>
<el-dropdown-item><span @click="logout">退出登录</span></el-dropdown-item>
<el-dropdown-item><span @click="login">重新登录</span></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span>damogic</span>
......@@ -61,6 +61,19 @@
return {
tableData: Array(20).fill(item)
}
},
methods:{
login() {
this.axios.get('http://gicdev.demogic.com/api-auth/do-login?requestProject=gic-web&loginName=damogic&password=damo2018&eid=ff808081593917d90159398ec6340012').then(res => {
console.log(res);
if (res.data.errorCode === 0) {
this.$message({type:'success',message:'登录成功'});
}
})
},
logout() {
window.location.href = '/gic-web';
}
}
};
</script>
src/views/calllog/index.vue
......@@ -18,7 +18,7 @@
</el-table-column>
<el-table-column align="left" min-width="150" prop="clerkName" label="主叫">
<template slot-scope="scope">
<img class="vertical-middle table__avatar" :src="scope.row.clerkImage || defaultAvatar" width="60" height="60" alt="">
<img class="vertical-middle table__avatar--40" :src="scope.row.clerkImage || defaultAvatar" width="60" height="60" alt="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.clerkName|| '--'}}</p>
<p class="fz13 gray">{{scope.row.storeGroupName || '--'}}</p>
......@@ -27,7 +27,7 @@
</el-table-column>
<el-table-column align="left" min-width="150" prop="memberId" label="被叫(会员)">
<template slot-scope="scope">
<img class="vertical-middle table__avatar" :src="scope.row.photeUrl || defaultAvatar" width="60" height="60" alt="">
<img class="vertical-middle table__avatar--40" :src="scope.row.photeUrl || defaultAvatar" width="60" height="60" alt="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.name|| '--'}}</p>
<p class="fz13 gray">{{scope.row.phoneNumber || '--'}}</p>
......
src/views/card/cardInfo.js
......@@ -472,9 +472,9 @@ export default {
// 这里判断部分门店是否为空
if (card.storeMode) {
let length = await this.$refs.storeCard.getRightList();
console.log(length)
if (!length) {
let data = await this.$refs.storeCard.getRightList();
console.log(data.length)
if (!data.length) {
this.$tips({type:'warning',message:'部分门店不能为空'});
return;
}
......
src/views/card/check.vue
......@@ -18,7 +18,7 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="true" width="140" header-align="left" align="left" prop="memberId" label="会员信息">
<template slot-scope="scope">
<img class="vertical-middle table__avatar" :src="scope.row.thirdImgUrl || defaultAvatar" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="scope.row.thirdImgUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="fz13 gray">{{scope.row.cardNum || '--'}}</p>
......@@ -33,7 +33,7 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="true" width="140" header-align="left" align="left" prop="clerkId" label="导购姓名">
<template slot-scope="scope">
<img class="vertical-middle table__avatar" :src="scope.row.imageUrl || defaultAvatar" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="scope.row.imageUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.clerkName || '--'}}</p>
<p class="fz13 gray">{{scope.row.storeName || '--'}}</p>
......
src/views/card/record-get.vue
......@@ -9,7 +9,7 @@
<el-select class="dm-select pl10" v-model="listParams.cardStatus" placeholder="选择卡券状态" @change="search">
<el-option v-for="(item,index) in cardStatusOptions" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
<span class="vertical-middle">领取时间：</span><el-date-picker v-model="dateTime" @change="search" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<span class="vertical-middle">领取时间：</span><el-date-picker v-model="dateTime" :clearable="false" @change="search" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<span class="vertical-middle">核销时间：</span><el-date-picker v-model="dateTime2" @change="search" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<!-- 列表 -->
......@@ -27,7 +27,7 @@
<el-table-column :show-overflow-tooltip="true" min-width="140" header-align="left" align="left" :key="Math.random()" prop="clerkId" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="scope.row.thirdimgurl || defaultAvatar" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="scope.row.thirdimgurl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="gray">{{scope.row.phoneNum || '--'}}</p>
......
src/views/evaluation/newest.vue
......@@ -32,7 +32,7 @@
<p class="fz13 gray">订单号:{{scope.row.orderNumber}}</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" width="140" align="left" prop="storeName" label="门店">
<el-table-column :show-overflow-tooltip="false" :min-width="140" align="left" prop="storeName" label="门店">
<template slot-scope="scope">
<p>{{scope.row.storeName || '--'}}</p>
<p class="fz13 gray">{{scope.row.areaName || '--'}}</p>
......@@ -42,7 +42,7 @@
<el-table-column min-width="140" header-align="left" align="left" prop="clerkId" label="导购信息">
<template slot-scope="scope">
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar" :src="filterAvatar(scope.row.clerkImage)" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.clerkImage)" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.clerkName || '--'}}</p>
<p class="fz13 gray">{{scope.row.storeName || '--'}}</p>
......@@ -54,7 +54,7 @@
<el-table-column min-width="140" header-align="left" align="left" prop="memberId" label="会员信息">
<template slot-scope="scope">
<a class="ellipsis-100" :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="filterAvatar(scope.row.thirdImgUrl)" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.thirdImgUrl)" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="fz13 gray">{{scope.row.cardNum || '--'}}</p>
......@@ -63,7 +63,7 @@
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" min-width="90" align="left" prop="fwtd" label="服务/专业/门店">
<el-table-column :show-overflow-tooltip="false" min-width="120" align="left" prop="fwtd" label="服务/专业/门店">
<template slot-scope="scope">
{{scope.row.fwtd+'/'+scope.row.zycd+'/'+scope.row.mdhj}}
</template>
......
src/views/evaluation/problem.vue
......@@ -5,7 +5,7 @@
<p>{{form.createTimeStr}}</p>
</el-form-item>
<el-form-item label="会员信息">
<img class="vertical-middle table__avatar" width="60" height="60" :src="form.thirdImgUrl || defaultAvatar" alt="">
<img class="vertical-middle table__avatar--40" width="60" height="60" :src="form.thirdImgUrl || defaultAvatar" alt="">
<div class="inline-block vertical-middle">
<p class="line-height1">{{form.memberName || '--'}}</p>
<p class="gray fz13">{{form.thirdNickName || '--'}}</p>
......
src/views/evaluation/suggestion.vue
......@@ -25,7 +25,7 @@
<el-table-column :show-overflow-tooltip="true" min-width="200" header-align="left" align="left" :key="Math.random()" prop="memberId" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="scope.row.thirdImgUrl || defaultAvatar" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="scope.row.thirdImgUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="fz13 gray">{{scope.row.cardNum || '--'}}</p>
......
src/views/game/dzp/record.vue
......@@ -15,7 +15,7 @@
<template slot-scope="scope">
<div v-if="scope.row.memberDTO">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberDTO.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="scope.row.memberDTO.thirdImgUrl" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberDTO.thirdImgUrl" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberDTO.memberName || '--'}}</p>
</div>
......
src/views/game/ggk/record.vue
......@@ -15,7 +15,7 @@
<template slot-scope="scope">
<div v-if="scope.row.memberDTO">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberDTO.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="scope.row.memberDTO.thirdImgUrl" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberDTO.thirdImgUrl" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberDTO.memberName || '--'}}</p>
</div>
......
src/views/game/klfl/record.vue
......@@ -15,7 +15,7 @@
<el-table-column :min-width="150" align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar" width="60" height="60" :src="scope.row.imgUrl" alt="" srcset="">
<img class="vertical-middle table__avatar--40" width="60" height="60" :src="scope.row.imgUrl" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
</div>
......
src/views/game/ptyx/record.vue
......@@ -15,7 +15,7 @@
<el-table-column min-width="150" header-align="left" align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle table__avatar" :src="scope.row.memberPhotoUrl" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberPhotoUrl" alt="" srcset="">
<p class="inline-block vertical-middle">{{scope.row.memberName || '--'}}</p>
</a>
</template>
......
src/views/game/znm/record.vue
......@@ -14,7 +14,7 @@
<el-table-column align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle table__avatar" :src="scope.row.memberPhotoUrl" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberPhotoUrl" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="gray fz13">{{scope.row.memberNickName || '--'}}</p>
......@@ -38,7 +38,7 @@
<el-table-column align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle table__avatar" :src="scope.row.memberImage" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberImage" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="gray fz13">{{scope.row.memberNickName || '--'}}</p>
......
src/views/mall/coupon/exchange.vue
......@@ -37,7 +37,7 @@ import {formateDateTimeByType} from '@/utils/index.js';
{label:'流水号',prop:'definedCode',minWidth:'100',align:'left'},
{label:'会员信息',prop:'issuingQuantity',minWidth:'170',align:'left',formatter(row){
return `<a href="/member/#/wechatmemberDetail?memberId=${row.memberId}" target="_blank">
<img class="vertical-middle table__avatar" src="${row.photoUrl}" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" src="${row.photoUrl}" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">${row.memberName || '--'}</p>
<p class="table-name--ellipsis fz13">${row.cardNum || '--'}</p>
......
src/views/mall/coupon/list.vue
......@@ -7,7 +7,7 @@
<el-table-column label="商品" align="left" prop="timesStatus" min-width="140">
<template slot-scope="scope">
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar" :src="filterAvatar(scope.row.cardType)" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.cardType)" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proTitle || '--'}}</p>
<p class="fz13 gray">{{scope.row.proSubTitle || '--'}}</p>
......
src/views/mall/gift/exchange.vue
......@@ -55,7 +55,7 @@ import express from '../common/express';
{label:'会员信息',prop:'issuingQuantity',minWidth:'170',align:'left',formatter(row){
const photoUrl = row.photoUrl.match(/^http(s)?/) ? row.photoUrl : _vm.defaultAvatar;
return `<a href="/member/#/wechatmemberDetail?memberId=${row.memberId}" target="_blank">
<img class="vertical-middle table__avatar" src="${photoUrl}" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" src="${photoUrl}" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">${row.memberName || '--'}</p>
<p class="table-name--ellipsis fz13">${row.cardNum || '--'}</p>
......
src/views/mall/gift/list.vue
......@@ -32,7 +32,7 @@
<el-table-column label="礼品信息" align="left" prop="proName" min-width="140">
<template slot-scope="scope">
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar" :src="scope.row.mainImageUrl || defaultAvatar" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="scope.row.mainImageUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proName || '--'}}</p>
<p class="fz13 gray">{{scope.row.giftCategoryName || '--'}}</p>
......
src/views/mall/goods/list.vue
......@@ -16,7 +16,7 @@
<el-table-column label="礼品信息" align="left" prop="giftName" min-width="140">
<template slot-scope="scope">
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar" :src="scope.row.giftMainPic || defaultAvatar" width="60" height="60" />
<img class="vertical-middle table__avatar--40" :src="scope.row.giftMainPic || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.giftName || '--'}}</p>
<p class="fz13 gray">{{scope.row.giftCategoryName || '--'}}</p>
......@@ -41,7 +41,7 @@
<el-table-column label="会员信息" align="left" prop="changeType" min-width="180">
<template slot-scope="scope" >
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar" :src="scope.row.memberImgUrl || defaultAvatar" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberImgUrl || defaultAvatar" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="table-name--ellipsis fz13">{{scope.row.cardNum || '--'}}</p>
......
src/views/message/detail.vue
......@@ -44,7 +44,7 @@
<el-table-column min-width="150" align="left" label="会员信息">
<template slot-scope="scope">
<div class="sms-table_info">
<img class="table__avatar vertical-middle" :src="scope.row.thirdImgUrl" alt="" srcset="">
<img class="table__avatar--40 vertical-middle" :src="scope.row.thirdImgUrl" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName}}</p>
<p class="fz13 gray">{{scope.row.nickname}}</p>
......
static/css/common.css
......@@ -159,8 +159,8 @@ li {
html,
body {
width: 100%;
min-height: 100%;
height: 100%;
/* min-height: 100%;
height: 100%; */
/*background-color: #ffffff;*/
background-color: #fff;
box-sizing: border-box;
......
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