[techron][修改]:20240314

App.vue

@@ -40,5 +40,8 @@
 </script>
 
 <style lang="scss">
-  @import '@/static/scss/index.scss'
+  @import '@/static/scss/index.scss';
+  .uni-page-head .uni-page-head__title{
+	font-weight: 800 !important;
+  }
 </style>

locale/en.json

@@ -24,26 +24,26 @@
     "请先将充电枪插入后再点击充电": "Please insert the charging gun first and then click \"Start Charging\".",
     "确认开始充电么？": "Are you sure you want to start charging?",
     "端口无法开始充电": "The port cannot start charging.",
-    "设备端口": "Device port",
+    "设备端口": "Device Port",
     "空闲中": "Idle",
     "充电中": "Charging",
     "禁用中": "Disabled",
     "故障中": "Fault",
     "已连接": "Connected",
     "已预约": "Booked",
-    "预约充电": "Book charging",
+    "预约充电": "Book Charging",
     "点击预约充电": "Click to book charging",
     "可点击取消预约": "Can click to cancel the booking",
-    "设备操作": "Device operation",
-    "停止充电": "Stop charging",
-    "立即充电": "Start charging",
-    "获取状态": "Get status",
-    "设备控制": "Device control",
+    "设备操作": "Device Operation",
+    "停止充电": "Stop Charging",
+    "立即充电": "Start Charging",
+    "获取状态": "Get Status",
+    "设备控制": "Device Control",
     "返回上级": "Return back",
     "原密码": "Original password",
     "6位数字新密码": "6-digit new password",
-    "端口一": "Port one",
-    "端口二":"Port two",
+    "端口一": "Port One",
+    "端口二":"Port Two",
     "确认取消预约？": "Confirm cancel booking？",
     "取消成功": "Cancellation successful",
     "今日": "Today",
@@ -54,23 +54,23 @@
     "正在重置，请稍等...": "Resetting, please wait...",
     "正在重启中，请稍等...": "Restarting, please wait...",
     "自定义": "Customized",
-    "充电电流": "Charging current",
+    "充电电流": "Charging Current",
     "请输入电流": "Please enter the current",
-    "获取主板配置": "MainBoard configuration",
-    "恢复默认配置": "Restore default settings",
-    "重启充电桩": "Restart charging station",
+    "获取主板配置": "MainBoard Configuration",
+    "恢复默认配置": "Restore Default Settings",
+    "重启充电桩": "Restart Charging Station",
     "蓝牙连接": "Bluetooth connection",
     "扫码绑定": "Scan to bind",
     "设备列表": "Device list",
     "点击登录": "Click to log in",
     "你好": "Welcome",
-    "账户设置": "Account settings",
-    "充电记录": "Charging record",
-    "预约记录": "Reservation record",
+    "账户设置": "Account Settings",
+    "充电记录": "Charging Record",
+    "预约记录": "Reservation Record",
     "确定注销并退出系统吗？": "Are you sure you want to log out and exit the system?",
     "请输入旧密码": "Enter the old password",
     "请输入新密码": "Please enter the new password",
-    "旧密码": "Old password",
+    "旧密码": "Old Password",
     "新密码": "New Password",
     "确认密码": "Confirm Password",
     "请确认新密码": "Please confirm the new password",
@@ -134,7 +134,7 @@
     "序列号有误": "The device no is wrong",
     "当前密码为初始密码，请修改": "Please change the pawssword",
     "设备号": "Device no",
-    "重置设备": "Reset device",
+    "重置设备": "Reset Device",
     "正在重置中，请稍等...": "Reseting pease wait",
     "查看状态": "Watch status",
     "忘记序列号": "Forget device no",
@@ -144,7 +144,7 @@
     "系统接口请求超时": "System API request timed out.",
     "登录状态已过期，您可以继续留在该页面，或者重新登录?": "The login session has expired, you can continue staying on this page, or log in again?",
     "无效的会话，或者会话已过期，请重新登录。": "Invalid session, or session has expired, please log in again.",
-    "注销账号": "Delete account",
+    "注销账号": "Delete Account",
     "确定删除账号吗？": "Are you sure you want to delete the account?",
     "请打开系统蓝牙开关": "Please turn on the system Bluetooth switch.",
     "请打开系统定位开关": "Please turn on the system location switch.",
@@ -212,7 +212,7 @@
     "nopwd": "Password cannot be empty.",
     "pwdtip": "6-digit numeric password.",
     "pwdinput": "Please enter the operation password.",
-    "errpwd": "Password cannot be empty.",
+    "errpwd": "Password error.",
     "connecting": "Device connecting.",
     "tip": "Prompt"
   },
@@ -239,18 +239,18 @@
   },
   "page": {
     "login": "Login",
-    "bluetooth": "Bluetooth control",
+    "bluetooth": "Bluetooth Control",
     "charepage": "Charging page",
-    "blueconnect": "Bluetooth connection",
+    "blueconnect": "Bluetooth Connection",
     "setting": "Setting",
     "control": "Send command",
-    "plan": "Reservation",
+    "plan": "Book Charging",
     "detail": "Device details",
     "controltai": "Console",
     "worktai": "Workbench",
     "mine": "mine",
-    "chargerecord": "Charging record",
-    "planrecord": "Reservation record",
+    "chargerecord": "Charging Record",
+    "planrecord": "Reservation Record",
     "scan": "Scan",
     "deviceList": "My Device",
     "modifypwd":"Change Password"

pages.json

@@ -9,49 +9,50 @@
     {
       "path": "pages/weitiandi/bluetooth/index",
       "style": {
-        "navigationBarTitleText": "蓝牙控制",
+        "navigationBarTitleText": "Charging Setting",
         "navigationStyle": "default"
       }
     },
     {
       "path": "pages/weitiandi/bluetooth/status",
       "style": {
-        "navigationBarTitleText": "%page.charepage%",
+        //"navigationBarTitleText": "%page.charepage%",
         "navigationStyle": "default"
       }
     },
     {
       "path": "pages/bluetooth/index/index",
       "style": {
-        "navigationBarTitleText": "连接蓝牙",
+        "navigationBarTitleText": "%blueconnect%",
         "navigationStyle": "default"
       }
     },
     {
       "path": "pages/weitiandi/bluetooth/setting",
       "style": {
-        "navigationBarTitleText": "%page.setting%",
+        "navigationBarTitleText": "Charging Setting",
         "navigationStyle": "default"
       }
     },
 	{
 	  "path": "pages/bluetooth/device/device",
 	  "style": {
-	    "navigationBarTitleText": "%page.control%",
+	    "navigationBarTitleText": "Charging Setting",
 		"navigationStyle": "default"
 	  }
 	},
      {
   "path": "pages/weitiandi/device/plan",
   "style": {
-    "navigationBarTitleText": "%page.plan%",
+    "navigationBarTitleText": "Book Charging",
+	 "enablePullDownRefresh": false,
     "navigationStyle": "default"
   }
   },
     {
       "path" : "pages/weitiandi/device/index",
       "style" : {
-        "navigationBarTitleText": "%page.detail%",
+        "navigationBarTitleText": "Charging Setting",
         "enablePullDownRefresh": false,
         "navigationStyle": "default"
       }
@@ -67,7 +68,7 @@
 	{
     "path": "pages/weitiandi/device/setting",
     "style": {
-      "navigationBarTitleText": "%page.setting%",
+      "navigationBarTitleText": "Setting",
       "navigationStyle": "default"
     }
   },
@@ -86,8 +87,11 @@
   }, {
     "path": "pages/mine/index",
     "style": {
-      "navigationBarTitleText": "%page.mine%",
-      "navigationStyle": "default"
+      "navigationBarTitleText": " ",
+      "navigationStyle": "default",
+	  "titleNView": {
+	  					"autoBackButton": false
+	  				}
     }
   }, {
     "path": "pages/mine/avatar/index",
@@ -170,7 +174,10 @@
             {
                 "navigationBarTitleText": "设备列表",
                 "enablePullDownRefresh": false,
-              "navigationStyle": "default"
+              "navigationStyle": "default",
+			  "titleNView": {
+			  					"autoBackButton": false
+			  				}
             }
             
         }
@@ -178,7 +185,7 @@
             "path" : "pages/bluetooth/index/wifi",
             "style" :
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "%WIFI配网%",
                 "enablePullDownRefresh": false,
               "navigationStyle": "default"
             }
@@ -197,7 +204,7 @@
   "globalStyle": {
     "navigationBarTextStyle": "white",
     "navigationBarTitleText": "充电助手",
-    "navigationBarBackgroundColor": "#000000",
+    "navigationBarBackgroundColor": "#25282A",
     "navigationStyle":"custom"
   }
 }

pages/bluetooth/index/index.vue

@@ -169,7 +169,7 @@ export default {
     },
     inputPwd(){
       if(!this.pwd ){
-        this.$modal.showToast(this.$t('buletooth.errpwd'));
+        this.$modal.showToast(this.$t('buletooth.nopwd'));
       }else{
         if(this.rightPwd && this.rightPwd === this.pwd){
           this.loginSuccess();

pages/index.vue

@@ -12,13 +12,13 @@
       </uni-swiper-dot>
     </view> -->
 		<view style="height: 10vh;text-align: center;">
-			<image style="height: 3vh;width: 15vh;margin-top: 5vh;"
+			<image style="height: 3vh;width: 35vw;margin-top: 5vh;"
 				src="../static/images/new/starts/login/backImg2.png"></image>
 
 		</view>
 		<view style="text-align: center;top:12vh;position: relative;color: aliceblue;">
-			<view style="font-size: 30rpx;">Please choose from the below options:</view>
-			<view style="font-size: 20rpx;">Charge up quickly & easily to enjoy a smarter life!</view>
+			<view style="font-size: 30rpx;">Charge up from the Ontions Below</view>
+			<!-- <view style="font-size: 20rpx;">Charge up quickly & easily to enjoy a smarter life!</view> -->
 		</view>
 		<view style="margin:0 5vw;left:0px;right:0px;text-align: center;top:45vh;position: absolute;display: flex;flex-direction: rows;justify-content: space-evenly;">
 			<!-- <view style="color:white;width:80px;">
@@ -31,7 +31,7 @@
 							style="width: 60px;height: 60px;margin-top: 2vh;"></image>
 					</view>
 					<view style="color: aliceblue;">
-						Scan with Bluetooth
+						Scan With Bluetooth
 					</view>
 				</view>
 				<view>
@@ -64,7 +64,7 @@
 			</view>
 			
 			<view style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
-				<image style="height: 3vh;width: 30vw;position: absolute;bottom: 13vh;left: 35vw;" src="../static/images/new/starts/login/backImg2.png"></image>
+				<!-- <image style="height: 3vh;width: 35vw;position: absolute;bottom: 13vh;left: 32.5vw;" src="../static/images/new/starts/login/backImg2.png"></image> -->
 				<view @click="skip(0)" style="margin:0px 10px;">
 					<image src="@/static/images/new/starts/tabbar/one_on.png"
 						style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
@@ -130,9 +130,9 @@
 		onLoad: function() {},
 		onShow() {
 			uni.setNavigationBarTitle({
-				title: this.$t('page.worktai')
+				title: " "
 			})
-			console.log("???"+ uni.getStorageSync('blueStatus')+'||'+uni.getStorageSync('scanStatus')+'||'+uni.getStorageSync('wifiStatus'))
+			//console.log("???"+ uni.getStorageSync('blueStatus')+'||'+uni.getStorageSync('scanStatus')+'||'+uni.getStorageSync('wifiStatus'))
 			this.blueStatus=uni.getStorageSync('blueStatus')!=null?uni.getStorageSync('blueStatus'):0
 			this.scanStatus=uni.getStorageSync('scanStatus')!=null?uni.getStorageSync('scanStatus'):0
 			this.wifiStatus=uni.getStorageSync('wifiStatus')!=null?uni.getStorageSync('wifiStatus'):0
@@ -269,8 +269,10 @@
 </script>
 
 <style>
+	
 	.content {
-		background-image: url('../static/images/new/starts/bg2.jpg');
+		background-image: url('../static/images/new/starts/bg1.jpg');
+		background-color: #050609;
 		background-size: cover;
 		background-repeat: no-repeat;
 		inset: 0;

pages/login.vue

@@ -23,11 +23,12 @@
       <view class="input-item flex align-center"  v-if="locale == 'en'">
         <!-- <view class="iconfont icon-user icon"></view> -->
 	   <uni-row>
-	   <uni-col :span="2">
-		<uni-icons class="icon" type="email" size="20" color="#e3e3e3"></uni-icons>
+	   <uni-col :span="2" style="padding-top: 5px;">
+		<uni-icons class="icon" type="email" style="margin-top: 2px;" size="20" color="#e3e3e3"></uni-icons>
        </uni-col>
-	   <uni-col :span="22">
-	    <input style="color: #9c9c9c;" v-model="loginForm.username" class="input" type="text" :placeholder="$t('login.mailInput')" maxlength="30" />
+	   <uni-col :span="18">
+		   <uni-easyinput style="margin-left:-15px ;color: #9c9c9c;" :clearable="false" :inputBorder="false"  v-model="loginForm.username"  type="text" class="input"  :placeholder="$t('login.mailInput')" maxlength="30" />
+	    <!-- <input style="color: #9c9c9c;" v-model="loginForm.username" class="input" type="text" :placeholder="$t('login.mailInput')" maxlength="30" /> -->
 	   </uni-col>
 	   </uni-row>
       </view>
@@ -38,56 +39,60 @@
 		<uni-icons class="icon" type="locked-filled" size="20" color="#e3e3e3"></uni-icons>
 		</uni-col>
 		<uni-col :span="18">
-        <uni-easyinput style="margin-left:-10px ;color: #9c9c9c;" :inputBorder="false" v-model="loginForm.password"  type="password" class="input"  :placeholder="$t('login.pwdInput')" maxlength="30" />
+        <uni-easyinput style="margin-left:-15px ;color: #9c9c9c;" :inputBorder="false" v-model="loginForm.password"  type="password" class="input"  :placeholder="$t('login.pwdInput')" maxlength="30" />
 		</uni-col>
 		</uni-row>
       </view>
-	  <view class="xieyi text-center" style="margin-top: -10px;" v-if="locale == 'en'">
-		  <text class="text-grey">{{ $t('login.noAccount') }}，</text>
-		  <text @click="toggleLoginMode" class="text-green">{{ $t('login.resiger') }}</text>
-		  <!-- <text @click="handleUserAgrement" class="text-green">立即注册</text> -->
-		  <!-- <text @click="handlePrivacy" class="text-blue">《隐私协议》</text> -->
-		</view>
-
-     <!-- <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-        <view class="iconfont icon-code icon"></view>
-        <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-        <view class="login-code"> <image :src="codeUrl" @click="getCode" class="login-code-img"></image></view  >
-      </view> -->
-	  <view class="text-green" style="margin: 5px 0;margin-top:15px;font-size: 12px;;" @click="forgetPwd">{{i18('忘记密码?')}}</view>
-      <view class="action-btn" style="z-index: 99;position: relative;">
+
+      <view class="action-btn" style="z-index: 99;position: relative;margin-top: 10vh;">
         <button style="border-radius: 20px;" @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">{{ $t('login.tologin') }}</button>
       </view>
+	  <view class="xieyi text-center" style="margin-top: 0px;display: flex;" v-if="locale == 'en'">
+	  		  <text class="text-grey" style="margin-top: 5px;">{{ $t('login.noAccount') }}，</text>
+	  		  <text @click="toggleLoginMode" class="text-green"  style="margin-top: 10px;">{{ $t('login.resiger') }}</text>
+	  		  <!-- <text @click="handleUserAgrement" class="text-green">立即注册</text> -->
+	  		  <!-- <text @click="handlePrivacy" class="text-blue">《隐私协议》</text> -->
+			  <text class="text-green" style="margin: 5px 15vw;margin-top:10px;font-size: 12px;;" @click="forgetPwd">{{i18('忘记密码?')}}</text>
+	  		</view>
+	  
+	  <!-- <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
+	     <view class="iconfont icon-code icon"></view>
+	     <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+	     <view class="login-code"> <image :src="codeUrl" @click="getCode" class="login-code-img"></image></view  >
+	   </view> -->
+	   
     </view>
     <view class="login-form-content" style="z-index: 9999;position: relative;" v-show="!isLogin" @submit.prevent="handleRegister">
           <!-- 注册表单 -->
 		  <view>
 		  <view class="input-item flex align-center">
 		   <uni-row>
-		   <uni-col :span="2">
+		   <uni-col :span="2" style="padding-top: 5px;">
 		  		<uni-icons class="icon" type="email" size="20" color="#e3e3e3"></uni-icons>
 		   </uni-col>
 		   <uni-col :span="22">
-		    <input style="color: #9c9c9c;" v-model="register.username" class="input" type="text" :placeholder="$t('login.mailInput')" maxlength="30" />
+			   <uni-easyinput style="margin-left:-15px ;color: #9c9c9c;" :inputBorder="false"  v-model="loginForm.username" :clearable="false"  type="text" class="input"  :placeholder="$t('login.mailInput')" maxlength="30" />
+		    <!-- <input style="color: #9c9c9c;" v-model="register.username" class="input" type="text" :placeholder="$t('login.mailInput')" maxlength="30" /> -->
 		   </uni-col>
 		   </uni-row>
 		  </view>
 		  <view>
 		  <view class="input-item flex align-center">
 		   <uni-row>
-		   <uni-col :span="2">
+		   <uni-col :span="2" style="padding-top: 5px;">
 		  		<uni-icons class="icon" type="locked" size="20" color="#e3e3e3"></uni-icons>
 		   </uni-col>
-		   <uni-col :span="22">
-		    <input v-model="register.password" style="color: #9c9c9c;" class="input" type="text" :placeholder="$t('login.pwdInput')" maxlength="30" />
+		   <uni-col :span="18">
+			   <uni-easyinput style="margin-left:-15px ;color: #9c9c9c;" :inputBorder="false" v-model="loginForm.password"  type="password" class="input"  :placeholder="$t('login.pwdInput')" maxlength="30" />
+		    <!-- <input v-model="register.password" style="color: #9c9c9c;" class="input" type="text" :placeholder="$t('login.pwdInput')" maxlength="30" /> -->
 		   </uni-col>
 		   </uni-row>
 		  </view>
 		  </view>
-		  <view class="xieyi text-center" style="margin-top: -10px;">
+		  <view class="xieyi text-center" style="margin-top: -10px;display: contents;">
 		  <p class="text-grey">{{ $t('register.hasAccount') }}<a href="#" @click="toggleLoginMode" class="text-green">{{ $t('register.backLogin') }}</a></p>
 		  </view>
-		  <view class="action-btn" style="z-index: 9999;position: relative;">
+		  <view class="action-btn" style="z-index: 9999;position: relative;margin-top: 5.5vh;">
           <button @click="handleRegister" style="border-radius: 20px;" type="submit" class="login-btn cu-btn block bg-blue lg round">{{ $t('register.register') }}</button>
 		  </view>
      </view>
@@ -654,6 +659,7 @@
       .xieyi {
         color: #333;
         margin-top: 100px;
+		width: 100vw;
       }
 
       .login-code {

pages/mine/index.vue

@@ -4,19 +4,26 @@
         {{ $t('login.language') }}：{{localeConfig[locale]}}<uni-icons type="gear" size="15"></uni-icons>
       </view> -->
 	<view class="mine-container">
-		<view style="height: 0vh;place-items: center;display: grid;background-color: #141414;">
-			<image style="height: 3vh;width: 15vh;margin-top: 1vh;top: 3vh;"
+		<view style="     margin-top: -1vh;
+    place-items: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    height: 7vh;
+    width: 100vw;
+    background-color: #25282A;">
+			<image style="height: 3vh;width: 35vw;margin-left: 25vw;"
 				src="../../static/images/new/starts/login/backImg2.png"></image>
-			<text @click="clickRight()" style="font-size: 15px;margin: -5px 0 0 31vh;font-weight: bold;z-index: 9999;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
+			<text @click="clickRight()" style="font-size: 15px;font-weight: bold;z-index: 9999;height: 3vh;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
 			<!-- <view >
 				<u-popup :show="show" mode="right" customStyle="top:14vh;" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="1" ref="showRight" :overlay="false" >
 				           
 						</u-popup>
 			</view> -->
 		</view>
-		<view style=";margin-top: 10vh;" v-if="show">
+		<view style=";margin-top: 0vh;" v-if="show">
 			<view style="width: 100vw;">
-			   <scroll-view  style="background: linear-gradient(#000000, #000000);font-size: 20px;" scroll-y="true">
+			   <scroll-view  style="background: linear-gradient(#161616, #000000);font-size: 20px;" scroll-y="true">
 			   	<view class="prop-item" @click="handleLogout()">
 			   		<!-- <view class="prop-item-image">
 			   								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
@@ -53,9 +60,9 @@
 		<!-- <u-divider style="margin-top: 15vh;border-width: 5px;"></u-divider> -->
 		<view style=";margin-top: 10vh;" v-else>
 		<view style=";margin-top: 10vh;justify-content: center;align-items: center;justify-content: center;display: grid;align-content: center;justify-items: center;line-height: 50px;">
-			<image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix" style="margin-top: 5vh;">
-			<!-- <image v-if="avatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
-			</image>
+			<image   :src="avatar" class="cu-avatar xl round" mode="widthFix" style="margin-top: 5vh;">
+			 <!-- <image v-if="avatar" :src="avatar" class="cu-avatar xl round" mode="widthFix"> -->
+			<!--</image>
 			<view >
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
@@ -63,7 +70,7 @@
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start.png"></image>
 			</view> -->
-			<view style="color: #d0d0d0;">
+			<view style="color: #d0d0d0;font-weight: bold;font-size: 15px;">
 			  {{ name }}
 			</view>
 		</view>
@@ -90,7 +97,7 @@
 		  </view>
 		  </view>
     <view style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
-			<image style="height: 3vh;width: 30vw;position: absolute;bottom: 13vh;left: 35vw;" src="../../static/images/new/starts/login/backImg2.png"></image>
+			<!-- <image style="height: 3vh;width: 35vw;position: absolute;bottom: 13vh;left: 32.5vw;" src="../../static/images/new/starts/login/backImg2.png"></image> -->
       <view @click="skipPage(0)" style="margin:0px 10px;">
         <image src="@/static/images/new/starts/tabbar/one_off.png"
                style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
@@ -203,9 +210,9 @@
 			this.setLocale();
 		},
 		onShow() {
-			uni.setNavigationBarTitle({
-				title: this.$t('page.mine')
-			})
+			// uni.setNavigationBarTitle({
+			// 	title: this.$t('page.mine')
+			// })
 		},
 		methods: {
       skipPage(type){
@@ -321,6 +328,7 @@
 <style lang="scss">
 	page {
 		// background-color: #000000;
+		background-color: #000000;
 		background-image: url('../../static/images/new/starts/bg2.jpg');
 		background-size: cover;
 		background-repeat: no-repeat;

pages/mine/pwd/index.vue

@@ -1,23 +1,23 @@
 <template>
 	<view class="pwd-retrieve-container">
-		<view style="wibackground-color: black;">
-		<view style="width: 70vw;margin-left: 13vw;margin-top: 10vh;">
+		<view style="">
+		<view style="width: 70vw;margin-left: 15vw;margin-top: 10vh;">
 			<uni-forms ref="form" :value="user" labelWidth="0px">
 				<uni-forms-item name="oldPassword">
 					<!-- <uni-easyinput type="password" :styles="styles" :placeholderStyle="placeholderStyle"
 					v-model="user.oldPassword" :placeholder="i18('请输入旧密码')" /> -->
-					<view style="color: aliceblue;margin-left: 1vw;">{{i18('旧密码')}}{{oldPassword}}</view>
-					<u-input :placeholder="i18('请输入旧密码')" v-show="oldPassword" :password="true" :styles="styles"
-						color="#e7e7e7" v-model="user.oldPassword" style="border-radius: 20px;">
+					<view style="color: aliceblue;margin-left: 1vw;">{{i18('旧密码')}}</view>
+					<u-input :placeholderStyle="placeholderStyle" :placeholder="i18('请输入旧密码')" v-show="oldPassword" :password="true" :styles="styles"
+						color="#e7e7e7" v-model="user.oldPassword" style="border-radius: 20px;background-color: #25282A;">
 						<template slot="suffix">
-							<uni-icons :type="oldPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+							<uni-icons :type="oldPassword ? 'eye': 'eye-slash'" size="25" style="color: #BEBEBE;"
 								@click="oldPasswordeye()"></uni-icons>
 						</template>
 					</u-input>
-					<u-input :placeholder="i18('请输入旧密码')" v-show="!oldPassword" :password="false" :styles="styles"
-						color="#e7e7e7" v-model="user.oldPassword" style="border-radius: 20px;">
+					<u-input :placeholderStyle="placeholderStyle" :placeholder="i18('请输入旧密码')" v-show="!oldPassword" :password="false" :styles="styles"
+						color="#e7e7e7" v-model="user.oldPassword" style="border-radius: 20px;background-color: #25282A;">
 						<template slot="suffix">
-							<uni-icons :type="oldPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+							<uni-icons :type="oldPassword ? 'eye': 'eye-slash'" size="25" style="color: #BEBEBE;"
 								@click="oldPasswordeye()"></uni-icons>
 						</template>
 					</u-input>
@@ -25,17 +25,17 @@
 				<uni-forms-item name="newPassword">
 					<!-- <uni-easyinput type="password" v-model="user.newPassword" :styles="styles" :placeholderStyle="placeholderStyle" :placeholder="i18('请输入新密码')" /> -->
 					<view style="color: aliceblue;margin-left: 1vw;">{{i18('新密码')}}</view>
-					<u-input :placeholder="i18('请输入新密码')" v-show="newPassword" :password="true" :styles="styles"
-						color="#e7e7e7" v-model="user.newPassword" style="border-radius: 20px;">
+					<u-input :placeholderStyle="placeholderStyle" :placeholder="i18('请输入新密码')" v-show="newPassword" :password="true" :styles="styles"
+						color="#e7e7e7" v-model="user.newPassword" style="border-radius: 20px;background-color: #25282A;">
 						<template slot="suffix">
-							<uni-icons :type="newPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+							<uni-icons :type="newPassword ? 'eye': 'eye-slash'" size="25" style="color: #BEBEBE;"
 								@click="newPasswordeye()"></uni-icons>
 						</template>
 					</u-input>
-					<u-input :placeholder="i18('请输入新密码')" v-show="!newPassword" :password="false" :styles="styles"
-						color="#e7e7e7" v-model="user.newPassword" style="border-radius: 20px;">
+					<u-input :placeholderStyle="placeholderStyle" :placeholder="i18('请输入新密码')" v-show="!newPassword" :password="false" :styles="styles"
+						color="#e7e7e7" v-model="user.newPassword" style="border-radius: 20px;background-color: #25282A;">
 						<template slot="suffix">
-							<uni-icons :type="newPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+							<uni-icons :type="newPassword ? 'eye': 'eye-slash'" size="25" style="color: #BEBEBE;"
 								@click="newPasswordeye()"></uni-icons>
 						</template>
 					</u-input>
@@ -43,34 +43,39 @@
 				<uni-forms-item name="confirmPassword">
 					<!-- <uni-easyinput type="password" v-model="user.confirmPassword" :styles="styles" :placeholderStyle="placeholderStyle" :placeholder="i18('请确认新密码')" /> -->
 					<view style="color: aliceblue;margin-left: 1vw;">{{i18('确认密码')}}</view>
-					<u-input :placeholder="i18('请确认新密码')" v-show="confirmPassword" :password="true" :styles="styles"
-						color="#e7e7e7" v-model="user.confirmPassword" style="border-radius: 20px;">
+					<u-input :placeholderStyle="placeholderStyle" :placeholder="i18('请确认新密码')" v-show="confirmPassword" :password="true" :styles="styles"
+						color="#e7e7e7" v-model="user.confirmPassword" style="border-radius: 20px;background-color: #25282A;">
 						<template slot="suffix">
-							<uni-icons :type="confirmPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+							<uni-icons :type="confirmPassword ? 'eye': 'eye-slash'" size="25" style="color: #BEBEBE;"
 								@click="confirmPasswordeye()"></uni-icons>
 						</template>
 					</u-input>
-					<u-input :placeholder="i18('请确认新密码')" v-show="!confirmPassword" :password="false" :styles="styles"
-						color="#e7e7e7" v-model="user.confirmPassword" style="border-radius: 20px;">
+					<u-input :placeholderStyle="placeholderStyle" :placeholder="i18('请确认新密码')" v-show="!confirmPassword" :password="false" :styles="styles"
+						color="#e7e7e7" v-model="user.confirmPassword" style="border-radius: 20px;background-color: #25282A;">
 						<template slot="suffix">
-							<uni-icons :type="confirmPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+							<uni-icons :type="confirmPassword ? 'eye': 'eye-slash'" size="25" style="color: #BEBEBE;"
 								@click="confirmPasswordeye()"></uni-icons>
 						</template>
 					</u-input>
 				</uni-forms-item>
-				<button type="primary" style="background: #57B03D;color: white;border-radius: 20px;"
+				<button type="primary" style="background: #57B03D;color: white;border-radius: 20px;margin-bottom: 3vh;"
 					@click="submit">{{i18('提交')}}</button>
-
-				<view style="bottom: 80px;position: absolute;left: 10px;right:10px">
+					
+				<button type="warn" @click="" style="background: #ca2f14;color: white;border-radius: 20px;"
+						@click="deleteUser">{{i18('注销账号')}}</button>
+				<!-- <view style="bottom: 80px;position: absolute;left: 10px;right:10px">
 					<button type="warn" @click="" style="background: #ca2f14;color: white;border-radius: 20px;"
 						@click="deleteUser">{{i18('注销账号')}}</button>
-				</view>
+				</view> -->
 				<!-- <view style="bottom: 10px;position: absolute;left: 10px;right:10px">
         <button type="warn"  @click="" style="background: #57B03D;color: white" @click="handleLogout">{{i18('退出登录')}}</button>
       </view> -->
 			</uni-forms>
 		</view>
 		</view>
+		<view style="width: 100%;text-align: center;">
+			<image style="height: 3vh;width: 35vw;position: absolute;bottom: 13vh;left: 32.5vw;" src="/static/images/new/starts/login/backImg2.png"></image>
+		</view>
 	</view>
 </template>
 
@@ -82,7 +87,7 @@
 	export default {
 		data() {
 			return {
-				placeholderStyle: "color:#bababa;font-size:14px",
+				placeholderStyle: "color:##BEBEBE;font-size:14px;",
 				styles: {
 					color: '#ffffff',
 					borderColor: '#ffffff'
@@ -193,7 +198,6 @@
 
 	.pwd-retrieve-container {
 		padding-top: 36rpx;
-		padding: 15px;
 		line-height: 30px;
 	}
 </style>

pages/weitiandi/bluetooth/index.vue

@@ -118,7 +118,7 @@
       </view> -->
 <view class="dboxs dport">
 			<view class="dboxtitle">
-				<image class="portimg" src="../../../static/images/new/starts/mine/symbol (1).png" />
+				<image class="" style="width: 18px;height: 30px;" src="../../../static/images/new/starts/mine/symbol1.png" />
 				<view class="dboxtitle-text"> {{ i18('设备端口') }}</view>
 			</view>
 			<view class="dportitems">
@@ -168,17 +168,17 @@
 		</view>
 		<view class="dboxs dport" style="height: 100px" @click="planCharge">
 			<view class="dboxtitle">
-				<image class="portimg" src="../../../static/images/new/starts/index/yuyue.png" />
+				<image class="portimg" src="../../../static/images/new/starts/mine/yuyue.png" />
 				<view class="dboxtitle-text">{{ i18('预约充电') }}</view>
 			</view>
 
-			<view class="port-text" v-if="planInfo != null" style="left:40px;top:48px;font-size: 14px">
+			<view class="port-text" v-if="planInfo != null" style="left:60px;top:55px;font-size: 14px">
 				{{ i18('已预约') }} {{planInfo.runTime}}
 			</view>
-			<view class="port-text" style="left:40px;top:55px;font-size: 14px" v-else>
+			<view class="port-text" style="left:60px;top:55px;font-size: 14px" v-else>
 				{{ i18('点击预约充电') }}
 			</view>
-			<view class="port-num" style="left:40px;top:70px;font-size: 12px" v-if="planInfo != null">
+			<view class="port-num" style="left:60px;top:55px;font-size: 12px" v-if="planInfo != null">
 				{{ i18('可点击取消预约') }}
 			</view>
 			<!-- <view class="port-icon" v-if="planInfo == null" style="width: 50px;height: 50px;right:10px;top:28%">
@@ -195,6 +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 class="control-btn" @click="trigger()" v-if="portDetail.portStatus == 2">
 				<image class="btn-image" src="/static/images/new/start/stop.png">
 				</image>
@@ -232,6 +233,7 @@
       <!--        </image>-->
       <!--        <view>使用记录</view>-->
       <!--      </view>-->
+	  </view>
     </view>
     <u-picker ref="uPicker" @cancel="cancelPicker" @confirm="confirm" :show="showPlan" :columns="planCols" @change="changeHandler"></u-picker>
     <u-modal :show="showPwd" :confirmText="i18('确认')" @confirm="inputPwd" @cancel="cancel" :showCancelButton="true"  title="修改密码" >
@@ -256,6 +258,10 @@
 
       </view>
     </u-modal>
+	<view style="width: 100%;text-align: center;">
+		<image style="height: 3vh;width: 35vw;position: absolute;bottom: 10vh;left: 32.5vw;"
+			src="../../../static/images/new/starts/login/backImg2.png"></image>
+	</view>
   </view>
 </template>
 
@@ -317,7 +323,7 @@ export default {
   },
   onShow(){
     uni.setNavigationBarTitle({
-      title: this.$t('page.control')
+      title: 'Charging Setting'
     })
     this.buletooth();
 
@@ -956,7 +962,7 @@ export default {
   display: inline-block;;
   height: 60px;
   width: 25%;
-  padding:10px 20px;
+  padding:10px 15px;
   text-align: center;
   font-size: 12px;
   color: white;
@@ -980,7 +986,7 @@ export default {
 }
 .portimg{
   width: 20px;
-  height: 20px;
+  height: 22px;
 }
 .dportitem-img{
   width: 50px;
@@ -996,10 +1002,11 @@ export default {
   justify-content: center;
   align-items: center;
   position: relative;
+  margin-left: 7px;
 }
 .dportitem{
-  margin:10px;
-  width: 70px;
+  margin:10px 10px 0 32px;;
+  width: 81px;
   position: relative;
   display: inline-block;
 }
@@ -1022,13 +1029,13 @@ export default {
 .dboxtitle-text{
   display: inline-block;
   position: absolute;
-  top: -2px;
-  left: 25px;
+  top: 0px;
+  left: 40px;
   color: #b0b0b0;
 }
 .btn-image{
-  width: 30px;
-  height: 30px;
+  width: 42px;
+  height: 42px;
 }
 .control-btn{
   font-size: 14px;

pages/weitiandi/bluetooth/setting.vue

@@ -21,7 +21,7 @@
 		  
         <view class="prop-title-auto"><view>Bluetooth settings:</view> <view style="font-size: 9px;">{{i18('连接自动充电')}}</view></view>
         <view class="prop-value">
-			<u-switch style="margin-left: 100px;border-color: aliceblue;" v-model="value" asyncChange activeColor="#57B03D" inactiveColor="#080808" :activeValue="0" :inactiveValue="1"  @change="setAutoCharge"></u-switch>
+			<u-switch style="border-color: aliceblue;margin-right: 1vw;" v-model="value" asyncChange activeColor="#57B03D" inactiveColor="#080808"  :activeValue="1" :inactiveValue="0"  @change="setAutoCharge"></u-switch>
           <!-- <view :style="item.style" class="value-tag" @click=" setAutoCharge(item.value)" v-for="item in autoCharge">
             {{ i18(item.title) }}
           </view> -->
@@ -153,6 +153,7 @@ export default {
     },
     getAutoChargeValue(){
       let autoCharge = uni.getStorageSync("autoCharge");
+	  console.log('getautoCharge>>>'+(!autoCharge)+'<<'+autoCharge+'>>')
       if(!autoCharge ){
         autoCharge = 0;
       }
@@ -389,7 +390,7 @@ export default {
   top: 0px;
   right: 0px;
   bottom:0px;
-  background-image: url('../../../static/images/new/starts/bg2.jpg');
+  background-image: url('../../../static/images/new/starts/bg1.jpg');
   background-size: cover;
   background-repeat: no-repeat;;
 }
@@ -400,6 +401,7 @@ export default {
 .prop-item-auto{
 	padding: 2vh;
 	display: flex;
+	justify-content: space-between;
 }
 
 .prop-value {
@@ -411,6 +413,7 @@ export default {
   color: white;
   font-weight: bold;
   margin-bottom: 2.5vh;
+  margin-left: 1vw;
 }
 .prop-title-auto {
 	display: grid;
@@ -418,6 +421,7 @@ export default {
   color: white;
   font-weight: bold;
   margin-bottom: 2.5vh;
+  margin-left: 1vw;
 }
 
 .value-tag {

pages/weitiandi/bluetooth/status.vue

@@ -148,11 +148,11 @@
 
       </view>
     </u-modal> -->
-<view style="height: 0vh;place-items: center;display: grid;">
-			<image style="height: 3vh;width: 15vh;margin-top: 5vh;top: 3vh;"
+<view style=" margin: 2vh 0 0 22vw;place-items: center;display: flex;flex-direction: row;justify-content: space-evenly;">
+			<image style="height: 3vh;width: 35vw;"
 				src="../../../static/images/new/starts/login/backImg2.png"></image>
 			<text @click="clickRight()"
-					style="font-size: 15px;margin: -5px 0 0 30vh;font-weight: bold;z-index: 9999;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
+					style="font-size: 15px;font-weight: bold;z-index: 9999;height: 3vh;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
 					
 					<!-- <uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 						:mask-click="true">
@@ -160,7 +160,7 @@
 					</uni-drawer> -->
 			</view>
 			<view >
-				<u-popup :show="show" mode="right" customStyle="top:14vh;bottom:200px" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="100" ref="showRight" :overlay="false" >
+				<u-popup :show="show" mode="right" customStyle="top:10vh;bottom:200px" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="100" ref="showRight" :overlay="false" >
 				            <view style="width: 100vw;height: 100vh;">
 				               <scroll-view  style="background: linear-gradient(#000000, #161615);font-size: 20px;height: 100vh;" scroll-y="true">
 				               	<view class="prop-item" @click="handleLogout()">
@@ -197,7 +197,7 @@
 				            </view>
 						</u-popup>
 			</view>
-    <view style="    position: relative;top: 10vh;margin-top: 4vh;text-align: center;display: flex;flex-direction: row;justify-content: center;">
+    <view style="    position: relative;top: 4vh;margin-top: 4vh;text-align: center;display: flex;flex-direction: row;justify-content: center;">
       <view class="progress_box" style="text-align: center">
 		  <view >
 		  <image class="progress-barup" src="../../../static/images/new/starts/kedu.png"></image>
@@ -233,8 +233,8 @@
 	  		</view>
 	  	</view>
 		</view>
-		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 5vh;">
-			 <view  class="port_item" :class="item.id==choosePort?'selected_item':''" v-for="item in curPort" @click="selectPort(item.id);">{{ i18(item.text )}}</view>
+		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 6vh;">
+			 <view  class="port_item" v-if="curPort.length>1" :class="item.id==choosePort?'selected_item':''" v-for="item in curPort" @click="selectPort(item.id);">{{ i18(item.text )}}</view>
 			<view
 				style="background-color:#494E51 ;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 75vw;;border-radius: 27px;">
 				<view span="4" style="width: 25vw;">
@@ -268,7 +268,9 @@
 						<view style="font-weight: bold;"><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
 							<span  v-else>{{$t('charge.chargetime')}}</span></view>
 						<view class="demo-layout bg-purple"
-							style="border-radius: 8px;background-color: aliceblue;color: #000;">
+							style="border-radius: 8px;background-color: aliceblue;color: #000;display: flex;padding-top: 5px;
+    justify-content: center;
+    align-items: center;">
 							<view >{{ chargeTime  }}{{ i18('分钟') }}</view>
 							
 						</view>
@@ -301,7 +303,9 @@
 					<view style="margin-left: 3vw;font-size: 11px;">
 						<view style="font-weight: bold;"> Ampere</view>
 						<view class="demo-layout bg-purple"
-							style="border-radius: 8px;background-color: aliceblue;color: #000;">
+							style="border-radius: 8px;background-color: aliceblue;color: #000;display: flex;padding-top: 5px;
+    justify-content: center;
+    align-items: center;">
 							<view v-if="deviceV  == 0">0A</view>
 							<view v-else>{{currentValue}}A</view>
 						</view>
@@ -310,7 +314,7 @@
 			</view>
 		</view>
 		
-		<view style="display: flex;align-items: center;justify-content: center;margin-top: 5vh;">
+		<view style="display: flex;align-items: center;justify-content: center;margin-top: 0vh;">
 			<view @click="toPage">
 				<image src="../../../static/images/new/starts/status/Setting.png"
 					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
@@ -334,20 +338,20 @@
 			</view>
 		</view>
 		
-		<view style="display: flex;align-items: center;justify-content: center;">
-			<view @click="skip(0)">
-				<image src="../../../static/images/new/starts/tabbar/one_off.png"
-					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-			</view>
-			<view @click="skip(1)">
-				<image src="../../../static/images/new/starts/tabbar/two_off.png"
-					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-			</view>
-			<view @click="skip(2)">
-				<image src="../../../static/images/new/starts/tabbar/three_off.png"
-					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-			</view>
-		</view>
+		<view style="position:fixed;bottom:1vh;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
+		  <view @click="skip(0)" style="margin:0px 10px;">
+		    <image src="@/static/images/new/starts/tabbar/one_off.png"
+		           style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+		  </view>
+		  <view @click="skip(1)" style="margin:0px 10px;">
+		    <image src="@/static/images/new/starts/tabbar/two_on.png"
+		           style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+		  </view>
+		  <view @click="skip(2)" style="margin:0px 10px;">
+		    <image src="@/static/images/new/starts/tabbar/three_off.png"
+		           style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+		  </view>
+		  </view>
     <u-modal :show="showInitPwd" :confirmText="i18('确认')" :cancelText="i18('取消')" @confirm="inputPwd" @cancel="cancelInitDlg" :showCancelButton="true"  :title="i18('当前密码为初始密码，请修改')" >
       <view class="slot-content">
         <view style="margin-bottom:10px;">
@@ -478,7 +482,7 @@ export default {
   },
   onShow(){
     uni.setNavigationBarTitle({
-      title: this.$t('page.detail')
+      title:' '
     })
     this.buletooth();
 
@@ -516,8 +520,8 @@ export default {
 	  	var gradient = ctx.createLinearGradient(0, 0, 120, 0);
 	  
 	  	let increase = 0.15;
-	  	let end = (150/100 ) * 2 * Math.PI ; // 最后的角度
-	  	let current = (50 / 100) * 2 * Math.PI-Math.PI/2 ; // 起始角度
+	  	let end = (120/100 ) * 2 * Math.PI ; // 最后的角度
+	  	let current = (50 / 100) * 2 * Math.PI-Math.PI/3 ; // 起始角度
 	  	if(this.portDetail.portStatus == 2){
 			if(this.timeFlg){
 				this.timeFlg=false
@@ -538,16 +542,16 @@ export default {
 	  			if(this.portDetail.portStatus != 2){
 	  			clearInterval(timer);	
 				this.timeFlg=true
-	  			}else{
-	  				end = (150/100 ) * 2 * Math.PI ; // 最后的角度
-	  				current = (50 / 100) * 2 * Math.PI-Math.PI/2 ; // 起始角度
 	  			}
+	  				end = (120/100 ) * 2 * Math.PI ; // 最后的角度
+	  				current = (50 / 100) * 2 * Math.PI-Math.PI/3 ; // 起始角度
+	  			
 	  		}
-	  		ctx.arc(100, 100, 90, (50 / 100) * 2 * Math.PI-Math.PI/2, current, false);
+	  		ctx.arc(120, 120, 115, (50 / 100) * 2 * Math.PI-Math.PI/2, current, false);
 	  		ctx.stroke();
 	  		ctx.draw();
 	  		
-	  	}, 20);
+	  	}, 40);
 	  	}
 		}
 	  },
@@ -992,8 +996,9 @@ export default {
     getAutoChargeValue(){
       let autoCharge = uni.getStorageSync("autoCharge");
       if(!autoCharge ){
-        autoCharge = 1;
+        autoCharge = 0;
       }
+	   uni.setStorageSync("autoCharge",autoCharge);
       return autoCharge;
     },
     planCharge(){
@@ -1087,7 +1092,7 @@ export default {
       if(portStatus == 2){//需要停止充电
         this.$modal.confirm("需要停止充电么？").then(res=>{
           this.stopCharge();
-		  this.drawCircle(0); //参数为1-100
+		  this.drawCircle(100); //参数为1-100
         })
       }else{
         if(portStatus == 1){
@@ -1263,8 +1268,8 @@ export default {
 	.progress_box {
 		/* position: relative; */
 		/* position: relative; */
-		width: 52vw;
-		height: 35vh;
+		/* width: 60vw; */
+		height: 38vh;
 		/* background-color: red; */
 		display: flex;
 		text-align: center;
@@ -1279,13 +1284,13 @@ export default {
 
 .progress_bg {
 		position: absolute;
-		width: 30vh;
-		height: 30vh;
+		width: 60vw;
+		height: 50vh;
 	}
 .progress_txt {
-		    position: absolute;
+		    /* position: absolute; */
 		    z-index: 99;
-		    width: 55vw;
+		    /* width: 55vw; */
 	/* 	text-align: center;
 		font-size: 28upx;
 		margin: 16vw;
@@ -1296,33 +1301,33 @@ export default {
 
 	.progress_bar {
 		position: absolute;
-		width: 60vw;
-		margin: 2px;
+		width: 64vw;
+		margin:  7px 0px 0px 5px;
 		height: 50vh;
 		
 	}
 	.progress-barup{
 	        position: absolute;
-	        width: 200px;
-	        margin: 2px;
-	        height: 196px;
+	        width: 250px;
+	        margin: 0px;
+	        height: 250px;
 	        z-index: 1;
 	}
 
 	
 	.progress_line {
 		position: absolute;
-		width: 30vh;
-		height: 30vh;
+		width: 60vw;
+		height: 50vh;
 	}
 .progress_info {
 	      display: flex;
 	      font-size: 10px;
-	      margin: 70px 30px;
+	      margin: 80px 30px;
 	      align-items: center;
 	      flex-direction: column;
-		  height: 14vh;
-		  width: 35vw;
+		  /* height: 14vh; */
+		  width: 190px;
 	}
 
 .header-status-desc {

pages/weitiandi/device/chargerecord.vue

@@ -80,12 +80,15 @@
 </script>
 
 <style>
+	
+	
 	.container {
-		background-image: url('../../../static/images/new/starts/bg1.jpg');
+		/* background-image: url('../../../static/images/new/starts/bg1.jpg'); */
+		background-color: #030303;
 		background-size: cover;
 		background-repeat: no-repeat;
 		inset: 0;
-		position: absolute;
+		/* position: absolute; */
 	}
 
 	.list-item {
@@ -96,9 +99,9 @@
 	.item {
 		box-shadow: 0px 5px 27px 0px rgba(195, 195, 195, 0.4);
 		border-radius: 4px;
-		margin: 4vw;
+		margin: 0 0 1vw 0;
 		padding: 4vw;
-		background: linear-gradient(#1e1e1e, #050609);
+		background: linear-gradient(#000000eb, #000000);
 		color: aliceblue;
 		
 	}

pages/weitiandi/device/index.vue

@@ -46,13 +46,13 @@
 
 		<view class="dboxs dport">
 			<view class="dboxtitle">
-				<image class="portimg" src="../../../static/images/new/starts/mine/symbol1.png" />
+				<image class="" style="width: 18px;height: 30px;" src="../../../static/images/new/starts/mine/symbol1.png" />
 				<view class="dboxtitle-text"> {{ i18('设备端口') }}</view>
 			</view>
 			<view class="dportitems">
 				<view class="dportitem " v-for="item in curPort" @click="selectPort(item.id);">
 					<p class="dpropitem-title "> {{ item.text }}</p>
-					<view style="position: absolute;right: 0px;z-index: 9999" v-if="item.id == choosePort">
+					<view style="position: absolute;right: 20px;z-index: 9999" v-if="item.id == choosePort">
 						<image class="dportitem-img" style="width: 15px;height: 15px"
 							src="/static/images/new/start/choose.png" />
 					</view>
@@ -100,13 +100,13 @@
 				<view class="dboxtitle-text">{{ i18('预约充电') }}</view>
 			</view>
 
-			<view class="port-text" v-if="planInfo != null" style="left:40px;top:48px;font-size: 14px">
+			<view class="port-text" v-if="planInfo != null" style="left:60px;top:55px;font-size: 14px">
 				{{ i18('已预约') }} {{planInfo.runTime}}
 			</view>
-			<view class="port-text" style="left:40px;top:55px;font-size: 14px" v-else>
+			<view class="port-text" style="left:60px;top:55px;font-size: 14px" v-else>
 				{{ i18('点击预约充电') }}
 			</view>
-			<view class="port-num" style="left:40px;top:70px;font-size: 12px" v-if="planInfo != null">
+			<view class="port-num" style="left:60px;top:55px;font-size: 12px" v-if="planInfo != null">
 				{{ i18('可点击取消预约') }}
 			</view>
 			<!-- <view class="port-icon" v-if="planInfo == null" style="width: 50px;height: 50px;right:10px;top:28%">
@@ -123,6 +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 class="control-btn" @click="trigger()">
 				<view v-if="portDetail.portStatus == 2">
 					<image class="btn-image" src="../../../static/images/new/start/stop.png">
@@ -162,11 +163,12 @@
 				</image>
 				<view>{{ i18('重置设备') }}</view>
 			</view>
+			</view>
 		</view>
 		<u-picker @cancel="showPort=false" @confirm="confirmPort" :show="showPort" :columns="portList"
 			keyName="text"></u-picker>
 		<view style="width: 100%;text-align: center;">
-			<image style="height: 3vh;width: 30vw;position: absolute;bottom: 10vh;left: 35vw;"
+			<image style="height: 3vh;width: 35vw;position: absolute;bottom: 10vh;left: 32.5vw;"
 				src="../../../static/images/new/starts/login/backImg2.png"></image>
 		</view>
 	</view>
@@ -610,8 +612,8 @@
 	}
 
 	.btn-image {
-		width: 90%;
-		height: 100%;
+		width: 42px;
+		height: 42px;
 	}
 
 	.info-bottom-btn {
@@ -702,8 +704,8 @@
 
 	.port-text {
 		position: absolute;
-		top: 13px;
-		left: 75px;
+	top:13px;
+	left:75px;
 		font-weight: bold;
 	}
 
@@ -751,7 +753,7 @@
 		;
 		height: 60px;
 		width: 25%;
-		padding: 10px 20px;
+		padding: 10px 15px;
 		text-align: center;
 		font-size: 12px;
 		color: black;
@@ -771,13 +773,13 @@
 		padding: 20px;
 		font-size: 0.24rem;
 		color: #57B03D;
-		margin: 20px;
+		margin: 5px;
 		position: relative;
 	}
 
 	.portimg {
 		width: 20px;
-		height: 20px;
+		height: 22px;
 	}
 
 	.dportitem-img {
@@ -788,13 +790,13 @@
 	.dpropitem-block {
 		/* padding: 0.12rem 0.37rem;
 		background: #e6f6f1; */
-		margin-left: 10px;
+		margin-left: 7px;
 
 	}
 
 	.dportitem {
-		margin: 10px 10px 0 16px;
-		width: 70px;
+		margin: 10px 10px 0 32px;
+		width: 81px;
 		position: relative;
 		display: inline-block;
 	}
@@ -808,10 +810,12 @@
 		text-align: center;
 		margin-bottom: 5px;
 		font-size: 16px;
+		/* margin-left: 16px; */
 	}
 
 	.dpropitem-status {
 		font-size: 14px;
+		
 	}
 
 	.dboxtitle {
@@ -822,15 +826,12 @@
 	.dboxtitle-text {
 		display: inline-block;
 		position: absolute;
-		top: -2px;
-		left: 25px;
+		top: 0px;
+		left: 40px;
 		color: #e7e7e7;
 	}
 
-	.btn-image {
-		width: 30px;
-		height: 30px;
-	}
+
 
 	.control-btn {
 		font-size: 14px;

pages/weitiandi/device/plan.vue

@@ -56,7 +56,7 @@
       </view>
     </uni-popup>
 	<view style="width: 100%;text-align: center;">
-		<image style="height: 3vh;width: 30vw;position: absolute;bottom: 13vh;left: 35vw;" src="../../../static/images/new/starts/login/backImg2.png"></image>
+		<image style="height: 3vh;width: 35vw;position: absolute;bottom: 13vh;left: 32.5vw;" src="../../../static/images/new/starts/login/backImg2.png"></image>
 	</view>
   </view>
 </template>

pages/weitiandi/device/planrecord.vue

@@ -7,16 +7,16 @@
             {{i18('设备编号')}}：{{ item.deviceId }}
           </view>
           <view class="item-status">
-            <uni-tag type="success" :text="i18('激活中')" v-if="item.status === 1"></uni-tag>
-            <uni-tag type="error" :text="i18('已停用')" v-if="item.status === 2"></uni-tag>
-            <uni-tag type="success" :text="i18('已执行')"  v-if="item.status === 3"></uni-tag>
+            <uni-tag :circle="true" type="success" :text="i18('激活中')" v-if="item.status === 1"></uni-tag>
+            <uni-tag :circle="true" type="error" :text="i18('已停用')" v-if="item.status === 2"></uni-tag>
+            <uni-tag :circle="true" type="success" :text="i18('已执行')"  v-if="item.status === 3"></uni-tag>
           </view>
         </view>
         <view class="item-body">
           <view style="font-size: 12px">
             {{i18('预约类型')}}:
-            <uni-tag type="primary" :text="i18('单次')" v-if="item.planType === 1"></uni-tag>
-            <uni-tag type="warning" :text="i18('重复')" v-if="item.planType === 2"></uni-tag>
+            <uni-tag :circle="true" type="primary" :text="i18('单次')" v-if="item.planType === 1"></uni-tag>
+            <uni-tag :circle="true" type="warning" :text="i18('重复')" v-if="item.planType === 2"></uni-tag>
           </view>
           <view style="font-size: 12px; margin: 5px 0">
             {{i18('创建时间')}}：{{ item.createTime }}
@@ -115,8 +115,8 @@ export default {
 		box-shadow: 0px 5px 27px 0px rgba(195, 195, 195, 0.4);
 		border-radius: 4px;
 		/* background: #FFFFFF; */
-		background: linear-gradient(#565656, #050609);
-		margin: 4vw;
+		background: linear-gradient(#2b2b2b, #050609);
+		margin: 1vw;
 		padding: 4vw;
 	}
 

pages/weitiandi/device/setting.vue

@@ -6,7 +6,7 @@
         <view class="prop-title">{{i18('充电电流')}}</view>
         <view class="prop-value">
           <view :style="item.style" class="value-tag" @click="checkItem(current,item)" v-for="item in current.items">
-            {{ item.text }}
+            <span style="margin-top: 5px;">{{ item.text }}</span>
           </view>
         </view>
         <view class="prop-input" style="width: 100%" v-if="current.custom">
@@ -19,13 +19,10 @@
 
     </view>
 
-
     <view class="bottom-area">
-
 	<view style="text-align: center;width: 100%;">
       <view class="btn" @click="confirm">{{i18('确认')}}</view>
 	</view>
-
       <view class="areas">
         <view class="areas-item" @click="sendMainboardCmd">
           <view class="areas-img">
@@ -294,6 +291,7 @@ export default {
   color: #dddddd;
   font-weight: bold;
   margin-bottom: 2.5vh;
+  margin-left: 1vw;
 }
 
 .value-tag {
@@ -301,10 +299,10 @@ export default {
   color: #000000;
   width: 14vw;
   height: 4vh;
-  line-height: 4vh;
+  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/device/status.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container">
-		<view style="height: 0vh;place-items: center;display: grid;">
-			<image style="height: 3vh;width: 27vw;margin-top: 1vh;top: 3vh;"
+		<view style=" margin: 2vh 0 0 22vw;place-items: center;display: flex;flex-direction: row;justify-content: space-evenly;">
+			<image style="height: 3vh;width: 35vw;"
 				src="../../../static/images/new/starts/login/backImg2.png"></image>
-			<text @click="clickRight()"
-				style="font-size: 15px;margin: -5px 0 0 30vh;font-weight: bold;z-index: 9999;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
+			<view @click="clickRight()"
+				style="font-size: 15px;font-weight: bold;z-index: 9999;height: 3vh;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></view>
 				
 				<!-- <uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 					:mask-click="true">
@@ -12,7 +12,7 @@
 				</uni-drawer> -->
 		</view>
 		<view >
-			<u-popup :show="show" mode="right" customStyle="top:14vh;bottom:200px;" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="100" ref="showRight" :overlay="false" >
+			<u-popup :show="show" mode="right" customStyle="top:10vh;bottom:200px;" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="100" ref="showRight" :overlay="false" >
 			            <view style="width: 100vw;height: 100vh;">
 			               <scroll-view  style="background: linear-gradient(#000000, #161615);font-size: 20px;height: 100vh;" scroll-y="true">
 			               	<view class="prop-item" @click="handleLogout()">
@@ -49,7 +49,7 @@
 			            </view>
 					</u-popup>
 		</view>
-		<view style="    position: relative;top: 10vh;margin-top: 4vh;text-align: center;display: flex;flex-direction: row;justify-content: center;">
+		<view style="    position: relative;top: 4vh;margin-top: 4vh;text-align: center;display: flex;flex-direction: row;justify-content: center;">
 			<view class="progress_box" style="text-align: center">
 				<!-- <canvas class="progress_bg" canvas-id="cpbg"></canvas> -->
 				<view >
@@ -59,7 +59,7 @@
 				<!-- <canvas class="progress_line" canvas-id="cpline"></canvas> -->
 				<view class="progress_txt">
 					<view class="progress_info">
-						<view class="p0" style="color: azure;" st="">{{ deviceInfo.qrcode}}</view>
+						<view class="p0" style="color: azure;font-size: 13px;" st="">{{ deviceInfo.qrcode}}</view>
 						<view class="p1">
 						  <view v-if="portStatus  == 2" style="position: relative;">
 						    {{$t('charge.charging')}}
@@ -131,7 +131,7 @@
 		
 		
 		
-		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 5vh;">
+		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 6vh;">
 			<view
 				style="background-color: #494E51;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 75vw;;border-radius: 27px;">
 				<view span="4" style="width: 25vw;">
@@ -164,9 +164,10 @@
 						<view style="font-weight: bold;"><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
 							<span  v-else>{{$t('charge.chargetime')}}</span></view>
 						<view class="demo-layout bg-purple"
-							style="border-radius: 8px;background-color: aliceblue;color: #000;">
-							<view >{{ chargeTime  }}{{ i18('分钟') }}</view>
-							
+							style="border-radius: 8px;background-color: aliceblue;color: #000;display: flex;padding-top: 5px;
+    justify-content: center;
+    align-items: center;">
+							<view style="">{{ chargeTime  }}{{ i18('分钟') }}</view>
 						</view>
 					</view>
 				</view>
@@ -197,7 +198,9 @@
 					<view style="margin-left: 3vw;font-size: 11px;">
 						<view style="font-weight: bold;"> Ampere</view>
 						<view class="demo-layout bg-purple"
-							style="border-radius: 8px;background-color: aliceblue;color: #000;">
+							style="border-radius: 8px;background-color: aliceblue;color: #000;display: flex;padding-top: 5px;
+    justify-content: center;
+    align-items: center;">
 							<view v-if="deviceV  == 0">0A</view>
 							<view v-else>{{currentValue}}A</view>
 						</view>
@@ -229,20 +232,20 @@
 			</view> -->
 		</view>
 
-		<view style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
-			<view @click="skipPage(0)">
-				<image src="../../../static/images/new/starts/tabbar/one_off.png"
-					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-			</view>
-			<view @click="skipPage(1)">
-				<image src="../../../static/images/new/starts/tabbar/two_off.png"
-					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-			</view>
-			<view @click="skipPage(2)">
-				<image src="../../../static/images/new/starts/tabbar/three_off.png"
-					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-			</view>
-		</view>
+		<view style="position:fixed;bottom:1vh;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
+		  <view @click="skipPage(0)" style="margin:0px 10px;">
+		    <image src="@/static/images/new/starts/tabbar/one_off.png"
+		           style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+		  </view>
+		  <view @click="skipPage(1)" style="margin:0px 10px;">
+		    <image src="@/static/images/new/starts/tabbar/two_on.png"
+		           style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+		  </view>
+		  <view @click="skipPage(2)" style="margin:0px 10px;">
+		    <image src="@/static/images/new/starts/tabbar/three_off.png"
+		           style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+		  </view>
+		  </view>
 
 
 
@@ -331,6 +334,7 @@
 	export default {
 		data() {
 			return {
+				consolee:0, //测试参数
 				refreshTimer: null,
 				curPort: [],
 				chargeTime: 0,
@@ -390,9 +394,9 @@
 
 		mounted: function() {
 			this.drawCircle(25);
-			this.drawProgressbg();
+			//this.drawProgressbg();
 			 //参数为1-100
-			this.drawLine();
+			//this.drawLine();
 		},
 		methods: {
 			resetMainboard() {
@@ -483,28 +487,29 @@
 
 				}
 			},
-			drawProgressbg: function() {
-				// 自定义组件实例 this ，表示在这个自定义组件下查找拥有 canvas-id 的 <canvas/>
-				var ctx = uni.createCanvasContext('cpbg', this);
-				ctx.setLineWidth(20); // 设置圆环的宽度
-				ctx.setStrokeStyle('#35383A'); // 设置圆环的颜色
-				// ctx.setLineCap('round'); // 设置圆环端点的形状
-				ctx.setLineCap('square'); // 设置圆环端点的形状
-				ctx.beginPath(); //开始一个新的路径
-				ctx.arc(100, 100, 90, 0 * Math.PI, 2 * Math.PI, false);
-				//设置一个原点(110,110)，半径为100的圆的路径到当前路径
-				ctx.stroke(); //对当前路径进行描边
-				ctx.draw();
-			},
+			// drawProgressbg: function() {
+			// 	// 自定义组件实例 this ，表示在这个自定义组件下查找拥有 canvas-id 的 <canvas/>
+			// 	var ctx = uni.createCanvasContext('cpbg', this);
+			// 	ctx.setLineWidth(20); // 设置圆环的宽度
+			// 	ctx.setStrokeStyle('#35383A'); // 设置圆环的颜色
+			// 	// ctx.setLineCap('round'); // 设置圆环端点的形状
+			// 	ctx.setLineCap('square'); // 设置圆环端点的形状
+			// 	ctx.beginPath(); //开始一个新的路径
+			// 	ctx.arc(120, 120, 90, 0 * Math.PI, 2 * Math.PI, false);
+			// 	//设置一个原点(110,110)，半径为100的圆的路径到当前路径
+			// 	ctx.stroke(); //对当前路径进行描边
+			// 	ctx.draw();
+			// },
 			drawCircle: function(step) {
 			var ctx = uni.createCanvasContext('cpbar', this);
 			// 进度条的渐变(中心x坐标-半径-边宽，中心Y坐标，中心x坐标+半径+边宽，中心Y坐标)
 			var gradient = ctx.createLinearGradient(0, 0, 120, 0);
 				  
 			let increase = 0.15;
-			let end = (150 /100) * 2 * Math.PI ; // 最后的角度
-			let current = (50 / 100) * 2 * Math.PI-Math.PI/2 ; // 起始角度
+			let end = (120 /100) * 2 * Math.PI ; // 最后的角度
+			let current = (50 / 100) * 2 * Math.PI-Math.PI/3 ; // 起始角度
 			if(this.portDetail.portStatus == 2){
+				this.consolee+=1
 				if(this.timeFlg){
 					this.timeFlg=false
 			let timer = setInterval(() => {
@@ -523,16 +528,15 @@
 					if(this.portDetail.portStatus != 2){
 					clearInterval(timer);	
 					this.timeFlg=true
-					}else{
-						end = (150 /100) * 2 * Math.PI ; // 最后的角度
-						current = (50 / 100) * 2 * Math.PI-Math.PI/2 ; // 起始角度
 					}
+						end = (120 /100) * 2 * Math.PI ; // 最后的角度
+						current = (50 / 100) * 2 * Math.PI-Math.PI/3 ; // 起始角度
 				}
-				ctx.arc(100, 100, 90, (50 / 100) * 2 * Math.PI-Math.PI/2, current, false);
+				ctx.arc(120, 120, 115, (50 / 100) * 2 * Math.PI-Math.PI/2, current, false);
 				ctx.stroke();
 				ctx.draw();
 				
-			}, 20);
+			}, 40);
 			}
 			}
 			},
@@ -936,8 +940,8 @@
 	.progress_box {
 		
 		    /* position: relative; */
-		    width: 52vw;
-		    height: 35vh;
+		    /* width: 60vw; */
+		    height: 38vh;
 		    /* background-color: red; */
 		    display: flex;
 		    text-align: center;
@@ -957,9 +961,9 @@
 	}
 
 	.progress_txt {
-		    position: absolute;
+		    /* position: absolute; */
 		    z-index: 99;
-		    width: 55vw;
+		    /* width: 55vw; */
 	/* 	text-align: center;
 		font-size: 28upx;
 		margin: 16vw;
@@ -970,16 +974,16 @@
 
 	.progress_bar {
 		position: absolute;
-		width: 60vw;
-		margin: 2px;
+		width: 64vw;
+		margin: 7px 0px 0px 5px;
 		height: 50vh;
 		
 	}
 	.progress-barup{
 	        position: absolute;
-	        width: 200px;
-	        margin: 2px;
-	        height: 196px;
+	        width: 250px;
+	        margin: 0px;
+	        height: 250px;
 	        z-index: 1;
 	}
 
@@ -993,11 +997,11 @@
 	.progress_info {
 	      display: flex;
 	      font-size: 10px;
-	      margin: 70px 30px;
+	      margin: 80px 30px;
 	      align-items: center;
 	      flex-direction: column;
 		 /* height: 14vh; */
-		  width: 35vw;
+		  width: 190px;
 	}
 
 	.header {
@@ -1555,7 +1559,7 @@
 	}
 
 	.p1 {
-		font-size: 20px;
+		font-size: 22px;
 		color: white;
 		font-weight: bold;
 		margin-top: 10px;
@@ -1563,7 +1567,7 @@
 	}
 	.p2{
 		color: #888;
-		font-size: 20px;
+		font-size: 22px;
 		font-weight: bold;
 		
 	}

pages/weitiandi/deviceList.vue

@@ -34,6 +34,7 @@
 	  		</uni-drawer>
 	  	</view> -->
 	  </view>
+	   <view v-if="chargeList.length==0" class="notice"> - {{ $t('buletooth.nodevice') }} -</view>
     <view class="list-item">
       <view class="item" v-for="item in chargeList" :key="item.id">
         <view class="item-header">
@@ -41,8 +42,14 @@
             {{i18('设备编号')}}：{{ item.qrcode }}
           </view>
           <view class="item-status">
-            <uni-tag type="success" style="border-radius: 20px;" :text="i18('在线中')" v-if="item.status === 1"></uni-tag>
-            <uni-tag type="default" style="border-radius: 20px;" :text="i18('已离线')" v-if="item.status === 0"></uni-tag>
+			  <view  class="value-tag" v-if="item.status === 1" style="background: #57B03D;color: #f5f5f5;">
+			    <span style="margin-top: 5px;">{{ i18('在线中') }}</span>
+			  </view>
+			  <view  class="value-tag" v-if="item.status === 0" style="background: #a3a5a4;color: #f5f5f5;">
+			    <span style="margin-top: 5px;">{{ i18('已离线') }}</span>
+			  </view>
+            <!-- <uni-tag type="success" style="border-radius: 20px;" :text="i18('在线中')" v-if="item.status === 1"></uni-tag> -->
+            <!-- <uni-tag type="default" style="border-radius: 20px;" :text="i18('已离线')" v-if="item.status === 0"></uni-tag> -->
           </view>
         </view>
         <view class="item-body">
@@ -65,9 +72,10 @@
 	
 	<view>
 		<view style="width: 100%;text-align: center;">
-			<image style="height: 3vh;width: 30vw;position: absolute;bottom: 13vh;left: 35vw;" src="../../static/images/new/starts/login/backImg2.png"></image>
+			
 		</view>
     <view style="position:fixed;bottom:1vh;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
+		<image style="height: 3vh;width: 35vw;position: absolute;bottom: 13vh;left: 32.5vw;" src="../../static/images/new/starts/login/backImg2.png"></image>
       <view @click="skipPage(0)" style="margin:0px 10px;">
         <image src="@/static/images/new/starts/tabbar/one_off.png"
                style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
@@ -210,13 +218,30 @@ export default {
 };
 </script>
 <style>
+	.uni-page-head-bd{
+		font-weight: bold;
+	}
+	
 .container {
   background-image: url('../../static/images/new/starts/bg2.jpg');
   background-size: cover;
+  background-color: #050609;
   background-repeat: no-repeat;
   inset: 0;
   position: absolute;
 }
+.value-tag {
+  background: #57B03D;
+  color: #f5f5f5;
+  width: 14vw;
+  height: 3vh;
+  line-height: 3.5vh;
+  border-radius: 3vw;
+  text-align: center;
+  margin: 0px 1vw 1px 1vw;
+  font-weight: bold;
+  font-size: 12px;
+}
 
 .list-item {
   margin: 0vw;
@@ -238,7 +263,7 @@ export default {
 }
 
 .item-status {
-  display: inline-block;
+ display: inline-block;
   float: right;
   
 }
@@ -301,4 +326,12 @@ border-radius: 20px 0 0 20px;
 		top: 5rpx;
 		color: #BCBCBF;
 	}
+	.notice {
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  margin-top: 10px;
+	  font-size: 13px;
+	  color: #909399;
+	}
 </style>