dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.18

Browse Source
This commit is contained in:
xvv 2024-09-18 09:37:28 +08:00
parent 37ebf7fdbb
commit 1ee07bf869
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/components/map/mapComponent.vue
View File

@ -83,6 +83,7 @@ export default {
}) })
}, },
initAMap() { initAMap() {
console.log("86",this.pform)
let _this = this; let _this = this;
AMapLoader.load({ AMapLoader.load({
key: "b5abec514cab7c71cb0572765131e6fc", // 申请好的Web端开发者Key，首次调用 load 时必填 key: "b5abec514cab7c71cb0572765131e6fc", // 申请好的Web端开发者Key，首次调用 load 时必填
@ -113,6 +114,7 @@ export default {
this.setMapMarker(); this.setMapMarker();
}); });
}).catch(() => {}); }).catch(() => {});
}, },
// 标记点 // 标记点
setMapMarker() { setMapMarker() {

13
fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
View File

@ -46,13 +46,22 @@
<span v-if="scope.row.putType==3">积分兑换</span> <span v-if="scope.row.putType==3">积分兑换</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="优惠内容"></el-table-column> <el-table-column prop="createTime" label="优惠内容">
<template slot-scope="scope">
<span>{{ scope.row.remark }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="有效期"> <el-table-column prop="createTime" label="有效期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.effectiveDateStart }}~{{ scope.row.effectiveDateEnd }}</span> <span>{{ scope.row.effectiveDateStart }}~{{ scope.row.effectiveDateEnd }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="已领/投放数量"></el-table-column> <el-table-column prop="tfGetNum" label="已领/投放数量">
<template slot-scope="scope">
<span>{{ scope.row.tfGetNum || 0 }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="已核销"></el-table-column> <el-table-column prop="createTime" label="已核销"></el-table-column>
<el-table-column prop="status" label="状态"> <el-table-column prop="status" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">