修改UI

pages/device/detail.vue

@@ -537,7 +537,7 @@
             </view>
             <view class="prop-item-left">当前扭力</view>
             <view class="prop-item-right" >
-              {{validCurrent}}MA
+              {{validCurrent}}
             </view>
           </view>
           <view class="prop-item" v-if="firstTab && boardType == 5">
@@ -546,7 +546,7 @@
             </view>
             <view class="prop-item-left">扭力设置</view>
             <view class="prop-item-right" @click="showLiuProp">
-              {{turnCurrent}}MA<uni-icons type="forward" size="16"></uni-icons>
+              {{turnCurrent}}<uni-icons type="forward" size="16"></uni-icons>
             </view>
           </view>
 
@@ -1098,9 +1098,9 @@ export default {
       let self = this;
 
       uni.showModal({
-        title: "提示",
+        title: "提 示",
         content: "非专业人员修改可能导致机器损坏",
-        confirmText:"是",
+        confirmText:"确认",
         success: function (res) {
           if(res.confirm){
             self.showModelPicker = true;
@@ -1242,9 +1242,9 @@ export default {
     showLiuProp(){
       let self = this;
       uni.showModal({
-        title: "提示",
+        title: "提 示",
         content: "非专业人员修改可能导致机器损坏",
-        confirmText:"是",
+        confirmText:"确认",
         success: function (res) {
           if(res.confirm){
             self.liuzhuanPopDlg = true;
@@ -1255,9 +1255,9 @@ export default {
     showJiaozhunProp(){
       let self = this;
       uni.showModal({
-        title: "提示",
-        content: "“非专业人员修改可能导致机器损坏",
-        confirmText:"是",
+        title: "提 示",
+        content: "非专业人员修改可能导致机器损坏",
+        confirmText:"确认",
         success: function (res) {
           if(res.confirm){
             self.jiaozhunTemp_temp = self.jiaozhunTemp;
@@ -1593,14 +1593,21 @@ export default {
     },
     reset(){
       let self = this;
-      this.showConfirm("提示","确认恢复出厂吗",function(){
-        let arr = [];
-        let obj = {};
-        obj.id = "RestoreFactory";
-        obj.shadow = 1;
-        arr.push(obj);
-        self.mqttPublish(2,self.deviceInfo,arr)
-      },function(){});
+      uni.showModal({
+        title: "提 示",
+        content: "非专业人员修改可能导致机器损坏",
+        confirmText:"确认",
+        success: function (res) {
+          if(res.confirm){
+            let arr = [];
+            let obj = {};
+            obj.id = "RestoreFactory";
+            obj.shadow = 1;
+            arr.push(obj);
+            self.mqttPublish(2,self.deviceInfo,arr)
+          }
+        },
+      })
 
     },
     turnChange(type){