diff --git a/src/App.vue b/src/App.vue index 759fecd..b9a0887 100644 --- a/src/App.vue +++ b/src/App.vue @@ -40,7 +40,7 @@ import Login from './views/components/login.vue' function update() { openpop.value = false - //location.reload() + location.reload() //?? } diff --git a/src/api/operation/wxuser.ts b/src/api/operation/wxuser.ts index 9ce1691..03e1d53 100644 --- a/src/api/operation/wxuser.ts +++ b/src/api/operation/wxuser.ts @@ -17,7 +17,7 @@ interface Querydata{ url: '/cloud/wechat/user/list', method: 'get', params - }) + },false) } //关联公司 diff --git a/src/api/order/reservation.ts b/src/api/order/reservation.ts index 20cbeff..0e1012a 100644 --- a/src/api/order/reservation.ts +++ b/src/api/order/reservation.ts @@ -2,7 +2,9 @@ import server from '@/utils/request' //新增 interface Addobj{ + source:String //来源：1-小程序，2-云端，3-站端 userId:String //预约人ID + ucode:String uname:String //预约人姓名 phone:String //手机号码 plateNum:String //车牌号 @@ -10,7 +12,7 @@ interface Addobj{ stationName:String //换电站名称 swapDay:String //预约换电日期,示例值(yyyyMMdd) swapDuration:String //预约换电时间段,示例值(8:00-10:00) - status:String|Number //状态：1-预约成功，2-到店使用，3-取消，4-过期 + // status:String|Number //状态：1-预约成功，2-到店使用，3-取消，4-过期 // source:String //来源：1-小程序，2-云端，3-站端 // ucode:String //预约人编码 @@ -52,7 +54,7 @@ interface Querydata{ swapDayEnd?:String //预约换电日期结束 stationCode?:String //换电站编码 } -export function getjqrlist(params:Querydata) { +export function getyylist(params:Querydata) { return server.request({ url: '/cloud/order/swap/pre/list', method: 'get', diff --git a/src/api/swapstation/hdz.ts b/src/api/swapstation/hdz.ts index ed2ee49..fc4fb7a 100644 --- a/src/api/swapstation/hdz.ts +++ b/src/api/swapstation/hdz.ts @@ -61,7 +61,7 @@ export function gethdzlist(params:Querydata) { url: '/cloud/batterystation/list', method: 'get', params - }) + },false) } //删除 diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 9f7fd79..714cc31 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -49,7 +49,7 @@ - 个人中心 + 退出登录 diff --git a/src/utils/validate.ts b/src/utils/validate.ts index 8797d2c..26a88f4 100644 --- a/src/utils/validate.ts +++ b/src/utils/validate.ts @@ -129,4 +129,18 @@ export function carNum(rule:any, value:any, callback:any) { return callback() } return callback() +} + +export function getDateDaysAgo(days:number = 0,time?:string) { + const date = new Date(); + date.setDate(date.getDate() - days); + + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + + if(time){ + return `${year}-${month}-${day} ${time}` + } + return `${year}-${month}-${day}` } \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index a51e38a..86017a4 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -15,7 +15,7 @@ -
+
{{ operatotal }}
@@ -55,19 +55,19 @@ -
+
{{ rzcompany }}
认证公司
-
+
{{ rzuser }}
认证用户
-
+
{{ rzvehicle }}
@@ -120,15 +120,15 @@
-
+
电池总量
{{ dctotal }}
-
+
充电电池
{{cddctotal}}
-
+
可用电池
{{kydctotal}}
diff --git a/src/views/order/account/baldetails.vue b/src/views/order/account/baldetails.vue index f75462c..156e6ff 100644 --- a/src/views/order/account/baldetails.vue +++ b/src/views/order/account/baldetails.vue @@ -14,18 +14,55 @@ highlight-current-row max-height="620px" > - - - - + + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + - - - - + + + + + + + + + +