fix:修复各种细节

api/device/device.js

@@ -82,3 +82,10 @@ export function deviceList(){
         method: 'post',
     })
 }
+
+export function unBind(qrcode){
+    return request({
+        url: '/device/unbindDevice?qrcode='+qrcode,
+        method: 'post',
+    })
+}

locale/en.json

@@ -153,7 +153,13 @@
     "正在连接蓝牙": "",
     "配网成功,请扫码绑定设备" : "Successfully,Please scan to bind device.",
     "正在配置网络信息": "Configuring network information.",
-    "解绑设备":"Unbind"
+    "解绑设备":"Unbind",
+    "确认解绑该设备？": "Are you sure to unBind this device?",
+    "充电时间": "Createtime",
+    "该设备已被绑定": "The device has already been bound.",
+    "结束时间": "Endtime",
+    "充电完成": "Charging complete",
+    "正在充电": "Charging"
 
   },
   "locale.auto": "System",

manifest.json

@@ -2,8 +2,8 @@
     "name" : "WeGoodCharger",
     "appid" : "__UNI__60E8019",
     "description" : "",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/weitiandi/device/chargerecord.vue

@@ -5,17 +5,17 @@
 			<view class="item" v-for="item in chargeList">
 				<view class="item-header">
 					<view class="item-title">
-						{{item.deviceId}}
+						{{item.sn}}
 					</view>
 
 					<view class="item-status">
-						<uni-tag type="success" style="background: #0E9F9B" text="充电完成" v-if="item.status == 1"></uni-tag>
-						<uni-tag type="success"  text="正在充电" v-if="item.status == 0"></uni-tag>
+						<uni-tag type="success" style="background: #0E9F9B" :text="i18('充电完成')" v-if="item.status == 1"></uni-tag>
+						<uni-tag type="success"  :text="i18('正在充电')" v-if="item.status == 0"></uni-tag>
 					</view>
 				</view>
 				<view class="item-body">
-					<view class="item-time">充电时间：{{item.createTime}}</view>
-					<view class="item-time" v-if="item.status == 1">结束时间：{{item.endTime}}</view>
+					<view class="item-time">{{i18('充电时间')}}：{{item.createTime}}</view>
+					<view class="item-time" v-if="item.status == 1">{{i18('结束时间')}}：{{item.endTime}}</view>
 				</view>
 			</view>
       <uni-load-more @clickLoadMore="getMore" :content-text="contentText" :status="startText"></uni-load-more>

pages/weitiandi/device/setting.vue

@@ -3,7 +3,7 @@
     <view class="setting">
 
       <view class="prop-item">
-        <view class="prop-title">充电电流</view>
+        <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 }}

pages/weitiandi/deviceList.vue

@@ -13,7 +13,7 @@
         </view>
         <view class="item-body">
           <view style="font-size: 12px; margin: 5px 0;position: relative">
-            <view class="item-detail-btn" @click="unbind(item)">
+            <view class="item-detail-btn" @click="unbind(item.qrcode)">
               {{i18('解绑设备')}}
             </view>
           </view>
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { deviceList } from '@/api/device/device.js';
+import { deviceList,unBind } from '@/api/device/device.js';
 import i18 from '@/utils/i18.js'
 export default {
   data() {
@@ -57,8 +57,17 @@ export default {
     })
   },
   methods: {
-    unbind(item){
-
+    unbind(qrcode){
+      let self = this;
+      this.$modal.confirm("确认解绑该设备？").then(res=>{
+        unBind(qrcode).then(res=>{
+          if(res.data){
+            self.deviceList();
+          }else{
+            this.$modal.showToast("Device is offline.");
+          }
+        });
+      })
     },
     i18(text){
       return i18(text)