From 57226aedd6b28f5683b206cef7d74a3251c792ea Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期四, 09 六月 2022 17:58:21 +0800
Subject: [PATCH] order list detail
---
vue.config.js | 2 +-
src/pages/desktop/index/components/Desktop.vue | 8 +++++++-
app.rar | 0
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app.rar b/app.rar
new file mode 100644
index 0000000..09fbc86
--- /dev/null
+++ b/app.rar
Binary files differ
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 7cf072d..cf01e71 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -208,12 +208,13 @@
<span>{{ item.orderMoney }} 鍏�</span>
</div>
<div class="desc">
+ <div>璁㈠崟鐢熸垚鏃ユ湡锛歿{ item.createTime }}</div>
<div>浜у搧鍚嶇О锛歿{ prod.productName }}</div>
<div>浜у搧绫诲瀷锛歿{ prod.productTypeName }}</div>
<div>绯荤粺鐗堟湰锛歿{ prod.edition }}</div>
<div>閫氶亾鏁伴噺锛歿{ prod.ChCount }}</div>
<div>鎽勫儚鏈烘暟閲忥細{{ prod.cameraCount }}</div>
- <div>鏈嶅姟鏃堕暱锛歿{ prod.serveYear }} 骞�</div>
+ <div>璧锋鏈嶅姟鏃堕棿 锛歿{ startAndEnd(item.createTime, prod.serveYear) }}</div>
</div>
</div>
</div>
@@ -285,6 +286,11 @@
this.validateSn();
},
methods: {
+ startAndEnd(createTime,serveYear){
+ let year = createTime.split("-")[0]
+ let endTime = parseInt(year) + serveYear + createTime.slice(4)
+ return createTime + " - " + endTime
+ },
activeVerByOrd() {
activeByOrder({
token: this.token,
diff --git a/vue.config.js b/vue.config.js
index 4a47f61..a2a7dba 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -117,7 +117,7 @@
},
"/data/api-v/app/findAllApp": {
// target: '/',
- target: "http://localhost:8080/",
+ target: "http://localhost:8081/",
changeOrigin: true,
pathRewrite: {
"^/data/api-v/app/findAllApp": "apps.json"
--
Gitblit v1.8.0