From a60cdc066e1a8e09e0e75632eb8b07778fba22be 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, 31 Oct 2023 09:18:44 +0800
Subject: [PATCH] bug

---
 components/Cn-device-card/Cn-device-card.vue |   2 +-
 manifest.json                                |   4 ++--
 pages/device/APF/detail.vue                  |  20 ++++++++++++++-----
 pages/index/mine.vue                         |   4 ++--
 pages/mine/audit.vue                         |   4 ++--
 static/cancel.png                            | Bin 0 -> 4308 bytes
 static/confirm.png                           | Bin 0 -> 4140 bytes
 static/gongcheng.png                         | Bin 0 -> 2685 bytes
 8 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 static/cancel.png
 create mode 100644 static/confirm.png
 create mode 100644 static/gongcheng.png

diff --git a/components/Cn-device-card/Cn-device-card.vue b/components/Cn-device-card/Cn-device-card.vue
index fca58f6..97bc1ec 100644
--- a/components/Cn-device-card/Cn-device-card.vue
+++ b/components/Cn-device-card/Cn-device-card.vue
@@ -2,7 +2,7 @@
     <uni-card
         :title="device.equipmentName"
         :sub-title="device.mac"
-        :extra="device.isPrimaryUser == 1 ? '主用户' : '子用户'"
+        :extra="device.isPrimaryUser == 1 ? '主用户' : '分享用户'"
         padding="0"
         @click="jump(device)"
         :thumbnail="deviceIcon(device.runStatus)"
diff --git a/manifest.json b/manifest.json
index 5982390..c41994b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.3.8",
-    "versionCode" : 138,
+    "versionName" : "1.3.9",
+    "versionCode" : 139,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index 2457474..ef17258 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -87,7 +87,7 @@
                     <view style="height: 40rpx; background: #fff"></view>
                 </uni-popup>
                 <!-- 完成调试输入框 -->
-                <uni-popup ref="inputDialog" type="dialog">
+                <!-- <uni-popup ref="inputDialog" type="dialog">
                     <uni-popup-dialog
                         ref="inputClose"
                         mode="input"
@@ -97,6 +97,15 @@
                         @close="dialogInputClose"
                         @confirm="dialogInputConfirm"
                     ></uni-popup-dialog>
+                </uni-popup> -->
+                 <!-- 输入框示例 -->
+                 <uni-popup ref="inputDialog" type="dialog">
+                    <uni-popup-dialog ref="inputClose" type="info" mode="input" :title="dialogType"
+                                      value="对话框预置提示内容!"
+                                      placeholder="请输入内容" @confirm="dialogInputConfirm">
+                        <uni-easyinput type="textarea" :maxlength="250" autoHeight v-model="remarkContent"
+                                       placeholder="请输入备注"></uni-easyinput>
+                    </uni-popup-dialog>
                 </uni-popup>
             </view>
         </view>
@@ -123,6 +132,7 @@ export default {
     },
     data() {
         return {
+            remarkContent: '',
             dialogType: '',
             domLoading: true,
             loading: true,
@@ -252,7 +262,7 @@ export default {
             if (this.dialogType == '取消调试') {
                 cancelDebug({
                     deviceId: this.devId,
-                    remark: val,
+                    remark: this.remarkContent,
                     type: Number(this.pageOptions.process),
                 }).then((res) => {
                     this.$util.toast(res.message)
@@ -263,7 +273,7 @@ export default {
             } else {
                 finishDebug({
                     deviceId: this.devId,
-                    remark: val,
+                    remark: this.remarkContent,
                     type: Number(this.pageOptions.process),
                 }).then((res) => {
                     console.log(res)
@@ -448,11 +458,11 @@ export default {
                     text: '编辑',
                 },
                 {
-                    iconPath: '/static/delate.png',
+                    iconPath: '/static/cancel.png',
                     text: '取消调试',
                 },
                 {
-                    iconPath: '/static/delate.png',
+                    iconPath: '/static/confirm.png',
                     text: '完成调试',
                 },
             )
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 07bb405..d44bd8f 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -29,7 +29,7 @@
 
             <!-- <view class="mine-nav" @click="jump('user')" v-if="userInfo.authorities === 'app_vip_user'">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/subordinate.png" />
-                <view class="mine-nav-label">子用户列表</view>
+                <view class="mine-nav-label">分享用户列表</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view> -->
             <view
@@ -42,7 +42,7 @@
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('engineering')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/gongcheng.png" />
                 <view class="mine-nav-label">工程管理</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
diff --git a/pages/mine/audit.vue b/pages/mine/audit.vue
index 542899d..e7414a3 100644
--- a/pages/mine/audit.vue
+++ b/pages/mine/audit.vue
@@ -3,13 +3,13 @@
         <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">
+                    <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">
+                    <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>
diff --git a/static/cancel.png b/static/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38991fc1fb45eae0d011af5e4d811903e64f7c8
GIT binary patch
literal 4308
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
Cw8J3)

literal 0
HcmV?d00001

diff --git a/static/confirm.png b/static/confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..78aad727e1b9c25374b7db0c8c0c541a04146034
GIT binary patch
literal 4140
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

literal 0
HcmV?d00001

diff --git a/static/gongcheng.png b/static/gongcheng.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f8747edcd3bd82dcd47c8de0dbf00d5a985f48d
GIT binary patch
literal 2685
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

literal 0
HcmV?d00001