[techron][修改2]:20240314

pages/bluetooth/index/index.vue

@@ -1,4 +1,5 @@
 <template>
+	 <view  class="container" style="height: 100vh" >
   <scroll-view class="main-container" scroll-y="true"
                :refresher-enabled="false">
     <view v-for="(item, index) in deviceListDataShow" :key="item.id" class="list-item" hover-class="list-item-hover"
@@ -49,7 +50,7 @@
     <view v-if="deviceListDataShow.length==0" class="notice"> - {{ $t('buletooth.nodevice') }} -</view>
     <view class="gap"></view>
   </scroll-view>
-
+ </view>
 
 </template>
 
@@ -89,7 +90,12 @@ export default {
     uni.setNavigationBarTitle({
       title: this.$t('page.bluetooth')
     })
-    ecUI.showLoading(this.$t('buletooth.init'))
+	let titles = i18(this.$t('buletooth.init'));
+	uni.showLoading({
+	    titles,
+	    mask:true,
+	});
+    // ecUI.showLoading(this.$t('buletooth.init'))
     ctx = this
     clearInterval(this.timer);
     this.timer = setInterval(() => {
@@ -196,7 +202,12 @@ export default {
     },
     listViewTap(id){
       let self = this;
-      ecUI.showLoading(this.$t('buletooth.connecting'))
+      // ecUI.showLoading(this.$t('buletooth.connecting'))
+	  let titles = i18(this.$t('buletooth.connecting'));
+	  uni.showLoading({
+	      titles,
+	      mask:true,
+	  });
       ecBLE.onBLEConnectionStateChange(res => {
         console.log(res);
         if (res.ok) {
@@ -352,11 +363,15 @@ export default {
 </script>
 
 <style>
+	.container{
+		background-image: url('../../../static/images/new/starts/bg2.jpg');
+		background-size: cover;
+		background-repeat: no-repeat;
+		height: 100%;
+		width: 100%;
+	}
 .main-container {
-  height: 100vh;
-  background-image: url('../../../static/images/new/starts/bg1.jpg');
-  background-size: cover;
-  background-repeat: no-repeat;
+  height: 100%;
 }
 
 .list-item {

pages/bluetooth/index/wifi.vue

@@ -726,6 +726,8 @@ export default {
 		background-image: url('../../../static/images/new/starts/bg2.jpg');
 		background-size: cover;
 		background-repeat: no-repeat;
+		height: 100%;
+		width: 100%;
 	}
 .main-container {
   height: 100vh;

pages/index.vue

@@ -277,6 +277,8 @@
 		background-repeat: no-repeat;
 		inset: 0;
 		position: absolute;
+		height: 100%;
+		width: 100%;
 	}
 
 

pages/weitiandi/bluetooth/index.vue

@@ -195,7 +195,7 @@
 				<image class="portimg" src="/static/images/new/starts/mine/list.png" />
 				<view class="dboxtitle-text"> {{ i18('设备操作') }}</view>
 			</view>
-			<view style="margin-left: 25px;">
+			<view style="margin-left: 7vw;display: flex;width: 70vw;">
 			<view class="control-btn" @click="trigger()" v-if="portDetail.portStatus == 2">
 				<image class="btn-image" src="/static/images/new/start/stop.png">
 				</image>
@@ -769,6 +769,8 @@ export default {
   position: absolute;
   background-size: cover;
   background-repeat: no-repeat;
+  height: 100%;
+  width: 100%;
 }
 
 .header {
@@ -848,10 +850,7 @@ export default {
   color: #B2B2B2;
   font-weight: 400;
 }
-.btn-image{
-  width: 90%;
-  height: 100%;
-}
+
 .info-bottom-btn{
   display: flex;
   flex-direction: row;
@@ -959,12 +958,12 @@ export default {
   padding:3%;
 }
 .control-btn{
-  display: inline-block;;
+  /* display: inline-block;;
   height: 60px;
-  width: 25%;
-  padding:10px 15px;
+  width: 25%; */
+  padding:10px 12px;
   text-align: center;
-  font-size: 12px;
+ font-size: 12px;
   color: white;
 }
 .control-btn .btn-image{
@@ -1037,7 +1036,5 @@ export default {
   width: 42px;
   height: 42px;
 }
-.control-btn{
-  font-size: 14px;
-}
+
 </style>

pages/weitiandi/bluetooth/setting.vue

@@ -392,7 +392,9 @@ export default {
   bottom:0px;
   background-image: url('../../../static/images/new/starts/bg1.jpg');
   background-size: cover;
-  background-repeat: no-repeat;;
+  background-repeat: no-repeat;
+  height: 100%;
+  width: 100%;
 }
 
 .prop-item {
@@ -427,12 +429,12 @@ export default {
 .value-tag {
   background: rgb(227, 242, 245);
   color: #000000;
-  width: 15vw;
-  height: 4vh;
-  line-height: 4vh;
+  width: 14vw;
+  height: 4.5vh;
+  line-height: 4.5vh;
   border-radius: 3vw;
   text-align: center;
-  margin: 0 1vw;
+  margin: 0px 1vw 0 1vw;
   font-weight: bold;
   font-size: 12px;
 }

pages/weitiandi/bluetooth/status.vue

@@ -324,7 +324,7 @@
 					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
 			</view> -->
 			<view @click="modifyPwd">
-				<image src="../../../static/images/new/starts/status/Lock／Unlocked.png"
+				<image src="../../../static/images/new/starts/status/Unlocked.png"
 					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
 			</view
 			>
@@ -1228,6 +1228,8 @@ export default {
   background-repeat: no-repeat;
   inset: 0;
   position: absolute;
+  height: 100%;
+  width: 100%;
 }
 
 .header {

pages/weitiandi/device/chargerecord.vue

@@ -88,6 +88,8 @@
 		background-size: cover;
 		background-repeat: no-repeat;
 		inset: 0;
+		height: 100%;
+		width: 100%;
 		/* position: absolute; */
 	}
 

pages/weitiandi/device/index.vue

@@ -123,7 +123,7 @@
 				<image class="portimg" src="../../../static/images/new/starts/mine/list.png" />
 				<view class="dboxtitle-text"> {{ i18('设备操作') }}</view>
 			</view>
-			<view style="margin-left: 25px;">
+			<view style="margin-left: 7vw;display: flex;width: 70vw;">
 			<view class="control-btn" @click="trigger()">
 				<view v-if="portDetail.portStatus == 2">
 					<image class="btn-image" src="../../../static/images/new/start/stop.png">
@@ -525,6 +525,8 @@
 		position: absolute;
 		background-size: cover;
 		background-repeat: no-repeat;
+		height: 100%;
+		width: 100%;
 	}
 
 	.header {
@@ -749,11 +751,11 @@
 	}
 
 	.control-btn {
-		display: inline-block;
+		/* display: inline-block;
 		;
 		height: 60px;
-		width: 25%;
-		padding: 10px 15px;
+		width: 25%; */
+		padding: 10px 12px;
 		text-align: center;
 		font-size: 12px;
 		color: black;

pages/weitiandi/device/plan.vue

@@ -244,6 +244,8 @@ export default {
   background-image: url('../../../static/images/new/starts/bg2.jpg');
   background-size: cover;
   background-repeat: no-repeat;
+  height: 100%;
+  width: 100%;
 }
 .header-image{
   width: 100%;

pages/weitiandi/device/planrecord.vue

@@ -104,6 +104,8 @@ export default {
 		background-repeat: no-repeat;
 		inset: 0;
 		position: absolute;
+		height: 100%;
+		width: 100%;
 	}
 
 	.list-item {

pages/weitiandi/device/setting.vue

@@ -275,6 +275,8 @@ export default {
 	background-repeat: no-repeat;
   position: absolute;
   inset: 0;
+  height: 100%;
+  width: 100%;
   /* background: rgb(249, 252, 255); */
 }
 

pages/weitiandi/device/status.vue

@@ -905,6 +905,8 @@
 		position: absolute;
 		background-size: cover;
 		background-repeat: no-repeat;
+		height: 100%;
+		width: 100%;
 	}
 .prop-item {
 		position: relative;

pages/weitiandi/deviceList.vue

@@ -229,6 +229,8 @@ export default {
   background-repeat: no-repeat;
   inset: 0;
   position: absolute;
+  height: 100%;
+  width: 100%;
 }
 .value-tag {
   background: #57B03D;