From 58bf48cea61c6c5b4381a4b8ff5b4a39eb4671eb Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期五, 10 六月 2022 09:36:03 +0800
Subject: [PATCH] 国标摄像机信息接口

---
 src/pages/desktop/index/components/Desktop.vue |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 11c59fb..cf01e71 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -208,20 +208,25 @@
               <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>
       </div>
       <div class="no-order-list" v-else>鎶辨瓑锛屾病鏈夋煡璇㈠埌璁㈠崟銆�</div>
       <span slot="footer" class="dialog-footer">
-       <div class="btns">
+        <div class="btns">
           <el-button class="cancel" @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
-        <el-button class="ok" type="primary" @click="activeVerByOrd">婵�娲�</el-button>
-       </div>
+          <el-button class="ok" type="primary" @click="activeVerByOrd"
+            >婵�娲�</el-button
+          >
+        </div>
       </span>
     </el-dialog>
   </div>
@@ -252,7 +257,7 @@
       showFreeVersion: false,
       activeDialog: false,
       countdown: 60,
-      innerDialog: true,
+      innerDialog: false,
       versionName: "",
       codeMsg: "鑾峰彇楠岃瘉鐮�",
       versionState: "灏氭湭婵�娲�",
@@ -264,7 +269,7 @@
       snExpire: false,
       timer: null,
       token: "",
-      orderList: [],
+      orderList: [ ],
       phone: {
         phoneNum: "",
         verifyCode: "",
@@ -281,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,
@@ -674,6 +684,7 @@
   }
 }
 .el-dialog.my-order {
+  border-radius: 24px;
   .el-dialog__body {
     padding: 22px 20px;
   }
@@ -681,7 +692,7 @@
     display: flex;
     justify-content: right;
     .cancel {
-     width: 140px;
+      width: 140px;
 
       height: 40px;
       cursor: pointer;
@@ -695,7 +706,7 @@
       justify-content: center;
     }
     .ok {
-     width: 140px;
+      width: 140px;
       height: 40px;
       cursor: pointer;
       border-radius: 20px;
@@ -710,14 +721,13 @@
     }
   }
   .tip {
-        width: auto;
-    /* height: 40px; */
+    width: auto;
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
     padding: 0 10px;
     border-radius: 5px;
-    color: #5F5F5F;
+    color: #5f5f5f;
     line-height: 20px;
     font-weight: bold;
     -ms-flex-align: center;
@@ -742,7 +752,7 @@
     height: 550px;
     overflow-y: auto;
     .order-card {
-      height: 150px;
+      // height: 150px;
       background: #fff;
       margin-bottom: 15px;
 
@@ -763,10 +773,10 @@
         display: flex;
         flex-direction: column;
         justify-content: space-evenly;
-        height: 110px;
         text-align: left;
-        box-sizing: border-box;
-        padding: 0 20px;
+        box-sizing: border-box;    font-size: 13px;
+
+        padding: 8px 20px;    line-height: 20px;
       }
     }
   }

--
Gitblit v1.8.0