wzh 1 рік тому
батько
коміт
b201c92ec1

+ 16 - 5
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 v-if="isH5"  @click='goBack()' style="font-size: 17px;
+    padding-top: 7px;
+    position: absolute;">
+        返回
+      </view>
 
       <view class="status_info">
         <view class="status_detail">
@@ -1133,6 +1133,7 @@ export default {
       baowenTemp:100,
       hasBaowen:false,
       baowenId:0,
+      isH5:false
     }
   },
   onLoad: function(opt) {
@@ -1142,6 +1143,7 @@ export default {
     this.getDetail();
     this.imgUrl = config.imgUrl
     this.fixStyle();
+    this.setSystemInfo();
     // this.fixImage();
     // console.log = function(){}
   },
@@ -1163,6 +1165,15 @@ export default {
     }
   },
   methods:{
+    setSystemInfo(){
+      const systemInfo = uni.getSystemInfoSync();
+      let uniPlatform = systemInfo.uniPlatform;
+      if(uniPlatform == 'web' || uniPlatform == 'h5'){
+        this.isH5 = true;
+      }else{
+        this.isH5 = false;
+      }
+    },
 	  goBack(){
 	uni.navigateBack();
 	  },

+ 17 - 6
pages/device/detail_6.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 v-if="isH5"  @click='goBack()' style="font-size: 17px;
+    padding-top: 7px;
+    position: absolute;">
+        返回
+      </view>
 
       <view class="status_info">
         <view class="status_detail">
@@ -998,7 +998,8 @@ export default {
       wenwuhuoTurn:false,
       wenduSetting:false,
       wenduSettingTimer:null,
-      workText:"·在线"
+      workText:"·在线",
+      isH5:false
     }
   },
   onLoad: function(opt) {
@@ -1008,6 +1009,7 @@ export default {
     this.getDetail();
     this.imgUrl = config.imgUrl
     this.fixStyle();
+    this.setSystemInfo();
     // this.fixImage();
     // console.log = function(){}
   },
@@ -1041,6 +1043,15 @@ export default {
     }
   },
   methods:{
+    setSystemInfo(){
+      const systemInfo = uni.getSystemInfoSync();
+      let uniPlatform = systemInfo.uniPlatform;
+      if(uniPlatform == 'web' || uniPlatform == 'h5'){
+        this.isH5 = true;
+      }else{
+        this.isH5 = false;
+      }
+    },
     setStatusText(){
       if(!this.jianyaoIng()){
         this.workText = "·在线";

+ 17 - 6
pages/device/detail_new_5.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 v-if="isH5"  @click='goBack()' style="font-size: 17px;
+    padding-top: 7px;
+    position: absolute;">
+        返回
+      </view>
 
       <view class="status_info">
         <view class="status_detail">
@@ -1010,7 +1010,8 @@ export default {
       wenwuhuoTurn:false,
       wenduSetting:false,
       wenduSettingTimer:null,
-      workText:"·在线"
+      workText:"·在线",
+      isH5:false
     }
   },
   onLoad: function(opt) {
@@ -1020,6 +1021,7 @@ export default {
     this.getDetail();
     this.imgUrl = config.imgUrl
     this.fixStyle();
+    this.setSystemInfo();
     // this.fixImage();
     // console.log = function(){}
   },
@@ -1053,6 +1055,15 @@ export default {
     }
   },
   methods:{
+    setSystemInfo(){
+      const systemInfo = uni.getSystemInfoSync();
+      let uniPlatform = systemInfo.uniPlatform;
+      if(uniPlatform == 'web' || uniPlatform == 'h5'){
+        this.isH5 = true;
+      }else{
+        this.isH5 = false;
+      }
+    },
     setStatusText(){
       if(!this.jianyaoIng()){
         this.workText = "·在线";

+ 5 - 1
pages/work/index.vue

@@ -239,6 +239,10 @@ export default {
                   uni.navigateTo({
                     url: '/pages/device/detail_6?id='+device.deviceId
                   });
+                }else if(type == 20 || type == 21 || type == 22){
+                  uni.navigateTo({
+                    url: '/pages/device/detail_new_5?id='+device.deviceId
+                  });
                 }else{
                   uni.navigateTo({
                     url: '/pages/device/detail?id='+device.deviceId
@@ -328,7 +332,7 @@ export default {
 				url:'/pages/reviews/reviews'
 			})
 		}
-		
+
 
       }
     }

BIN
static/favicon.ico


BIN
static/images/device/offline.png


BIN
static/images/device/zaixian.png