[修改][techron]:20240223提交版本

api/login.js

@@ -8,7 +8,7 @@ export function login(username, password) {
     // uuid
   }
   return request({
-    'url': '/mailLogin',
+    'url': '/mailLogin?appfrom=techtron',
     headers: {
       isToken: false
     },
@@ -35,7 +35,7 @@ export function register(username, password) {
 	password
   }
   return request({
-    'url': '/mailRegister',
+    'url': '/mailRegister?appfrom=techtron',
     headers: {
       isToken: false
     },
@@ -55,7 +55,7 @@ export function getInfo() {
 // 获取用户详细信息
 export function checkVersion(obj) {
   return request({
-    'url': '/device/checkVersion?versionCode='+obj.versionCode+"&platom="+obj.platom,
+    'url': '/device/checkVersion?appfrom=techtron&versionCode='+obj.versionCode+"&platom="+obj.platom,
     data:obj,
     'method': 'post'
   })

manifest.json

@@ -2,13 +2,10 @@
     "name" : "Techtron",
     "appid" : "__UNI__60E8019",
     "description" : "",
-    "versionName" : "1.1.6",
-    "versionCode" : 116,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : false,
     "app-plus" : {
-        "globalStyle" : {
-            "fontFamily:" : "AktivBold"
-        },
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
         "splashscreen" : {

pages/bluetooth/index/wifi.vue

@@ -723,7 +723,7 @@ export default {
 
 <style>
 	.container{
-		background-image: url('../../../static/images/new/starts/bg1.jpg');
+		background-image: url('../../../static/images/new/starts/bg2.jpg');
 		background-size: cover;
 		background-repeat: no-repeat;
 	}

pages/index.vue

@@ -27,7 +27,7 @@
 			<view style="text-align: center;margin-top: -15vh">
 				<view>
 					<view class="blue" @click="buleTeeth()">
-						<image src="../static/images/new/starts/index/blue.png"
+						<image :src="blueStatus==0?'../static/images/new/starts/index/blue.png':'../static/images/new/starts/index/blueto.png'"
 							style="width: 60px;height: 60px;margin-top: 2vh;"></image>
 					</view>
 					<view style="color: aliceblue;">
@@ -36,7 +36,7 @@
 				</view>
 				<view>
 					<view class="" @click="scan">
-						<image src="../static/images/new/starts/index/scan.png"
+						<image :src="scanStatus==0?'../static/images/new/starts/index/scan.png':'../static/images/new/starts/index/scanto.png'"
 							style="width: 60px;height: 60px;margin-top: 2vh;"></image>
 					</view>
 					<view style="color: aliceblue;">
@@ -45,7 +45,7 @@
 				</view>
 				<view>
 					<view class="" @click="wifi">
-						<image src="../static/images/new/starts/WiFi.png"
+						<image :src="wifiStatus==0?'../static/images/new/starts/WiFi.png':'../static/images/new/starts/WIFIto.png'"
 							style="width: 60px;height: 60px;margin-top: 2vh;"></image>
 					</view>
 					<view style="color: aliceblue;">
@@ -62,7 +62,9 @@
    							style="background: #505086;color:white;border-radius: 100vh;width: 120px;margin-right: -10px;">绑 定</u-button>
    					</u--input> -->
 			</view>
-			<view style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;">
+			
+			<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>
 				<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>
@@ -114,7 +116,10 @@
 				swiperDotIndex: 0,
 				data: [{
 					image: '/index/banner-index.png'
-				}]
+				}],
+				blueStatus: 0,
+				scanStatus: 0,
+				wifiStatus:0,
 			}
 		},
 		computed: {
@@ -127,8 +132,36 @@
 			uni.setNavigationBarTitle({
 				title: this.$t('page.worktai')
 			})
+			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
 		},
 		methods: {
+			iconStatus(type){
+				if(type==1){
+					this.blueStatus=1
+					this.scanStatus=0
+					this.wifiStatus=0
+					uni.setStorageSync('blueStatus',1)
+					uni.setStorageSync('scanStatus',0)
+					uni.setStorageSync('wifiStatus',0)
+				}else if(type==2){
+					this.blueStatus=0
+					this.scanStatus=1
+					this.wifiStatus=0
+					uni.setStorageSync('blueStatus',0)
+					uni.setStorageSync('scanStatus',1)
+					uni.setStorageSync('wifiStatus',0)
+				}else{
+					this.blueStatus=0
+					this.scanStatus=0
+					this.wifiStatus=1
+					uni.setStorageSync('blueStatus',0)
+					uni.setStorageSync('scanStatus',0)
+					uni.setStorageSync('wifiStatus',1)
+				}
+			},
 			skip(type) {
 				if (type == 0) {
 					uni.reLaunch({
@@ -153,11 +186,13 @@
 				return i18(text)
 			},
 			buleTeeth() {
+				this.iconStatus(1)
 				uni.navigateTo({
 					url: '/pages/bluetooth/index/index'
 				});
 			},
 			wifi() {
+				this.iconStatus(3)
 				uni.navigateTo({
 					url: '/pages/bluetooth/index/wifi'
 				});
@@ -177,6 +212,7 @@
 				})
 			},
 			scan() {
+				this.iconStatus(2)
 				let self = this;
 				uni.scanCode({
 					success: function(res) {
@@ -234,7 +270,7 @@
 
 <style>
 	.content {
-		background-image: url('../static/images/new/starts/bg1.jpg');
+		background-image: url('../static/images/new/starts/bg2.jpg');
 		background-size: cover;
 		background-repeat: no-repeat;
 		inset: 0;

pages/mine/index.vue

@@ -4,52 +4,57 @@
         {{ $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;">
-			<image style="height: 3vh;width: 15vh;margin-top: 5vh;top: 3vh;"
+		<view style="height: 0vh;place-items: center;display: grid;background-color: #141414;">
+			<image style="height: 3vh;width: 15vh;margin-top: 1vh;top: 3vh;"
 				src="../../static/images/new/starts/login/backImg2.png"></image>
-			<text @click="clickRight()" style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
-			<view>
-				<uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
-					:mask-click="true">
-					<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%" scroll-y="true">
-						<view class="prop-item" @click="handleLogout()">
-							<!-- <view class="prop-item-image">
-														<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-													</view> -->
-							<view class="prop-item-right">{{i18('退出登录')}}</view>
-							<view class="prop-item-left">
-								<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-							</view>
-						</view>
-						<u-divider/>
-						<view class="prop-item" @click="skip(2)">
-							<!-- <view class="prop-item-image">
-														<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-													</view> -->
-							<view class="prop-item-right">{{i18('关于我们')}}</view>
-							<view class="prop-item-left">
-								<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-							</view>
-						</view>
-						<u-divider/>
-						<view class="prop-item" @click="skip(3)">
-							<!-- <view class="prop-item-image">
-														<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-													</view> -->
-							<view class="prop-item-right">{{i18('帮助')}}</view>
-							<view class="prop-item-left">
-								<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-							</view>
-						</view>
-						<u-divider/>
-					</scroll-view>
-				</uni-drawer>
-			</view>
+			<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>
+			<!-- <view >
+				<u-popup :show="show" mode="right" customStyle="top:14vh;" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="1" ref="showRight" :overlay="false" >
+				           
+						</u-popup>
+			</view> -->
 		</view>
-		<u-divider style="margin-top: 15vh;"></u-divider>
-		<view style="margin-top: 5vh;justify-content: center;align-items: center;justify-content: center;display: grid;align-content: center;justify-items: center;line-height: 30px;">
-			<!-- <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix"> -->
-			<image v-if="avatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
+		<view style=";margin-top: 10vh;" v-if="show">
+			<view style="width: 100vw;">
+			   <scroll-view  style="background: linear-gradient(#000000, #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%;" />
+			   							</view> -->
+			   		<view class="prop-item-right">{{i18('退出登录')}}</view>
+			   		<view class="prop-item-left">
+			   			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+			   		</view>
+			   	</view>
+			   	<u-divider />
+			   	<view class="prop-item" @click="skipPage(3)">
+			   		<!-- <view class="prop-item-image">
+			   								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+			   							</view> -->
+			   		<view class="prop-item-right">{{i18('关于我们')}}</view>
+			   		<view class="prop-item-left">
+			   			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+			   		</view>
+			   	</view>
+			   	<u-divider />
+			   	<view class="prop-item" @click="skipPage(4)">
+			   		<!-- <view class="prop-item-image">
+			   								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+			   							</view> -->
+			   		<view class="prop-item-right">{{i18('帮助')}}</view>
+			   		<view class="prop-item-left">
+			   			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+			   		</view>
+			   	</view>
+			   	<u-divider />
+			   </scroll-view>
+			</view>
+			</view>
+		<!-- <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>
 			<view >
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
@@ -57,33 +62,35 @@
 			 <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>
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start.png"></image>
-			</view>
+			</view> -->
 			<view style="color: #d0d0d0;">
 			  {{ name }}
 			</view>
 		</view>
-		<u-divider style="color: aqua;"/>
-		<view class="menu-list">
+		<view class="menu-list" style="width: 100vw;line-height: 40px;">
+			<u-divider style=";width: 100vw;"/>
 		  <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
-		    <view class="menu-item-box">
-		      <image :src="this.imgUrl+'/mine/symbol.png'" style="width: 18px;height: 18px;margin-right:5px"></image>
+		    <view class="menu-item-box" >
+		      <image :src="this.imgUrl+'/mine/symbol.png'" style="width: 18px;height: 18px;"></image>
 		      <view class="menu-text"> {{  i18('账户设置')}}</view>
 		    </view>
 		  </view>
 		  <view class="list-cell list-cell-arrow" @click="handleAbout">
 		    <view class="menu-item-box">
-		      <image :src="this.imgUrl+'/mine/record.png'" style="width: 18px;height: 18px;margin-right:5px"></image>
+		      <image :src="this.imgUrl+'/mine/record.png'" style="width: 18px;height: 18px;"></image>
 		      <view class="menu-text">{{  i18('充电记录')}}</view>
 		    </view>
 		  </view>
 		  <view class="list-cell list-cell-arrow" @click="handleToSetting">
 		    <view class="menu-item-box">
-		      <image :src="this.imgUrl+'/mine/symbol (1).png'" style="width: 18px;height: 18px;margin-right:5px"></image>
+		      <image :src="this.imgUrl+'/mine/symbol (1).png'" style="width: 18px;height: 18px;"></image>
 		      <view class="menu-text">{{  i18('预约记录')}}</view>
 		    </view>
 		  </view>
 		  </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>
       <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>
@@ -172,7 +179,8 @@
 				name: this.$store.state.user.name,
 				version: getApp().globalData.config.appInfo.version,
 				imgUrl: getApp().globalData.config.imgUrl,
-				clickRightTag: 0
+				clickRightTag: 0,
+				show:false,
 			}
 		},
 		computed: {
@@ -239,13 +247,14 @@
 			//自定义头右操作函数
 			clickRight() {
 				//打开抽屉
-				if (this.clickRightTag == 0) {
-					this.$refs.showRight.open();
-					this.clickRightTag = 1
-				} else {
-					this.$refs.showRight.close()
-					this.clickRightTag = 0
-				}
+				this.show=!this.show
+				// if (this.clickRightTag == 0) {
+				// 	this.$refs.showRight.open();
+				// 	this.clickRightTag = 1
+				// } else {
+				// 	this.$refs.showRight.close()
+				// 	this.clickRightTag = 0
+				// }
 			},
 			cancelLocale() {
 				this.showLocale = false;
@@ -312,7 +321,7 @@
 <style lang="scss">
 	page {
 		// background-color: #000000;
-		background-image: url('../../static/images/new/starts/bg1.jpg');
+		background-image: url('../../static/images/new/starts/bg2.jpg');
 		background-size: cover;
 		background-repeat: no-repeat;
 	}
@@ -375,15 +384,14 @@
 	}
 
 	.menu-list {
-
-		box-shadow: 0px 2px 24px 0px rgba(54, 54, 54, 0.1);
-
+		box-shadow: 0px 2px 24px 0px rgba(0, 0, 0, 0.1);
 		border-radius: 20px;
+		margin: 0 0 0 0 ;
 	}
 
 	.list-cell {
-		padding: 17px 15px;
-		background-color: #555555;
+		// padding: 17px 15px;
+		background-color: #000000;
 	}
 
 	.menu-text {
@@ -401,7 +409,7 @@
 		flex-direction: row;
 		height: 40px;
 		line-height: 40px;
-		margin: 0 20rpx;
+		margin: 10px 20rpx;
 	}
 
 	.prop-item-left {

pages/mine/pwd/index.vue

@@ -1,26 +1,76 @@
 <template>
 	<view class="pwd-retrieve-container">
-		<uni-forms ref="form" :value="user" labelWidth="80px">
-			<uni-forms-item  name="oldPassword" :label="i18('旧密码')">
-				<uni-easyinput type="password" :styles="styles" :placeholderStyle="placeholderStyle"
-					v-model="user.oldPassword" :placeholder="i18('请输入旧密码')" />
-			</uni-forms-item>
-			<uni-forms-item name="newPassword" :label="i18('新密码')">
-				<uni-easyinput type="password" v-model="user.newPassword" :styles="styles" :placeholderStyle="placeholderStyle" :placeholder="i18('请输入新密码')" />
-			</uni-forms-item>
-			<uni-forms-item name="confirmPassword" :label="i18('确认密码')">
-				<uni-easyinput type="password" v-model="user.confirmPassword" :styles="styles" :placeholderStyle="placeholderStyle" :placeholder="i18('请确认新密码')" />
-			</uni-forms-item>
-			<button type="primary" style="background: #57B03D;color: white" @click="submit">{{i18('提交')}}</button>
+		<view style="wibackground-color: black;">
+		<view style="width: 70vw;margin-left: 13vw;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;">
+						<template slot="suffix">
+							<uni-icons :type="oldPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+								@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;">
+						<template slot="suffix">
+							<uni-icons :type="oldPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+								@click="oldPasswordeye()"></uni-icons>
+						</template>
+					</u-input>
+				</uni-forms-item>
+				<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;">
+						<template slot="suffix">
+							<uni-icons :type="newPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+								@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;">
+						<template slot="suffix">
+							<uni-icons :type="newPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+								@click="newPasswordeye()"></uni-icons>
+						</template>
+					</u-input>
+				</uni-forms-item>
+				<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;">
+						<template slot="suffix">
+							<uni-icons :type="confirmPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+								@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;">
+						<template slot="suffix">
+							<uni-icons :type="confirmPassword ? 'eye': 'eye-slash'" size="25" style="color: aliceblue;"
+								@click="confirmPasswordeye()"></uni-icons>
+						</template>
+					</u-input>
+				</uni-forms-item>
+				<button type="primary" style="background: #57B03D;color: white;border-radius: 20px;"
+					@click="submit">{{i18('提交')}}</button>
 
-			<view style="bottom: 80px;position: absolute;left: 10px;right:10px">
-				<button type="warn" @click="" style="background: #57B03D;color: white"
-					@click="deleteUser">{{i18('注销账号')}}</button>
-			</view>
-			<!-- <view style="bottom: 10px;position: absolute;left: 10px;right:10px">
+				<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 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>
+			</uni-forms>
+		</view>
+		</view>
 	</view>
 </template>
 
@@ -71,7 +121,11 @@
 							errorMessage: i18('两次输入的密码不一致')
 						}]
 					}
-				}
+				},
+				oldPassword: true,
+				newPassword: true,
+				confirmPassword: true,
+
 			}
 		},
 		onReady() {
@@ -83,6 +137,24 @@
 			})
 		},
 		methods: {
+			eye(type) {
+				if (type == 1) {
+					this.oldPassword = !this.oldPassword
+				} else if (type = 2) {
+
+				} else {
+
+				}
+			},
+			oldPasswordeye() {
+				this.oldPassword = !this.oldPassword
+			},
+			confirmPasswordeye() {
+				this.confirmPassword = !this.confirmPassword
+			},
+			newPasswordeye() {
+				this.newPassword = !this.newPassword
+			},
 			i18(text) {
 				return i18(text)
 			},
@@ -113,11 +185,15 @@
 
 <style lang="scss">
 	page {
-		background-color: #2b2b2b;
+		background-image: url('/static/images/new/starts/bg2.jpg');
+		background-size: cover;
+		background-repeat: no-repeat;
 	}
+	
 
 	.pwd-retrieve-container {
 		padding-top: 36rpx;
 		padding: 15px;
+		line-height: 30px;
 	}
 </style>

pages/weitiandi/bluetooth/index.vue

@@ -129,30 +129,30 @@
 							src="/static/images/new/start/choose.png" />
 					</view>
 					<view class="dpropitem-block dportitem-block-2" v-if="item.status == 2">
-						<image class="dportitem-img" src="/static/images/new/start/using.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/charnging.png" />
 						<view class="dpropitem-status">{{ i18('充电中') }}</view>
 					</view>
 
 					<view class="dpropitem-block dportitem-block-1" v-if="item.status == 1 || item.status == 7">
-						<image class="dportitem-img" src="/static/images/new/start/free.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/free.png" />
 						<view class="dpropitem-status">{{ i18('空闲中') }}</view>
 					</view>
 
 					<view class="dpropitem-block dportitem-block-3" style="background: rgb(247,238,240);color:#FF6868"
 						v-if="item.status == 3">
-						<image class="dportitem-img" src="/static/images/new/start/ban.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/ban.png" />
 						<view class="dpropitem-status">{{ i18('禁用中') }}</view>
 					</view>
 
 					<view class="dpropitem-block dportitem-block-3" style="background: rgb(248,244,230);color:#FFAA00"
 						v-if="item.status == 4">
-						<image class="dportitem-img" src="/static/images/new/start/bad.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/bad.png" />
 						<view class="dpropitem-status">{{ i18('故障中') }}</view>
 					</view>
 
 
 					<view class="dpropitem-block dportitem-block-3" style=";" v-if="item.status == 5">
-						<image class="dportitem-img" src="/static/images/new/start/lianjie.png" />
+						<image class="dportitem-img" src="/static/images/new/port.png" />
 						<view class="dpropitem-status">{{ i18('已连接') }}</view>
 					</view>
 
@@ -181,18 +181,18 @@
 			<view class="port-num" style="left:40px;top:70px;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%">
+			<!-- <view class="port-icon" v-if="planInfo == null" style="width: 50px;height: 50px;right:10px;top:28%">
 				<image class="btn-image" src="../../../static/images/new/starts/index/yuyue.png">
 				</image>
 			</view>
 			<view class="port-icon" v-if="planInfo != null" style="width: 50px;height: 50px;right:10px;top:28%">
 				<image class="btn-image" src="/static/images/new/start/del.png">
 				</image>
-			</view>
+			</view> -->
 		</view>
 		<view class="dboxs dport" style="height: 200px">
 			<view class="dboxtitle">
-				<image class="portimg" src="../../../static/images/new/starts/index/list.png" />
+				<image class="portimg" src="/static/images/new/starts/mine/list.png" />
 				<view class="dboxtitle-text"> {{ i18('设备操作') }}</view>
 			</view>
 			<view class="control-btn" @click="trigger()" v-if="portDetail.portStatus == 2">
@@ -202,7 +202,7 @@
 			</view>
 
 			<view class="control-btn" @click="trigger()" v-if="portDetail.portStatus != 2">
-				<image class="btn-image" src="/static/images/new/start/using.png">
+				<image class="btn-image" src="/static/images/new/starts/index/using.png">
 				</image>
 				<view>{{ i18('立即充电') }}</view>
 			</view>
@@ -223,7 +223,7 @@
 				<view>{{ i18('查看状态') }}</view>
 			</view> -->
 			<view class="control-btn" @click="restart">
-				<image class="btn-image" src="../../../static/images/new/starts/index/return.png">
+				<image class="btn-image" src="/static/images/new/starts/index/return.png">
 				</image>
 				<view>{{ i18('重置设备') }}</view>
 			</view>
@@ -758,7 +758,7 @@ export default {
 
 <style>
 .container {
-  background-image: url('../../../static/images/new/starts/bg1.jpg');
+  background-image: url('../../../static/images/new/starts/bg2.jpg');
   inset: 0;
   position: absolute;
   background-size: cover;
@@ -968,7 +968,7 @@ export default {
 }
 .dboxs{
   /* background: #F8FCFF; */
-  background: linear-gradient(#565656, #050609);
+  background: linear-gradient(#303030, #050609);
   border: 0px solid #F8FCFF;
   box-shadow: 0px 0px 6px 1px rgba(101,101,101,0.29);
   border-radius: 4px;
@@ -983,12 +983,12 @@ export default {
   height: 20px;
 }
 .dportitem-img{
-  width: 30px;
-  height: 30px;
+  width: 50px;
+  height: 50px;
 }
 .dpropitem-block{
-  padding: 0.12rem 0.37rem;
-  background: #e6f6f1;
+  /* padding: 0.12rem 0.37rem;
+  background: #e6f6f1; */
   display: flex;
   width: 70px;
   height: 70px;
@@ -1004,7 +1004,7 @@ export default {
   display: inline-block;
 }
 .dportitem-block-2{
-  background: #f9f4e5;
+  /* background: #f9f4e5; */
   color: #FFAA00;
 }
 .dpropitem-title{

pages/weitiandi/bluetooth/setting.vue

@@ -17,12 +17,14 @@
         </view>
       </view>
 
-      <view class="prop-item">
-        <view class="prop-title">{{i18('连接自动充电')}}</view>
+      <view class="prop-item-auto">
+		  
+        <view class="prop-title-auto"><view>Bluetooth settings:</view> <view style="font-size: 9px;">{{i18('连接自动充电')}}</view></view>
         <view class="prop-value">
-          <view :style="item.style" class="value-tag" @click=" setAutoCharge(item.value)" v-for="item in autoCharge">
+			<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>
+          <!-- <view :style="item.style" class="value-tag" @click=" setAutoCharge(item.value)" v-for="item in autoCharge">
             {{ i18(item.title) }}
-          </view>
+          </view> -->
         </view>
       </view>
 
@@ -31,8 +33,9 @@
 
     <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">
@@ -114,7 +117,8 @@ export default {
         ],
         custom: false,
         customValue: ''
-      }
+      },
+	  value:0
 
     }
 
@@ -150,22 +154,26 @@ export default {
     getAutoChargeValue(){
       let autoCharge = uni.getStorageSync("autoCharge");
       if(!autoCharge ){
-        autoCharge = 1;
+        autoCharge = 0;
       }
       return autoCharge;
     },
     setAutoCharge(value,tip){
-      for (let i = 0; i < this.autoCharge.length; i++) {
-        let obj = this.autoCharge[i];
-        if(obj.value == value){
-          obj.style = ";  background: #57B03D;color:white";
-        }else{
-          obj.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
-        }
-        if(obj.text ==i18('自定义')){
-          obj.style +=";width:100px;"
-        }
-      }
+		console.log("value>>>>"+value)
+		this.value=value
+    //   for (let i = 0; i < this.autoCharge.length; i++) {
+    //     let obj = this.autoCharge[i];
+    //     if(obj.value == value){
+    //       // obj.style = ";  background: #57B03D;color:white";
+		  // this.value=0
+    //     }else{
+    //       // obj.style = ";  background: rgb(227, 242, 245);color: #000000;"
+		  // this.value=1
+    //     }
+    //     if(obj.text ==i18('自定义')){
+    //       obj.style +=";width:100px;"
+    //     }
+    //   }
       uni.setStorageSync("autoCharge",value);
       if(!tip){
         this.$modal.showToast("设置成功")
@@ -270,7 +278,7 @@ export default {
           hasValue = true;
           dian.style = ";  background: #57B03D;color:white"
         }else{
-          dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
+          dian.style = ";  background: rgb(227, 242, 245);color: #000000;"
         }
         if(dian.text ==i18('自定义')){
           dian.style +=";width:100px;"
@@ -287,7 +295,7 @@ export default {
       let len = items.length;
       for (let i = 0; i < len; i++) {
         let dian = items[i];
-        dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
+        dian.style = ";  background: rgb(227, 242, 245);color: #000000;"
       }
       item.style = ";  background: #57B03D;color:white"
       if (item.value == -1) {
@@ -381,7 +389,7 @@ export default {
   top: 0px;
   right: 0px;
   bottom:0px;
-  background-image: url('../../../static/images/new/starts/bg1.jpg');
+  background-image: url('../../../static/images/new/starts/bg2.jpg');
   background-size: cover;
   background-repeat: no-repeat;;
 }
@@ -389,6 +397,10 @@ export default {
 .prop-item {
   padding: 2vh;
 }
+.prop-item-auto{
+	padding: 2vh;
+	display: flex;
+}
 
 .prop-value {
   display: flex;
@@ -400,11 +412,18 @@ export default {
   font-weight: bold;
   margin-bottom: 2.5vh;
 }
+.prop-title-auto {
+	display: grid;
+	justify-items: start;
+  color: white;
+  font-weight: bold;
+  margin-bottom: 2.5vh;
+}
 
 .value-tag {
   background: rgb(227, 242, 245);
-  color: #57B03D;
-  width: 14vw;
+  color: #000000;
+  width: 15vw;
   height: 4vh;
   line-height: 4vh;
   border-radius: 3vw;
@@ -440,13 +459,13 @@ export default {
 }
 
 .btn {
+  width: 40vw;
   background: #57B03D;
-  text-align: center;
   color: white;
   height: 6vh;
   line-height: 6vh;
-  margin: 0 5vh;
-  border-radius: 1vh;
+  margin: 0 30vw;
+  border-radius: 20vh;
   border-style: none;
 }
 

pages/weitiandi/bluetooth/status.vue

@@ -151,66 +151,73 @@
 <view style="height: 0vh;place-items: center;display: grid;">
 			<image style="height: 3vh;width: 15vh;margin-top: 5vh;top: 3vh;"
 				src="../../../static/images/new/starts/login/backImg2.png"></image>
-			<text @click.stop="clickRight()"
-				style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
-			<view>
-				<uni-drawer @change="changeDrawer" :width="300" style="top:20vh;height: 23vh;height: 100vh" ref="showRight" mode="right"
-					:mask-click="true">
-	  			<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%" scroll-y="true">
-	  				<view class="prop-item" @click="handleLogout()">
-	  					<!-- <view class="prop-item-image">
-	  											<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  										</view> -->
-	  					<view class="prop-item-right">{{i18('退出登录')}}</view>
-	  					<view class="prop-item-left">
-	  						<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-	  					</view>
-	  				</view>
-	  				<u-divider />
-	  				<view class="prop-item" @click="skip(3)">
-	  					<!-- <view class="prop-item-image">
-	  											<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  										</view> -->
-	  					<view class="prop-item-right">{{i18('关于我们')}}</view>
-	  					<view class="prop-item-left">
-	  						<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-	  					</view>
-	  				</view>
-	  				<u-divider />
-	  				<view class="prop-item" @click="skip(4)">
-	  					<!-- <view class="prop-item-image">
-	  											<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  										</view> -->
-	  					<view class="prop-item-right">{{i18('帮助')}}</view>
-	  					<view class="prop-item-left">
-	  						<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-	  					</view>
-	  				</view>
-	  				<u-divider />
-	  			</scroll-view>
-	  		</uni-drawer>
-	  	</view>
-	  </view>
-    <view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 28%;">
+			<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>
+					
+					<!-- <uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
+						:mask-click="true">
+					
+					</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" >
+				            <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()">
+				               		<!-- <view class="prop-item-image">
+				               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+				               							</view> -->
+				               		<view class="prop-item-right">{{i18('退出登录')}}</view>
+				               		<view class="prop-item-left">
+				               			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+				               		</view>
+				               	</view>
+				               	<u-divider />
+				               	<view class="prop-item" @click="skipPage(3)">
+				               		<!-- <view class="prop-item-image">
+				               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+				               							</view> -->
+				               		<view class="prop-item-right">{{i18('关于我们')}}</view>
+				               		<view class="prop-item-left">
+				               			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+				               		</view>
+				               	</view>
+				               	<u-divider />
+				               	<view class="prop-item" @click="skipPage(4)">
+				               		<!-- <view class="prop-item-image">
+				               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+				               							</view> -->
+				               		<view class="prop-item-right">{{i18('帮助')}}</view>
+				               		<view class="prop-item-left">
+				               			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+				               		</view>
+				               	</view>
+				               	<u-divider />
+				               </scroll-view>
+				            </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 class="progress_box" style="text-align: center">
-	  		<canvas class="progress_bg" canvas-id="cpbg"></canvas>
+		  <view >
+		  <image class="progress-barup" src="../../../static/images/new/starts/kedu.png"></image>
+		  <canvas class="progress_bar" canvas-id="cpbar"></canvas>
+		  </view>
+	  		<!-- <canvas class="progress_bg" canvas-id="cpbg"></canvas>
 	  		<canvas class="progress_bar" canvas-id="cpbar"></canvas>
-	  		<canvas class="progress_line" canvas-id="cpline"></canvas>
+	  		<canvas class="progress_line" canvas-id="cpline"></canvas> -->
 	  		<view class="progress_txt">
 	  			<view class="progress_info">
 	  				<view class="p0" style="color: azure;" st="">{{ deviceInfo.deviceId}}</view>
-	  				<view class="p1" style="width: 60px;">
-	  				  <view v-if="portStatus  == 2" style="position: relative;
-    left: -17px;">
+	  				<view class="p1" >
+	  				  <view v-if="portStatus  == 2" style="position: relative;">
 	  				    {{$t('charge.charging')}}
 	  				  </view>
-	  				  <view v-else-if="portStatus  == 6" style="position: relative;
-    left: -17px;">
+	  				  <view v-else-if="portStatus  == 6" style="position: relative;">
 	  				    {{$t('charge.planed')}}
 	  				  </view>
 	  				
-	  				  <view v-else-if="portStatus  == 5" style="position: relative;
-    left: -17px;">
+	  				  <view v-else-if="portStatus  == 5" style="position: relative">
 	  				    {{$t('charge.connected')}}
 	  				  </view>
 	  				
@@ -225,23 +232,23 @@
 		<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="background-color: black;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 32vh;;border-radius: 27px;">
-				<view span="3" style="width: 8vh;">
+				style="background-color:#494E51 ;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 76vw;;border-radius: 27px;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value">{{ deviceV  }}V</view>
 					<span class="item-text">{{$t('charge.voltage')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 8vh;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value">{{ gonglv  }}W</view>
 					<span class="item-text">{{$t('charge.power')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 8vh;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value">{{deviceTemp}}℃</view>
 					<span class="item-text">{{$t('charge.devtemper')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 8vh;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value" v-if="portDetail.voltage == 0">0 {{ i18('度') }}</view>
 					<view class="item-value" v-else>{{ dianliang }} {{ i18('度') }}</view>
 					<span class="item-text">{{$t('charge.elec')}}</span>
@@ -251,8 +258,8 @@
 		
 		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 3vh;">
 			<view
-          style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 30px;}">
-        <view  style="width: 5vh;left:10%;position: absolute;font-size: 12px;">
+          style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 6vh;}">
+        <view  style="width: 25vw;left:10%;position: absolute;font-size: 11px;">
 					<view style="margin-left: 1vh;;width: 100px">
 						<view><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
 							<span  v-else>{{$t('charge.chargetime')}}</span></view>
@@ -265,14 +272,14 @@
 				</view>
         <view span="2" style="width: 100px;left:36%;position: absolute">
 					<view v-if="portDetail.portStatus == 2"
-						style="text-align: center;position: absolute;margin:-1vh 5vw;border: 0ch;height: 20vh;">
+						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
 						<u-button @click="toPage()" shape="circle"
-							style="background: #ec3e41;color:white;width: 100vm;border: 0ch;height: 6vh;">Charge</u-button>
+							style="background: #ec3e41;color:white;width: 28vw;border: 0ch;height: 6vh;">Charge</u-button>
 					</view>
 					<view v-if="portDetail.portStatus != 2"
-						style="text-align: center;position: absolute;margin:-1vh 5vw;border: 0ch;height: 20vh;">
+						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
 						<u-button @click="toPage()" shape="circle"
-							style="background: #57B03D;color:white;width: 100vm;border: 0ch;height: 6vh;">Charge</u-button>
+							style="background: #57B03D;color:white;width: 28vw;border: 0ch;height: 6vh;">Charge</u-button>
 					</view>
 					<!-- <view class="control-btn" @click="trigger()" v-if="portDetail.portStatus == 2">
 										  <image class="btn-image" src="/static/images/new/start/stop.png" >
@@ -286,8 +293,8 @@
 										  <view>{{ i18('立即充电') }}</view>
 										</view> -->
 				</view>
-        <view span="3" style="width: 80px;left:65%;position: absolute">
-					<view style="margin-left: 1vh;font-size: 12px;">
+        <view span="3" style="width: 25vw;left:65%;position: absolute">
+					<view style="margin-left: 3vw;font-size: 11px;">
 						<view> Ampere</view>
 						<view class="demo-layout bg-purple"
 							style="border-radius: 8px;background-color: aliceblue;color: #000;">
@@ -446,7 +453,9 @@ export default {
       curPort:[],
       firstRender:false,
       refreshTimer:null,
-	  clickRightTag:0
+	  clickRightTag:0,
+	  show:false,
+	  timeFlg:true
     }
   },
   computed: {
@@ -477,7 +486,7 @@ export default {
     }
   },
   mounted: function() {
-  	this.drawCircle(100);
+  	this.drawCircle(25);
   	this.drawProgressbg();
   	 //参数为1-100
   	this.drawLine();
@@ -486,12 +495,12 @@ export default {
 	  drawProgressbg: function() {
 	  	// 自定义组件实例 this ，表示在这个自定义组件下查找拥有 canvas-id 的 <canvas/>
 	  	var ctx = uni.createCanvasContext('cpbg', this);
-	  	ctx.setLineWidth(19); // 设置圆环的宽度
-	  	ctx.setStrokeStyle('#E9E9E9'); // 设置圆环的颜色
+	  	ctx.setLineWidth(20); // 设置圆环的宽度
+	  	ctx.setStrokeStyle('#35383A'); // 设置圆环的颜色
 	  	// ctx.setLineCap('round'); // 设置圆环端点的形状
 	  	ctx.setLineCap('square'); // 设置圆环端点的形状
 	  	ctx.beginPath(); //开始一个新的路径
-	  	ctx.arc(90, 90, 80, 0 * Math.PI, 2 * Math.PI, false);
+	  	ctx.arc(100, 100, 90, 0 * Math.PI, 2 * Math.PI, false);
 	  	//设置一个原点(110,110)，半径为100的圆的路径到当前路径
 	  	ctx.stroke(); //对当前路径进行描边
 	  	ctx.draw();
@@ -500,16 +509,18 @@ export default {
 	  	
 	  	var ctx = uni.createCanvasContext('cpbar', this);
 	  	// 进度条的渐变(中心x坐标-半径-边宽，中心Y坐标，中心x坐标+半径+边宽，中心Y坐标)
-	  	var gradient = ctx.createLinearGradient(0, 0, 130, 0);
+	  	var gradient = ctx.createLinearGradient(0, 0, 120, 0);
 	  
-	  	let increase = 0.05;
-	  	let end = (step / 100) * 2 * Math.PI - Math.PI / 2; // 最后的角度
-	  	let current = -Math.PI / 2; // 起始角度
-	  	if(this.portDetail.portStatus != 2){
+	  	let increase = 0.15;
+	  	let end = (150/100 ) * 2 * Math.PI ; // 最后的角度
+	  	let current = (50 / 100) * 2 * Math.PI-Math.PI/2 ; // 起始角度
+	  	if(this.portDetail.portStatus == 2){
+			if(this.timeFlg){
+				this.timeFlg=false
 	  	let timer = setInterval(() => {
 	  		gradient.addColorStop('0', '#57B03D');
 	  		gradient.addColorStop('1.0', '#57B03D');
-	  		ctx.setLineWidth(12);
+	  		ctx.setLineWidth(10);
 	  		ctx.setStrokeStyle(gradient);
 	  		ctx.setLineCap('square');
 	  		ctx.beginPath();
@@ -522,25 +533,26 @@ export default {
 	  			current = end;
 	  			if(this.portDetail.portStatus != 2){
 	  			clearInterval(timer);	
+				this.timeFlg=true
 	  			}else{
-	  				current = -Math.PI / 2; // 起始角度
+	  				end = (150/100 ) * 2 * Math.PI ; // 最后的角度
+	  				current = (50 / 100) * 2 * Math.PI-Math.PI/2 ; // 起始角度
 	  			}
-	  			
-	  			
 	  		}
-	  		ctx.arc(90, 90, 80, -Math.PI / 2, current, false);
+	  		ctx.arc(100, 100, 90, (50 / 100) * 2 * Math.PI-Math.PI/2, current, false);
 	  		ctx.stroke();
 	  		ctx.draw();
 	  		
 	  	}, 20);
 	  	}
+		}
 	  },
 	  // 画刻度
 	  drawLine() {
 	  	var context = uni.createCanvasContext("cpline", this);
-	  	var r = 80;
-	  	var x0 = 90;
-	  	var y0 = 90;
+	  	var r = 90;
+	  	var x0 = 100;
+	  	var y0 = 100;
 	  	var x;
 	  	var y;
 	  	var lineWidth = 15;
@@ -548,7 +560,7 @@ export default {
 	  	for (let i = 0; i < 60; i++) {
 	  		context.beginPath();
 	  		context.setLineWidth(lineWidth);
-	  		context.setStrokeStyle("#FFFFFF");
+	  		context.setStrokeStyle("#35383A");
 	  
 	  		x = x0 - r * Math.sin(((6 * (i + 1) - 3) * Math.PI) / 180);
 	  		y = y0 - r * Math.cos(((6 * (i + 1) - 3) * Math.PI) / 180);
@@ -569,6 +581,7 @@ export default {
 	  	context.stroke();
 	  	context.draw();
 	  },
+	  
 	  getInfo() {
 	  	let self = this;
 	  	this.$modal.loading("正在获取状态，请稍等...");
@@ -629,13 +642,14 @@ export default {
 	  //自定义头右操作函数
 	  clickRight() {
 	  	//打开抽屉
-	  	if (this.clickRightTag == 0) {
-	  		this.$refs.showRight.open();
-	  		this.clickRightTag = 1
-	  	} else {
-	  		this.$refs.showRight.close()
-	  		this.clickRightTag = 0
-	  	}
+		this.show=!this.show
+	  	// if (this.clickRightTag == 0) {
+	  	// 	this.$refs.showRight.open();
+	  	// 	this.clickRightTag = 1
+	  	// } else {
+	  	// 	this.$refs.showRight.close()
+	  	// 	this.clickRightTag = 0
+	  	// }
 	  },
     cancelInitDlg(){
       this.showInitPwd = false;
@@ -1244,13 +1258,13 @@ export default {
 	}
 	.progress_box {
 		/* position: relative; */
-		width: 35vh;
+		/* position: relative; */
+		width: 52vw;
 		height: 35vh;
 		/* background-color: red; */
-		display: inline-block;
-		align-items: center;
-		justify-content: center;
+		display: flex;
 		text-align: center;
+		flex-direction: row;
 
 	}
 
@@ -1264,19 +1278,31 @@ export default {
 		width: 30vh;
 		height: 30vh;
 	}
-
 .progress_txt {
-		position: absolute;
+		    position: absolute;
+		    z-index: 99;
+		    width: 55vw;
+	/* 	text-align: center;
 		font-size: 28upx;
-		margin-top: 54px;
-		margin-left: 86px;
-		color: #999999;
+		margin: 16vw;
+		/* margin-top: 54px;
+		margin-left: 74px; 
+		color: #999999; */
 	}
 
 	.progress_bar {
 		position: absolute;
-		width: 30vh;
-		height: 30vh;
+		width: 60vw;
+		margin: 2px;
+		height: 50vh;
+		
+	}
+	.progress-barup{
+	        position: absolute;
+	        width: 200px;
+	        margin: 2px;
+	        height: 196px;
+	        z-index: 1;
 	}
 
 	
@@ -1285,12 +1311,14 @@ export default {
 		width: 30vh;
 		height: 30vh;
 	}
-
 .progress_info {
-		font-size: 25upx;
-		/* padding-left: 16upx; */
-		letter-spacing: 2upx;
-	    margin: 1vh 0vh 0vh -3vh;
+	      display: flex;
+	      font-size: 10px;
+	      margin: 70px 30px;
+	      align-items: center;
+	      flex-direction: column;
+		  height: 14vh;
+		  width: 35vw;
 	}
 
 .header-status-desc {
@@ -1729,7 +1757,7 @@ export default {
 .item-text{
   font-size: 11px;
   margin:1px 0;
-  color: #999999;
+  color: #eeeeee;
 }
 .start{
   background: #1A87FF;

pages/weitiandi/device/chargerecord.vue

@@ -9,8 +9,8 @@
 					</view>
 
 					<view class="item-status">
-						<uni-tag type="success" style="background: #57B03D" :text="i18('充电完成')" v-if="item.status == 1"></uni-tag>
-						<uni-tag type="success"  :text="i18('正在充电')" v-if="item.status == 0"></uni-tag>
+						<uni-tag type="success" style="background: #57B03D;border-radius: 20px;" :text="i18('充电完成')" v-if="item.status == 1"></uni-tag>
+						<uni-tag type="success" style=";border-radius: 20px;" :text="i18('正在充电')" v-if="item.status == 0"></uni-tag>
 					</view>
 				</view>
 				<view class="item-body">
@@ -98,7 +98,7 @@
 		border-radius: 4px;
 		margin: 4vw;
 		padding: 4vw;
-		background: linear-gradient(#565656, #050609);
+		background: linear-gradient(#1e1e1e, #050609);
 		color: aliceblue;
 		
 	}

pages/weitiandi/device/index.vue

@@ -39,14 +39,14 @@
 			</view> -->
 		</view>
 		<view>
-			
+
 		</view>
-		
-		
-		
+
+
+
 		<view class="dboxs dport">
 			<view class="dboxtitle">
-				<image class="portimg" src="../../../static/images/new/starts/mine/symbol (1).png" />
+				<image class="portimg" src="../../../static/images/new/starts/mine/symbol1.png" />
 				<view class="dboxtitle-text"> {{ i18('设备端口') }}</view>
 			</view>
 			<view class="dportitems">
@@ -57,30 +57,30 @@
 							src="/static/images/new/start/choose.png" />
 					</view>
 					<view class="dpropitem-block dportitem-block-2" v-if="item.status == 2">
-						<image class="dportitem-img" src="/static/images/new/start/using.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/charnging.png" />
 						<view class="dpropitem-status">{{ i18('充电中') }}</view>
 					</view>
 
 					<view class="dpropitem-block dportitem-block-1" v-if="item.status == 1 || item.status == 7">
-						<image class="dportitem-img" src="/static/images/new/start/free.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/free.png" />
 						<view class="dpropitem-status">{{ i18('空闲中') }}</view>
 					</view>
 
 					<view class="dpropitem-block dportitem-block-3" style="background: rgb(247,238,240);color:#FF6868"
 						v-if="item.status == 3">
-						<image class="dportitem-img" src="/static/images/new/start/ban.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/ban.png" />
 						<view class="dpropitem-status">{{ i18('禁用中') }}</view>
 					</view>
 
 					<view class="dpropitem-block dportitem-block-3" style="background: rgb(248,244,230);color:#FFAA00"
 						v-if="item.status == 4">
-						<image class="dportitem-img" src="/static/images/new/start/bad.png" />
+						<image class="dportitem-img" src="/static/images/new/starts/bad.png" />
 						<view class="dpropitem-status">{{ i18('故障中') }}</view>
 					</view>
 
 
 					<view class="dpropitem-block dportitem-block-3" style=";" v-if="item.status == 5">
-						<image class="dportitem-img" src="/static/images/new/start/lianjie.png" />
+						<image class="dportitem-img" src="/static/images/new/port.png" />
 						<view class="dpropitem-status">{{ i18('已连接') }}</view>
 					</view>
 
@@ -96,7 +96,7 @@
 		</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>
 
@@ -109,31 +109,38 @@
 			<view class="port-num" style="left:40px;top:70px;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%">
+			<!-- <view class="port-icon" v-if="planInfo == null" style="width: 50px;height: 50px;right:10px;top:28%">
 				<image class="btn-image" src="../../../static/images/new/starts/index/yuyue.png">
 				</image>
 			</view>
 			<view class="port-icon" v-if="planInfo != null" style="width: 50px;height: 50px;right:10px;top:28%">
 				<image class="btn-image" src="/static/images/new/start/del.png">
 				</image>
-			</view>
+			</view> -->
 		</view>
-		<view class="dboxs dport" style="height: 200px">
+		<view class="dboxs dport" style="height: 25vh">
 			<view class="dboxtitle">
-				<image class="portimg" src="../../../static/images/new/starts/index/list.png" />
+				<image class="portimg" src="../../../static/images/new/starts/mine/list.png" />
 				<view class="dboxtitle-text"> {{ i18('设备操作') }}</view>
 			</view>
-			<view class="control-btn" @click="trigger()" v-if="portDetail.portStatus == 2">
-				<image class="btn-image" src="/static/images/new/start/stop.png">
-				</image>
-				<view>{{ i18('停止充电') }}</view>
+			<view class="control-btn" @click="trigger()">
+				<view v-if="portDetail.portStatus == 2">
+					<image class="btn-image" src="../../../static/images/new/start/stop.png">
+					</image>
+					<view>{{ i18('停止充电') }}</view>
+				</view>
+				<view v-else>
+					<image class="btn-image" src="../../../static/images/new/starts/index/using.png"> </image>
+						<view>{{ i18('立即充电') }}</view>
+				</view>
 			</view>
-
-			<view class="control-btn" @click="trigger()" v-if="portDetail.portStatus != 2">
-				<image class="btn-image" src="/static/images/new/start/using.png">
+			<!-- <view class="control-btn" @click="trigger()" v-else-if="portDetail.portStatus != 2">
+				<view>
+				<image class="btn-image" src="../../../static/images/new/starts/index/using.png"
 				</image>
-				<view>{{ i18('立即充电') }}</view>
-			</view>
+				<view>{{ i18('立即充电') }}{{portDetail.portStatus}}</view>
+				</view>
+			</view> -->
 			<view class="control-btn" @click="getInfo">
 				<image class="btn-image" src="../../../static/images/new/starts/index/icon_pull.png">
 				</image>
@@ -151,15 +158,17 @@
 				<view>{{ i18('查看状态') }}</view>
 			</view> -->
 			<view class="control-btn" @click="restart">
-				<image class="btn-image"  src="../../../static/images/new/starts/index/return.png">
+				<image class="btn-image" src="../../../static/images/new/starts/index/return.png">
 				</image>
 				<view>{{ i18('重置设备') }}</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;"
+				src="../../../static/images/new/starts/login/backImg2.png"></image>
+		</view>
 	</view>
 </template>
 
@@ -509,7 +518,7 @@
 <style>
 	.container {
 		/* background: rgb(213, 213, 213); */
-		background-image: url('../../../static/images/new/starts/bg1.jpg');
+		background-image: url('../../../static/images/new/starts/bg2.jpg');
 		inset: 0;
 		position: absolute;
 		background-size: cover;
@@ -653,7 +662,7 @@
 		height: 70px;
 		background: #F8FCFF;
 		border: 0px solid #F8FCFF;
-		box-shadow: 0px 0px 6px 1px rgba(101, 101, 101, 0.29);
+		box-shadow: 0px 0px 10px 1px rgba(52, 52, 52, 0.3);
 		border-radius: 4px;
 		margin: 0 10px;
 		position: relative;
@@ -670,17 +679,19 @@
 		position: relative;
 		margin-top: 15px;
 	}
-.dpropitem-block{
-  padding: 0.12rem 0.37rem;
-  background: #e6f6f1;
-  display: flex;
-  width: 70px;
-  height: 70px;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-}
+
+	.dpropitem-block {
+		padding: 0.12rem 0.37rem;
+		/* background: #e6f6f1; */
+		display: flex;
+		width: 70px;
+		height: 70px;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+	}
+
 	.port-image {
 		height: 40px;
 		width: 40px;
@@ -753,7 +764,7 @@
 	}
 
 	.dboxs {
-		background: linear-gradient(#565656, #050609);
+		background: linear-gradient(#1e1e1e, #050609);
 		border: 0px solid #F8FCFF;
 		box-shadow: 0px 0px 6px 1px rgba(101, 101, 101, 0.29);
 		border-radius: 4px;
@@ -770,15 +781,15 @@
 	}
 
 	.dportitem-img {
-		width: 30px;
-		height: 30px;
+		width: 50px;
+		height: 50px;
 	}
 
 	.dpropitem-block {
 		/* padding: 0.12rem 0.37rem;
 		background: #e6f6f1; */
 		margin-left: 10px;
-		
+
 	}
 
 	.dportitem {
@@ -789,7 +800,7 @@
 	}
 
 	.dportitem-block-2 {
-		background: #f9f4e5;
+		/* background: #f9f4e5; */
 		color: #FFAA00;
 	}
 
@@ -813,7 +824,7 @@
 		position: absolute;
 		top: -2px;
 		left: 25px;
-		color: #b0b0b0;
+		color: #e7e7e7;
 	}
 
 	.btn-image {

pages/weitiandi/device/plan.vue

@@ -36,7 +36,7 @@
     </view>
 
     <view style="margin:5vh 7vw;">
-      <button @click="saveConfig"  style="background: #57B03D;color: white;" type="default" >{{i18('确认')}}</button>
+      <button @click="saveConfig"  style="background: #57B03D;color: white;border-radius: 20px;" type="default" >{{i18('确认')}}</button>
     </view>
 
     <uni-popup ref="popup" type="bottom">
@@ -50,13 +50,14 @@
             </view>
           </label>
         </checkbox-group>
-        <view style="text-align: center">
+        <view style="text-align: center;">
           <button size="mini" @click="chooseDay" style="background: #57B03D;color: white;" type="default" >{{i18('确认')}}</button>
         </view>
       </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>
+	</view>
   </view>
 </template>
 
@@ -240,7 +241,7 @@ export default {
 .container{
   position: absolute;
   inset:0;
-  background-image: url('../../../static/images/new/starts/bg1.jpg');
+  background-image: url('../../../static/images/new/starts/bg2.jpg');
   background-size: cover;
   background-repeat: no-repeat;
 }
@@ -253,32 +254,32 @@ export default {
   margin-top:2vh;
 }
 .charge-type-container{
-  margin:0 20vw;
+	width: 70%;
+	color: #e2e2e2;
+  margin:5vh 14vw;
   border:1px solid #57B03D;
-  border-radius: 2px;
+  border-radius: 20px
 }
 .charge-type-container view{
   display: inline-block;
   padding:2vw;
   width: 50%;
-  border-radius: 2px;
-
 }
 .type-left{
-
+border-radius: 20px 0 0 20px;
 }
 .type-choose{
   background: #57B03D;
   color:white;
 }
 .type-right{
-
+border-radius: 0 20px 20px 0;
 }
 .time-area{
   border: 1px solid #ffffff;
   border-radius: 10px;
-  margin:0 11vh;
-  margin-top:5vh;
+  margin:10vh 11vh;
+  margin-top:15vh;
   height: 25vh;
   text-align: center;
   padding: 8vw;

pages/weitiandi/device/setting.vue

@@ -22,8 +22,9 @@
 
     <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">
@@ -163,7 +164,7 @@ export default {
           hasValue = true;
           dian.style = ";  background: #57B03D;color:white"
         }else{
-          dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
+          dian.style = ";  background: rgb(227, 242, 245);color: #000000;"
         }
         if(dian.text ==i18('自定义')){
           dian.style +=";width:100px;"
@@ -180,7 +181,7 @@ export default {
       let len = items.length;
       for (let i = 0; i < len; i++) {
         let dian = items[i];
-        dian.style = ";  background: rgb(227, 242, 245);color: #57B03D;"
+        dian.style = ";  background: rgb(227, 242, 245);color: #000000;"
       }
       item.style = ";  background: #57B03D;color:white;"
       if(item.text ==i18('自定义')){
@@ -297,7 +298,7 @@ export default {
 
 .value-tag {
   background: rgb(227, 242, 245);
-  color: #57B03D;
+  color: #000000;
   width: 14vw;
   height: 4vh;
   line-height: 4vh;
@@ -334,13 +335,13 @@ export default {
 }
 
 .btn {
+	width: 40vw;
   background: #57B03D;
-  text-align: center;
   color: white;
   height: 6vh;
   line-height: 6vh;
-  margin: 0 5vh;
-  border-radius: 1vh;
+  margin: 0 30vw;
+  border-radius: 20vh;
   border-style: none;
 }
 

pages/weitiandi/device/status.vue

@@ -1,68 +1,74 @@
 <template>
 	<view class="container">
 		<view style="height: 0vh;place-items: center;display: grid;">
-			<image style="height: 3vh;width: 15vh;margin-top: 5vh;top: 3vh;"
+			<image style="height: 3vh;width: 27vw;margin-top: 1vh;top: 3vh;"
 				src="../../../static/images/new/starts/login/backImg2.png"></image>
-			<text @click.stop="clickRight()"
-				style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
-			<view>
-				<uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
+			<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>
+				
+				<!-- <uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 					:mask-click="true">
-					<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%;" scroll-y="true">
-						<view class="prop-item" @click="handleLogout()">
-							<!-- <view class="prop-item-image">
-	  												<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  											</view> -->
-							<view class="prop-item-right">{{i18('退出登录')}}</view>
-							<view class="prop-item-left">
-								<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-							</view>
-						</view>
-						<u-divider />
-						<view class="prop-item" @click="skipPage(3)">
-							<!-- <view class="prop-item-image">
-	  												<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  											</view> -->
-							<view class="prop-item-right">{{i18('关于我们')}}</view>
-							<view class="prop-item-left">
-								<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-							</view>
-						</view>
-						<u-divider />
-						<view class="prop-item" @click="skipPage(4)">
-							<!-- <view class="prop-item-image">
-	  												<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  											</view> -->
-							<view class="prop-item-right">{{i18('帮助')}}</view>
-							<view class="prop-item-left">
-								<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
-							</view>
-						</view>
-						<u-divider />
-					</scroll-view>
-				</uni-drawer>
-			</view>
+				
+				</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" >
+			            <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()">
+			               		<!-- <view class="prop-item-image">
+			               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+			               							</view> -->
+			               		<view class="prop-item-right">{{i18('退出登录')}}</view>
+			               		<view class="prop-item-left">
+			               			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+			               		</view>
+			               	</view>
+			               	<u-divider />
+			               	<view class="prop-item" @click="skipPage(3)">
+			               		<!-- <view class="prop-item-image">
+			               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+			               							</view> -->
+			               		<view class="prop-item-right">{{i18('关于我们')}}</view>
+			               		<view class="prop-item-left">
+			               			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+			               		</view>
+			               	</view>
+			               	<u-divider />
+			               	<view class="prop-item" @click="skipPage(4)">
+			               		<!-- <view class="prop-item-image">
+			               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
+			               							</view> -->
+			               		<view class="prop-item-right">{{i18('帮助')}}</view>
+			               		<view class="prop-item-left">
+			               			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+			               		</view>
+			               	</view>
+			               	<u-divider />
+			               </scroll-view>
+			            </view>
+					</u-popup>
 		</view>
-		<view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 28%;">
+		<view style="    position: relative;top: 10vh;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>
+				<!-- <canvas class="progress_bg" canvas-id="cpbg"></canvas> -->
+				<view >
+				<image class="progress-barup" src="../../../static/images/new/starts/kedu.png"></image>
 				<canvas class="progress_bar" canvas-id="cpbar"></canvas>
-				<canvas class="progress_line" canvas-id="cpline"></canvas>
+				</view>
+				<!-- <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="p1">
-						  <view v-if="portStatus  == 2" style="position: relative;
-    left: -17px;">
+						  <view v-if="portStatus  == 2" style="position: relative;">
 						    {{$t('charge.charging')}}
 						  </view>
-						  <view v-else-if="portStatus  == 6" style="position: relative;
-    left: -17px;">
+						  <view v-else-if="portStatus  == 6" style="position: relative;">
 						    {{$t('charge.planed')}}
 						  </view>
 						
-						  <view v-else-if="portStatus  == 5" style="position: relative;
-    left: -17px;">
+						  <view v-else-if="portStatus  == 5" style="position: relative;">
 						    {{$t('charge.connected')}}
 						  </view>
 						
@@ -118,25 +124,28 @@
 
       </view>-->
 		</view>
+		
+		
+		
 		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 5vh;">
 			<view
-				style="background-color: black;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 36vh;;border-radius: 27px;">
-				<view span="3" style="width: 9vh;">
+				style="background-color: #494E51;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 76vw;;border-radius: 27px;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value">{{ deviceV  }}V</view>
 					<span class="item-text">{{$t('charge.voltage')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 9vh;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value">{{ gonglv  }}W</view>
 					<span class="item-text">{{$t('charge.power')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 9vh;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value">{{deviceTemp}}℃</view>
 					<span class="item-text">{{$t('charge.devtemper')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 9vh;">
+				<view span="3" style="width: 19vw;">
 					<view class="item-value" v-if="portDetail.voltage == 0">0 {{ i18('度') }}</view>
 					<view class="item-value" v-else>{{ dianliang }} {{ i18('度') }}</view>
 					<span class="item-text">{{$t('charge.elec')}}</span>
@@ -146,9 +155,9 @@
 
 		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 3vh;">
 			<view
-				style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 30px;}">
-				<view  style="width: 80px;left:10%;position: absolute;font-size: 12px;">
-					<view style="margin-left: 1vh;width: 100px">
+				style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 6vh;}">
+				<view  style="width: 27vw;left:5vw;position: absolute;font-size: 11px;">
+					<view style="margin-left: 1vh;">
 						<view><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
 							<span  v-else>{{$t('charge.chargetime')}}</span></view>
 						<view class="demo-layout bg-purple"
@@ -158,16 +167,16 @@
 						</view>
 					</view>
 				</view>
-				<view span="2" style="width: 100px;left:36%;position: absolute">
+				<view span="2" style=";left:34vw;position: absolute">
 					<view v-if="portDetail.portStatus == 2"
-						style="text-align: center;position: absolute;margin:-1vh 5vw;border: 0ch;height: 20vh;">
+						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
 						<u-button @click="toPage()" shape="circle"
-							style="background: #ec3e41;color:white;width: 100vm;border: 0ch;height: 6vh;">Charge</u-button>
+							style="background: #ec3e41;color:white;width: 28vw;border: 0ch;height: 6vh;">Charge</u-button>
 					</view>
 					<view v-if="portDetail.portStatus != 2"
-						style="text-align: center;position: absolute;margin:-1vh 5vw;border: 0ch;height: 20vh;">
+						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
 						<u-button @click="toPage()" shape="circle"
-							style="background: #57B03D;color:white;width: 80px;border: 0ch;height: 6vh;">Charge</u-button>
+							style="background: #57B03D;color:white;width: 28vw;border: 0ch;height: 6vh;">Charge</u-button>
 					</view>
 					<!-- <view class="control-btn" @click="trigger()" v-if="portDetail.portStatus == 2">
 										  <image class="btn-image" src="/static/images/new/start/stop.png" >
@@ -181,8 +190,8 @@
 										  <view>{{ i18('立即充电') }}</view>
 										</view> -->
 				</view>
-				<view span="3" style="width: 80px;left:65%;position: absolute">
-					<view style="margin-left: 1vh;font-size: 12px;">
+				<view span="3" style="width: 26vw;left:65%;position: absolute">
+					<view style="margin-left: 3vw;font-size: 11px;">
 						<view> Ampere</view>
 						<view class="demo-layout bg-purple"
 							style="border-radius: 8px;background-color: aliceblue;color: #000;">
@@ -217,7 +226,7 @@
 			</view> -->
 		</view>
 
-		<view style="display: flex;align-items: center;justify-content: center;">
+		<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>
@@ -299,6 +308,7 @@
 			<view>3，{{i18('为保障您远程启动正常充电，请确保枪头完全连接充电口，同时确认您的爱车处于立即充电状态下')}};</view>
 			<view>4，{{i18('注意规范安全充电，停好车，锁好车。')}}</view>
 		</view> -->
+	
 	</view>
 </template>
 
@@ -348,8 +358,9 @@
 				],
 				planInfo: null,
 				days: ["", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
-				clickRightTag: 0
-
+				clickRightTag: 0,
+				show:false,
+				timeFlg:true
 			}
 		},
 		computed: {
@@ -375,7 +386,7 @@
 		},
 
 		mounted: function() {
-			this.drawCircle(100);
+			this.drawCircle(25);
 			this.drawProgressbg();
 			 //参数为1-100
 			this.drawLine();
@@ -419,26 +430,36 @@
 				})
 						
 			},
-			changeDrawer(event) {
-				if (event) {
-					// 抽屉打开时的逻辑
-
-					this.clickRightTag = 1
-				} else {
-					// 抽屉关闭时的逻辑
-					this.clickRightTag = 0
-				}
+			close(){
+				this.show=false
+			},
+			open(){
+				this.show=true
 			},
-			//自定义头右操作函数
+			// clickRight() {
+			// 	this.show=true
+			// },
+			// changeDrawer(event) {
+			// 	if (event) {
+			// 		// 抽屉打开时的逻辑
+
+			// 		this.clickRightTag = 1
+			// 	} else {
+			// 		// 抽屉关闭时的逻辑
+			// 		this.clickRightTag = 0
+			// 	}
+			// },
+			// //自定义头右操作函数
 			clickRight() {
 				//打开抽屉
-				if (this.clickRightTag == 0) {
-					this.$refs.showRight.open();
-					this.clickRightTag = 1
-				} else {
-					this.$refs.showRight.close()
-					this.clickRightTag = 0
-				}
+				this.show=!this.show
+				// if (this.clickRightTag == 0) {
+				// 	this.show=true
+				// 	this.clickRightTag = 1
+				// } else {
+				// 	this.show=false
+				// 	this.clickRightTag = 0
+				// }
 			},
 			//开始充电按钮
 			trigger() {
@@ -462,88 +483,55 @@
 			drawProgressbg: function() {
 				// 自定义组件实例 this ，表示在这个自定义组件下查找拥有 canvas-id 的 <canvas/>
 				var ctx = uni.createCanvasContext('cpbg', this);
-				ctx.setLineWidth(19); // 设置圆环的宽度
-				ctx.setStrokeStyle('#E9E9E9'); // 设置圆环的颜色
+				ctx.setLineWidth(20); // 设置圆环的宽度
+				ctx.setStrokeStyle('#35383A'); // 设置圆环的颜色
 				// ctx.setLineCap('round'); // 设置圆环端点的形状
 				ctx.setLineCap('square'); // 设置圆环端点的形状
 				ctx.beginPath(); //开始一个新的路径
-				ctx.arc(90, 90, 80, 0 * Math.PI, 2 * Math.PI, false);
+				ctx.arc(100, 100, 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, 130, 0);
-
-				let increase = 0.05;
-				let end = (step / 100) * 2 * Math.PI - Math.PI / 2; // 最后的角度
-				let current = -Math.PI / 2; // 起始角度
-				if(this.portDetail.portStatus != 2){
-				let timer = setInterval(() => {
-					gradient.addColorStop('0', '#57B03D');
-					gradient.addColorStop('1.0', '#57B03D');
-					ctx.setLineWidth(12);
-					ctx.setStrokeStyle(gradient);
-					ctx.setLineCap('square');
-					ctx.beginPath();
-					// 参数step 为绘制的百分比
-					if (current < end) {
-						current = current + increase;
-						
-					}
-					if (current >= end) {
-						current = end;
-						if(this.portDetail.portStatus != 2){
-						clearInterval(timer);	
-						}else{
-							current = -Math.PI / 2; // 起始角度
-						}
-						
-						
-					}
-					ctx.arc(90, 90, 80, -Math.PI / 2, current, false);
-					ctx.stroke();
-					ctx.draw();
-					
-				}, 20);
+			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 ; // 起始角度
+			if(this.portDetail.portStatus == 2){
+				if(this.timeFlg){
+					this.timeFlg=false
+			let timer = setInterval(() => {
+				gradient.addColorStop('0', '#57B03D');
+				gradient.addColorStop('1.0', '#57B03D');
+				ctx.setLineWidth(10);
+				ctx.setStrokeStyle(gradient);
+				ctx.setLineCap('square');
+				ctx.beginPath();
+				// 参数step 为绘制的百分比
+				if (current < end) {
+					current = current + increase;
 				}
-			},
-			// 画刻度
-			drawLine() {
-				var context = uni.createCanvasContext("cpline", this);
-				var r = 80;
-				var x0 = 90;
-				var y0 = 90;
-				var x;
-				var y;
-				var lineWidth = 15;
-
-				for (let i = 0; i < 60; i++) {
-					context.beginPath();
-					context.setLineWidth(lineWidth);
-					context.setStrokeStyle("#FFFFFF");
-
-					x = x0 - r * Math.sin(((6 * (i + 1) - 3) * Math.PI) / 180);
-					y = y0 - r * Math.cos(((6 * (i + 1) - 3) * Math.PI) / 180);
-
-					// console.log('x0:' + x0 + '   y0:' + y0 + '    x:' + x + '    y:' + y);
-					context.moveTo(x, y);
-					context.arc(
-						x0,
-						y0,
-						r,
-						((270 - 6 * (i + 1) + 3) * Math.PI) / 180,
-						((270 - 6 * i) * Math.PI) / 180,
-						false
-					);
-					context.stroke();
-					context.closePath();
+				if (current >= end) {
+					//current = end;
+					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 ; // 起始角度
+					}
 				}
-				context.stroke();
-				context.draw();
+				ctx.arc(100, 100, 90, (50 / 100) * 2 * Math.PI-Math.PI/2, current, false);
+				ctx.stroke();
+				ctx.draw();
+				
+			}, 20);
+			}
+			}
 			},
 
 			toPage() {
@@ -719,7 +707,7 @@
 				self.deviceV = self.portDetail.voltage;
 				self.$modal.closeLoading();
 				if(self.portDetail.portStatus==2){
-					this.drawCircle(100);
+					this.drawCircle(25);
 				}
 			},
 			initSocket(key) {
@@ -793,7 +781,7 @@
 					if (portStatus == 5) {
 						this.$modal.confirm("确认开始充电么？").then(res => {
 							this.startCharge();
-						this.drawCircle(100); //参数为1-100
+						this.drawCircle(50); //参数为1-100
 						})
 					}
 
@@ -802,9 +790,9 @@
 			getInfo() {
 			
 				let self = this;
-				this.$modal.loading("正在获取状态，请稍等...");
+				this.$modal.loading("正在获取状态，请稍等...",true);
 				sendPortDetailCmd(this.deviceInfo).then(res => {
-					this.$modal.loading("正在获取状态，请稍等...");
+					this.$modal.loading("正在获取状态，请稍等...",true);
 					this.visitTime = res.msg;
 					if (!this.visitTime) {
 						this.$modal.msg("请重新进入页面");
@@ -822,6 +810,7 @@
 						});
 					}, 500)
 				})
+				this.drawCircle(25)
 			},
 			stopCharge() {
 				let self = this;
@@ -942,14 +931,14 @@
 		color: #BCBCBF;
 	}
 	.progress_box {
-		/* position: relative; */
-		width: 35vh;
-		height: 35vh;
-		/* background-color: red; */
-		display: inline-block;
-		align-items: center;
-		justify-content: center;
-		text-align: center;
+		
+		    /* position: relative; */
+		    width: 52vw;
+		    height: 35vh;
+		    /* background-color: red; */
+		    display: flex;
+		    text-align: center;
+		    flex-direction: row;
 
 	}
 
@@ -960,35 +949,52 @@
 
 	.progress_bg {
 		position: absolute;
-		width: 30vh;
-		height: 30vh;
+		width: 60vw;
+		height: 50vh;
 	}
 
 	.progress_txt {
-		position: absolute;
+		    position: absolute;
+		    z-index: 99;
+		    width: 55vw;
+	/* 	text-align: center;
 		font-size: 28upx;
-		margin-top: 54px;
-		margin-left: 74px;
-		color: #999999;
+		margin: 16vw;
+		/* margin-top: 54px;
+		margin-left: 74px; 
+		color: #999999; */
 	}
 
 	.progress_bar {
 		position: absolute;
-		width: 30vh;
-		height: 30vh;
+		width: 60vw;
+		margin: 2px;
+		height: 50vh;
+		
+	}
+	.progress-barup{
+	        position: absolute;
+	        width: 200px;
+	        margin: 2px;
+	        height: 196px;
+	        z-index: 1;
 	}
 
 	.progress_line {
 		position: absolute;
-		width: 30vh;
-		height: 30vh;
+		width: 60vw;
+		height: 50vh;
+		
 	}
 
 	.progress_info {
-		font-size: 25upx;
-		/* padding-left: 16upx; */
-		letter-spacing: 2upx;
-	    margin: 1vh 0vh 0vh -3vh;
+	      display: flex;
+	      font-size: 10px;
+	      margin: 70px 30px;
+	      align-items: center;
+	      flex-direction: column;
+		 /* height: 14vh; */
+		  width: 35vw;
 	}
 
 	.header {
@@ -1492,7 +1498,8 @@
 	.item-text {
 		font-size: 11px;
 		margin: 1px 0;
-		color: #999999;
+		color: aliceblue;
+
 	}
 
 	.start {
@@ -1556,4 +1563,5 @@
 		text-align: center;
 		z-index: 9999;
 	}
+	
 </style>

pages/weitiandi/deviceList.vue

@@ -1,17 +1,14 @@
 <template>
   <view class="container">
 	  <view style="height: 0vh;place-items: center;display: grid;">
-	  	<image style="height: 3vh;width: 15vh;margin-top: 5vh;top: 3vh;"
+	  	<!-- <image style="height: 3vh;width: 15vh;margin-top: 5vh;top: 3vh;"
 	  		src="../../static/images/new/starts/login/backImg2.png"></image>
-	  	<text @click="clickRight()" style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
-	  	<view>
+	  	<text @click="clickRight()" style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text> -->
+	  <!-- 	<view>
 	  		<uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 	  			:mask-click="true">
 	  			<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%" scroll-y="true">
 	  				<view class="prop-item" @click="handleLogout()">
-	  					<!-- <view class="prop-item-image">
-	  												<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  											</view> -->
 	  					<view class="prop-item-right">{{i18('退出登录')}}</view>
 	  					<view class="prop-item-left">
 	  						<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
@@ -19,9 +16,6 @@
 	  				</view>
 	  				<u-divider/>
 	  				<view class="prop-item" @click="skip(2)">
-	  					<!-- <view class="prop-item-image">
-	  												<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  											</view> -->
 	  					<view class="prop-item-right">{{i18('关于我们')}}</view>
 	  					<view class="prop-item-left">
 	  						<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
@@ -29,9 +23,7 @@
 	  				</view>
 	  				<u-divider/>
 	  				<view class="prop-item" @click="skip(3)">
-	  					<!-- <view class="prop-item-image">
-	  												<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
-	  											</view> -->
+	  			
 	  					<view class="prop-item-right">{{i18('帮助')}}</view>
 	  					<view class="prop-item-left">
 	  						<uni-icons type="forward" color="lightgray" size="16"></uni-icons>
@@ -40,7 +32,7 @@
 	  				<u-divider/>
 	  			</scroll-view>
 	  		</uni-drawer>
-	  	</view>
+	  	</view> -->
 	  </view>
     <view class="list-item">
       <view class="item" v-for="item in chargeList" :key="item.id">
@@ -49,8 +41,8 @@
             {{i18('设备编号')}}：{{ item.qrcode }}
           </view>
           <view class="item-status">
-            <uni-tag type="success" :text="i18('在线中')" v-if="item.status === 1"></uni-tag>
-            <uni-tag type="default" :text="i18('已离线')" v-if="item.status === 0"></uni-tag>
+            <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">
@@ -70,7 +62,12 @@
         </view>
       </view>
     </view>
-    <view style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
+	
+	<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;">
       <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>
@@ -83,7 +80,9 @@
         <image src="@/static/images/new/starts/tabbar/three_off.png"
                style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
       </view>
+	  </view>
     </view>
+	
   </view>
 </template>
 
@@ -212,7 +211,7 @@ export default {
 </script>
 <style>
 .container {
-  background-image: url('../../static/images/new/starts/bg1.jpg');
+  background-image: url('../../static/images/new/starts/bg2.jpg');
   background-size: cover;
   background-repeat: no-repeat;
   inset: 0;
@@ -221,14 +220,14 @@ export default {
 
 .list-item {
   margin: 0vw;
-  margin-top: 15vh;
+  margin-top: 5vh;
 }
 
 .item {
 	color: aliceblue;
   box-shadow: 0px 5px 27px 0px rgba(94, 94, 94, 0.4);
   border-radius: 4px;
-  background: linear-gradient(#565656, #050609);
+  background: linear-gradient(#2b2b2b, #050609);
   margin: 4vw;
   padding: 4vw;
 }
@@ -241,6 +240,7 @@ export default {
 .item-status {
   display: inline-block;
   float: right;
+  
 }
 
 .item-header {
@@ -253,7 +253,12 @@ export default {
   padding-top: 4vw;
   line-height: 3vh;
 }
-
+.success{
+border-radius: 20px 0 0 20px;	
+}
+.default{
+border-radius: 20px 0 0 20px;	
+}
 .item-time {
   color: #545454;
   font-size: 12px;

plugins/modal.js

@@ -1,5 +1,6 @@
 import i18 from '@/utils/i18.js'
 export default {
+	
   // 消息提示
   msg(content) {
     content = i18(content);
@@ -68,13 +69,24 @@ export default {
     }
   },
   // 打开遮罩层
-  loading(content) {
+  
+  loading(content,bool) {
     content = i18(content);
     uni.showLoading({
       title: content,
       icon: 'none',
       mask:true
-    })
+    });
+	if(bool){
+		let timer=null
+	timer = setTimeout(() => {
+	    if (timer) {
+	      clearTimeout(timer);
+	      timer = null;
+		  uni.hideLoading()
+	    }
+	  }, 5000);
+	  }
   },
   // 关闭遮罩层
   closeLoading() {