From a5b8139b8832377b2c343658c6ff817d09d7e04a 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, 13 Mar 2023 10:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       | 12 +++++
 pages/message/feedback.vue       | 24 +++++-----
 pages/message/feedbackDetail.vue | 80 +++++++++++++++++++++-----------
 3 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/pages.json b/pages.json
index 3f11809..dee4550 100644
--- a/pages.json
+++ b/pages.json
@@ -356,6 +356,18 @@
       "style": {
         "navigationBarTitleText": "联系客服"
       }
+    },
+    {
+      "path": "pages/mine/book",
+      "style": {
+        "navigationBarTitleText": "使用手册"
+      }
+    },
+    {
+      "path": "pages/mine/database",
+      "style": {
+        "navigationBarTitleText": "资料库"
+      }
     }
   ],
   "tabBar": {
diff --git a/pages/message/feedback.vue b/pages/message/feedback.vue
index 4996da5..8feec27 100644
--- a/pages/message/feedback.vue
+++ b/pages/message/feedback.vue
@@ -1,8 +1,8 @@
 <template>
     <view class="content">
         <uni-list :border="false">
-            <uni-list-item :show-badge="index < 1" badgeType="error" isDot badge-text="未读" :title="item.title"
-                note="2023-02-01 15:10:29" v-for="(item, index) in list" :key="index"></uni-list-item>
+            <uni-list-item show-badge badgeType="error" isDot badge-text="新消息" title="机器死机" note="2023-02-03" clickable @click="jump" />
+            <uni-list-item  title="机器开不了机" note="2023-01-31" clickable @click="jump" />
         </uni-list>
         <uni-load-more status="nomore"></uni-load-more>
     </view>
@@ -12,22 +12,16 @@
 export default {
     data () {
         return {
-            title: '灿能',
-            list: [
-                {
-                    title: '机器不稳定',
-                },
-                {
-                    title: '死机'
-                },
-            ]
+            title: '灿能'
         }
     },
     onLoad () {
 
     },
     methods: {
-
+        jump(){
+            uni.navigateTo({ url: '/pages/message/feedbackDetail' })
+        }
     }
 }
 </script>
@@ -41,4 +35,10 @@ export default {
 /deep/ .uni-list-item {
     background-color: $uni-theme-white !important;
 }
+
+/deep/ .uni-badge {
+    background-color: unset !important;
+    color: #dd524d !important;
+    font-size: 28rpx !important;
+}
 </style>
diff --git a/pages/message/feedbackDetail.vue b/pages/message/feedbackDetail.vue
index 57cf164..a4fc53d 100644
--- a/pages/message/feedbackDetail.vue
+++ b/pages/message/feedbackDetail.vue
@@ -2,35 +2,30 @@
     <Cn-page :loading='loading'>
         <view slot='body'>
             <view class='detail'>
-                <view class="detail-content " style="font-size:32rpx">
-                    <!-- <view class="detail-content-title mb20">发生时间</view> -->
-                    <view>2023-02-14</view>
-                </view>
                 <view class="detail-content ">
-                    <view class="detail-content-title mb20">基础信息</view>
-                    <view class="mb10">CN_NPQS682</view>
-                    <view>发生暂降事件，特征幅值：88%，持续时间：0.047s</view>
-                    <view>
-                        南京市 灿能园区
-                    </view>
-                    <view>
-                        电压等级：0.38kV
-                    </view>
-                    <view>
-                        网路参数：00-B7-8D-A8-00-D3
-                    </view>
-                    <!-- <view class="space-between">请您评价本次事件是否对设备造成影响
-                        
-                    </view> -->
+                    <view class="detail-content-title mb20">机器不稳定</view>
+                    <view> 2023-02-14</view>
+                    <view class="mt10 mb10">机器不稳定机器不稳定机器不稳定机器不稳定机器不稳定</view>
+                    <uni-file-picker readonly v-model="imageValue" mode="grid" />
                 </view>
-                <view class="detail-content ">
-                    <view class="detail-content-title mb20">瞬时波形图</view>
-                    <image style="width:100%" src="/static/boxing1.jpeg" mode="widthFix" />
-                </view>
-                <view class="detail-content ">
-                    <view class="detail-content-title mb20">RMS波形图</view>
-                    <image style="width:100%" src="/static/boxing2.jpeg" mode="widthFix" />
+                <view class="detail-content " style="margin-bottom:0">
+                    <view class="detail-content-title ">
+                        <view class="title">回复</view>
+                        <view class="title-btn" @click="open">新增</view>
+                    </view>
                 </view>
+                <uni-list>
+                    <uni-list-item title="客服" note="已经安排专员处理，请保持电话畅通" rightText="09-13 10:52" />
+                    <uni-list-item title="用户名" note="重启还是不行" rightText="09-13 10:50" />
+                    <uni-list-item title="客服" note="重启试试" rightText="09-13 09:50" />
+                </uni-list>
+                <!-- 输入框示例 -->
+                <uni-popup ref="inputDialog" type="dialog">
+                    <uni-popup-dialog ref="inputClose" type="info" mode="input" title="输入内容" value="对话框预置提示内容!"
+                        placeholder="请输入内容" @confirm="dialogInputConfirm">
+                        <uni-easyinput type="textarea" :maxlength="250" autoHeight v-model="value" placeholder="请输入内容"></uni-easyinput>
+                    </uni-popup-dialog>
+                </uni-popup>
             </view>
         </view>
     </Cn-page>
@@ -39,10 +34,22 @@
 export default {
     data () {
         return {
-            loading: false
+            loading: false,
+            value: "",
+            imageValue: [
+                {
+                    "name": "file.png",
+                    "extname": "png",
+                    "url": "/static/logo.png",
+                }
+            ]
+
         }
     },
     methods: {
+        open () {
+            this.$refs.inputDialog.open()
+        }
     }
 }
 </script>
@@ -51,7 +58,7 @@ export default {
     padding: 20rpx 0;
 
     .detail-content {
-        padding: 20rpx;
+        padding: 20rpx 30rpx;
         background: #fff;
         margin-bottom: 20rpx;
         font-size: 26rpx;
@@ -60,6 +67,23 @@ export default {
             font-size: 32rpx;
             color: #111;
             font-weight: 700;
+            display: flex;
+            justify-content: space-between;
+
+            .title {
+                flex: 1;
+            }
+
+            .title-btn {
+                padding: 0 20rpx;
+                height: 50rpx;
+                background-color: #007aff;
+                font-size: 24rpx;
+                color: #fff;
+                text-align: center;
+                line-height: 50rpx;
+                border-radius: 10rpx;
+            }
         }
     }
 }