Skip to content

Z
zhichan
Commit 1f96f992 by 任建
Options

yangshi

parent 34e38177
Showing with 75 additions and 69 deletions
embed_applications/app/front/vues/pages/brandfind/brandfind.css
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
box-sizing: border-box; box-sizing: border-box;
width: 200px; width: 200px;
height: 120px; height: 120px;
border: 5px solid #f7f7f8; border: 1px solid #f7f7f8;
float: left; float: left;
} }
...@@ -432,7 +432,6 @@ ...@@ -432,7 +432,6 @@
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
padding: 4px 13px; padding: 4px 13px;
width: 126px;
height: 24px; height: 24px;
margin-right: 10px; margin-right: 10px;
text-align: center; text-align: center;
...@@ -459,6 +458,7 @@ ...@@ -459,6 +458,7 @@
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
letter-spacing: 0; letter-spacing: 0;
border-radius: 1px;
} }
...@@ -574,7 +574,9 @@ ...@@ -574,7 +574,9 @@
} }
.brandfind .el-input--suffix .el-input__inner { .brandfind .el-input--suffix .el-input__inner {
background: #fafafa; background:rgba(250,250,250,1);
border-radius:2px;
border:1px solid rgba(238,238,238,1);
} }
...@@ -629,4 +631,11 @@ ...@@ -629,4 +631,11 @@
} }
.el-message{ .el-message{
background: #fff !important; background: #fff !important;
} }
\ No newline at end of file
.el-table__row>td:nth-child(2)>div{
padding-left: 20px !important;
}
.is-active:hover{
color: #fff !important;
}
\ No newline at end of file
embed_applications/app/front/vues/pages/brandfind/brandfind.html
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<i @click="imageTextDelete" class="el-icon-circle-close"></i> <i @click="imageTextDelete" class="el-icon-circle-close"></i>
</div> </div>
<div> <div>
<el-button type="primary" @click="tmSearchButtonClick">智能查询</el-button> <el-button style="background:rgba(17,142,233,1);" type="primary" @click="tmSearchButtonClick">智能查询</el-button>
</div> </div>
</div> </div>
<!-- 搜索框结束 --> <!-- 搜索框结束 -->
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</div> </div>
<div v-if="ncl_list.length" class="brandfind-main-filter-more"> <div v-if="ncl_list.length" class="brandfind-main-filter-more">
<!-- i标签绑定class --> <!-- i标签绑定class -->
<button @click="addheight">{{collapse.text}}<i <button style="outline：none;outlineColor: rgba(255,255,255,0);" @click="addheight">{{collapse.text}}<i
:class="collapse.icon"></i></button> :class="collapse.icon"></i></button>
</div> </div>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</div> </div>
<div v-if="ncl_list.length" class="brandfind-main-filter-more"> <div v-if="ncl_list.length" class="brandfind-main-filter-more">
<!-- i标签绑定class --> <!-- i标签绑定class -->
<button @click="addheight1">{{collapse1.text}}<i <button style="outline：none;outlineColor: rgba(255,255,255,0);" @click="addheight1">{{collapse1.text}}<i
:class="collapse1.icon"></i> :class="collapse1.icon"></i>
</button> </button>
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.css
...@@ -71,14 +71,14 @@ ...@@ -71,14 +71,14 @@
height: auto; height: auto;
overflow: hidden; overflow: hidden;
margin-top: 15px; margin-top: 15px;
border-left: 1px solid #eee; border-left: 1px solid rgba(247,247,248,1);
} }
/* 隐藏 */ /* 隐藏 */
.ncldetail-main-content-particular { .ncldetail-main-content-particular {
width: 100%; width: 100%;
max-height: 120px; max-height: 120px;
padding: 0px 30px; padding: 0px 30px 0 0;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
padding: 15px 0px; padding: 15px 0px 0 0;
padding-right: 30px; padding-right: 30px;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -226,17 +226,17 @@ ...@@ -226,17 +226,17 @@
.ncldetail-main-item2 { .ncldetail-main-item2 {
width: 100%; width: 100%;
height: 120px; height: 120px;
border: 1px solid #F7F7F8; border: 1px solid rgba(230,232,233,1);
border-bottom: none; border-bottom: none;
} }
.ncldetail-main-item2:last-child { .ncldetail-main-item2:last-child {
border-bottom: 1px solid #F7F7F8; border-bottom: 1px solid rgba(230,232,233,1);
} }
.item2-left { .item2-left {
float: left; float: left;
border-right: 1px solid #f7f7f8; border-right: 1px solid rgba(230,232,233,1);
width: 180px; width: 180px;
height: 100%; height: 100%;
} }
...@@ -327,7 +327,8 @@ ...@@ -327,7 +327,8 @@
.RecommendedDetails { .RecommendedDetails {
width: 100%; width: 100%;
min-height: 400px; min-height: 400px;
border: 1px solid #E6E8E9; border: 1px solid rgba(230,232,233,1);
border-top: none;
} }
.RecommendedDetails>.Rtop { .RecommendedDetails>.Rtop {
...@@ -335,7 +336,7 @@ ...@@ -335,7 +336,7 @@
height: 177px; height: 177px;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #E6E8E9; border-bottom: 1px solid rgba(230,232,233,1);
position: relative; position: relative;
} }
...@@ -391,18 +392,17 @@ ...@@ -391,18 +392,17 @@
.RecommendedDetails>.Rbottom>.Rleft { .RecommendedDetails>.Rbottom>.Rleft {
float: left; float: left;
width: 44%; width: 46%;
padding: 30px; padding: 30px;
border-right: 1px solid #E6E8E9;
box-sizing: border-box; box-sizing: border-box;
border-right: 1px solid rgba(230,232,233,1);
} }
.RecommendedDetails>.Rbottom>.Rright { .RecommendedDetails>.Rbottom>.Rright {
float: right; float: right;
width: 54%; width: 54%;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
border-left: 1px solid rgba(230,232,233,1);
} }
.RecommendedDetails>.Rbottom>.Rleft>div { .RecommendedDetails>.Rbottom>.Rleft>div {
......
embed_applications/app/front/vues/pages/noticetm/noticetm.css
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
/* border: 1px solid #118EE9; */ /* border: 1px solid #118EE9; */
/* padding: 30px; */ /* padding: 30px; */
background: #ffffff; background: #ffffff;
padding: 0 10px;
} }
.noticetm-main-name { .noticetm-main-name {
...@@ -34,8 +35,8 @@ ...@@ -34,8 +35,8 @@
.noticetm-main-title>.title-item1 { .noticetm-main-title>.title-item1 {
float: left; float: left;
width: 120px; width: 120px;
height: 33px; height: 30px;
line-height: 33px; line-height: 30px;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
...@@ -48,8 +49,8 @@ ...@@ -48,8 +49,8 @@
.noticetm-main-title>.title-item2 { .noticetm-main-title>.title-item2 {
float: left; float: left;
width: 120px; width: 120px;
height: 33px; height: 30px;
line-height: 33px; line-height: 30px;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 14px; font-size: 14px;
color: #118EE9; color: #118EE9;
...@@ -96,6 +97,7 @@ ...@@ -96,6 +97,7 @@
.noticetm .el-table td, .el-table th.is-leaf{ .noticetm .el-table td, .el-table th.is-leaf{
text-align: center; text-align: center;
} }
.brandfind-main-filter-item .el-radio-button__inner, .brandfind-main-filter-item .el-radio-button__inner,
.brandfind-main-filter-item .el-radio-group { .brandfind-main-filter-item .el-radio-group {
vertical-align: top; vertical-align: top;
...@@ -104,9 +106,11 @@ ...@@ -104,9 +106,11 @@
.brandfind-main-filter-item .el-radio-button--mini .el-radio-button__inner { .brandfind-main-filter-item .el-radio-button--mini .el-radio-button__inner {
border: none; border: none;
margin-bottom: 10px; margin-bottom: 10px;
width: 120px;
margin-right: 20px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 14px;
color:rgba(151,166,173,1);
text-align: left;
padding: 7px 13px;
} }
.brandfind-main-filter-item .el-radio-button__orig-radio:checked+.el-radio-button__inner{ .brandfind-main-filter-item .el-radio-button__orig-radio:checked+.el-radio-button__inner{
background: #118EE9; background: #118EE9;
...@@ -115,34 +119,18 @@ ...@@ -115,34 +119,18 @@
border-left: none; border-left: none;
border-radius: 0; border-radius: 0;
width: -webkit-fill-available; width: -webkit-fill-available;
margin-left: 39px; margin-right: 16px;
margin-right: 47px;
} }
.brandfind-main-filter-item .el-radio-button:last-child .el-radio-button__inner { .brandfind-main-filter-item .el-radio-button:last-child .el-radio-button__inner {
border-radius: 0; border-radius: 0;
} }
.noticetm-input { .noticetm-input {
color: #797979; color: #797979;
letter-spacing: 0; letter-spacing: 0;
text-align: center; text-align: center;
height: 28px; height: 28px;
min-width: 1126px;
font-size: 14px;
} }
.noticetm-input>button { .noticetm-input>button {
...@@ -161,16 +149,16 @@ ...@@ -161,16 +149,16 @@
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #D1D1D1; border: 1px solid #D1D1D1;
border-radius: 2px; border-radius: 2px;
color: black; color: rgba(72,72,72,1);
transform: translateY(40px); transform: translateY(40px);
padding: 5px 3px; padding: 7px 3px;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
} }
.details-entry2 { .details-entry2 {
padding: 5px 3px; padding: 7px 3px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 2px; border-radius: 2px;
transform: translateY(60px); transform: translateY(60px);
...@@ -180,11 +168,6 @@ ...@@ -180,11 +168,6 @@
cursor: pointer; cursor: pointer;
} }
.noticetm .el-pagination button, .noticetm .el-pagination button,
.noticetm .el-pagination span:not([class*=suffix]) { .noticetm .el-pagination span:not([class*=suffix]) {
min-width: 69px; min-width: 69px;
...@@ -206,4 +189,15 @@ ...@@ -206,4 +189,15 @@
.noticetm .el-pagination.is-background .el-pager li:not(.disabled).active { .noticetm .el-pagination.is-background .el-pager li:not(.disabled).active {
background: #1C2B36; background: #1C2B36;
}
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99000;
}
.el-table td, .el-table th.is-leaf{
border-bottom:1px solid rgba(247,247,248,1) !important;
} }
\ No newline at end of file
embed_applications/app/front/vues/pages/noticetm/noticetm.html
<div class="noticetm"> <div class="noticetm">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="noticetm-main-name">商标公告</div> <div class="noticetm-main-name">商标公告</div>
<div class="noticetm-main-title"> <div class="noticetm-main-title">
<div :class="brandKey == 1 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 1">最新12期公告</div> <div :class="brandKey == 1 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 1">最新12期公告</div>
<div :class="brandKey == 2 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 2">公告商标查询</div> <div :class="brandKey == 2 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 2">公告商标查询</div>
</div> </div>
<div class="noticetm-notice" v-if="brandKey==1"> <div class="noticetm-notice" v-if="brandKey==1">
<el-table :data="issue_data" header-row-class-name="noticetm-notice-title"> <el-table :data="issue_data" header-row-class-name="noticetm-notice-title" >
<el-table-column label="公告期" width="177"> <el-table-column label="公告期" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="">第<span style="color:#F68367">{{ scope.row.notice_issue }}</span>期 <span style="">第<span style="color:#F68367">{{ scope.row.notice_issue }}</span>期
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="初审公告日期" width="177"> <el-table-column label="初审公告日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="">{{ scope.row.date }}</span> <span style="">{{ scope.row.date }}</span>
<!-- <p>姓名: {{ scope.row.name }}</p> <!-- <p>姓名: {{ scope.row.name }}</p>
<p>住址: {{ scope.row.address }}</p> --> <p>住址: {{ scope.row.address }}</p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请异议截止日期" width="177"> <el-table-column label="申请异议截止日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.enddate }}</span> <span style="margin-left: 10px">{{ scope.row.enddate }}</span>
<!-- <p>姓名: {{ scope.row.name }}</p> <!-- <p>姓名: {{ scope.row.name }}</p>
<p>住址: {{ scope.row.address }}</p> --> <p>住址: {{ scope.row.address }}</p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请异议剩余时间" width="177"> <el-table-column label="申请异议剩余时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.lastday }}</span> <span style="margin-left: 10px">{{ scope.row.lastday }}</span>
<!-- <p>姓名: {{ scope.row.name }}</p> <!-- <p>姓名: {{ scope.row.name }}</p>
<p>住址: {{ scope.row.address }}</p> --> <p>住址: {{ scope.row.address }}</p> -->
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="初审商标数" width="177"> <!-- <el-table-column label="初审商标数">
<template slot-scope="scope"> <template slot-scope="scope">
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="操作"> <el-table-column label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toNoticeDetail(scope.row)">详情 <el-button type="primary" size="mini" @click="toNoticeDetail(scope.row)">详情
</el-button> </el-button>
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
</div> </div>
<div class="brandfind-main-filter-more"> <div class="brandfind-main-filter-more">
<!-- i标签绑定class --> <!-- i标签绑定class -->
<button @click="addheight">{{collapse.text}}<i :class="collapse.icon"></i></button> <button style="outline：none;outlineColor: rgba(255,255,255,0);" @click="addheight">{{collapse.text}}<i :class="collapse.icon"></i></button>
</div> </div>
</div> </div>
...@@ -106,7 +107,7 @@ ...@@ -106,7 +107,7 @@
</div> </div>
<div class="brandfind-main-filter-more"> <div class="brandfind-main-filter-more">
<!-- i标签绑定class --> <!-- i标签绑定class -->
<button @click="addheight1">{{collapse1.text}}<i :class="collapse1.icon"></i></button> <button style="outline：none;outlineColor: rgba(255,255,255,0);" @click="addheight1">{{collapse1.text}}<i :class="collapse1.icon"></i></button>
</div> </div>
</div> </div>
......
embed_applications/app/front/vues/pages/noticetm/noticetm.js
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
typeList: '' typeList: '',
loading: false
} }
}, },
...@@ -87,15 +88,15 @@ ...@@ -87,15 +88,15 @@
noticetype: "TMZCSQ" noticetype: "TMZCSQ"
}; };
var that = this; var that = this;
this.$root.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
that.$root.loading = false; that.loading = false;
that.issue_list = d.data.selectdata; that.issue_list = d.data.selectdata;
that.issue_data = d.data.rows; that.issue_data = d.data.rows;
that.maxdata = d.data.selectdata[0].value; that.maxdata = d.data.selectdata[0].value;
console.log(d, "//////////////////////////"); console.log(d, "//////////////////////////");
}).catch(function (e) { }).catch(function (e) {
this.$root.loading = false; this.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -137,9 +138,9 @@ ...@@ -137,9 +138,9 @@
}; };
console.log(obj); console.log(obj);
var that = this; var that = this;
this.$root.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => {
that.$root.loading = false; that.loading = false;
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
var rows = d.data.rows; var rows = d.data.rows;
for (var i = 0; i < rows.length; i++) { for (var i = 0; i < rows.length; i++) {
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
} }
}).catch(function (e) { }).catch(function (e) {
console.log(e,"lslslslls"); console.log(e,"lslslslls");
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
......
embed_applications/app/front/vues/pages/proposer/proposer.html
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
<ul> <ul>
<li>{{companyInfo.name}}</li> <li>{{companyInfo.name}}</li>
<li><span>网址：</span><span>暂无数据</span></li> <li><span>网址：</span><span>-</span></li>
<li><span>电话：</span><span v-if="companyInfo.tel_info">{{companyInfo.tel_info}}</span><span v-else>-</span></li> <li><span>电话：</span><span v-if="companyInfo.tel_info">{{companyInfo.tel_info}}</span><span v-else>-</span></li>
<li><span>地址：</span><span v-if="companyInfo.businessAddress">{{companyInfo.businessAddress}}</span><span v-else>-</span></li> <li><span>地址：</span><span v-if="companyInfo.businessAddress">{{companyInfo.businessAddress}}</span><span v-else>-</span></li>
</ul> </ul>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<el-col v-if="companyInfo.registeredCapital" :span="8"> {{companyInfo.registeredCapital}}</el-col> <el-col v-if="companyInfo.registeredCapital" :span="8"> {{companyInfo.registeredCapital}}</el-col>
<el-col v-else :span="8"> -</el-col> <el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 发照日期</el-col> <el-col :span="4"> 发照日期</el-col>
<el-col v-if="companyInfo.dateIssue" :span="8"> {{companyInfo.busindateIssueessTerm}}</el-col> <el-col v-if="companyInfo.dateIssue" :span="8"> {{companyInfo.dateIssue}}</el-col>
<el-col v-else :span="8"> -</el-col> <el-col v-else :span="8"> -</el-col>
</el-row> </el-row>
......
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