From 27d747817373e0181f0469f3af8817fc0c158751 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期四, 03 三月 2022 16:53:31 +0800
Subject: [PATCH] 我的订单
---
src/pages/desktop/index/components/Desktop.vue | 102 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 53fdcf6..d54701d 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -208,6 +208,8 @@
<span>{{ item.orderMoney }} 鍏�</span>
</div>
<div class="desc">
+ <div>浜у搧鍚嶇О锛歿{ prod.productName }}</div>
+ <div>浜у搧绫诲瀷锛歿{ prod.productTypeName }}</div>
<div>绯荤粺鐗堟湰锛歿{ prod.edition }}</div>
<div>閫氶亾鏁伴噺锛歿{ prod.ChCount }}</div>
<div>鎽勫儚鏈烘暟閲忥細{{ prod.cameraCount }}</div>
@@ -218,10 +220,12 @@
</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 +256,7 @@
showFreeVersion: false,
activeDialog: false,
countdown: 60,
- innerDialog: false,
+ innerDialog: true,
versionName: "",
codeMsg: "鑾峰彇楠岃瘉鐮�",
versionState: "灏氭湭婵�娲�",
@@ -264,7 +268,76 @@
snExpire: false,
timer: null,
token: "",
- orderList: [],
+ orderList: [
+ {
+ id: "da09c92a-8bc0-4586-998e-4b6113f457fc",
+ orderMoney: 2320,
+ products: [
+ {
+ ChCount: 16,
+ activateCode: "E8B72-E0B09-5F44B-8BBC4-1C5AC",
+ activeTime: "",
+ appendix: [],
+ authCount: 16,
+ cameraCount: 0,
+ codeStatus: 0,
+ devCount: 1,
+ devIdList: ["407394c3-bc46-446b-88d5-ddf6d4694e32"],
+ devInstallLimit: 1,
+ edition: "",
+ moduleNames: [],
+ orderId: "",
+ productBaseDetail: null,
+ productId: "44aa3c6c-cb1a-445c-9c42-3af3f0d1bcf4",
+ productName: "SmartAI浜у搧瀵嗛挜",
+ productPrice: 0,
+ productType: 5,
+ productTypeName: "浜у搧瀵嗛挜",
+ productVersion: "",
+ sdkNames: [],
+ serveYear: 2,
+ targetPlatform: "",
+ usedCount: 0,
+ userId: "",
+ },
+ ],
+ },
+
+ {
+ id: "da09c92a-8bc0-4586-998e-4b6113f457fc",
+
+ orderMoney: 2320,
+ products: [
+ {
+ ChCount: 16,
+ activateCode: "E8B72-E0B09-5F44B-8BBC4-1C5AC",
+ activeTime: "",
+ appendix: [],
+ authCount: 16,
+ cameraCount: 0,
+ codeStatus: 0,
+ devCount: 1,
+ devIdList: ["407394c3-bc46-446b-88d5-ddf6d4694e32"],
+ devInstallLimit: 1,
+ edition: "",
+ moduleNames: [],
+ orderId: "",
+ productBaseDetail: null,
+ productId: "44aa3c6c-cb1a-445c-9c42-3af3f0d1bcf4",
+ productName: "SmartAI浜у搧瀵嗛挜",
+ productPrice: 0,
+ productType: 5,
+ productTypeName: "浜у搧瀵嗛挜",
+ productVersion: "",
+ sdkNames: [],
+ serveYear: 2,
+ targetPlatform: "",
+ usedCount: 0,
+ userId: "",
+ },
+ ],
+ },
+ ],
phone: {
phoneNum: "",
verifyCode: "",
@@ -354,7 +427,7 @@
getShopOrderList({ token: this.token })
.then((res) => {
if (res.code == 200) {
- this.orderList = res.data.list;
+ // this.orderList = res.data.list;
} else {
this.$notify.error("鑾峰彇璁㈠崟鍒楄〃澶辫触");
}
@@ -682,7 +755,7 @@
display: flex;
justify-content: right;
.cancel {
- width: 140px;
+ width: 140px;
height: 40px;
cursor: pointer;
@@ -696,7 +769,7 @@
justify-content: center;
}
.ok {
- width: 140px;
+ width: 140px;
height: 40px;
cursor: pointer;
border-radius: 20px;
@@ -711,14 +784,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;
@@ -743,7 +815,7 @@
height: 550px;
overflow-y: auto;
.order-card {
- height: 150px;
+ // height: 150px;
background: #fff;
margin-bottom: 15px;
@@ -764,10 +836,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