Merge branch 'dev'

src/components/v-tab-group-control/index.vue

@@ -20,7 +20,7 @@ export default {
     name: "v-tab-group",
     props: {
         value: {
-            type: Number,
+            type: [Number, String],
             default: 0
         },
         btns: {
@@ -28,7 +28,7 @@ export default {
             default: () => []
         },
         active: {
-            type: Number,
+            type: [Number,String],
             default: 0,
         }
     },

src/views/KeyMediaHome/spreadTOPbrands/index.vue

@@ -32,7 +32,7 @@ export default {
     },
     created() {
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
+        if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
             this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
             this.form.ilimitType = 2;
@@ -69,6 +69,7 @@ export default {
     width: 936px;
     height: 412px;
     border: 2px solid #0f2a4d;
+
     .stm-inner {
         width: 100%;
         height: calc(100% - 48px);

src/views/KeyMediaHome/spreadTOPmodels/index.vue

@@ -32,7 +32,7 @@ export default {
     },
     created() {
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
+        if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
             this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
             this.form.ilimitType = 2;
@@ -70,6 +70,7 @@ export default {
     height: 412px;
     border: 2px solid #0f2a4d;
     margin-left: 16px;
+
     .stm-inner {
         width: 100%;
         height: calc(100% - 48px);

src/views/KeyMediaHome/weiboCommunicationTrend/index.vue

@@ -59,7 +59,7 @@ export default {
     },
     created() {
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
+        if(this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
         this.form.ilimitType = 2;

src/views/KeyMediaHome/weiboCommunicationTrendLong/index.vue

@@ -61,7 +61,7 @@ export default {
     created() {
         this.form.token = this.getToken;
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
+        if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
             this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
             this.form.ilimitType = 2;
@@ -113,16 +113,19 @@ export default {
     width: 1887px;
     height: 460px;
     border: 2px solid #0f2a4d;
+
     .wct-inner {
         width: 100%;
         height: calc(100% - 48px);
     }
 }
+
 .vshow {
     position: absolute;
     width: 300px;
     background: rgb(3, 18, 36);
     border: 4px solid #0f2a4d;
+
     .vshow-item {
         padding: 11px;
         width: 100%;

src/views/KeyMediaHome/weiboContentTOPVolume/index.vue

@@ -40,7 +40,7 @@ export default {
   },
   created() {
     this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
+    if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
       this.form.ilimitType = 1;
     } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
       this.form.ilimitType = 2;
@@ -79,15 +79,18 @@ export default {
   margin-left: 16px;
   overflow: hidden;
 }
+
 .wct-inner {
   width: 100%;
   margin-top: 16px;
   height: calc(100% - 48px);
+
   .wct-d1 {
     position: relative;
     width: 233px;
     height: 206px;
     display: inline-block;
+
     .wct-d1-dd1 {
       position: absolute;
       padding: 0px 16px;
@@ -97,9 +100,11 @@ export default {
       justify-content: space-between;
       top: 140px;
       left: 0px;
+
       span {
         color: #d8d8d8;
         font-size: 12px;
+
         .ss1 {
           font-family: Bebas;
           font-size: 16px;