diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index b3c056a..fb87e07 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -92,7 +92,7 @@
-
+
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index d4edf1e..f533fed 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -27,8 +27,8 @@ class="streamer" /> -->
-
    -
  • +
      +
    • {{item.content}}
    @@ -98,17 +98,8 @@ key: 0, animate: false }); - const noticeList = [ - { - content: '苹果也疯狂!iPhone XR来到小米价,刷新售价底线' - }, { - content: '“5号电池一出”,充电宝没用了,所有手机通用,行千里不关机' - }, { - content: '小米10一出手就高配置,小米9难及十分之一,友商都汗颜' - }, { - content: 'iPhone XR2性能曝光,A13处理器+后置双摄' - } - ]; + + const noticeList = []; // 模拟异步数据加载 // setTimeout(() => { @@ -132,7 +123,9 @@ speed: 20, }); - const data = reactive({}); + const data = reactive({ + noticeList: [] + }); const adviceList = reactive([]); const boutiqueAttr = reactive({ columnNum: 4, @@ -186,9 +179,13 @@ queryEnforcementInspectionProgramListNoPermission({},success =>{ console.log(success) if(success.data.length > 4 ){ - for (let i = 0; i < 1; i++) { + for (let i = 0; i < 5; i++) { carouselList.push(success.data[i]); noticeObj.noticeList.push(success.data[i].planName) + var obj = { + content: success.data[i].planName + } + data.noticeList.push(obj) // noticeStr += success.data[i].planName + " "; // noticeStr += success.data[i].planName != null ?success.data[i].planName + "":""; } @@ -201,9 +198,14 @@ noticeObj.noticeList.push(success.data[i].planName); } noticeStr += success.data[0].planName != null ?success.data[0].planName + "":""; + var obj = { + content: success.data[i].planName + } + data.noticeList.push(obj) } freshMap.key = 1 console.log(carouselList); + console.log(data.noticeList); // timerObj.timer = setInterval(flushMessage, 4000); setNotificationMove(); },error =>{ @@ -261,7 +263,7 @@ isLoading.value = false; } }, error => { - + queryList(); }) // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber}, success => { // if (!(success.data == null && success.data.length == 0)) { @@ -321,8 +323,8 @@ const showNotice = () => { freshMap.animate = true setTimeout(() => { - noticeList.push(noticeList[0]) - noticeList.shift() + data.noticeList.push(data.noticeList[0]) + data.noticeList.shift() freshMap.animate = false }, 500) } diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue index bb9f7c3..314e141 100644 --- a/src/views/enterprise/complaintList.vue +++ b/src/views/enterprise/complaintList.vue @@ -100,6 +100,7 @@