From d8944c4764c3fc4b7baf6b5c1586cf17c88b0bb1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 23 三月 2022 22:38:20 +0800
Subject: [PATCH] 修改ztree复选框默认为父子联动
---
src/pages/desktop/index/components/Desktop.vue | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index a77c052..7cf072d 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -49,9 +49,9 @@
</span>
</div>
<div class="login-content">
+ <!-- status-icon -->
<el-form
:model="phone"
- status-icon
:rules="phoneCodeRule"
:validate-on-rule-change="false"
ref="phoneLogin"
@@ -159,7 +159,10 @@
<span slot="footer" class="dialog-footer">
<!-- v-if="!snExpire && versionName != 'SmartAI姝ｅ紡鐗�'" -->
<div class="btns">
- <el-button class="cancel" @click="activeDialog = false"
+ <el-button
+ v-if="!snExpire && versionName != 'SmartAI姝ｅ紡鐗�'"
+ class="cancel"
+ @click="activeDialog = false"
>缁х画璇曠敤</el-button
>
<el-button
@@ -186,7 +189,7 @@
>
<div class="tip">
<i class="el-icon-info"></i>
- <span> 璇锋鏌ヨ鍗曚俊鎭紝纭鏃犺鍚庡啀婵�娲荤郴缁熴�� </span>
+ <span>璇锋鏌ヨ鍗曚俊鎭槸鍚︽纭紝纭鏃犺鍚庡啀婵�娲荤郴缁�</span>
</div>
<div class="order-list" v-if="orderList.length">
@@ -205,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>
@@ -215,8 +220,12 @@
</div>
<div class="no-order-list" v-else>鎶辨瓑锛屾病鏈夋煡璇㈠埌璁㈠崟銆�</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
- <el-button type="primary" @click="activeVerByOrd">婵�娲�</el-button>
+ <div class="btns">
+ <el-button class="cancel" @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
+ <el-button class="ok" type="primary" @click="activeVerByOrd"
+ >婵�娲�</el-button
+ >
+ </div>
</span>
</el-dialog>
</div>
@@ -259,7 +268,7 @@
snExpire: false,
timer: null,
token: "",
- orderList: [],
+ orderList: [ ],
phone: {
phoneNum: "",
verifyCode: "",
@@ -540,10 +549,10 @@
.el-dialog.my-account {
border-radius: 24px;
.btns {
- display: flex;
+ display: flex;
justify-content: right;
.cancel {
- width: 76px;
+ width: 76px;
height: 40px;
cursor: pointer;
border-radius: 20px;
@@ -551,7 +560,6 @@
font-size: 14px;
color: var(--colorCard);
border-color: var(--colorCard) !important;
- margin-right: 12px;
display: flex;
align-items: center;
justify-content: center;
@@ -606,10 +614,11 @@
}
}
.el-dialog__footer {
- padding: 30px ;
+ padding: 30px;
text-align: left;
box-sizing: border-box;
- box-shadow: 0px -1px 0px rgb(0 0 0 / 8%);}
+ box-shadow: 0px -1px 0px rgb(0 0 0 / 8%);
+ }
.el-dialog__header {
padding: 14px 20px 13px;
text-align: center;
@@ -669,19 +678,58 @@
}
}
.el-dialog.my-order {
+ border-radius: 24px;
+ .el-dialog__body {
+ padding: 22px 20px;
+ }
+ .btns {
+ display: flex;
+ justify-content: right;
+ .cancel {
+ width: 140px;
+
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ line-height: 40px;
+ font-size: 14px;
+ color: var(--colorCard);
+ border-color: var(--colorCard) !important;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .ok {
+ width: 140px;
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ color: #fff;
+ line-height: 40px;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
.tip {
width: auto;
- height: 40px;
- background: rgb(145, 213, 255, 0.2);
- box-sizing: border-box;
- border: 1px rgb(145, 213, 255) solid;
+ display: -webkit-box;
+ display: -ms-flexbox;
display: flex;
padding: 0 10px;
border-radius: 5px;
+ color: #5f5f5f;
+ line-height: 20px;
+ font-weight: bold;
+ -ms-flex-align: center;
align-items: center;
+ justify-content: center;
i {
margin-right: 5px;
- font-size: 16px;
+ font-size: 24px;
color: var(--colorCard);
}
span {
@@ -698,7 +746,7 @@
height: 550px;
overflow-y: auto;
.order-card {
- height: 150px;
+ // height: 150px;
background: #fff;
margin-bottom: 15px;
@@ -719,10 +767,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