添加设备类型17 18 19

pages/device/detail.vue

@@ -2,11 +2,11 @@
   <view class="content"  >
     <view class="header" :style='"background-image:url("+imgUrl+"/detail/bg.png);background-repeat: no-repeat;background-size: 100% 200%;"'>
 
-      <view  @click='goBack()' style="font-size: 17px;
-    padding-top: 7px;
-    position: absolute;">
-        返回
-      </view>
+<!--      <view  @click='goBack()' style="font-size: 17px;-->
+<!--    padding-top: 7px;-->
+<!--    position: absolute;">-->
+<!--        返回-->
+<!--      </view>-->
 
       <view class="status_info">
         <view class="status_detail">

pages/device/detail_6.vue

@@ -1158,7 +1158,7 @@ export default {
       arr.push(pressObj);
 
       arr.push(baowen);
-      this.mqttPublish(2,this.deviceInfo,arr)
+      this.mqttPublish(2,this.deviceInfo,arr,true)
     },
 
     addBaowenSetting(){
@@ -2809,9 +2809,6 @@ export default {
         if(self.deviceType == 10){
           self.productImage = self.imgUrl+'/product/YJZ20.png'
         }
-        if(self.deviceType == 16 || self.deviceType == 17 || self.deviceType == 18){
-          self.productImage = self.imgUrl+'/product/16.png'
-        }
         heng = self.setImage(self.deviceType);
         let typeArr = [7,8,9,10,11,12,15];//单煎药机类型
         for (let i = 0; i < typeArr.length; i++) {
@@ -2896,6 +2893,16 @@ export default {
         heng = true;
       }else if(type == 15){
         self.productImage = self.imgUrl+'/product/15.png'
+      } else if(self.deviceType == 16 ){
+        self.productImage = self.imgUrl+'/product/16.png'
+      }
+      else if(self.deviceType == 17){
+        self.productImage = self.imgUrl+'/product/YJCX20-2&1.png'
+        heng = true;
+      }
+      else if(self.deviceType == 18){
+        self.productImage = self.imgUrl+'/product/YJCX20-3&1.png'
+        heng = true;
       }
 
 

pages/device/index.vue

@@ -82,7 +82,7 @@ export default {
   methods:{
     goDeviceDetail(item){
       let type = item.type;
-      if(type == 16 || type == 17 || type == 18){
+      if(type == 16 || type == 17 || type == 18 || type == 19){
         uni.navigateTo({
           url: '/pages/device/detail_6?id='+item.deviceId
         });

pages/work/index.vue

@@ -235,7 +235,7 @@ export default {
 
               if(device != null){
                 let type =device.type;
-                if(type == 16 || type == 17 || type == 18){
+                if(type == 16 || type == 17 || type == 18 || type == 19){
                   uni.navigateTo({
                     url: '/pages/device/detail_6?id='+device.deviceId
                   });