wzh 2 лет назад
Родитель
Сommit
1a208211e7

+ 7 - 1
pages/weitiandi/bluetooth/setting.vue

@@ -162,6 +162,9 @@ export default {
         }else{
           obj.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
         }
+        if(obj.text ==i18('自定义')){
+          obj.style +=";width:100px;"
+        }
       }
       uni.setStorageSync("autoCharge",value);
       if(!tip){
@@ -269,6 +272,9 @@ export default {
         }else{
           dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
         }
+        if(dian.text ==i18('自定义')){
+          dian.style +=";width:100px;"
+        }
       }
       if(!hasValue){
         this.current.custom = true;
@@ -390,7 +396,7 @@ export default {
 }
 
 .prop-title {
-  color: #252525;
+  color: white;
   font-weight: bold;
   margin-bottom: 2.5vh;
 }

+ 8 - 5
pages/weitiandi/bluetooth/status.vue

@@ -191,7 +191,7 @@
 	  		</uni-drawer>
 	  	</view>
 	  </view>
-    <view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 30%;">
+    <view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 28%;">
       <view class="progress_box" style="text-align: center">
 	  		<canvas class="progress_bg" canvas-id="cpbg"></canvas>
 	  		<canvas class="progress_bar" canvas-id="cpbar"></canvas>
@@ -199,15 +199,18 @@
 	  		<view class="progress_txt">
 	  			<view class="progress_info">
 	  				<view class="p0" style="color: azure;" st="">{{ deviceInfo.deviceId}}</view>
-	  				<view class="p1">
-	  				  <view v-if="portStatus  == 2">
+	  				<view class="p1" style="width: 60px;">
+	  				  <view v-if="portStatus  == 2" style="position: relative;
+    left: -17px;">
 	  				    {{$t('charge.charging')}}
 	  				  </view>
-	  				  <view v-else-if="portStatus  == 6">
+	  				  <view v-else-if="portStatus  == 6" style="position: relative;
+    left: -17px;">
 	  				    {{$t('charge.planed')}}
 	  				  </view>
 	  				
-	  				  <view v-else-if="portStatus  == 5">
+	  				  <view v-else-if="portStatus  == 5" style="position: relative;
+    left: -17px;">
 	  				    {{$t('charge.connected')}}
 	  				  </view>
 	  				

+ 7 - 1
pages/weitiandi/device/setting.vue

@@ -165,6 +165,9 @@ export default {
         }else{
           dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
         }
+        if(dian.text ==i18('自定义')){
+          dian.style +=";width:100px;"
+        }
       }
       if(!hasValue){
         this.current.custom = true;
@@ -179,7 +182,10 @@ export default {
         let dian = items[i];
         dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
       }
-      item.style = ";  background: #57B03D;color:white"
+      item.style = ";  background: #57B03D;color:white;"
+      if(item.text ==i18('自定义')){
+        item.style +=";width:100px;"
+      }
       if (item.value == -1) {
         obj.custom = true;
         obj.customValue = 8;

+ 7 - 4
pages/weitiandi/device/status.vue

@@ -43,7 +43,7 @@
 				</uni-drawer>
 			</view>
 		</view>
-		<view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 32%;">
+		<view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 28%;">
 			<view class="progress_box" style="text-align: center">
 				<canvas class="progress_bg" canvas-id="cpbg"></canvas>
 				<canvas class="progress_bar" canvas-id="cpbar"></canvas>
@@ -52,14 +52,17 @@
 					<view class="progress_info">
 						<view class="p0" style="color: azure;" st="">{{ deviceInfo.qrcode}}</view>
 						<view class="p1">
-						  <view v-if="portStatus  == 2">
+						  <view v-if="portStatus  == 2" style="position: relative;
+    left: -17px;">
 						    {{$t('charge.charging')}}
 						  </view>
-						  <view v-else-if="portStatus  == 6">
+						  <view v-else-if="portStatus  == 6" style="position: relative;
+    left: -17px;">
 						    {{$t('charge.planed')}}
 						  </view>
 						
-						  <view v-else-if="portStatus  == 5">
+						  <view v-else-if="portStatus  == 5" style="position: relative;
+    left: -17px;">
 						    {{$t('charge.connected')}}
 						  </view>