Commit d4d6e4e7 by shaojiawen

update: UI

parent 4dae5506
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont-hb3">&#xeb83;</span>
<div class="name">下载</div>
<div class="code-name">&amp;#xeb83;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xee14;</span> <span class="icon iconfont-hb3">&#xee14;</span>
<div class="name">操作日志</div> <div class="name">操作日志</div>
<div class="code-name">&amp;#xee14;</div> <div class="code-name">&amp;#xee14;</div>
...@@ -834,9 +840,9 @@ ...@@ -834,9 +840,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont-hb3'; font-family: 'iconfont-hb3';
src: url('iconfont.woff2?t=1658209429777') format('woff2'), src: url('iconfont.woff2?t=1659341736567') format('woff2'),
url('iconfont.woff?t=1658209429777') format('woff'), url('iconfont.woff?t=1659341736567') format('woff'),
url('iconfont.ttf?t=1658209429777') format('truetype'); url('iconfont.ttf?t=1659341736567') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
...@@ -863,6 +869,15 @@ ...@@ -863,6 +869,15 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont-hb3 iconxiazai"></span>
<div class="name">
下载
</div>
<div class="code-name">.iconxiazai
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconcaozuorizhi"></span> <span class="icon iconfont-hb3 iconcaozuorizhi"></span>
<div class="name"> <div class="name">
操作日志 操作日志
...@@ -2034,6 +2049,14 @@ ...@@ -2034,6 +2049,14 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconxiazai"></use>
</svg>
<div class="name">下载</div>
<div class="code-name">#iconxiazai</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconcaozuorizhi"></use> <use xlink:href="#iconcaozuorizhi"></use>
</svg> </svg>
<div class="name">操作日志</div> <div class="name">操作日志</div>
......
@font-face { @font-face {
font-family: "iconfont-hb3"; /* Project id 1628375 */ font-family: "iconfont-hb3"; /* Project id 1628375 */
src: url('iconfont.woff2?t=1658209429777') format('woff2'), src: url('iconfont.woff2?t=1659341736567') format('woff2'),
url('iconfont.woff?t=1658209429777') format('woff'), url('iconfont.woff?t=1659341736567') format('woff'),
url('iconfont.ttf?t=1658209429777') format('truetype'); url('iconfont.ttf?t=1659341736567') format('truetype');
} }
.iconfont-hb3 { .iconfont-hb3 {
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.iconxiazai:before {
content: "\eb83";
}
.iconcaozuorizhi:before { .iconcaozuorizhi:before {
content: "\ee14"; content: "\ee14";
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "19954052",
"name": "下载",
"font_class": "xiazai",
"unicode": "eb83",
"unicode_decimal": 60291
},
{
"icon_id": "27402276", "icon_id": "27402276",
"name": "操作日志", "name": "操作日志",
"font_class": "caozuorizhi", "font_class": "caozuorizhi",
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<div v-if="codeInfo.statusFlag != 2 && codeInfo.statusFlag" class="flex" style="padding-top:20px;"> <div v-if="codeInfo.statusFlag != 2 && codeInfo.statusFlag" class="flex" style="padding-top:20px;">
<el-button v-if="codeInfo.hmType == 2 && codeInfo.statusFlag == 1" icon="el-icon-download" type="primary" style="width:120px;margin-right: 12px;" @click="downloadQR">下载二维码</el-button> <el-button v-if="codeInfo.hmType == 2 && codeInfo.statusFlag == 1" type="primary" style="width:120px;margin-right: 12px;" @click="downloadQR"><i class="iconfont-hb3 iconxiazai m-r-6"></i>下载二维码</el-button>
<el-button type="primary" plain style="width:98px;" @click="modifyCode">编辑</el-button> <el-button type="primary" plain style="width:98px;" @click="modifyCode">编辑</el-button>
<el-button class="button-discard specter" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode">作废</el-button> <el-button class="button-discard specter" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode">作废</el-button>
</div> </div>
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
data() { data() {
return { return {
chartWidth: 0, chartWidth: 0,
fixedHeight: 237, fixedHeight: 217,
codeInfo: {}, codeInfo: {},
loading: false, loading: false,
activeName: 'first', activeName: 'first',
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
if (resData.code == 0) { if (resData.code == 0) {
that.statusIndex = resData.result.statusFlag == 1 && resData.result.overFlag == 1 ? 4 : resData.result.statusFlag; that.statusIndex = resData.result.statusFlag == 1 && resData.result.overFlag == 1 ? 4 : resData.result.statusFlag;
that.codeInfo = resData.result; that.codeInfo = resData.result;
that.fixedHeight = that.codeInfo.statusFlag != 2 ? 280 : 237; that.fixedHeight = that.codeInfo.statusFlag != 2 ? 260 : 217;
return; return;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
...@@ -200,11 +200,12 @@ export default { ...@@ -200,11 +200,12 @@ export default {
.fixed-tab { .fixed-tab {
position: absolute; position: absolute;
top: 110px; top: 110px;
z-index: 1; z-index: 20;
padding-bottom: 0; padding-bottom: 0;
height: 40px; height: 40px;
background: white; background: white;
width: calc(100% - 180px); width: calc(100% - 180px);
padding-top: 20px;
// left: 50px; // left: 50px;
} }
.button-discard { .button-discard {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment