diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue index 4b74101..c1c5838 100644 --- a/pages_admin/admin_index.vue +++ b/pages_admin/admin_index.vue @@ -41,15 +41,6 @@ - - 投放中 @@ -143,9 +134,7 @@ - + @@ -234,13 +223,9 @@ }); - // this.getareaid() - + // this.getareai this.getmarks() this.allVehicleNum() - - - // this.getmarks(); }, onLoad() { if (uni.getStorageSync('adminAreaid')) { @@ -254,15 +239,8 @@ type: 'wgs84', success: function(lb) { - - // that.latitude = Number(lb.latitude.toFixed(5)) - 0.005 - // that.longitude = Number(lb.longitude.toFixed(5)) + 0.005 console.log(that.areaInfo, 'that.areaInfo'); - // that.setMapScale() - // that.getmarks() - - - // + }, fail: function(error) { uni.showToast({ @@ -316,11 +294,7 @@ uni.createMapContext("map", this).getCenterLocation({ type: 'gcj02', success: (res) => { - // console.log("当前地图中心的经纬度", res) - // that.deviceGps.latitude = res.latitude; - // that.deviceGps.longitude = res.longitude; - - //其他逻辑 + }, fail: (err) => {} }) diff --git a/pages_admin/worke/woke_deviceMgmt.vue b/pages_admin/worke/woke_deviceMgmt.vue index e57d1e6..2c746b3 100644 --- a/pages_admin/worke/woke_deviceMgmt.vue +++ b/pages_admin/worke/woke_deviceMgmt.vue @@ -10,8 +10,7 @@ - + @@ -169,6 +168,10 @@ export default { { value: '3', label: '车牌号排序' + }, + { + value: '4', + label: '电量排序' }], lists: [{ value: 'desc', @@ -344,17 +347,17 @@ export default { }, getStatusColor(item) { if (item.status == 0 || item.status == 8) { - return '#808080'; // 下线和未上架状态为灰色 + return '#979797'; // 下线和未上架状态为灰色 } else if (item.status == 1) { - return '#28a745'; // 待租状态为绿色 + return '#4c97e7'; // 待租状态为绿色 } else if (item.status == 2) { - return '#ff8c00'; // 预约中状态为橙色 + return '#28c445'; // 预约中状态为橙色 } else if (item.status == 3) { - return '#007bff'; // 骑行中状态为蓝色 + return '#ffc757'; // 骑行中状态为蓝色 } else if (item.status == 4) { - return '#ffc107'; // 临时锁车中状态为黄色 + return '#ff7429'; // 临时锁车中状态为黄色 } else if (item.status == 6) { - return '#6f42c1'; // 调度中状态为紫色 + return '#986cf0'; // 调度中状态为紫色 } else if (item.status == 7) { return '#343a40'; // 未绑定状态为黑色 } diff --git a/pages_adminSet/modelMt.vue b/pages_adminSet/modelMt.vue index bfcf192..72ac3c0 100644 --- a/pages_adminSet/modelMt.vue +++ b/pages_adminSet/modelMt.vue @@ -23,10 +23,10 @@ + v-if="data.picture == ''" @click="btn()"> + v-if="data.picture != ''" @click="data.picture = ''"> @@ -108,7 +108,7 @@ - + 收费模版 @@ -139,20 +139,20 @@ 选择收费方式 - - - - - {{item.name}} - - + + + + + {{ item.name }} + + + - - + 确定 @@ -169,456 +169,397 @@ \ No newline at end of file