bug

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)"

manifest.json

@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.3.8",
+    "versionName" : "1.3.9",
-    "versionCode" : 138,
+    "versionCode" : 139,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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: '完成调试',
                 },
             )

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>

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>