From 7e90d2b6e13279d568f581a92e070c398ae92b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Mon, 6 Nov 2023 11:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/list.js            |  15 +--
 manifest.json                |   4 +-
 pages.json                   |   8 +-
 pages/device/APF/report.vue  | 177 +++++++++++++++++++++++++++++------
 pages/device/list.vue        |  85 +++++++++--------
 pages/engineering/detail.vue |   6 +-
 pages/engineering/list.vue   |  18 +++-
 pages/message/feedback.vue   |  34 ++++---
 pages/message/message.vue    |  13 ++-
 pages/mine/about.vue         |  21 ++---
 pages/project/detail.vue     |   2 +-
 pages/project/list.vue       |  36 +++++--
 12 files changed, 296 insertions(+), 123 deletions(-)

diff --git a/common/js/list.js b/common/js/list.js
index 1af13d7..51c9407 100644
--- a/common/js/list.js
+++ b/common/js/list.js
@@ -1,9 +1,6 @@
 export default {
     onPullDownRefresh() {
         this.store && this.store.reload()
-        this.store.loadedCallback = () => {
-            uni.stopPullDownRefresh()
-        }
     },
     onReachBottom() {
         if (this.store.status != 'noMore') {
@@ -20,7 +17,7 @@ export default {
             var me = this
             return {
                 data: [],
-                status: 'more',
+                status: 'noMore',
                 empty: false,
                 total: 0,
                 header: {
@@ -35,9 +32,8 @@ export default {
                 firstCallBack: null,
                 loadedCallback: null,
                 reload() {
-                    if(this.status == 'loading') return
+                    if (this.status == 'loading') return
                     this.data = []
-                    this.status = 'loading'
                     this.empty = false
                     this.params.pageNum = 1
                     this.next()
@@ -50,6 +46,7 @@ export default {
                     }, 300)
                 },
                 next() {
+                    this.status = 'loading'
                     me.$request({
                         url: url,
                         data: this.params,
@@ -68,14 +65,17 @@ export default {
                                 this.status = 'noMore'
                             } else if (res.total == resultData.length) {
                                 this.status = 'noMore'
+                            } else {
+                                this.status = 'more'
                             }
                         } else {
                             this.data.push(...resultData)
                             if (resultData.length < this.params.pageSize) {
                                 this.status = 'noMore'
+                            } else {
+                                this.status = 'more'
                             }
                         }
-
                         if (this.params.pageNum == 1) {
                             this.firstCallBack && this.firstCallBack()
                         }
@@ -83,6 +83,7 @@ export default {
                         this.params.pageNum++
                         this.total = res.total
                         this.loading = false
+                        uni.stopPullDownRefresh()
                     })
                 },
             }
diff --git a/manifest.json b/manifest.json
index d6fe042..0bcd460 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.4.2",
-    "versionCode" : 142,
+    "versionName" : "1.4.4",
+    "versionCode" : 144,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 4b889be..f125ae0 100644
--- a/pages.json
+++ b/pages.json
@@ -7,7 +7,8 @@
                 "navigationStyle": "custom",
         		"pullToRefresh": {
                     "support":true,
-                    "style": "circle"
+                    "style": "circle",
+                    "color":"#007aff"
                 }
             }
         },
@@ -194,6 +195,11 @@
         {
             "path": "pages/message/message",
             "style": {
+                "pullToRefresh": {
+                    "support":true,
+                    "style": "circle",
+                    "color":"#007aff"
+                },
                 "app-plus": {
                     "bounce": "none",
                     //关闭窗口回弹效果
diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue
index b797cfc..1d697f7 100644
--- a/pages/device/APF/report.vue
+++ b/pages/device/APF/report.vue
@@ -1,21 +1,50 @@
 <template>
     <Cn-page :loading="loading">
         <view class="content" slot="body">
-            <uni-list :border="false">
-                <uni-list-item
-                    isDot
-                    show-badge
-                    badgeType="error"
-                    :badge-text="item.status == 1 ? '' : '未读'"
-                    :title="'告警代码：'+item.code"
-                    :note="item.startTime"
-                    @click="jump(item)"
-                    clickable
-                    v-for="(item, index) in store.data"
-                />
-            </uni-list>
+            <view class="content-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
+                <view class="content-item-header">
+                    <uni-badge
+                        class="uni-badge-left-margin"
+                        :is-dot="true"
+                        :text="item.status == '1' ? 0 : 1"
+                        absolute="rightTop"
+                        size="small"
+                    >
+                        <view class="content-item-header-icon">
+                            <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
+                        </view>
+                    </uni-badge>
+                    <view class="content-item-header-right">
+                        <view class="content-item-header-right-title">{{ item.equipmentName }}</view>
+                        <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
+                        <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
+                        <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
+                        <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
+                    </view>
+                    <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
+                </view>
+                <view class="content-item-footer">{{ item.subTitle }}</view>
+            </view>
+            <!-- <uni-card
+                :title="item.equipmentName"
+                :extra="item.status == '1' ? '' : '未读'"
+                :sub-title="item.subTitle"
+                thumbnail="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png"
+                @click="jump(item)"
+                v-for="(item, index) in store.data"
+                :key="index"
+            >
+                <view class="term-list-bottom">
+                    <view class="term-list-bottom-item" v-for="(item2, textIndex) in item.dataSet" :key="textIndex">
+                        {{ item2.showName + ':' + (item2.value == 3.1415926 ? '-' : item2.value) + (item2.unit || '') }}
+                    </view>
+                </view>
+            </uni-card> -->
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
+            <uni-load-more
+                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"
+            ></uni-load-more>
         </view>
     </Cn-page>
 </template>
@@ -29,13 +58,31 @@ export default {
     data() {
         return {
             loading: true,
-            deviceId:''
+            type: '',
+            staticIcon: '',
         }
     },
-    onLoad(options) {
-        this.deviceId = options.id
-    },
-    onShow() {
+    onLoad(o) {
+        this.type = '3'
+        this.devId = o.id
+        switch (this.type) {
+            case '0':
+                uni.setNavigationBarTitle({ title: '暂态事件' })
+                this.staticIcon = '/static/zantai2.png'
+                break
+            case '1':
+                uni.setNavigationBarTitle({ title: '稳态事件' })
+                this.staticIcon = '/static/steady2.png'
+                break
+            case '2':
+                uni.setNavigationBarTitle({ title: '运行事件' })
+                this.staticIcon = '/static/run2.png'
+                break
+            case '3':
+                uni.setNavigationBarTitle({ title: '设备告警' })
+                this.staticIcon = '/static/device_bad2.png'
+                break
+        }
         this.init()
     },
     onNavigationBarButtonTap(e) {
@@ -45,9 +92,10 @@ export default {
             success: (res) => {
                 if (res.confirm) {
                     updateStatus({
-                        type: 3,
-                        eventIds:[]
+                        type: this.type,
+                        eventIds: [],
                     }).then(() => {
+                        this.loading = true
                         this.store.reload()
                     })
                 }
@@ -57,21 +105,48 @@ export default {
     methods: {
         async init() {
             let dictData = await this.$util.getDictData('app_event')
+            console.log(dictData)
             this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
-            this.store.params.type = 3
+            this.store.params.type = this.type
             this.store.params.deviceId = this.deviceId
-            this.store.firstCallBack = (res) => {
-                // this.store.data.forEach((item) => {
-                //     item.title = dictData.find((item2) => item2.code === item.tag)?.name
-                // })
-                // console.log(this.store.data)
+            this.store.loadedCallback = () => {
+                this.store.data.forEach((item) => {
+                    if (this.type === '3') {
+                        item.showName = '告警,告警码：' + item.code
+                    }
+                    if (this.type !== '0') {
+                        item.subTitle = `于${item.startTime}发生${item.showName}`
+                    } else {
+                        item.subTitle =
+                            `于${item.startTime}发生${item.showName}。` +
+                            item.dataSet
+                                .map((item2) => {
+                                    return (
+                                        item2.showName +
+                                        '：' +
+                                        (item2.value == 3.1415926 ? '-' : item2.value) +
+                                        (item2.unit || '')
+                                    )
+                                })
+                                .join('，')
+                    }
+                })
                 this.loading = false
             }
             this.store.reload()
         },
         jump(item) {
-            let str = JSON.stringify(item).replace(/%/g, '百分比')
-            uni.navigateTo({ url: '/pages/message/reportDetail?detail=' + encodeURIComponent(str) })
+            if (this.type === '0') {
+                let str = JSON.stringify(item).replace(/%/g, '百分比')
+                uni.navigateTo({ url: '/pages/message/messageDetail?detail=' + encodeURIComponent(str) })
+            } else {
+                if (item.status != '1') {
+                    item.status = '1'
+                    updateStatus({
+                        eventIds: [item.id],
+                    })
+                }
+            }
         },
     },
 }
@@ -79,6 +154,50 @@ export default {
 
 <style lang="scss">
 .content {
+    .content-item {
+        margin: 20rpx;
+        padding: 20rpx 20rpx;
+        box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 6rpx 2rpx;
+        border-radius: 8rpx;
+        border: 1px solid #ebeef5;
+        background: #fff;
+        .content-item-header {
+            display: flex;
+            padding: 20rpx 0;
+            border-bottom: 1px solid #ebeef5;
+            .content-item-header-icon {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100rpx;
+                height: 100rpx;
+                border-radius: 8rpx;
+                background: $uni-theme-color;
+            }
+            .content-item-header-right {
+                flex: 1;
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                height: 100rpx;
+                margin-left: 20rpx;
+                .content-item-header-right-title {
+                    font-size: 28rpx;
+                    font-weight: bold;
+                    color: #111;
+                }
+                .content-item-header-right-des {
+                    font-size: 24rpx;
+                    color: #999;
+                }
+            }
+        }
+        .content-item-footer {
+            margin-top: 20rpx;
+            font-size: 24rpx;
+            color: #999;
+        }
+    }
     // padding-top: 20rpx;
 }
 
diff --git a/pages/device/list.vue b/pages/device/list.vue
index 26a951d..0828068 100644
--- a/pages/device/list.vue
+++ b/pages/device/list.vue
@@ -3,9 +3,11 @@
         <template slot="body">
             <view class="device">
                 <view class="nav" :style="{ top: navTabHeight + 'px' }">
-                    <view class="nav-menu" :class="{ 'nav-menu-active': select.engineeringName }"
-                          @click="selectEngineering"
-                    >{{ select.engineeringName || '全部工程' }}
+                    <view
+                        class="nav-menu"
+                        :class="{ 'nav-menu-active': select.engineeringName }"
+                        @click="selectEngineering"
+                        >{{ select.engineeringName || '全部工程' }}
                         <uni-icons
                             type="bottom"
                             size="14"
@@ -20,8 +22,11 @@
                         range-key="text"
                         v-if="select.engineeringId"
                     >
-                        <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }"
-                              @click="select.selectProject = true">
+                        <view
+                            class="nav-menu"
+                            :class="{ 'nav-menu-active': select.projectName }"
+                            @click="select.selectProject = true"
+                        >
                             {{
                                 select.projectName
                                     ? select.projectName.length > 6
@@ -50,8 +55,11 @@
                         :range="projectType"
                         range-key="text"
                     >
-                        <view class="nav-menu" :class="{ 'nav-menu-active': select.runStatusName }"
-                              @click="select.runStatusSelect = true">
+                        <view
+                            class="nav-menu"
+                            :class="{ 'nav-menu-active': select.runStatusName }"
+                            @click="select.runStatusSelect = true"
+                        >
                             {{
                                 select.runStatusName
                                     ? select.runStatusName.length > 4
@@ -81,24 +89,21 @@
                     </picker> -->
                 </view>
                 <view class="content device" :style="{ minHeight: minHeight }">
-                    <Cn-device-card v-for="(item, index) in store.data" :device="item" :key="index">
-                    </Cn-device-card>
+                    <Cn-device-card v-for="(item, index) in store.data" :device="item" :key="index"> </Cn-device-card>
                     <uni-load-more
-                        v-if="store.status == 'loading' || store.data.length > 0"
+                        v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
                         :status="store.status"
                     ></uni-load-more>
                     <Cn-empty v-else></Cn-empty>
                 </view>
             </view>
         </template>
-
     </Cn-page>
-
 </template>
 <script>
-import {getProjectList} from '@/common/api/project'
-import {queryDictData} from '@/common/api/dictionary'
-import list from "@/common/js/list";
+import { getProjectList } from '@/common/api/project'
+import { queryDictData } from '@/common/api/dictionary'
+import list from '@/common/js/list'
 
 export default {
     mixins: [list],
@@ -122,24 +127,29 @@ export default {
             navTabHeight: 0,
             engineeringList: [],
             projectList: [],
-            projectType: [{
-                text: '全部',
-                value: '',
-            }, {
-                text: '离线',
-                value: 1
-            }, {
-                text: '在线',
-                value: 2
-            }],
-            pageOptions: {}
+            projectType: [
+                {
+                    text: '全部',
+                    value: '',
+                },
+                {
+                    text: '离线',
+                    value: 1,
+                },
+                {
+                    text: '在线',
+                    value: 2,
+                },
+            ],
+            pageOptions: {},
         }
     },
     watch: {
         select: {
             handler(val, oldVal) {
                 if (this.loading) return
-                this.store.params.projectId = val.projectNameIndex === 0 ? '' : this.filterProjectList[val.projectNameIndex].value
+                this.store.params.projectId =
+                    val.projectNameIndex === 0 ? '' : this.filterProjectList[val.projectNameIndex].value
                 this.store.params.runStatus = val.runStatusIndex === 0 ? '' : this.projectType[val.runStatusIndex].value
                 this.store.params.engineerId = val.engineeringId || ''
                 this.store.reload()
@@ -149,8 +159,10 @@ export default {
     },
     computed: {
         filterProjectList() {
-            return this.projectList.filter(item => item.engineeringId === this.select.engineeringId || item.value === '-1')
-        }
+            return this.projectList.filter(
+                (item) => item.engineeringId === this.select.engineeringId || item.value === '-1',
+            )
+        },
     },
     onLoad(options) {
         let engineering = uni.getStorageSync('engineering')
@@ -240,9 +252,9 @@ export default {
                 return
             }
             if (this.transfer) {
-                uni.navigateTo({url: '/pages/device/transfer?id=' + this.checkList.join(',')})
+                uni.navigateTo({ url: '/pages/device/transfer?id=' + this.checkList.join(',') })
             } else if (this.share) {
-                uni.navigateTo({url: '/pages/device/share?id=' + this.checkList.join(',')})
+                uni.navigateTo({ url: '/pages/device/share?id=' + this.checkList.join(',') })
             }
             this.cancel()
         },
@@ -255,7 +267,8 @@ export default {
         getDeviceList() {
             this.store = this.DataSource('/cs-device-boot/EquipmentDelivery/queryEquipmentByProject')
             this.store.params.engineerId = this.select.engineeringId
-            this.store.params.runStatus = this.select.runStatusIndex === 0 ? '' : this.projectType[this.select.runStatusIndex].value
+            this.store.params.runStatus =
+                this.select.runStatusIndex === 0 ? '' : this.projectType[this.select.runStatusIndex].value
             this.store.params.pageSize = 50
             this.store.firstCallBack = (res) => {
                 this.loading = false
@@ -305,7 +318,7 @@ export default {
             })
         },
         submitFeedBack() {
-            uni.navigateTo({url: '/pages/home/feedback'})
+            uni.navigateTo({ url: '/pages/home/feedback' })
         },
         runStatusChange(e) {
             this.select.runStatusSelect = false
@@ -333,7 +346,7 @@ export default {
                 confirmText: '直连设备',
                 cancelText: '网关接入',
                 cancelColor: '#007aff',
-                success: ({confirm, cancel}) => {
+                success: ({ confirm, cancel }) => {
                     if (confirm) {
                         uni.navigateTo({
                             url: '/pages/device/new',
@@ -362,6 +375,4 @@ export default {
     },
 }
 </script>
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>
diff --git a/pages/engineering/detail.vue b/pages/engineering/detail.vue
index a5f2e82..4602489 100644
--- a/pages/engineering/detail.vue
+++ b/pages/engineering/detail.vue
@@ -34,17 +34,17 @@
                             <view class="term-list-bottom">
                                 <view class="term-list-bottom-item">
                                     <view>设备个数</view>
-                                    <view>{{item.devNum}}</view>
+                                    <view>{{ item.devNum }}</view>
                                 </view>
                                 <view class="term-list-bottom-item">
                                     <view>创建时间</view>
-                                    <view>{{item.createTime}}</view>
+                                    <view>{{ item.createTime }}</view>
                                 </view>
                             </view>
                         </uni-card>
                         <Cn-empty v-if="store.empty"></Cn-empty>
                         <uni-load-more
-                            v-if="store.data && store.data.length > 0"
+                            v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
                             :status="store.status"
                         ></uni-load-more>
                     </view>
diff --git a/pages/engineering/list.vue b/pages/engineering/list.vue
index dc6317b..7cc405f 100644
--- a/pages/engineering/list.vue
+++ b/pages/engineering/list.vue
@@ -17,15 +17,20 @@
             @clickLeft="back"
             @clickRight="add"
         />
-        <uni-search-bar v-model="store.params.name" clearButton="none" bgColor="#fff" placeholder="请输入关键词"
-                        @input="store.search()"></uni-search-bar>
+        <uni-search-bar
+            v-model="store.params.name"
+            clearButton="none"
+            bgColor="#fff"
+            placeholder="请输入关键词"
+            @input="store.search()"
+        ></uni-search-bar>
         <view class="message">
             <uni-card
                 :title="item.name"
                 extra="🔍"
                 @click="jump(item)"
                 v-for="(item, index) in store.data"
-                :style="{marginTop:index===0?'0':''}"
+                :style="{ marginTop: index === 0 ? '0' : '' }"
                 :key="index"
             >
                 <view class="term-list-bottom">
@@ -40,7 +45,10 @@
                 </view>
             </uni-card>
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
+            <uni-load-more
+                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"
+            ></uni-load-more>
         </view>
     </view>
 </template>
@@ -52,7 +60,7 @@ export default {
     mixins: [list],
     data() {
         return {
-            loading: false,
+            loading: true,
             userInfo: {},
         }
     },
diff --git a/pages/message/feedback.vue b/pages/message/feedback.vue
index b1493c2..b2a6f75 100644
--- a/pages/message/feedback.vue
+++ b/pages/message/feedback.vue
@@ -3,36 +3,45 @@
         <view class="message-list-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
             <view class="hide-txt message-list-item-title">{{ item.title }}</view>
             <view class="message-list-item-footer">
-                <view class="mr20 message-list-item-footer-status message-list-item-footer-status-over"
-                      v-if="item.status === '0'">
+                <view
+                    class="mr20 message-list-item-footer-status message-list-item-footer-status-over"
+                    v-if="item.status === '0'"
+                >
                     已解决
                 </view>
-                <view class="mr20 message-list-item-footer-status message-list-item-footer-status-processing"
-                      v-else-if="item.status === '1'">
+                <view
+                    class="mr20 message-list-item-footer-status message-list-item-footer-status-processing"
+                    v-else-if="item.status === '1'"
+                >
                     待处理
                 </view>
-                <view class="mr20 message-list-item-footer-status message-list-item-footer-status-handler"
-                      v-else-if="item.status === '2'">
+                <view
+                    class="mr20 message-list-item-footer-status message-list-item-footer-status-handler"
+                    v-else-if="item.status === '2'"
+                >
                     处理中
                 </view>
                 <view class="message-list-item-footer-time"> {{ item.createTime }}</view>
-                <uni-badge class="uni-badge-left-margin" :text="item.chatCount"/>
+                <uni-badge class="uni-badge-left-margin" :text="item.chatCount" />
             </view>
         </view>
         <Cn-empty v-if="store.empty"></Cn-empty>
-        <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
+        <uni-load-more
+            v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+            :status="store.status"
+        ></uni-load-more>
     </view>
 </template>
 
 <script>
-import {queryFeedBackPage} from '../../common/api/feedback'
+import { queryFeedBackPage } from '../../common/api/feedback'
 import list from '../../common/js/list'
 
 export default {
     mixins: [list],
     data() {
         return {
-            title: '灿能'
+            title: '灿能',
         }
     },
     onShow() {
@@ -44,9 +53,9 @@ export default {
             this.store.reload()
         },
         jump(item) {
-            uni.navigateTo({url: '/pages/message/feedbackDetail?id=' + item.id + '&chatCount=' + item.chatCount})
+            uni.navigateTo({ url: '/pages/message/feedbackDetail?id=' + item.id + '&chatCount=' + item.chatCount })
         },
-    }
+    },
 }
 </script>
 
@@ -109,7 +118,6 @@ export default {
     }
 }
 
-
 /deep/ .uni-list-item {
     background-color: $uni-theme-white !important;
 }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index f79ec4a..c369493 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -41,7 +41,10 @@
                 </view>
             </uni-card> -->
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
+            <uni-load-more
+                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"
+            ></uni-load-more>
         </view>
     </Cn-page>
 </template>
@@ -79,11 +82,9 @@ export default {
                 this.staticIcon = '/static/device_bad2.png'
                 break
         }
-    },
-    onShow() {
-        this.loading = true
         this.init()
     },
+    onShow() {},
     onNavigationBarButtonTap(e) {
         uni.showModal({
             title: '提示',
@@ -109,6 +110,9 @@ export default {
             this.store.params.type = this.type
             this.store.loadedCallback = () => {
                 this.store.data.forEach((item) => {
+                    if (this.type === '3') {
+                        item.showName = '告警,告警码：' + item.code
+                    }
                     if (this.type !== '0') {
                         item.subTitle = `于${item.startTime}发生${item.showName}`
                     } else {
@@ -126,6 +130,7 @@ export default {
                                 .join('，')
                     }
                 })
+                console.log(this.store.data)
                 this.loading = false
             }
             this.store.reload()
diff --git a/pages/mine/about.vue b/pages/mine/about.vue
index 471f64a..4a6da0a 100644
--- a/pages/mine/about.vue
+++ b/pages/mine/about.vue
@@ -1,29 +1,28 @@
 <template>
-    <Cn-page :loading='loading'>
-        <view slot='body'>
-            <view class='about'>
+    <Cn-page :loading="loading">
+        <view slot="body">
+            <view class="about">
                 <image src="/static/logo.png" class="logo"></image>
                 <view class="name">灿能物联</view>
-                <view class="version">Version 1.0.1</view>
+                <view class="version">Version 1.0.2</view>
             </view>
         </view>
     </Cn-page>
 </template>
 <script>
 export default {
-    data () {
+    data() {
         return {
-            loading: false
+            loading: false,
         }
     },
-    methods: {
-    }
+    methods: {},
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .about {
     box-sizing: border-box;
-    padding:  34rpx;
+    padding: 34rpx;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -48,4 +47,4 @@ export default {
         color: #333;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/project/detail.vue b/pages/project/detail.vue
index 2a15cc1..fff63b8 100644
--- a/pages/project/detail.vue
+++ b/pages/project/detail.vue
@@ -36,7 +36,7 @@
                         </Cn-device-card>
                         <Cn-empty v-if="store.empty"></Cn-empty>
                         <uni-load-more
-                            v-if="store.data && store.data.length > 0"
+                            v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
                             :status="store.status"
                         ></uni-load-more>
                     </view>
diff --git a/pages/project/list.vue b/pages/project/list.vue
index 59c4bc1..b1c89ce 100644
--- a/pages/project/list.vue
+++ b/pages/project/list.vue
@@ -6,20 +6,33 @@
             :fixed="true"
             status-bar
             left-icon="left"
-            :rightIcon="userInfo.authorities === 'app_vip_user' || userInfo.authorities === 'engineering_user' ? 'plusempty' : ''"
+            :rightIcon="
+                userInfo.authorities === 'app_vip_user' || userInfo.authorities === 'engineering_user'
+                    ? 'plusempty'
+                    : ''
+            "
             background-color="#fff"
             color="#111"
             title="项目管理"
             @clickLeft="back"
             @clickRight="add"
         />
-        <uni-search-bar v-model="store.params.searchValue" clearButton="none" bgColor="#fff" placeholder="请输入关键词"
-                        @input="store.search()"></uni-search-bar>
+        <uni-search-bar
+            v-model="store.params.searchValue"
+            clearButton="none"
+            bgColor="#fff"
+            placeholder="请输入关键词"
+            @input="store.search()"
+        ></uni-search-bar>
         <view class="message">
-            <uni-card :title="item.name" @click="jump(item)"
-                      extra="🔍"
-                      v-for="(item, index) in store.data" :key="index"
-                      :style="{marginTop:index===0?'0':''}">
+            <uni-card
+                :title="item.name"
+                @click="jump(item)"
+                extra="🔍"
+                v-for="(item, index) in store.data"
+                :key="index"
+                :style="{ marginTop: index === 0 ? '0' : '' }"
+            >
                 <view class="term-list-bottom">
                     <view class="term-list-bottom-item">
                         <view>设备个数</view>
@@ -32,7 +45,10 @@
                 </view>
             </uni-card>
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
+            <uni-load-more
+                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"
+            ></uni-load-more>
         </view>
     </view>
 </template>
@@ -80,13 +96,13 @@ export default {
             })
         },
         jump(project) {
-            console.log(project);
+            console.log(project)
             uni.navigateTo({
                 url: `/pages/project/detail?project=${encodeURIComponent(JSON.stringify(project))}`,
             })
         },
     },
-    onLoad({engineeringId}) {
+    onLoad({ engineeringId }) {
         this.init(engineeringId)
     },
 }