首页样式调整

api/api.js

@@ -353,8 +353,13 @@ const install = (Vue, vm) => {
         authorizations: true,
         isparams: false
     })
+    // 通知公告/
+    let getNoticeList = (params) => http.get('/blade-desk/notice/list', params, {
+        authorizations: true,
+        isparams: false
+    })
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
-    vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd};
+    vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd,getNoticeList};
 }
 
 export default {

manifest.json

@@ -53,7 +53,10 @@
             "sdkConfigs" : {
                 "ad" : {},
                 "push" : {
-                    "unipush" : {}
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false
+                    }
                 },
                 "maps" : {
                     "amap" : {

pages/home/components/eacharts.vue

@@ -1,31 +1,9 @@
 <template>
   <view class="eacharts-box">
-    <view class="eacharts-time">
-      <!-- <u-form :model="form" ref="uForm">
-        <u-form-item label="选择时间:" label-width="140" :border-bottom="false">
-          <u-input v-model="form.searchTime" type="select" @click="calendarShow = true" :border="true"
-            placeholder="请选择时间" />
-        </u-form-item>
-      </u-form> -->
-      <u-calendar v-model="calendarShow" :mode="mode" @change="change"></u-calendar>
-    </view>
     <!-- eacharts 图表 -->
-    <view class="echarts" v-if="type == 'maintenanceStatistics'">
+    <view class="echarts" >
       <l-echart ref="chartRef" :key="Math.random()"></l-echart>
     </view>
-
-    <!-- 饼状图 -->
-    <view class="echartsPie" v-if="type == 'maintenanceStatisticsPie'">
-      <view class="pie-item">
-        <view style="height:308rpx"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
-        <text class="pie-title">故障现象分类</text>
-      </view>
-      <view class="pie-item">
-        <view style="height:308rpx"><l-echart ref="chartRefPieRight" :key="Math.random()"></l-echart></view>
-        <text class="pie-title">设备分类</text>
-      </view>
-    </view>
-
   </view>
 </template>
 <script>
@@ -53,17 +31,7 @@ export default {
     };
   },
   mounted() {
-
+    this.upkeepStat()
-    // 维修统计
-    if (this.type == "maintenanceStatistics") {
-      this.upkeepStat()
-
-
-    }
-    if (this.type == "maintenanceStatisticsPie") {
-      this.pieStat()
-
-    }
   },
   methods: {
     // 维修统计
@@ -72,12 +40,6 @@ export default {
         startTime: this.form.startTime,
         endTime: this.form.endTime,
       }
-      // if(this.form.startTime!=''){
-      //   query_.startTime=this.form.startTime
-      // }
-      // if(this.form.endTime!=''){
-      //   query_.endTime=this.form.endTime
-      // }
       this.$u.api.upkeepStat(query_).then(res => {
         if (res.code == 200) {
           this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
@@ -85,36 +47,6 @@ export default {
         }
       })
     },
-    // 饼图数据
-    pieStat() {
-      let query_ = {
-        startTime: this.form.startTime,
-        endTime: this.form.endTime,
-      }
-      this.$u.api.pieStat(query_).then(res => {
-        if (res.code == 200) {
-          this.pieInfo = res.data
-          this.maintenancePieLeftInit();
-          this.maintenancePieRightInit();
-        }
-      })
-    },
-    selectFun() {
-      this.calendarShow = true;
-    },
-    change(e) {
-      this.form.startTime = e.startDate;
-      this.form.endTime = e.endDate;
-      this.form.searchTime = e.startDate + "-" + e.endDate;
-      if (this.type == "maintenanceStatistics") {
-        this.upkeepStat()
-      }
-      if (this.type == "maintenanceStatisticsPie") {
-        this.pieStat()
-      }
-
-      // 查询数据
-    },
     // 维修统计柱状图
     maintenanceInit() {
       let opts = {
@@ -174,147 +106,22 @@ export default {
         return chart;
       });
     },
-    // 故障现象分类
-    maintenancePieLeftInit() {
-      let opts = {
-        series: [
-          {
-            name: "",
-            type: "pie",
-            radius: ['40%', '70%'],
-            label: {
-              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
-              normal: {
-                show: true,
-                fontSize: 8, // 是否显示标签[ default: false ]
-                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
-                formatter: "{b}\n {c}", // 标签内容
-                color: '#000'
-              },
-            },
-
-            data: this.pieInfo.fault,
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 1)",
-              },
-            },
-            labelLine: {
-              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
-              normal: {
-                show: true, // 是否显示视觉引导线。
-                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
-                length2: 5,
 
-                // 视觉引导项第二段的长度。
-                lineStyle: {
-                  // 视觉引导线的样式
-                  type: "solid",
-                },
-              },
-            },
-          },
-        ],
-      };
-      this.$refs.chartRefPieLeft.init((config) => {
-        const { canvas } = config;
-        const chart = echarts.init(canvas, null, config);
-        chart.setOption(opts);
-        // 需要把 chart 返回
-        return chart;
-      });
-    },
-    maintenancePieRightInit() {
-      let opts = {
-        series: [
-          {
-            type: "pie",
-            radius: ['40%', '70%'],
-            label: {
-              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
-              normal: {
-                show: true,
-                fontSize: 8, // 是否显示标签[ default: false ]
-                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
-                formatter: "{b}\n {c}", // 标签内容
-                color: '#000'
-              },
-            },
-            data: this.pieInfo.device,
-            labelLine: {
-              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
-              normal: {
-                show: true, // 是否显示视觉引导线。
-                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
-                length2: 5,
-                // 视觉引导项第二段的长度。
-                lineStyle: {
-                  // 视觉引导线的样式
-                  type: "solid",
-                },
-              },
-            },
-          },
-        ],
-      };
-      this.$refs.chartRefPieRight.init((config) => {
-        const { canvas } = config;
-        const chart = echarts.init(canvas, null, config);
-        chart.setOption(opts);
-        // 需要把 chart 返回
-        return chart;
-      });
-    },
   },
 };
 </script>
 <style lang="scss" scoped>
 .eacharts-box {
   background: #fff;
-  margin: 0 40rpx 32rpx;
+  margin: 0 32rpx 32rpx;
   border-radius: 20rpx;
   overflow: hidden;
-
+  height: 368rpx;
-  .eacharts-time {
-    margin: 0 136rpx 0 24rpx;
-    display: flex;
-    flex-direction: row;
-
-    text {
-      line-height: 60rpx;
-      color: rgba(16, 16, 16, 1);
-      font-size: 28rpx;
-      margin-top: 30rpx;
-      margin-right: 10rpx;
-    }
-  }
-
   .echarts {
     width: calc(100% - 64rpx);
-    height: 308rpx;
+    height: 328rpx;
-    margin: 0 auto 20rpx;
+    margin:30rpx auto 20rpx;
-  }
+    overflow: hidden;
-
-  .echartsPie {
-    width: calc(100% - 64rpx);
-    min-height: 308rpx;
-    margin: 0 auto 0;
-
-    .pie-item {
-      width: 100%;
-      height: 368rpx;
-      // float: left;
-    }
-  }
-
-  .pie-title {
-    height: 30rpx;
-    text-align: center;
-    display: block;
-    color: rgba(16, 16, 16, 1);
-    font-size: 28rpx;
   }
 }
 </style>

pages/home/components/eacharts_pie.vue

@@ -4,7 +4,7 @@
     <!-- 饼状图 -->
     <view class="echartsPie">
       <view class="pie-item">
-        <view style="height:308rpx"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
+        <view style="height:308rpx;margin-top: 40rpx;"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
       </view>
     </view>
 
@@ -20,9 +20,15 @@ export default {
       type: String,
       default: "",
     },
-    data:{
+    echartData: {
-      type:Array,
+      type: Array,
-      default:[]
+      default: []
+    }
+  },
+  watch: {
+    echartData(val) {
+      this.pieInfo = val
+      this.maintenancePieInit()
     }
   },
   data() {
@@ -32,137 +38,14 @@ export default {
         startTime: "",
         endTime: "",
       },
-      calendarShow: false,
+      pieInfo: [],//饼图数据
-      mode: "range",
-      upkeepStatInfo: {},
-      pieInfo: {},//饼图数据
-    };
-  },
-  mounted() {
-    this.maintenancePieLeftInit()
-    // // 维修统计
-    // if (this.type == "maintenanceStatistics") {
-    //   this.upkeepStat()
-
-
-    // }
-    // if (this.type == "maintenanceStatisticsPie") {
-    //   this.pieStat()
-
-    // }
 
+    };
   },
+  mounted() { },
   methods: {
-    // 维修统计
-    upkeepStat() {
-      let query_ = {
-        startTime: this.form.startTime,
-        endTime: this.form.endTime,
-      }
-      // if(this.form.startTime!=''){
-      //   query_.startTime=this.form.startTime
-      // }
-      // if(this.form.endTime!=''){
-      //   query_.endTime=this.form.endTime
-      // }
-      this.$u.api.upkeepStat(query_).then(res => {
-        if (res.code == 200) {
-          this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
-          this.maintenanceInit();
-        }
-      })
-    },
-    // 饼图数据
-    pieStat() {
-      let query_ = {
-        startTime: this.form.startTime,
-        endTime: this.form.endTime,
-      }
-      this.$u.api.pieStat(query_).then(res => {
-        if (res.code == 200) {
-          this.pieInfo = res.data
-          this.maintenancePieLeftInit();
-          this.maintenancePieRightInit();
-        }
-      })
-    },
-    selectFun() {
-      this.calendarShow = true;
-    },
-    change(e) {
-      this.form.startTime = e.startDate;
-      this.form.endTime = e.endDate;
-      this.form.searchTime = e.startDate + "-" + e.endDate;
-      if (this.type == "maintenanceStatistics") {
-        this.upkeepStat()
-      }
-      if (this.type == "maintenanceStatisticsPie") {
-        this.pieStat()
-      }
-
-      // 查询数据
-    },
-    // 维修统计柱状图
-    maintenanceInit() {
-      let opts = {
-        tooltip: {},
-        legend: {
-          //图例组件
-          data: ["总计", "已完成", "未完成"],
-        },
-        xAxis: {
-          data: this.upkeepStatInfo.xData,
-        },
-        grid: {
-          top: "15%",
-          left: "10%",
-          right: "5%",
-          bottom: "15%",
-        },
-        yAxis: {},
-        series: [
-          {
-            name: "总计",
-            type: "bar",
-            data: this.upkeepStatInfo.total,
-            barWidth: 30, // 设置柱子宽度
-            barGap: "0", // 设置不同系列之间的间隔为0
-            itemStyle: {
-              color: "#2478f2",
-            },
-          },
-          {
-            name: "已完成",
-            type: "bar",
-            data: this.upkeepStatInfo.completed,
-            barWidth: 30, // 设置柱子宽度
-            barGap: "0", // 设置不同系列之间的间隔为0
-            itemStyle: {
-              color: "#84b7f9",
-            },
-          },
-          {
-            name: "未完成",
-            type: "bar",
-            data: this.upkeepStatInfo.unCompleted,
-            barWidth: 30, // 设置柱子宽度
-            barGap: "0", // 设置不同系列之间的间隔为0
-            itemStyle: {
-              color: "#5f9cf8",
-            },
-          },
-        ],
-      };
-      this.$refs.chartRef.init((config) => {
-        const { canvas } = config;
-        const chart = echarts.init(canvas, null, config);
-        chart.setOption(opts);
-        // 需要把 chart 返回
-        return chart;
-      });
-    },
     // 故障现象分类
-    maintenancePieLeftInit() {
+    maintenancePieInit() {
       let opts = {
         series: [
           {
@@ -180,7 +63,7 @@ export default {
               },
             },
 
-            data: this.data,
+            data: this.pieInfo,
             emphasis: {
               itemStyle: {
                 shadowBlur: 10,
@@ -213,74 +96,20 @@ export default {
         return chart;
       });
     },
-    maintenancePieRightInit() {
+
-      let opts = {
-        series: [
-          {
-            type: "pie",
-            radius: ['40%', '70%'],
-            label: {
-              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
-              normal: {
-                show: true,
-                fontSize: 8, // 是否显示标签[ default: false ]
-                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
-                formatter: "{b}\n {c}", // 标签内容
-                color: '#000'
-              },
-            },
-            data: this.pieInfo.device,
-            labelLine: {
-              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
-              normal: {
-                show: true, // 是否显示视觉引导线。
-                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
-                length2: 5,
-                // 视觉引导项第二段的长度。
-                lineStyle: {
-                  // 视觉引导线的样式
-                  type: "solid",
-                },
-              },
-            },
-          },
-        ],
-      };
-      this.$refs.chartRefPieRight.init((config) => {
-        const { canvas } = config;
-        const chart = echarts.init(canvas, null, config);
-        chart.setOption(opts);
-        // 需要把 chart 返回
-        return chart;
-      });
-    },
   },
 };
 </script>
 <style lang="scss" scoped>
 .eacharts-box {
   background: #fff;
-  margin: 0 40rpx 32rpx;
+  margin: 0 32rpx 32rpx;
   border-radius: 20rpx;
   overflow: hidden;
   
-  .eacharts-time {
-    margin: 0 136rpx 0 24rpx;
-    display: flex;
-    flex-direction: row;
-
-    text {
-      line-height: 60rpx;
-      color: rgba(16, 16, 16, 1);
-      font-size: 28rpx;
-      margin-top: 30rpx;
-      margin-right: 10rpx;
-    }
-  }
-
   .echarts {
     width: calc(100% - 64rpx);
-    height: 308rpx;
+    height: 368rpx;
     margin: 0 auto 20rpx;
   }
 
@@ -292,16 +121,9 @@ export default {
     .pie-item {
       width: 100%;
       height: 368rpx;
+      overflow: hidden;
       // float: left;
     }
   }
-
-  .pie-title {
-    height: 30rpx;
-    text-align: center;
-    display: block;
-    color: rgba(16, 16, 16, 1);
-    font-size: 28rpx;
-  }
 }
 </style>

pages/home/index.vue

@@ -8,9 +8,9 @@
       </view>
     </u-navbar>
     <!-- 通知公告 -->
-    <view class="notice_box" v-if="noticeList.length>0">
+    <view class="notice_box" v-if="noticeList.length > 0">
-      <u-notice-bar mode="horizontal" type="primary" :list="noticeList" :more-icon="true"
+      <u-notice-bar mode="horizontal" type="primary" :list="noticeList" :more-icon="true" @getMore="getNotice()"
-        @getMore="getNotice()"></u-notice-bar>
+        :is-circular="false"></u-notice-bar>
     </view>
     <view class="">
       <view class="banner-swiper" v-if="swiperList.length > 0">
@@ -34,20 +34,17 @@
         </view>
       </view>
 
-      <view class="work-title">实验室巡检</view>
+    
-      <swiperSlider></swiperSlider>
       <view class="work-title">设备统计</view>
-      <eacharts_pie :data="pieInfo"></eacharts_pie>
+      <eachartsPie :echartData="pieInfo"></eachartsPie>
 
       <view class="work-title">检修单状态</view>
+      <eachartsPie :echartData="pieInfo"></eachartsPie>
     
-      <!-- <view>
-        <alarm></alarm>
-      </view> -->
       <view class="work-title">维修统计</view>
       <view class="statistics">
-        <eacharts :type="'maintenanceStatistics'"></eacharts>
+     <eacharts :type="'maintenanceStatistics'"></eacharts>
-        <eacharts :type="'maintenanceStatisticsPie'"></eacharts>
+           <!-- <eacharts :type="'maintenanceStatisticsPie'"></eacharts> -->
       </view>
     </view>
     <betone-tabbar ref="tabbarRef" />
@@ -58,13 +55,13 @@
 import swiperSlider from "./components/swiper.vue";
 import alarm from "./components/alarm.vue";
 import eacharts from "./components/eacharts.vue";
-import eacharts_pie from "./components/eacharts_pie.vue";
+import eachartsPie from "./components/eacharts_pie.vue";
 export default {
   components: {
     swiperSlider,
     alarm,
     eacharts,
-    eacharts_pie
+    eachartsPie
   },
   data() {
     return {
@@ -72,23 +69,21 @@ export default {
       workList: [],
       pieInfo: [],//饼图数据
       noticeList: [
-        '寒雨连江夜入吴',
+
-        '平明送客楚山孤',
-        '洛阳亲友如相问',
-        '一片冰心在玉壶'
       ],//通知列表
     };
   },
+  onLoad() {
+    this.pieStat()
+  },
   onShow() {
     this.$nextTick(() => {
       this.$refs.tabbarRef.getPermission();
+      this.getNoticeList()
 
-      //  this.BetLoading.show();
-      //   setTimeout(() => {
-      //    this.BetLoading.hide();
-      //   }, 1000);
     });
     //工作台
+
     this.getUserInfo()
     this.getoverview()
   },
@@ -167,7 +162,18 @@ export default {
       uni.navigateTo({
         url: '/pages/notice/announcement',
       });
-    }
+    },
+
+    getNoticeList() {
+      this.$u.api.getNoticeList().then(res => {
+        if (res.code == 200) {
+          let data = res.data.records
+          data.forEach(item => {
+            this.noticeList.push(item.title)
+          })
+        }
+      })
+    },
   },
 };
 </script>
@@ -257,10 +263,10 @@ export default {
   }
 
   .menu_box {
-    width: 100%;
     background: #fff;
     position: relative;
-
+    margin: 0 32rpx;
+    border-radius: 20rpx;
     &::after {
       content: '';
       position: absolute;

pages/notice/announcement.vue

@@ -1,180 +1,178 @@
 <template>
     <view class="notice-list">
 
-      <scroll-view scroll-y="true" style="height:calc(100vh - 140rpx);width: 100%;background: #F5F5F5;margin-top:32rpx"
+        <scroll-view scroll-y="true"
-        :refresher-triggered="triggered" :refresher-enabled="true" @refresherrefresh="refresherrefresh"
+            style="height:calc(100vh - 140rpx);width: 100%;background: #F5F5F5;margin-top:32rpx"
-        refresher-background="#f1f1f1" @scrolltolower="onListBottom">
+            :refresher-triggered="triggered" :refresher-enabled="true" @refresherrefresh="refresherrefresh"
-        <ul class="card">
+            refresher-background="#f1f1f1" @scrolltolower="onListBottom">
-          <li v-for="(item, index) in dataList" :key="index" @click="jump(item)">
+            <ul class="card">
-            <view class="title">
+                <li v-for="(item, index) in dataList" :key="index" @click="jump(item)">
-              <view class="text">
+                    <view class="title">
-                <view>{{ item.title }}</view>
+                        <view class="text">
-                <view class="mark" v-if="!item.readStatus"></view>
+                            <view>{{ item.title }}</view>
-              </view>
+                            <!-- <view class="mark" v-if="!item.readStatus"></view> -->
-              <view style="flex-shrink: 0;color: #999999;">{{ item.createdAt }}</view>
+                        </view>
+                        <view style="flex-shrink: 0;color: #999999;">{{ item.categoryName }}</view>
+                    </view>
+                    <view>
+                        <u-parse :html="item.content"></u-parse>
+                    </view>
+                </li>
+            </ul>
+            <view style=" line-height: 100rpx;">
+                <uni-load-more :status="scrollType"></uni-load-more>
             </view>
-            <view>
+        </scroll-view>
-              <!-- {{ item.content }} -->
-              <u-parse :html="item.content"></u-parse>
-            </view>
-          </li>
-        </ul>
-        <view style=" line-height: 100rpx;">
-          <uni-load-more :status="scrollType"></uni-load-more>
-        </view>
-      </scroll-view>
     </view>
-  </template>
+</template>
-  <script>
+<script>
-  // import requestName from '@/common/requestName'
+// import requestName from '@/common/requestName'
-  export default {
+export default {
     name: 'NoticeList',
     data() {
-      return {
+        return {
-        dataList: [
+            dataList: [
-            {
+            ],
-                title:'11111',//标题
+            current: 0,
-                createdAt:'转发通知',
+            style: {
-                content:'222<p>44444444444</p>',
+                borderRadius: '100px',
-                readStatus:true
+                background: '#fff',
-            }
+                padding: '0 32rpx'
-        ],
+            },
-        current: 0,
+            search: {
-        style: {
+                pageNo: 1,
-          borderRadius: '100px',
+                pageSize: 20,
-          background: '#fff',
+                readStatus: ''
-          padding: '0 32rpx'
+            },
-        },
+            scrollType: '',
-        search: {
+            triggered: false,
-          pageNo: 1,
+            refreshNeed: false
-          pageSize: 20,
+        }
-          readStatus: ''
-        },
-        scrollType: '',
-        triggered: false,
-        refreshNeed: false
-      }
     },
     onLoad(data) {
-      this.getList()
+        this.getList()
     },
     onShow() {
-      console.log(this.refreshNeed);
+        console.log(this.refreshNeed);
-      if (this.refreshNeed) {
+        if (this.refreshNeed) {
-        this.reSearch()
+            this.reSearch()
-      }
+        }
     },
+    
     methods: {
 
-      getList() {
+        getList() {
-        // this.$wx_http.get(requestName['pageNotice'], this.search).then(res => {
+            this.$u.api.getNoticeList(this.search).then(res => {
-        //   let data = res.data.records
+                if (res.code == 200) {
-        //   this.scrollType = ''
+                    let data = res.data.records
-        //   this.triggered = false
+                    this.scrollType = ''
-        //   if (data.length >= this.search.pageSize) {
+                    this.triggered = false
-        //     this.scrollType = 'more'
+                    if (data.length >= this.search.pageSize) {
-        //   }
+                        this.scrollType = 'more'
-        //   this.dataList = this.dataList.concat(data)
+                    }
-        // })
+                    this.dataList = this.dataList.concat(data)
-      },
+                }
-  
+            })
-      reSearch() {
+        },
-        this.search.pageNo = 1
-        this.dataList = []
-        this.getList()
-      },
 
-      onListBottom() {
+        reSearch() {
-        if (this.scrollType == 'more') {
+            this.search.pageNo = 1
-          this.search.pageNo += 1
+            this.dataList = []
-          this.getList()
+            this.getList()
+        },
+
+        onListBottom() {
+            if (this.scrollType == 'more') {
+                this.search.pageNo += 1
+                this.getList()
+            }
+        },
+        onreachBottom() {
+            this.getDevicePage()
+        },
+        refresherrefresh() {
+            this.triggered = true
+            this.reSearch()
         }
-      },
-      onreachBottom() {
-        this.getDevicePage()
-      },
-      refresherrefresh() {
-        this.triggered = true
-        this.reSearch()
-      }
     },
-  }
+}
-  </script>
+</script>
 
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
-  .notice-list {
+.notice-list {
     height: calc(100vh - 0px);
     background: #F5F5F5;
     overflow: hidden;
+
     .mark-read-btn {
-      background: #FFFFFF;
+        background: #FFFFFF;
-      border-radius: 8rpx;
+        border-radius: 8rpx;
-      border: 1px solid rgba(255, 255, 255, 0.43);
+        border: 1px solid rgba(255, 255, 255, 0.43);
-      padding: 0;
+        padding: 0;
-      margin: 24rpx 30rpx;
+        margin: 24rpx 30rpx;
-      text-align: center;
+        text-align: center;
-      height: 88rpx;
+        height: 88rpx;
-      line-height: 88rpx;
+        line-height: 88rpx;
-      font-size: 30rpx;
+        font-size: 30rpx;
-      color: #FF8800;
+        color: #FF8800;
-      display: flex;
+        display: flex;
-      justify-content: center;
+        justify-content: center;
-      align-items: center;
+        align-items: center;
-  
+
-      image {
+        image {
-        width: 34rpx;
+            width: 34rpx;
-        height: 32rpx;
+            height: 32rpx;
-        display: block;
+            display: block;
-        margin-right: 20rpx;
+            margin-right: 20rpx;
-        fill:#004BAA
+            fill: #004BAA
-      }
+        }
     }
 
 
     .card {
-      margin: 0 16px;
+        margin: 0 16px;
-      list-style: none;
+        list-style: none;
-      padding: 0;
+        padding: 0;
+
+        li {
+            background: #FFFFFF;
+            border-radius: 4px;
+            border: 1px solid rgba(255, 255, 255, 0.43);
+            padding: 12px 14px;
+            margin-bottom: 24rpx;
+            font-size: 28rpx;
+
+            .title {
+                border-bottom: 1px solid #F0F0F0;
+                display: flex;
+                justify-content: space-between;
+                padding-bottom: 10rpx;
+                margin-bottom: 15rpx;
+
+
+                .text {
+                    font-size: 30rpx;
+                    flex-grow: 1;
+                    display: flex;
+                    margin-right: 20rpx;
+                    font-weight: 400;
+                    color: #333333;
+                }
+
+                .mark {
+                    width: 16rpx;
+                    height: 16rpx;
+                    background: #D9362D;
+                    border-radius: 50%;
+                    margin-left: 12rpx;
+                    margin-top: 5rpx;
+                    flex-shrink: 0;
+                }
 
-      li {
+            }
-        background: #FFFFFF;
-        border-radius: 4px;
-        border: 1px solid rgba(255, 255, 255, 0.43);
-        padding: 12px 14px;
-        margin-bottom: 24rpx;
-        font-size: 28rpx;
-  
-        .title {
-          border-bottom: 1px solid #F0F0F0;
-          display: flex;
-          justify-content: space-between;
-          padding-bottom: 10rpx;
-          margin-bottom: 15rpx;
-  
-  
-          .text {
-            font-size: 30rpx;
-            flex-grow: 1;
-            display: flex;
-            margin-right: 20rpx;
-            font-weight: 400;
-            color: #333333;
-          }
-  
-          .mark {
-            width: 16rpx;
-            height: 16rpx;
-            background: #D9362D;
-            border-radius: 50%;
-            margin-left: 12rpx;
-            margin-top: 5rpx;
-            flex-shrink: 0;
-          }
-  
-        }
 
 
-      }
+        }
     }
-  }
+}
-  </style>
+</style>