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

Compare commits

base: dianliang:e0de005c1bc50fb274bf4014fad1b6d1d24147f1
Branches Tags
dianliang:main
dianliang:master
..
compare: dianliang:29780ec58320c7a7a8993ec5bf1a4434b595d380
Branches Tags
dianliang:main
dianliang:master

No commits in common. "e0de005c1bc50fb274bf4014fad1b6d1d24147f1" and "29780ec58320c7a7a8993ec5bf1a4434b595d380" have entirely different histories.
e0de005c1b ... 29780ec583

2 changed files with 2 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -83,7 +83,6 @@ 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 时必填
@ -114,7 +113,6 @@ export default {
this.setMapMarker(); this.setMapMarker();
}); });
}).catch(() => {}); }).catch(() => {});
}, },
// 标记点 // 标记点
setMapMarker() { setMapMarker() {

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

@ -46,22 +46,13 @@
<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 prop="createTime" label="优惠内容"></el-table-column>
<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="tfGetNum" label="已领/投放数量"> <el-table-column prop="createTime" label="已领/投放数量"></el-table-column>
<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">