From 7efeb8800e982837026475db39dc02f945f7f623 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期三, 02 三月 2022 21:22:19 +0800
Subject: [PATCH] 授权弹窗新ui
---
vue.config.js | 2
src/pages/vindicate/views/sysInfo.vue | 147 +++++++++++++++++++++++++++++-------
src/pages/desktop/index/components/Desktop.vue | 78 +++++++++++++++----
3 files changed, 179 insertions(+), 48 deletions(-)
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index a77c052..11c59fb 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">
@@ -215,8 +218,10 @@
</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>
@@ -247,7 +252,7 @@
showFreeVersion: false,
activeDialog: false,
countdown: 60,
- innerDialog: false,
+ innerDialog: true,
versionName: "",
codeMsg: "鑾峰彇楠岃瘉鐮�",
versionState: "灏氭湭婵�娲�",
@@ -540,10 +545,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 +556,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 +610,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 +674,58 @@
}
}
.el-dialog.my-order {
+ .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;
+ width: auto;
+ /* height: 40px; */
+ 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 {
diff --git a/src/pages/vindicate/views/sysInfo.vue b/src/pages/vindicate/views/sysInfo.vue
index b03f889..072ad51 100644
--- a/src/pages/vindicate/views/sysInfo.vue
+++ b/src/pages/vindicate/views/sysInfo.vue
@@ -48,16 +48,35 @@
</div>
</div>
- <el-dialog title="鍐嶆纭" :visible.sync="dialogVisible">
+ <el-dialog
+ title="鍐嶆纭"
+ :visible.sync="dialogVisible"
+ custom-class="my-confirm"
+ >
<div class="ver">
- <span class="icon iconfont" style="color: orangered"></span>
- 浜у搧瀵嗛挜瀵煎嚭鍚庯紝绯荤粺澶ч儴鍒嗗姛鑳藉皢鏃犳硶浣跨敤锛岃纭鏄惁缁х画锛�
+ <span
+ class="iconfont"
+ style="color: orangered; font-size: 40px; margin-bottom: 10px"
+ ></span
+ >
+ <span class="ver-text">
+ 浜у搧瀵嗛挜瀵煎嚭鍚庯紝绯荤粺澶ч儴鍒嗗姛鑳藉皢鏃犳硶浣跨敤锛岃纭鏄惁缁х画锛�
+ </span>
</div>
<div class="info">
- 濡傞渶缁х画锛岃杈撳叆绠＄悊鍛樺瘑鐮侊紝骞跺鍏ヤ綘鎯宠婵�娲荤殑璁惧璇锋眰鐮侊紝鐒跺悗鐐瑰嚮鈥滅‘璁も�濄��
- <span style="color: #8f949a; font-size: 14px"
- >璁惧璇锋眰鐮佽幏鍙栨柟寮忥細濡傜郴缁熷凡婵�娲伙紝鍦ㄦ縺娲婚〉闈㈠鍑哄嵆鍙紱濡傝澶囨湭婵�娲伙紝鍦⊿martAI婵�娲婚〉闈㈡壂鐮佽幏鍙栥��</span
- >
+ <span class="info-cont">
+ 濡傞渶缁х画锛岃杈撳叆绠＄悊鍛樺瘑鐮侊紝骞跺鍏ユ偍瑕佹縺娲荤殑璁惧璇锋眰鐮侊紝鐒跺悗鐐瑰嚮鈥滅‘瀹氣�濄��
+ </span>
+ <div style="margin-top: 10px">璁惧璇锋眰鐮佽幏鍙栨柟寮忥細</div>
+ <ul>
+ <li style="list-style: inside">濡傜郴缁熷凡婵�娲伙紝鍦ㄦ縺娲婚〉闈㈠鍑哄嵆鍙紱</li>
+ <li style="list-style: inside">
+ 濡傝澶囨湭婵�娲伙紝鍦⊿martAI婵�娲婚〉闈㈡壂鐮佽幏鍙�
+ </li>
+ </ul>
+ <!-- <span style="color: #8f949a; font-size: 14px"
+ >銆�</span
+ > -->
</div>
<!-- -->
<div class="pw">
@@ -65,7 +84,6 @@
size="small"
placeholder="璇疯緭鍏ョ鐞嗗憳瀵嗙爜"
v-model="password"
- style="padding-left: 50px; width: 460px"
></el-input>
</div>
<div class="validate">
@@ -91,8 +109,10 @@
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="confirmCancel">纭畾</el-button>
+ <div class="btns">
+ <el-button class="cancel" @click="dialogVisible = false">鍙栨秷</el-button>
+ <el-button class="ok" type="primary" @click="confirmCancel">纭畾</el-button>
+ </div>
</span>
</el-dialog>
</div>
@@ -111,7 +131,6 @@
serializedNumber: "",
secrectKey: "",
q: "",
- // verText: "SmartAIOS姝ｅ紡鐗�",
activeState: "宸叉縺娲�",
password: "",
dialogVisible: false,
@@ -194,27 +213,83 @@
border-left: 4px solid #f2f2f7;
.el-dialog {
- width: 625px;
+ width: 640px; border-radius: 24px;
+
}
.el-dialog__header {
- padding: 15px 20px 10px;
- text-align: left;
- font-weight: 600;
+ padding: 14px 20px 13px;
+ text-align: center;
+ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.08);
+ .el-dialog__title {
+ font-weight: 600;
+ font-size: 18px;
+ color: #5f5f5f;
+ line-height: 25px;
+ }
}
.el-dialog__body {
text-align: left;
- padding: 0;
- padding-bottom: 10px;
+ padding: 30px;
+ .pw {
+ .el-input--small .el-input__inner {
+ height: 32px;
+ line-height: 32px;
+ border-radius: 16px;
+ border-color: #d4d6d9 !important;
+ }
+ }
}
+ .el-dialog__footer {
+ padding: 10px 20px 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;
+ }
+ }
+}
.el-divider--horizontal {
margin: 20px 0;
}
.validate {
- padding: 0 50px;
display: flex;
align-items: baseline;
margin-top: 15px;
+ .el-button--small {
+ font-size: 14px;
+ border-radius: 3px;
+ border-radius: 16px;
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ min-width: 120px; padding: 8px 15px;
+
+ }
}
#myForm {
display: flex;
@@ -224,23 +299,38 @@
margin: 0 8px;
width: 60px;
}
+ .el-textarea__inner {
+ min-height: 32px;
+ height: 32px;
+ border: 1px solid #d4d6d9;
+ box-sizing: border-box;
+ border-radius: 16px;
+ }
}
.ver {
- margin-bottom: 10px;
- background-color: rgba(242, 242, 242, 1);
- font-size: 16px;
- height: 60px;
- padding-left: 50px;
- line-height: 60px;
+ margin-bottom: 30px;
+
+ display: flex;
+ flex-direction: column;
+ align-items: center;
.ver-text {
- font-weight: 600;
+ font-weight: bold;
+ font-size: 16px;
+ line-height: 22px;
+ color: #5f5f5f;
}
}
.info {
- padding: 0 50px;
- font-size: 15px;
line-height: 25px;
margin: 15px 0;
+ font-size: 12px;
+ line-height: 21px;
+ color: #666666;
+ .info-cont {
+ font-weight: bold;
+ font-size: 14px;
+ color: #5f5f5f;
+ }
}
.qr-code-img {
width: 100px;
@@ -341,9 +431,6 @@
font-weight: 700;
margin-left: 30px;
max-width: 568px;
- /* overflow: hidden; */
- /* text-overflow: ellipsis; */
- /* white-space: nowrap; */
line-height: normal;
word-wrap: break-word;
text-align: left;
diff --git a/vue.config.js b/vue.config.js
index 7b45f90..198dc60 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -95,7 +95,7 @@
},
"/data/api-v/app/findAllApp": {
// target: '/',
- target: "http://localhost:8081/",
+ target: "http://localhost:8080/",
changeOrigin: true,
pathRewrite: {
"^/data/api-v/app/findAllApp": "apps.json",
--
Gitblit v1.8.0