Commit e90d9907 by chenweisong

营销模块改bug

parent 5865daef
......@@ -8,7 +8,7 @@
<div class="fl selects-date" @click="changeModel(2)">
<selectDate :value="showSelectDateValue"></selectDate>
</div>
<div class="fr selects-stars" @click="collectFn">
<div v-if="public" class="fr selects-stars" @click="collectFn">
<img v-if="!isStar" class="stars" src="../../assets/app/star.png"/>
<img v-if="isStar" class="stars" src="../../assets/app/starYellow.png"/>
</div>
......@@ -21,6 +21,7 @@
</div>
<div v-if="showUpperLevel" @click="changeUpperLevel" class="upper-level">上一级</div>
<ModelArea
:public="public"
:userInfo="userInfo"
:initFlag="initFlag"
ref="areaRef"
......@@ -178,6 +179,7 @@
},
data() {
return {
public: true,
tabActive: REAL_TIME,
showUpperLevel: false,
isShowTable: false,
......@@ -455,7 +457,7 @@
async fetch() {
let res = null;
try {
res = await this.post(this.$urls.data483, {});
res = await this.post(this.public ? this.$urls.data483 : this.$urls.dataPublic483, {});
} catch (error) {
console.log("error :", error);
Indicator.close();
......@@ -496,14 +498,14 @@
let url = "";
let dateStr = "";
if (this.tabActive === MONTH) {
url = this.$urls.data485;
url = this.public ? this.$urls.data485 : this.$urls.dataPublic485;
dateStr = formatDateTimeReg(
new Date(this.mouthActiveDate),
"YYYY-MM-DD mm:ss"
);
} else {
// url = this.$urls.data481
url = this.$urls.data484;
url = this.public ? this.$urls.data484 : this.$urls.dataPublic484;
// dateStr = formatDateTimeReg(new Date(), "YYYY-MM-DD mm:ss");
dateStr = formatDateTimeReg(new Date(this.now), "YYYY-MM-DD mm:ss");
}
......@@ -846,7 +848,13 @@
this.selectArea.level = Number(this.userInfo.level) + 1;
this.selectArea.areaId = this.userInfo.aid;
this.selectArea.selectAreaName = this.userInfo.area;
this.isExistedCollect();
let origin = this.$route.query.origin;
if (origin && origin === "p0") {
this.public = false;
} else {
this.public = true;
this.isExistedCollect();
}
await this.fetch();
await this.getData();
}
......
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