|
|
@@ -6,9 +6,9 @@
|
|
|
<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" ref="showRight" mode="right"
|
|
|
+ <uni-drawer @change="changeDrawer" width=300 style="top:20vh;height: 100vh" ref="showRight" mode="right"
|
|
|
:mask-click="true">
|
|
|
- <scroll-view style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;" scroll-y="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%;" />
|
|
|
@@ -19,7 +19,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<u-divider />
|
|
|
- <view class="prop-item" @click="skip(3)">
|
|
|
+ <view class="prop-item" @click="skipPage(3)">
|
|
|
<!-- <view class="prop-item-image">
|
|
|
<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
|
|
|
</view> -->
|
|
|
@@ -29,7 +29,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<u-divider />
|
|
|
- <view class="prop-item" @click="skip(4)">
|
|
|
+ <view class="prop-item" @click="skipPage(4)">
|
|
|
<!-- <view class="prop-item-image">
|
|
|
<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
|
|
|
</view> -->
|
|
|
@@ -43,8 +43,8 @@
|
|
|
</uni-drawer>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view style=";position: relative;top: 10vh;margin-top:2vh;">
|
|
|
- <view class="progress_box">
|
|
|
+ <view style=";position: relative;top: 10vh;margin-top:4vh;text-align: center;padding:0 32%;">
|
|
|
+ <view class="progress_box" style="text-align: center">
|
|
|
<canvas class="progress_bg" canvas-id="cpbg"></canvas>
|
|
|
<canvas class="progress_bar" canvas-id="cpbar"></canvas>
|
|
|
<canvas class="progress_line" canvas-id="cpline"></canvas>
|
|
|
@@ -143,9 +143,9 @@
|
|
|
|
|
|
<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 3vh;">
|
|
|
<view
|
|
|
- style="justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 40vh;}">
|
|
|
- <view span="3" style="width: 12vh;">
|
|
|
- <view style="margin-left: 1vh;">
|
|
|
+ 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">
|
|
|
+ <view style="margin-left: 1vh;width: 100px">
|
|
|
<view><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
|
|
|
<span v-else>{{$t('charge.chargetime')}}</span></view>
|
|
|
<view class="demo-layout bg-purple"
|
|
|
@@ -155,16 +155,16 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view span="3" style="width: 16vh;">
|
|
|
+ <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;">
|
|
|
- <u-button @click="trigger()" shape="circle"
|
|
|
- style="background: #ec3e41;color:white;width: 100vm;border: 0ch;height: 6vh;">{{ i18('停止充电') }}</u-button>
|
|
|
+ <u-button @click="toPage()" shape="circle"
|
|
|
+ style="background: #ec3e41;color:white;width: 100vm;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;">
|
|
|
- <u-button @click="trigger()" shape="circle"
|
|
|
- style="background: #57B03D;color:white;width: 100vm;border: 0ch;height: 6vh;">{{ i18('立即充电') }}</u-button>
|
|
|
+ <u-button @click="toPage()" shape="circle"
|
|
|
+ style="background: #57B03D;color:white;width: 80px;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" >
|
|
|
@@ -178,7 +178,7 @@
|
|
|
<view>{{ i18('立即充电') }}</view>
|
|
|
</view> -->
|
|
|
</view>
|
|
|
- <view span="3" style="width: 12vh;">
|
|
|
+ <view span="3" style="width: 80px;left:65%;position: absolute">
|
|
|
<view style="margin-left: 1vh;">
|
|
|
<view> Ampere</view>
|
|
|
<view class="demo-layout bg-purple"
|
|
|
@@ -191,8 +191,8 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view style="display: flex;align-items: center;justify-content: center;margin-top: 5vh;">
|
|
|
- <view @click="toPage">
|
|
|
+ <view style="display: flex;align-items: center;justify-content: center;margin-top: 0vh;">
|
|
|
+ <view @click="toSetting">
|
|
|
<image src="../../../static/images/new/starts/status/Setting.png"
|
|
|
style="width: 60px;height: 60px;margin: 2vh 2vh;"></image>
|
|
|
</view>
|
|
|
@@ -215,15 +215,15 @@
|
|
|
</view>
|
|
|
|
|
|
<view style="display: flex;align-items: center;justify-content: center;">
|
|
|
- <view @click="skip(0)">
|
|
|
+ <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="skip(1)">
|
|
|
+ <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="skip(2)">
|
|
|
+ <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>
|
|
|
@@ -390,20 +390,22 @@
|
|
|
},5000)
|
|
|
})
|
|
|
},
|
|
|
- skip(type){
|
|
|
+ skipPage(type){
|
|
|
if(type==0){
|
|
|
- uni.switchTab({
|
|
|
+ uni.navigateTo({
|
|
|
url:'/pages/index'
|
|
|
})
|
|
|
}else if(type==1){
|
|
|
- uni.switchTab({
|
|
|
+ uni.navigateTo({
|
|
|
url:'/pages/weitiandi/deviceList'
|
|
|
})
|
|
|
}else if(type==2){
|
|
|
- uni.switchTab({
|
|
|
+ uni.navigateTo({
|
|
|
url:'/pages/mine/index'
|
|
|
})
|
|
|
- }
|
|
|
+ }else{
|
|
|
+ this.$modal.showToast("功能开发中..");
|
|
|
+ }
|
|
|
},
|
|
|
handleLogout() {
|
|
|
this.$modal.confirm('确定注销并退出系统吗？').then(() => {
|
|
|
@@ -547,6 +549,14 @@
|
|
|
url: '/pages/weitiandi/device/index?id=' + imei + '&ccid=' + ccid
|
|
|
});
|
|
|
},
|
|
|
+ toSetting(){
|
|
|
+ let imei = this.deviceInfo.deviceId;
|
|
|
+ let ccid = this.deviceInfo.ccid;
|
|
|
+ this.closeSocket();
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/weitiandi/device/setting?id=' + imei + '&ccid=' + ccid
|
|
|
+ });
|
|
|
+ },
|
|
|
i18(text) {
|
|
|
return i18(text)
|
|
|
},
|
|
|
@@ -930,8 +940,6 @@
|
|
|
/* position: relative; */
|
|
|
width: 35vh;
|
|
|
height: 35vh;
|
|
|
- margin-left: 13vh;
|
|
|
- margin-top: 10vh;
|
|
|
/* background-color: red; */
|
|
|
display: inline-block;
|
|
|
align-items: center;
|
