From eb72146e0d253e816a2b601af859ab1f9161db61 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Sat, 25 Apr 2026 15:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Cn-device-card/Cn-device-card.vue |   8 +-
 pages/engineering/list.vue                   | 151 +++++++---
 pages/index/comp/apply.vue                   |   3 +-
 pages/index/comp/steadyState.vue             |   2 +-
 pages/index/comp/transient.vue               |  73 +++--
 pages/message1/comp/alarmDetails.vue         |   6 +-
 pages/message1/comp/steadyStateDetails.vue   |   4 +-
 pages/message1/comp/transientDetails.vue     |   2 +-
 pages/message1/index.scss                    |   6 +-
 pages/project/list.vue                       |  56 ++--
 pages/user/head.vue                          | 295 ++++++++++---------
 11 files changed, 321 insertions(+), 285 deletions(-)

diff --git a/components/Cn-device-card/Cn-device-card.vue b/components/Cn-device-card/Cn-device-card.vue
index 47c00e1..f972a54 100644
--- a/components/Cn-device-card/Cn-device-card.vue
+++ b/components/Cn-device-card/Cn-device-card.vue
@@ -147,7 +147,7 @@ export default {
     .device-body-item {
         display: flex;
         justify-content: space-between;
-        font-size: 26rpx;
+        font-size: 28rpx;
         color: #666666;
         line-height: 1.2;
     }
@@ -170,12 +170,12 @@ export default {
     }
 }
 .uni-card .uni-card__header .uni-card__header-content .uni-card__header-content-title {
-    font-size: 28rpx;
+    font-size: 30rpx;
     color: #3a3a3a;
     font-weight: 700;
 }
 .uni-card .uni-card__header .uni-card__header-content .uni-card__header-content-subtitle {
-    font-size: 12px;
+    font-size: 24rpx;
     // margin-top: 5px;
     color: #666666;
 }
@@ -208,7 +208,7 @@ export default {
     margin-right: 20rpx;
 }
 .event-tag {
-    font-size: 20rpx;
+    font-size: 22rpx;
     padding: 2rpx 10rpx;
     border-radius: 8rpx;
     margin-top: 5rpx;
diff --git a/pages/engineering/list.vue b/pages/engineering/list.vue
index 8eab040..846f4cf 100644
--- a/pages/engineering/list.vue
+++ b/pages/engineering/list.vue
@@ -1,61 +1,48 @@
 <template>
     <view :loading="loading">
         <!-- <uni-nav-bar left-icon="left" right-icon="cart" title="标题" /> -->
-        <uni-nav-bar
-            dark
-            :fixed="true"
-            status-bar
-            left-icon="left"
-            :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.name"
-            clearButton="none"
-            bgColor="#fff"
-            placeholder="请输入关键词"
-            @input="store.search()"
-        ></uni-search-bar>
+        <uni-nav-bar dark :fixed="true" status-bar left-icon="left" :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.name" clearButton="none" bgColor="#fff" placeholder="请输入关键词"
+            @input="store.search()"></uni-search-bar>
         <view class="message">
-            <uni-card
-                class="boxClick"
-                :title="item.name"
-                extra="🔍"
-                @click="jump(item)"
-                v-for="(item, index) in store.data"
-                :style="{ marginTop: index === 0 ? '0' : '' }"
-                :key="index"
-            >
-                <view class="term-list-bottom">
-                    <view class="term-list-bottom-item">
-                        <view>区域</view>
-                        <view>{{ item.provinceName + item.cityName }}</view>
-                    </view>
-                    <view class="term-list-bottom-item">
-                        <view>创建时间</view>
-                        <view>{{ item.createTime }}</view>
-                    </view>
-                </view>
-            </uni-card>
+
+
+            <uni-swipe-action>
+                <uni-swipe-action-item v-for="(item, index) in store.data"
+                    :style="{ marginTop: index === 0 ? '0' : '' }" :key="index" :threshold="0"
+                    :right-options="item.isTop == 0 ? options1 : options12" @click="bindClick($event, item)">
+                    <uni-card class="boxClick" :title="item.name" extra="🔍" @click="jump(item)">
+                        <view class="term-list-bottom">
+                            <view class="term-list-bottom-item">
+                                <view>区域</view>
+                                <view>{{ item.provinceName + item.cityName }}</view>
+                            </view>
+                            <view class="term-list-bottom-item">
+                                <view>创建时间</view>
+                                <view>{{ item.createTime }}</view>
+                            </view>
+                        </view>
+                        <view class="pinToTop" v-if="item.isTop == 1"> 置顶 </view>
+                    </uni-card>
+                </uni-swipe-action-item>
+            </uni-swipe-action>
+
+
+
+
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more
-                v-if="store.status == 'loading' || (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>
 
 <script>
 import list from '../../common/js/list'
+import { engineeringPinToTop } from '@/common/api/device'
 
 export default {
     mixins: [list],
@@ -63,9 +50,39 @@ export default {
         return {
             loading: true,
             userInfo: {},
+            options1: [
+                {
+                    text: '置顶',
+                    style: {
+                        backgroundColor: '#376cf3',
+                    },
+                },
+            ],
+            options12: [
+                {
+                    text: '取消',
+                    style: {
+                        backgroundColor: '#ccc',
+                    },
+                },
+            ],
         }
     },
     methods: {
+        bindClick(e, item) {
+            engineeringPinToTop({
+                targetId: item.id,
+                targetType: 2,
+                userId: uni.getStorageSync(this.$cacheKey.userInfo).userIndex,
+            }).then((res) => {
+                if (res.code == 'A0000') {
+                    this.$util.toast('操作成功!')
+                    this.store.search()
+                } else {
+                    this.$util.toast(res.message)
+                }
+            })
+        },
         init() {
             this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
             this.store = this.DataSource('/cs-device-boot/engineering/queryEngineeringPage')
@@ -174,7 +191,7 @@ export default {
 .term-list-bottom {
     .term-list-bottom-item {
         font-size: 28rpx;
-        margin-bottom: 20rpx;
+        // margin-bottom: 20rpx;
         display: flex;
         justify-content: space-between;
         // view:first-of-type{
@@ -186,4 +203,42 @@ export default {
         margin-bottom: 0;
     }
 }
+
+/deep/ .uni-card--border {
+    margin: 0 10px !important;
+    padding-bottom: 10px;
+}
+
+/deep/ .uni-swipe {
+
+    margin-bottom: 10px;
+}
+
+.pinToTop {
+    background-color: $uni-theme-color;
+    width: 100rpx;
+    height: 60rpx;
+    line-height: 90rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 20rpx;
+    position: absolute;
+    top: 0rpx;
+    right: 0rpx;
+    position: absolute;
+    top: 0;
+    right: 0;
+
+    /* 核心：旋转成斜三角效果 */
+    transform: rotate(45deg) translate(50rpx, -10rpx);
+    transform-origin: top right;
+}
+
+/deep/ .uni-card__content {
+    padding: 5px 10px 10px !important;
+}
+
+/deep/ .uni-card__header-content-title {
+    font-weight: 700;
+}
 </style>
diff --git a/pages/index/comp/apply.vue b/pages/index/comp/apply.vue
index 639d2f3..58f5e6b 100644
--- a/pages/index/comp/apply.vue
+++ b/pages/index/comp/apply.vue
@@ -279,8 +279,7 @@ export default {
                     uni.showToast({
                         icon: 'success',
                         mask: true,
-                        title: '申请暂态报告,成功!',
-                        duration: 1000,
+                        title: '申请报告,成功!',
                     })
                 })
             }
diff --git a/pages/index/comp/steadyState.vue b/pages/index/comp/steadyState.vue
index 911b552..937bb7a 100644
--- a/pages/index/comp/steadyState.vue
+++ b/pages/index/comp/steadyState.vue
@@ -272,7 +272,7 @@ export default {
 }
 
 .event-detail {
-    font-size: 25rpx !important;
+    // font-size: 25rpx !important;
     // display: grid;
     // grid-template-columns: 1fr 1fr;
 }
diff --git a/pages/index/comp/transient.vue b/pages/index/comp/transient.vue
index 8b1d87c..5d3cd1b 100644
--- a/pages/index/comp/transient.vue
+++ b/pages/index/comp/transient.vue
@@ -1,13 +1,8 @@
 <template>
     <view class="dateReport">
         <view class="pd20">
-            <uni-segmented-control
-                :current="curSub"
-                class="subsection"
-                active-color="#376cf3"
-                :values="subsectionList"
-                @clickItem="sectionChange"
-            />
+            <uni-segmented-control :current="curSub" class="subsection" active-color="#376cf3" :values="subsectionList"
+                @clickItem="sectionChange" />
         </view>
 
         <!-- 申请报告 -->
@@ -22,15 +17,9 @@
                 <!-- 筛选条件 -->
                 <Cn-filterCriteria @select="select" :showQianTree="false"> </Cn-filterCriteria>
             </view>
-            <scroll-view
-                scroll-y="true"
-                @refresherrefresh="refresherrefresh"
-                @scrolltolower="scrolltolower"
-                :refresher-triggered="triggered"
-                refresher-enabled="true"
-                class="record event-list mt20"
-                :style="{ height: 'calc(100vh - ' + (navHeight + height) + 'px)', overflow: 'auto' }"
-            >
+            <scroll-view scroll-y="true" @refresherrefresh="refresherrefresh" @scrolltolower="scrolltolower"
+                :refresher-triggered="triggered" refresher-enabled="true" class="record event-list mt20"
+                :style="{ height: 'calc(100vh - ' + (navHeight + height) + 'px)', overflow: 'auto' }">
                 <uni-card class="event-item" :class="item.type" v-for="(item, index) in store.data" :key="index">
                     <!-- 头部：图标 + 信息 + 操作 -->
                     <view class="event-header">
@@ -58,14 +47,11 @@
                             </view>
                         </view>
                         <view class="event-action">
-                            <view class="iconText boxClick" v-if="item.isComplete == 1" @click="download(item)"
-                                ><uni-icons type="arrow-down" color="#fff" size="16"></uni-icons>
+                            <view class="iconText boxClick" v-if="item.isComplete == 1" @click="download(item)">
+                                <uni-icons type="arrow-down" color="#fff" size="16"></uni-icons>
                             </view>
-                            <view
-                                class="nav-menu nav-menu-btn boxClick" 
-                                v-else-if="userInfo.authorities === 'operation_manager'"
-                                @click="generate(item)"
-                                >生成报告
+                            <view class="nav-menu nav-menu-btn boxClick"
+                                v-else-if="userInfo.authorities === 'operation_manager'" @click="generate(item)">生成报告
                             </view>
                         </view>
                     </view>
@@ -76,6 +62,12 @@
                             <text>申请人：</text>
                             <text>{{ item.applyUser }}</text>
                         </view>
+                        <view class="device-body-item">
+                            <text>报告状态：</text>
+                            <text :style="{ color: item.isComplete == 1 ? '#10b981' : '#FF0000' }">{{
+                                item.isComplete == 1 ? '已完成' : '未完成'
+                                }}</text>
+                        </view>
                         <view class="device-body-item">
                             <text>申请时间：</text>
                             <text>{{ item.time }}</text>
@@ -84,12 +76,7 @@
                             <text>暂降事件：</text>
                             <text>{{ item.eventNums }}次</text>
                         </view>
-                        <view class="device-body-item">
-                            <text>报告状态：</text>
-                            <text :style="{ color: item.isComplete == 1 ? '#10b981' : '#FF0000' }">{{
-                                item.isComplete == 1 ? '已完成' : '未完成'
-                            }}</text>
-                        </view>
+
 
                         <!-- <view class="device-body-item">
                             <text>申请时间：</text>
@@ -99,10 +86,8 @@
 
                     <!-- </view> -->
                 </uni-card>
-                <uni-load-more
-                    v-if="store.status == 'loading' || (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>
                 <Cn-empty v-else style="top: 30%"></Cn-empty>
             </scroll-view>
         </view>
@@ -149,7 +134,7 @@ export default {
             selectValue: {},
         }
     },
-    created() {},
+    created() { },
     mounted() {
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
     },
@@ -262,7 +247,7 @@ export default {
                                 })
                             }
                         },
-                        fail: function (res) {},
+                        fail: function (res) { },
                     })
                 })
                 .catch((err) => {
@@ -308,7 +293,7 @@ export default {
 
 .event-detail {
     display: grid;
-    grid-template-columns: 1fr 1.2fr;
+    grid-template-columns: 1.6fr 1fr;
 }
 
 // /deep/ .record {
@@ -320,28 +305,35 @@ export default {
     .nav {
         background-color: #fff;
     }
+
     .choose1 {
         background-color: #fff;
         padding: 0 20rpx;
         display: flex;
         justify-content: space-between;
+
         /deep/ .uni-checkbox-input {
             width: 30rpx;
             height: 30rpx;
         }
+
         font-size: 26rpx;
     }
 }
+
 // .device-body {
 //     padding: 10rpx 20rpx 20rpx;
 
 .device-body-item {
     display: flex;
     // justify-content: space-between;
-    font-size: 26rpx;
+    font-size: 28rpx;
     color: #666666;
     line-height: 1.5;
+
+    
 }
+
 // }
 .iconText {
     display: flex;
@@ -352,6 +344,7 @@ export default {
     justify-content: center;
     align-items: center;
 }
+
 .nav-menu {
     height: 40rpx;
     padding: 6rpx 20rpx;
@@ -360,26 +353,32 @@ export default {
     line-height: 40rpx;
     background: #ebeaec;
     color: #666;
+
     &-active {
         background: #dfe5f7;
         color: $uni-theme-color;
     }
+
     &-btn {
         background: $uni-theme-color;
         color: #fff;
     }
 }
+
 .event-list {
+
     /* 图标区域（按类型区分背景色） */
     .event-icon {
         background-color: #376cf320;
     }
 }
+
 .segmented-control {
     flex: 1;
     margin-right: 24rpx;
     height: 60rpx;
 }
+
 /deep/ .uni-scroll-view-refresher {
     display: none;
 }
diff --git a/pages/message1/comp/alarmDetails.vue b/pages/message1/comp/alarmDetails.vue
index c8cbca5..02df5b7 100644
--- a/pages/message1/comp/alarmDetails.vue
+++ b/pages/message1/comp/alarmDetails.vue
@@ -122,7 +122,7 @@ export default {
         padding: 20rpx;
         background: #fff;
         margin-bottom: 20rpx;
-        font-size: 26rpx;
+        font-size: 28rpx;
 
         .detail-content-title {
             font-size: 30rpx;
@@ -141,13 +141,13 @@ export default {
     }
     .frequency {
         display: flex;
-        font-size: 26rpx;
+        font-size: 28rpx;
         // color: #666666;
     }
 }
 .textBox {
     // border-bottom: 1px solid #eee;
-    font-size: 26rpx;
+    font-size: 28rpx;
     color: #666666;
     text-indent: 2em;
 }
diff --git a/pages/message1/comp/steadyStateDetails.vue b/pages/message1/comp/steadyStateDetails.vue
index 249aa57..ef4688b 100644
--- a/pages/message1/comp/steadyStateDetails.vue
+++ b/pages/message1/comp/steadyStateDetails.vue
@@ -97,7 +97,7 @@ export default {
         padding: 20rpx;
         background: #fff;
         margin-bottom: 20rpx;
-        font-size: 26rpx;
+        font-size: 28rpx;
 
         .detail-content-title {
             font-size: 30rpx;
@@ -131,7 +131,7 @@ export default {
         text {
             width: 100rpx;
             text-align: center;
-            font-size: 26rpx;
+            font-size: 28rpx;
             // color: #333;
             &:nth-child(1) {
                 flex: 1;
diff --git a/pages/message1/comp/transientDetails.vue b/pages/message1/comp/transientDetails.vue
index 9d972c4..b10c0fa 100644
--- a/pages/message1/comp/transientDetails.vue
+++ b/pages/message1/comp/transientDetails.vue
@@ -87,7 +87,7 @@ export default {
         padding: 20rpx;
         background: #fff;
         margin-bottom: 20rpx;
-        font-size: 26rpx;
+        font-size: 28rpx;
 
         .detail-content-title {
             font-size: 30rpx;
diff --git a/pages/message1/index.scss b/pages/message1/index.scss
index b1baf88..41055be 100644
--- a/pages/message1/index.scss
+++ b/pages/message1/index.scss
@@ -109,7 +109,7 @@
         flex-wrap: wrap; /* 适配小屏，防止文字溢出 */
     }
     .event-id {
-        font-size: 28rpx;
+        font-size: 30rpx;
         font-weight: 700;
         color: #333333;
         margin-right: 16rpx;
@@ -150,7 +150,7 @@
         gap: 8rpx;
     }
     .event-desc text {
-        font-size: 26rpx;
+        font-size: 28rpx;
         color: #666666;
         line-height: 1.2;
     }
@@ -172,7 +172,7 @@
 
     /* 详情文本 */
     .event-detail {
-        font-size: 26rpx;
+        font-size: 28rpx;
         color: #666666;
         line-height: 1.5;
         padding-top: 10rpx;
diff --git a/pages/project/list.vue b/pages/project/list.vue
index e22bf27..f91658f 100644
--- a/pages/project/list.vue
+++ b/pages/project/list.vue
@@ -1,39 +1,15 @@
 <template>
     <view :loading="loading">
         <!-- <uni-nav-bar left-icon="left" right-icon="cart" title="标题" /> -->
-        <uni-nav-bar
-            dark
-            :fixed="true"
-            status-bar
-            left-icon="left"
-            :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-nav-bar dark :fixed="true" status-bar left-icon="left" :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>
         <view class="message">
-            <uni-card
-                class="boxClick"
-                :title="item.name"
-                @click="jump(item)"
-                extra="🔍"
-                v-for="(item, index) in store.data"
-                :key="index"
-                :style="{ marginTop: index === 0 ? '0' : '' }"
-            >
+            <uni-card class="boxClick" :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>
@@ -46,10 +22,8 @@
                 </view>
             </uni-card>
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more
-                v-if="store.status == 'loading' || (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>
@@ -169,7 +143,7 @@ export default {
 .term-list-bottom {
     .term-list-bottom-item {
         font-size: 28rpx;
-        margin-bottom: 20rpx;
+        // margin-bottom: 20rpx;
         display: flex;
         justify-content: space-between;
         // view:first-of-type{
@@ -181,4 +155,12 @@ export default {
         margin-bottom: 0;
     }
 }
+
+/deep/ .uni-card__content {
+    padding: 5px 10px 10px !important;
+}
+
+/deep/ .uni-card__header-content-title {
+    font-weight: 700;
+}
 </style>
diff --git a/pages/user/head.vue b/pages/user/head.vue
index 9a3d166..9205d2c 100644
--- a/pages/user/head.vue
+++ b/pages/user/head.vue
@@ -1,147 +1,148 @@
-<template>
-    <view>
-        <Cn-page :loading="loading">
-            <view slot="body">
-                <view class="head">
-                    <image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
-                    <image class="head-img" src="/static/head.png" v-else></image>
-                    <view class="head-setup">
-                        <view class="head-setup-item" @click="take('album')">从相册选一张</view>
-                        <view class="head-setup-item" @click="take('camera')">拍一张照片</view>
-                    </view>
-                </view>
-            </view>
-        </Cn-page>
-
-        <uni-popup ref="alertDialog" type="dialog">
-            <uni-popup-dialog
-                style="width: 90%; margin: 5%"
-                cancelText="禁止"
-                confirmText="允许"
-                title="权限说明"
-                content='是否允许"灿能物联"使用相机?'
-                @confirm="handleScon('camera')"
-                @close="dialogClose"
-            ></uni-popup-dialog>
-        </uni-popup>
-        <uni-popup ref="message" type="message">
-            <uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
-                <view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
-                <view style="color: #6c6c6c; margin-top: 3rpx">　用于拍照上传头像!</view>
-            </uni-popup-message>
-        </uni-popup>
-        <yk-authpup ref="authpup" type="top" @changeAuth="changeAuth" permissionID="CAMERA"></yk-authpup>
-        <yk-authpup
-            ref="authpup1"
-            type="top"
-            @changeAuth="changeAuth"
-            permissionID="WRITE_EXTERNAL_STORAGE"
-        ></yk-authpup>
-    </view>
-</template>
-<script>
-import { uploadImage, getImageUrl } from '@/common/api/basic'
-import { apiUpdateUser } from '@/common/api/user'
-import ykAuthpup from '@/components/yk-authpup/yk-authpup'
-export default {
-    components: {
-        ykAuthpup,
-    },
-    data() {
-        return {
-            loading: false,
-            userInfo: {},
-            type: '',
-        }
-    },
-    methods: {
-        take(type) {
-            this.type = type
-            if (type == 'camera') {
-                if (plus.os.name == 'Android') {
-                    this.$refs['authpup'].open()
-                    //未授权
-                    // this.$refs.message.open()
-                    // this.$refs.alertDialog.open('bottom')
-                } else {
-                    this.handleScon(type)
-                }
-            } else {
-                if (plus.os.name == 'Android') {
-                    this.$refs['authpup1'].open()
-                    //未授权
-                    // this.$refs.message.open()
-                    // this.$refs.alertDialog.open('bottom')
-                } else {
-                    this.handleScon(type)
-                }
-                // this.handleScon(type)、
-            }
-        },
-        changeAuth() {
-            //这里是权限通过后执行自己的代码逻辑
-            console.log('权限已授权，可执行自己的代码逻辑了')
-            // this.handleScon()
-            this.handleScon(this.type)
-        },
-        handleScon(type) {
-            this.$refs.message.close()
-            uni.chooseImage({
-                count: 1,
-                sizeType: ['original', 'compressed'],
-                sourceType: [type],
-                success: (res) => {
-                    uploadImage(res.tempFilePaths[0]).then((res) => {
-                        console.log(res)
-                        let result = JSON.parse(res[1].data)
-                        apiUpdateUser({
-                            headSculpture: result.data.minFileUrl,
-                        }).then((res) => {
-                            console.log(res)
-                            this.userInfo.headSculpture = result.data.minFileUrl
-                            this.userInfo.avatar = this.$config.static + result.data.minFileUrl
-                            uni.setStorageSync(this.$cacheKey.userInfo, this.userInfo)
-                            this.$forceUpdate()
-                        })
-                    })
-                },
-            })
-        },
-        dialogClose() {
-            this.$refs.message.close()
-        },
-    },
-
-    onLoad(options) {
-        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
-    },
-}
-</script>
-<style lang="scss">
-.head {
-    .head-img {
-        height: 750rpx;
-        width: 750rpx;
-    }
-
-    .head-setup {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 750rpx;
-        padding-bottom: 60rpx;
-        background-color: #fff;
-
-        .head-setup-item {
-            height: 100rpx;
-            line-height: 100rpx;
-            text-align: center;
-            border-top: 1rpx solid #e8e8e8;
-        }
-    }
-}
-/deep/ .uni-popup-message__box {
-    border-radius: 10rpx !important;
-    background-color: #fff;
-}
-</style>
+<template>
+    <view>
+        <Cn-page :loading="loading">
+            <view slot="body">
+                <view class="head">
+                    <image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
+                    <image class="head-img" src="/static/head.png" v-else></image>
+                    <view class="head-setup">
+                        <view class="head-setup-item" @click="take('album')">从相册选一张</view>
+                        <view class="head-setup-item" @click="take('camera')">拍一张照片</view>
+                    </view>
+                </view>
+            </view>
+        </Cn-page>
+
+        <uni-popup ref="alertDialog" type="dialog">
+            <uni-popup-dialog
+                style="width: 90%; margin: 5%"
+                cancelText="禁止"
+                confirmText="允许"
+                title="权限说明"
+                content='是否允许"灿能物联"使用相机?'
+                @confirm="handleScon('camera')"
+                @close="dialogClose"
+            ></uni-popup-dialog>
+        </uni-popup>
+        <uni-popup ref="message" type="message">
+            <uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
+                <view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
+                <view style="color: #6c6c6c; margin-top: 3rpx">　用于拍照上传头像!</view>
+            </uni-popup-message>
+        </uni-popup>
+        <yk-authpup ref="authpup" type="top" @changeAuth="changeAuth" permissionID="CAMERA"></yk-authpup>
+        <yk-authpup
+            ref="authpup1"
+            type="top"
+            @changeAuth="changeAuth"
+            permissionID="WRITE_EXTERNAL_STORAGE"
+        ></yk-authpup>
+    </view>
+</template>
+<script>
+import { uploadImage, getImageUrl } from '@/common/api/basic'
+import { apiUpdateUser } from '@/common/api/user'
+import ykAuthpup from '@/components/yk-authpup/yk-authpup'
+export default {
+    components: {
+        ykAuthpup,
+    },
+    data() {
+        return {
+            loading: false,
+            userInfo: {},
+            type: '',
+        }
+    },
+    methods: {
+        take(type) {
+            this.type = type
+            if (type == 'camera') {
+                if (plus.os.name == 'Android') {
+                    this.$refs['authpup'].open()
+                    //未授权
+                    // this.$refs.message.open()
+                    // this.$refs.alertDialog.open('bottom')
+                } else {
+                    this.handleScon(type)
+                }
+            } else {
+                if (plus.os.name == 'Android') {
+                    this.$refs['authpup1'].open()
+                    //未授权
+                    // this.$refs.message.open()
+                    // this.$refs.alertDialog.open('bottom')
+                } else {
+                    this.handleScon(type)
+                }
+                // this.handleScon(type)、
+            }
+        },
+        changeAuth() {
+            //这里是权限通过后执行自己的代码逻辑
+            console.log('权限已授权，可执行自己的代码逻辑了')
+            // this.handleScon()
+            this.handleScon(this.type)
+        },
+        handleScon(type) {
+            this.$refs.message.close()
+            uni.chooseImage({
+                count: 1,
+                sizeType: ['original', 'compressed'],
+                sourceType: [type],
+                success: (res) => {
+                    uploadImage(res.tempFilePaths[0]).then((res) => {
+                        console.log(res)
+                        console.log("🚀 ~ res:", res)
+                        let result = JSON.parse(res[1].data)
+                        apiUpdateUser({
+                            headSculpture: result.data.minFileUrl,
+                        }).then((res) => {
+                            console.log(res)
+                            this.userInfo.headSculpture = result.data.minFileUrl
+                            this.userInfo.avatar = this.$config.static + result.data.minFileUrl
+                            uni.setStorageSync(this.$cacheKey.userInfo, this.userInfo)
+                            this.$forceUpdate()
+                        })
+                    })
+                },
+            })
+        },
+        dialogClose() {
+            this.$refs.message.close()
+        },
+    },
+
+    onLoad(options) {
+        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+    },
+}
+</script>
+<style lang="scss">
+.head {
+    .head-img {
+        height: 750rpx;
+        width: 750rpx;
+    }
+
+    .head-setup {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 750rpx;
+        padding-bottom: 60rpx;
+        background-color: #fff;
+
+        .head-setup-item {
+            height: 100rpx;
+            line-height: 100rpx;
+            text-align: center;
+            border-top: 1rpx solid #e8e8e8;
+        }
+    }
+}
+/deep/ .uni-popup-message__box {
+    border-radius: 10rpx !important;
+    background-color: #fff;
+}
+</style>