From 5feb70a9c5c766a53da17d478d0eec929c63b2b8 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: Tue, 28 Feb 2023 16:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=B8=E5=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  13 +-
 pages/device/APF/detail.vue                   |   3 +
 pages/device/APF/report.vue                   |  13 ++
 pages/index/comp/indexGongCheng.vue           |  11 +-
 pages/index/comp/indexYouKe.vue               | 221 ++++++++++++++++++
 pages/index/comp/indexYunWei.vue              |   8 +-
 pages/index/comp/indexZhuYongHu.vue           |  15 +-
 pages/index/comp/indexZhuanZhi.vue            |   6 +-
 pages/index/comp/indexZiYongHu.vue            |  12 +-
 pages/index/index.vue                         |  23 +-
 pages/index/message.vue                       |   6 +-
 pages/index/mine.vue                          |  21 +-
 pages/mine/audit.vue                          |  77 ++++++
 static/feedback.png                           | Bin 8646 -> 4940 bytes
 static/feedback2.png                          | Bin 0 -> 4168 bytes
 static/message4.png                           | Bin 0 -> 5685 bytes
 .../components/uni-nav-bar/uni-nav-bar.vue    |   2 +-
 17 files changed, 388 insertions(+), 43 deletions(-)
 create mode 100644 pages/index/comp/indexYouKe.vue
 create mode 100644 pages/mine/audit.vue
 create mode 100644 static/feedback2.png
 create mode 100644 static/message4.png

diff --git a/pages.json b/pages.json
index 9e0b958..80ab1d7 100644
--- a/pages.json
+++ b/pages.json
@@ -142,13 +142,16 @@
     {
       "path": "pages/device/APF/report",
       "style": {
-        "navigationBarTitleText": "告警情况"
+        "navigationBarTitleText": "告警情况",
+        "navigationStyle": "custom"
+        
       }
     },
     {
       "path": "pages/device/DVR/report",
       "style": {
-        "navigationBarTitleText": "告警情况"
+        "navigationBarTitleText": "告警情况",
+        "navigationStyle": "custom"
       }
     },
     {
@@ -330,6 +333,12 @@
       "style": {
         "navigationBarTitleText": "项目移交"
       }
+    },
+    {
+      "path": "pages/mine/audit",
+      "style": {
+        "navigationBarTitleText": "角色升级审核"
+      }
     }
   ],
   "tabBar": {
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index 374d865..79e4d5d 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -178,6 +178,9 @@ export default {
                     }, {
                         iconPath: '/static/table.png',
                         text: '删除',
+                    }, {
+                        iconPath: '/static/feedback.png',
+                        text: '反馈',
                     })
                     break;
                 case 5:
diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue
index ce742df..064a298 100644
--- a/pages/device/APF/report.vue
+++ b/pages/device/APF/report.vue
@@ -2,6 +2,8 @@
     <Cn-page :loading='loading'>
         <view slot='body'>
             <view class='record'>
+                <uni-nav-bar dark :fixed="true" status-bar left-icon="left" rightText="关闭通知" background-color="#fff"
+                    color="#111" title="告警情况" @clickLeft="back" @clickRight="messageSet" />
                 <div class="header">
                     <uni-segmented-control :current="current" :values="items" :style-type="styleType"
                         :active-color="activeColor" @clickItem="onClickItem" />
@@ -26,6 +28,17 @@ export default {
         }
     },
     methods: {
+        back(){
+            uni.navigateBack()
+        },
+        messageSet(){
+            uni.showModal({
+                title: '提示',
+                content: '确定关闭该设备的告警通知吗？',
+                showCancel: true,
+                success: ({ confirm, cancel }) => {}
+            })
+        },
         onClickItem (e) {
             this.current = e.currentIndex
         },
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index cd3edf0..ce80c58 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/pages/index/comp/indexGongCheng.vue
@@ -15,11 +15,10 @@
             </div>
         </div>
         <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+            <Cn-grid title="常用功能">
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item>
+                <Cn-grid-item src="/static/feedback2.png" text="提交反馈" @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
         </view>
         <view class="nav">
@@ -46,6 +45,7 @@ export default {
     data () {
         return {
             loading: false,
+            userInfo: {},
             select: {
                 projectName: '',
                 projectNameIndex: 0,
@@ -209,6 +209,7 @@ export default {
         },
     },
     mounted () {
+        this.userInfo = uni.getStorageSync('userInfo')
         setTimeout(() => {
             // 获取nav高度
             uni.createSelectorQuery().select('.nav').boundingClientRect((rect) => {
diff --git a/pages/index/comp/indexYouKe.vue b/pages/index/comp/indexYouKe.vue
new file mode 100644
index 0000000..cf49a9c
--- /dev/null
+++ b/pages/index/comp/indexYouKe.vue
@@ -0,0 +1,221 @@
+<template>
+    <view class="index-zhuyonghu">
+        <div class="header">
+            <div class="header-item">
+                <div class="header-item-value">3</div>
+                <div class="header-item-label">正常设备</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">1</div>
+                <div class="header-item-label">报警设备</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">0</div>
+                <div class="header-item-label">离线设备</div>
+            </div>
+        </div>
+        <view class="nav">
+            <picker @change="projectNameChange" :value="select.projectNameIndex" :range="projectList" range-key="text">
+                <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }">{{
+                    select.projectName || '项目' }} </view>
+            </picker>
+            <picker @change="projectTypeChange" :value="select.projectTypeIndex" :range="projectType" range-key="text">
+                <view class="nav-menu" :class="{ 'nav-menu-active': select.projectType }">{{
+                    select.projectType || '类型' }} </view>
+            </picker>
+        </view>
+        <view class="content device" :style="{ minHeight: minHeight }">
+            <uni-card :title="item.name" :sub-title="item.project" :extra="item.type" padding="0"
+                v-for="(item, index) in deviceListFilter" :key="index" @click="jump(item)" thumbnail="/static/device.png">
+                <!-- <text>{{ item.project }} {{ item.type }}</text> -->
+            </uni-card>
+            <uni-load-more status="nomore"></uni-load-more>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            loading: false,
+            userInfo: {},
+            select: {
+                projectName: '',
+                projectNameIndex: 0,
+                projectType: '',
+                projectTypeIndex: 0
+            },
+            projectType: [
+                {
+                    text: '全部类型',
+                    value: 0
+                },
+                {
+                    text: '监测',
+                    value: 1
+                },
+                {
+                    text: '用能',
+                    value: 2
+                },
+                {
+                    text: '环境',
+                    value: 3
+                },
+                {
+                    text: '安防',
+                    value: 4
+                },
+                {
+                    text: '其他',
+                    value: 5
+                }
+            ],
+            projectList: [
+                {
+                    text: '全部项目',
+                    value: 1
+                },
+                {
+                    text: 'XXX项目1',
+                    value: 1
+                },
+                {
+                    text: 'XXX项目2',
+                    value: 1
+                },
+                {
+                    text: 'XXX项目3',
+                    value: 1
+                },
+
+            ],
+            navHeight: 0,
+            minHeight: '',
+            deviceList: [
+                {
+                    name: '设备APF-1',
+                    des: '设备描述1',
+                    type: '监测',
+                    project: 'XXX项目1',
+                },
+                {
+                    name: '设备APF-2',
+                    des: '设备描述1',
+                    type: '监测',
+                    project: 'XXX项目1',
+                },
+                {
+                    name: '设备APF-3',
+                    des: '设备描述2',
+                    type: '用能',
+                    project: 'XXX项目2'
+                },
+                {
+                    name: '设备DVR-1',
+                    des: '设备描述3',
+                    type: '监测',
+                    project: 'XXX项目3'
+                }
+            ]
+        }
+    },
+    computed: {
+
+        deviceListFilter () {
+            return this.deviceList.filter(item => {
+                if (this.select.projectName) {
+                    return item.project === this.select.projectName
+                } else if (this.select.projectType) {
+                    return item.type === this.select.projectType
+                } else {
+                    return true
+                }
+            })
+        }
+    },
+    methods: {
+        projectTypeChange (e) {
+            // 重置name
+            this.select.projectName = ''
+            this.select.projectNameIndex = 0
+
+            this.select.projectTypeIndex = e.detail.value
+            if (e.detail.value === 0) {
+                this.select.projectType = ''
+                return
+            }
+            this.select.projectType = this.projectType[e.detail.value].text
+
+
+        },
+        projectNameChange (e) {
+            console.log(e);
+            // 重置type
+            this.select.projectType = ''
+            this.select.projectTypeIndex = 0
+
+            this.select.projectNameIndex = e.detail.value
+            if (e.detail.value === 0) {
+                this.select.projectName = ''
+                return
+            }
+            this.select.projectName = this.projectList[e.detail.value].text
+        },
+        registerDevice () {
+            uni.showModal({
+                title: '提示',
+                content: '请选择设备类型',
+                confirmText: '直连装置',
+                cancelText: '网关接入',
+                cancelColor: '#007aff',
+                success: ({ confirm, cancel }) => {
+                    if (confirm) {
+                        uni.navigateTo({
+                            url: '/pages/device/new'
+                        })
+                    } else if (cancel) {
+                        uni.navigateTo({
+                            url: '/pages/gateway/list'
+                        })
+                    }
+                }
+            })
+        },
+        registerGateway () {
+            uni.navigateTo({
+                url: '/pages/gateway/new'
+            })
+        },
+        navMenuClick (index) {
+            this.navMenuActive = index
+        },
+        jump (item) {
+            if (item.name.indexOf('APF') > -1) {
+                uni.navigateTo({
+                    url: '/pages/device/APF/detail'
+                })
+            } else if (item.name.indexOf('DVR') > -1) {
+                uni.navigateTo({
+                    url: '/pages/device/DVR/detail'
+                })
+            }
+        },
+    },
+    mounted () {
+        setTimeout(() => {
+            // 获取nav高度
+            uni.createSelectorQuery().select('.nav').boundingClientRect((rect) => {
+                this.navHeight = rect.height
+                // #ifdef H5 
+                this.minHeight = 'calc(100vh - env(safe-area-inset-bottom) - ' + (50 + this.navHeight) + 'px)'
+                // #endif
+                // #ifdef APP-PLUS
+                this.minHeight = 'calc(100vh - ' + this.navHeight + 'px)'
+                // #endif
+            }).exec()
+        }, 1000);
+    }
+}
+</script>
+<style lang='scss'></style>
\ No newline at end of file
diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue
index cd3edf0..be992ae 100644
--- a/pages/index/comp/indexYunWei.vue
+++ b/pages/index/comp/indexYunWei.vue
@@ -15,11 +15,9 @@
             </div>
         </div>
         <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+            <Cn-grid title="常用功能">
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item>
             </Cn-grid>
         </view>
         <view class="nav">
diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue
index cd3edf0..9f1c936 100644
--- a/pages/index/comp/indexZhuYongHu.vue
+++ b/pages/index/comp/indexZhuYongHu.vue
@@ -15,11 +15,11 @@
             </div>
         </div>
         <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+            <Cn-grid title="常用功能">
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item>
+                <Cn-grid-item src="/static/feedback2.png"  text="提交反馈"
+                    @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
         </view>
         <view class="nav">
@@ -141,6 +141,11 @@ export default {
         }
     },
     methods: {
+        submitFeedBack () {
+            uni.navigateTo({
+                url: '/pages/device/feedback'
+            })
+        },
         projectTypeChange (e) {
             // 重置name
             this.select.projectName = ''
diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue
index feb8274..a75f9fe 100644
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/pages/index/comp/indexZhuanZhi.vue
@@ -36,7 +36,7 @@
 export default {
     data () {
         return {
-            loading: false
+            loading: false,
         }
     },
     methods: {
@@ -51,7 +51,9 @@ export default {
                 })
             }
         },
-    }
+    },
+    created(){
+    },
 }
 </script>
 <style lang='scss'>
diff --git a/pages/index/comp/indexZiYongHu.vue b/pages/index/comp/indexZiYongHu.vue
index 3407b4c..d649b3c 100644
--- a/pages/index/comp/indexZiYongHu.vue
+++ b/pages/index/comp/indexZiYongHu.vue
@@ -14,14 +14,11 @@
                 <div class="header-item-label">离线设备</div>
             </div>
         </div>
-        <!-- <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+        <view style="padding:20rpx 20rpx 0">
+            <Cn-grid title="常用功能">
+                <Cn-grid-item src="/static/feedback2.png" text="提交反馈" @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
-        </view> -->
+        </view>
         <view class="nav">
             <picker @change="projectNameChange" :value="select.projectNameIndex" :range="projectList" range-key="text">
                 <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }">{{
@@ -46,6 +43,7 @@ export default {
     data () {
         return {
             loading: false,
+            userInfo: {},
             select: {
                 projectName: '',
                 projectNameIndex: 0,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 20a33ac..0631c61 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,6 +12,7 @@
                 <ZhuYongHu v-if="userInfo.role == 4" />
                 <!-- 子用户 -->
                 <ZiYongHu v-if="userInfo.role == 5" />
+                <YouKe v-if="userInfo.role == 6"> </YouKe>
                 <uni-fab ref="fab" direction="vertical" horizontal="right" vertical="bottom" :content="content"
                     @trigger="trigger" />
             </view>
@@ -24,13 +25,15 @@ import GongCheng from "./comp/indexGongCheng.vue";
 import ZhuYongHu from "./comp/indexZhuYongHu.vue";
 import ZiYongHu from "./comp/indexZiYongHu.vue";
 import ZhuanZhi from "./comp/indexZhuanZhi.vue";
+import YouKe from "./comp/indexYouKe.vue";
 export default {
     components: {
         YunWei,
         GongCheng,
         ZhuYongHu,
         ZiYongHu,
-        ZhuanZhi
+        ZhuanZhi,
+        YouKe
     },
     data () {
         return {
@@ -58,6 +61,9 @@ export default {
             }, {
                 iconPath: '/static/mine3.png',
                 text: '子用户',
+            }, {
+                iconPath: '/static/mine3.png',
+                text: '游客',
             }
             ]
             return content
@@ -78,14 +84,10 @@ export default {
         },
 
         trigger (e) {
-            if (e.index === 5) {
+            if (e.index === 500) {
                 uni.navigateTo({
                     url: '/pages/device/new'
                 })
-            } else if (e.index === 6) {
-                uni.navigateTo({
-                    url: '/pages/gateway/new'
-                })
             } else {
                 this.userInfo.role = e.index + 1
                 uni.setStorageSync('userInfo', {
@@ -125,6 +127,13 @@ export default {
                             text: '6'
                         })
                         break
+                    case 6:
+                        roleName = '游客'
+                        uni.setTabBarBadge({
+                            index: 1,
+                            text: '6'
+                        })
+                        break
                 }
                 this.$util.toast(roleName + '角色切换成功')
             }
@@ -144,7 +153,7 @@ export default {
                 role: 4
             })
         }
-        if (this.userInfo.role == 4 || this.userInfo.role == 5) {
+        if (this.userInfo.role == 4 || this.userInfo.role == 5 || this.userInfo.role == 6) {
             uni.setTabBarBadge({
                 index: 1,
                 text: '6'
diff --git a/pages/index/message.vue b/pages/index/message.vue
index 61748b4..ef31523 100644
--- a/pages/index/message.vue
+++ b/pages/index/message.vue
@@ -11,19 +11,19 @@
                 <view class="message-nav-label">反馈</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="message-nav" @click="jump('report')" v-if="userInfo.role == '4' || userInfo.role == '5'">
+            <view class="message-nav" @click="jump('report')" v-if="userInfo.role == '4' || userInfo.role == '5'|| userInfo.role == '6'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/report.png" />
                 <view class="message-nav-label">稳态越限</view>
                 <uni-badge text="3"></uni-badge>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="message-nav" @click="jump('incident')" v-if="userInfo.role == '4' || userInfo.role == '5'">
+            <view class="message-nav" @click="jump('incident')" v-if="userInfo.role == '4' || userInfo.role == '5'|| userInfo.role == '6'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/incident.png" />
                 <view class="message-nav-label">暂态事件</view>
                 <uni-badge text="2"></uni-badge>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="message-nav" @click="jump('term')" v-if="userInfo.role == '4' || userInfo.role == '5'">
+            <view class="message-nav" @click="jump('term')" v-if="userInfo.role == '4' || userInfo.role == '5'|| userInfo.role == '6'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/term.png" />
                 <view class="message-nav-label">终端状态</view>
                 <uni-badge text="1"></uni-badge>
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 6684f2e..1ed301d 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -4,18 +4,23 @@
             <view class="mine-header" @click="jump('basic')">
                 <image mode="aspectFill" class="mine-header-head" src="/static/head.png" />
                 <view class="mine-header-name hide-txt">
-                    <view>灿能电力</view>
+                    <view>灿能物联</view>
                     <view class="tag">{{ roleName }}</view>
                 </view>
                 <image src="/static/erweima.png" style="height: 50rpx;width: 50rpx;border-radius:12rpx"
                     mode="scaleToFill" />
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <!-- <view class="mine-nav" @click="jump('upgrade')">
+            <view class="mine-nav" v-if="userInfo.role == 6" @click="jump('upgrade')">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
                 <view class="mine-nav-label">角色升级</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view> -->
+            </view>
+            <view class="mine-nav" @click="jump('audit')" v-if="userInfo.role == 2">
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
+                <view class="mine-nav-label">角色审核</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
 
             <!-- <view class="mine-nav" @click="jump('user')" v-if="userInfo.role == 4">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/subordinate.png" />
@@ -27,20 +32,21 @@
                 <view class="mine-nav-label">扫一扫</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="mine-nav" @click="jump('project')" v-if="userInfo.role == 4 || userInfo.role == 3">
+            <view class="mine-nav" @click="jump('project')"
+                v-if="userInfo.role == 4 || userInfo.role == 3 || userInfo.role == 2">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
                 <view class="mine-nav-label">项目管理</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('gateway')"
-                v-if="userInfo.role == 4 || userInfo.role == 3 || userInfo.role == 5"
+                v-if="userInfo.role == 4 || userInfo.role == 3 || userInfo.role == 5 || userInfo.role == 2"
                 style="border-bottom: none; box-shadow: 0 4rpx 8rpx #e7e7e74c;">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/gateway.png" />
                 <view class="mine-nav-label">网关列表</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('setupMessage')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/notice2.png" />
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/message4.png" />
                 <view class="mine-nav-label">消息配置</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
@@ -84,6 +90,9 @@ export default {
                 case 5:
                     roleName = '子用户'
                     break
+                case 6:
+                    roleName = '游客'
+                    break
             }
             return roleName
 
diff --git a/pages/mine/audit.vue b/pages/mine/audit.vue
new file mode 100644
index 0000000..06d924b
--- /dev/null
+++ b/pages/mine/audit.vue
@@ -0,0 +1,77 @@
+<template>
+    <Cn-page :loading='loading'>
+        <view slot='body'>
+            <view class='index'>
+                <uni-list>
+                    <uni-list-item title="张三申请成为主用户" note="2023-02-10 14:55" thumb="/static/head.png" thumb-size="lg">
+                        <template v-slot:footer>
+                            <view class="footer-btn mt20" style="background:#e47470" @click="del">拒绝</view>
+                            <view class="footer-btn mt20 ml10" @click="jump">通过</view>
+                        </template>
+                    </uni-list-item>
+                    <uni-list-item title="李四申请成为子用户" note="2023-02-10 14:55" thumb="/static/head.png" thumb-size="lg">
+                        <template v-slot:footer>
+                            <view class="footer-btn mt20" style="background:#e47470" @click="del">拒绝</view>
+                            <view class="footer-btn mt20 ml10" @click="jump">通过</view>
+                        </template>
+                    </uni-list-item>
+                </uni-list>
+                <uni-load-more status="nomore"></uni-load-more>
+            </view>
+        </view>
+    </Cn-page>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            loading: false
+        }
+    },
+    methods: {
+        jump () {
+            uni.showModal({
+                title: '提示',
+                content: '确定要通过该成员吗？',
+                success: function (res) {
+                    if (res.confirm) {
+                        console.log('用户点击确定')
+                    } else if (res.cancel) {
+                        console.log('用户点击取消')
+                    }
+                }
+            })
+        },
+        del () {
+            console.log('del');
+            uni.showModal({
+                title: '提示',
+                content: '确定要拒绝该成员吗？',
+                success: function (res) {
+                    if (res.confirm) {
+                        console.log('用户点击确定')
+                    } else if (res.cancel) {
+                        console.log('用户点击取消')
+                    }
+                }
+            })
+        }
+    }
+}
+</script>
+<style lang='scss'>
+.index {
+    padding: 20rpx;
+
+    .footer-btn {
+        padding: 0 20rpx;
+        height: 50rpx;
+        background-color: #007aff;
+        font-size: 24rpx;
+        color: #fff;
+        text-align: center;
+        line-height: 50rpx;
+        border-radius: 10rpx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/static/feedback.png b/static/feedback.png
index 674cf696b19e8265a126c69623ce3be557de5063..cc281ed385b262878c8c746149e52f9b3c22ddca 100644
GIT binary patch
literal 4940
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
Y9fubi79x+hsrDE^`?fx+RKte&AKU8WBLDyZ

literal 8646
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

diff --git a/static/feedback2.png b/static/feedback2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a55159cdfc6797f16121b6777faa5bd2a09582e
GIT binary patch
literal 4168
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

literal 0
HcmV?d00001

diff --git a/static/message4.png b/static/message4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc0aab468d6b86d0a551d10cc177e25393c94ae8
GIT binary patch
literal 5685
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

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
index d15b06b..e8e773e 100644
--- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -37,7 +37,7 @@
 					</slot>
 				</view>
 			</view>
-		</view>
+		</view>
 		<!-- #ifndef APP-NVUE -->
 		<view class="uni-navbar__placeholder" v-if="fixed">
 			<status-bar v-if="statusBar" />