Skip to content

Z
zhichan
Commit 38f6ba59 by 任建
Options

123

parent 7905387e
Showing with 37 additions and 14 deletions
embed_applications/app/front/entry/index.ejs
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
<div> <div>
<el-scrollbar class="page-component__scroll" > <el-scrollbar class="page-component__scroll" >
<div id="embedwarpper"> <div id="embedwarpper">
<div> <div><keep-alive>
<router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中" <router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)"> element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
</router-view> </router-view></keep-alive>
</div> </div>
</div> </div>
</el-scrollbar> </el-scrollbar>
......
embed_applications/app/front/vues/pages/brandfind/brandfind.css
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
.brandfind-main-filter-item { .brandfind-main-filter-item {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
min-width: 1126px;
min-height: 24px; min-height: 24px;
line-height: 24px; line-height: 24px;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -164,7 +163,7 @@ ...@@ -164,7 +163,7 @@
} }
.brandfind-main-filter-item>div:nth-child(2) { .brandfind-main-filter-item>div:nth-child(2) {
max-width: 800px; max-width: 85%;
height: 26px; height: 26px;
overflow: hidden; overflow: hidden;
transition: height 1s; transition: height 1s;
...@@ -284,7 +283,7 @@ ...@@ -284,7 +283,7 @@
.brandfind-main-equal-form { .brandfind-main-equal-form {
box-sizing: border-box; box-sizing: border-box;
width: 50%; width: 49%;
height: 256px; height: 256px;
border: 1px solid #F7F7F8; border: 1px solid #F7F7F8;
padding: 20px 30px 30px 30px; padding: 20px 30px 30px 30px;
......
embed_applications/app/front/vues/pages/brandfind/brandfind.html
...@@ -292,8 +292,9 @@ ...@@ -292,8 +292,9 @@
@click="toTmDetail(tm)"> @click="toTmDetail(tm)">
<div <div
class="brandfind-list-box-logo"> class="brandfind-list-box-logo">
<img :src="tm.logo" <img v-if="tm.logo" :src="tm.logo"
alt=""> alt="">
<img v-else src="/imgs/loading.png" alt="">
</div> </div>
<div <div
class="brandfind-list-box-text"> class="brandfind-list-box-text">
......
embed_applications/app/front/vues/pages/brandfind/brandfind.js
...@@ -516,7 +516,6 @@ ...@@ -516,7 +516,6 @@
} }
this.$root.postReq(url, obj).then((d) => { this.$root.postReq(url, obj).then((d) => {
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
console.log(11111111111111);
this.province_counts_o = d.data.province_counts.slice(0, 5).map((item, index) => { this.province_counts_o = d.data.province_counts.slice(0, 5).map((item, index) => {
item.index = index + 1; item.index = index + 1;
return item; return item;
...@@ -525,6 +524,27 @@ ...@@ -525,6 +524,27 @@
item.index = index + 6; item.index = index + 6;
return item; return item;
}); });
if(d.data.province_counts.length){
var num1 = this.province_counts_o.length;
for(var i = 0; i < 5 - num1; i++){
this.province_counts_o.push({
count: "-",
index: "-",
percent: "-",
province: "-"
})
}
var num2 = this.province_counts_t.length;
for(var j = 0; j < 5 - num2; j++){
console.log(j);
this.province_counts_t.push({
count: "-",
index: "-",
percent: "-",
province: "-"
})
}
}
this.ncl_counts_o = d.data.ncl_counts.slice(0, 5).map((item, index) => { this.ncl_counts_o = d.data.ncl_counts.slice(0, 5).map((item, index) => {
item.index = index + 1; item.index = index + 1;
return item; return item;
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.css
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
/* 隐藏 */ /* 隐藏 */
.ncldetail-main-content-particular { .ncldetail-main-content-particular {
width: 100%; width: 100%;
height: auto; max-height: 160px;
padding: 0px 15px; padding: 0px 15px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: auto;
} }
.ncldetail-main-content-particular>div { .ncldetail-main-content-particular>div {
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.html
...@@ -53,5 +53,5 @@ ...@@ -53,5 +53,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
embed_applications/app/front/vues/pages/ncldetail/ncldetail.js
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
var that = this; var that = this;
const loadingbyc = this.$loading({ const loadingbyc = this.$loading({
lock: true, lock: true,
text: 'Loading', text: '拼命加载中',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
......
embed_applications/app/front/vues/pages/noticetm/noticetm.js
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
}, },
/** 最新12期公告页面点击详情按钮前往公告商标查询 */ /** 最新12期公告页面点击详情按钮前往公告商标查询 */
toNoticeDetail(row){ toNoticeDetail(row){
console.log(row); console.log(row,";l;;;;;;;;;;;;;;;;;;");
if (row && row.notice_issue) { if (row && row.notice_issue) {
this.selected_issue = row.notice_issue; this.selected_issue = row.notice_issue;
this.brandKey = 2; this.brandKey = 2;
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
"currentPage": 1 "currentPage": 1
} */ } */
console.log(v); console.log(v,"lllllllllllllll");
var selected_issue = ""; var selected_issue = "";
if (this.selected_issue && this.selected_issue != "不限") { if (this.selected_issue && this.selected_issue != "不限") {
selected_issue = this.selected_issue; selected_issue = this.selected_issue;
...@@ -135,6 +135,7 @@ ...@@ -135,6 +135,7 @@
applynumber: this.selected_regnum, tmname: this.selected_tmname, applynumber: this.selected_regnum, tmname: this.selected_tmname,
applier: this.selected_applier, nclNum: selected_nclNum applier: this.selected_applier, nclNum: selected_nclNum
}; };
console.log(obj);
var that = this; var that = this;
this.$root.loading = true; this.$root.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => {
...@@ -142,6 +143,7 @@ ...@@ -142,6 +143,7 @@
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++) {
console.log(rows[i],"99999999");
if (rows[i].sblb) { if (rows[i].sblb) {
var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, ""); var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, "");
var nclnum = sblb.split(" ")[0]; var nclnum = sblb.split(" ")[0];
......
embed_applications/app/front/vues/pages/proposer/proposer.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</h1> </h1>
<div class="proposer-title"> <div class="proposer-title">
<div> <div>
<img src="/imgs/mz.jpg" alt=""> <img src="/imgs/loading.png" alt="">
</div> </div>
<ul> <ul>
<li>{{companyInfo.name}}</li> <li>{{companyInfo.name}}</li>
......
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