Commit bddd3589 by shaojiawen

update: 接口

parent 952c3b3a
......@@ -16,7 +16,7 @@
<div style="width: 84px;">欢迎语内容:</div>
<div style="width: 555px;">{{ welcomeData.welcomeContent }}</div>
</div>
<div class="link-file-view">
<div class="link-file-view" v-if="welcomeData.welcomeMediaList.length > 0">
<div class="flexBoxContainer" v-for="(item, index) in welcomeData.welcomeMediaList" :key="index">
<div class="flexBox">
<svg-icon :iconname="iconType[item.mediaType]" size="16" style="margin-right: 13px;"> </svg-icon>
......
......@@ -171,10 +171,10 @@ export default {
// ]
// }
// };
resData.result.dateList.map(function(date) {
((resData.result || {}).dateList || []).map(function(date) {
date['新增人数'] = date.addNum;
});
that.overViewData = resData.result;
that.overViewData = resData.result || {};
return;
}
errMsg.errorMsg(resData);
......
......@@ -9,42 +9,43 @@
<el-table-column prop="" label="基本信息" show-overflow-tooltip min-width="210px" fixed>
<template slot-scope="scope">
<div class="flex">
<img class="image-40" :src="scope.row.memberImage ? scope.row.memberImage : '@/assets/user-default.svg'" />
<img v-if="scope.row.memberImage" class="image-40" :src="scope.row.memberImage" />
<img v-if="!scope.row.memberImage" class="image-40" src="@/assets/user-default.svg" />
<div class="p-l-10 line-20" style="width: calc(100% - 50px);">
<div class="flex text-ellipsis">
<span class="text-ellipsis">{{ scope.row.memberName }}</span>
<span class="color-909399 text-ellipsis">{{ scope.row.memberNick }}</span>
<span class="text-ellipsis">{{ scope.row.memberName || '--' }}</span>
<span class="color-909399 text-ellipsis">{{ scope.row.memberNick || '--' }}</span>
</div>
<p class="font-12">{{ scope.row.memberPhone }}</p>
<p class="font-12">{{ scope.row.memberPhone || '--' }}</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="" label="会员卡号" show-overflow-tooltip min-width="126px">
<template slot-scope="scope">
{{ scope.row.memberCardNo }}
{{ scope.row.memberCardNo || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="会员等级" show-overflow-tooltip min-width="86px">
<template slot-scope="scope">
{{ scope.row.memberGradeName }}
{{ scope.row.memberGradeName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="导购信息" show-overflow-tooltip min-width="128px">
<template slot-scope="scope">
<p class="line-20 text-ellipsis">{{ scope.row.clerkName }}</p>
<p class="color-606266 line-18 text-ellipsis font-12">{{ scope.row.clerkCode }}</p>
<p class="line-20 text-ellipsis">{{ scope.row.clerkName || '--' }}</p>
<p class="color-606266 line-18 text-ellipsis font-12">{{ scope.row.clerkCode || '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="" label="导购所属门店" show-overflow-tooltip min-width="185px">
<template slot-scope="scope">
<p class="line-20 text-ellipsis">{{ scope.row.storeName }}</p>
<p class="color-606266 line-18 text-ellipsis font-12">{{ scope.row.storeCode }}</p>
<p class="line-20 text-ellipsis">{{ scope.row.storeName || '--' }}</p>
<p class="color-606266 line-18 text-ellipsis font-12">{{ scope.row.storeCode || '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="" label="企微号" show-overflow-tooltip min-width="107px">
<template slot-scope="scope">
{{ scope.row.staffName }}
{{ scope.row.staffName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="添加时间" show-overflow-tooltip min-width="106px" sortable>
......@@ -55,7 +56,7 @@
</el-table-column>
<el-table-column prop="" label="标签" show-overflow-tooltip min-width="144px">
<template slot-scope="scope">
{{ scope.row.memberLabelName }}
{{ scope.row.memberLabelName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="关联类型" show-overflow-tooltip min-width="103px">
......@@ -65,7 +66,7 @@
</el-table-column>
<el-table-column prop="" label="关联信息" show-overflow-tooltip min-width="150px">
<template slot-scope="scope">
{{ scope.row.addChannel == 1 ? scope.row.linkName : scope.row.hmName }}
{{ scope.row.addChannel == 1 ? scope.row.linkName || '--' : scope.row.hmName || '--' }}
</template>
</el-table-column>
</el-table>
......@@ -78,7 +79,7 @@
<script>
import errMsg from '@/common/js/error';
// import { _debounce } from '@/common/js/public';
import { postRequest } from '@/api/api';
import { postJsonRequest } from '@/api/api';
export default {
name: 'actCodeRecord',
components: {},
......@@ -121,6 +122,7 @@ export default {
sortChange(column, prop, order) {
const that = this;
console.log(column.order);
that.currentPage = 1;
that.sortType = column.order == 'ascending' ? 'asc' : 'desc'; // 默认倒序
that.getTableList();
},
......@@ -156,14 +158,14 @@ export default {
hmId: that.$route.query.hmId,
createTimeOrder: that.sortType || ''
};
console.log(para);
postRequest('/haoban-manage3-web/hm/qrcode/wxUserAddLog/list', para)
// console.log(para);
postJsonRequest('/haoban-manage3-web/hm/qrcode/wxUserAddLog/list', para)
.then(res => {
let resData = res.data;
that.loading = false;
if (resData.errorCode == 1) {
that.tableData = resData.result.list || [];
that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
if (resData.code == 0) {
that.tableData = resData.result.result || [];
that.total = resData.result.totalCount || 0;
return;
}
errMsg.errorMsg(resData);
......
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