rj

embed_applications/app/front/vues/pages/noticetm/noticetm.html

@@ -98,9 +98,9 @@
                                 </el-checkbox-group> -->
                                 <el-radio-group v-model="selected_issue" size="mini" :border="true"
                                         @change="noticetmquery" style="dispaly:flex">
-                                        <!-- <el-radio-button label="不限">
+                                        <el-radio-button label="不限">
                                                 不限
-                                        </el-radio-button> -->
+                                        </el-radio-button>
                                         <div>
                                                 <el-radio-button v-for="(item, index) in issue_list" :label="item.value"
                                                         v-model="item.value">
@@ -188,7 +188,7 @@
                                 <!-- 分页 -->
                                 <div class="brandfind-list-page" v-if="tms.length">
                                         <el-pagination style="marginTop:18px;" background v-if="tms" layout="prev, pager, next" :page-size="pageSize" prev-text="上一页"
-                                                next-text="下一页" :current-page="currentPage" :total="total"
+                                                next-text="下一页" :current-page="currentPage" :total="total>10000 ? 10000 : total"
                                                 @current-change="currentChange">
                                         </el-pagination>
                                 </div>

embed_applications/app/front/vues/pages/noticetm/noticetm.js

@@ -91,10 +91,9 @@
       this.loading = true;
       this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
         that.loading = false;
-        that.issue_list = d.data.selectdata.slice(1,12);
-        that.issue_data = d.data.rows.slice(1,12);
+        that.issue_list = d.data.selectdata;
+        that.issue_data = d.data.rows;
         that.maxdata = d.data.selectdata[0].value;
-        console.log(d, "//////////////////////////");
       }).catch(function (e) {
         this.loading = false;
         that.$message.warning(`操作失败，请刷新页面后重新操作`);
@@ -102,10 +101,10 @@
     },
     /** 最新12期公告页面点击详情按钮前往公告商标查询 */
     toNoticeDetail(row){
-      console.log(row,";l;;;;;;;;;;;;;;;;;;");
       if (row && row.notice_issue) {
         this.selected_issue = row.notice_issue;
         this.brandKey = 2;
+        this.currentPage = 1;
         this.noticetmquery();
       }
     },
@@ -122,7 +121,9 @@
         "currentPage": 1
 
       } */
-      console.log(v,"lllllllllllllll");
+      if(v!=undefined) {
+        this.currentPage = 1;
+      };
       var selected_issue = "";
       if (this.selected_issue && this.selected_issue != "不限") {
         selected_issue = this.selected_issue;
@@ -136,7 +137,6 @@
         applynumber: this.selected_regnum, tmname: this.selected_tmname,
         applier: this.selected_applier, nclNum: selected_nclNum
       };
-      console.log(obj);
       var that = this;
       this.loading = true;
       this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => {
@@ -144,12 +144,10 @@
         if (d.status == 0 && d.data) {
           var rows = d.data.rows;
           for (var i = 0; i < rows.length; i++) {
-              console.log(rows[i],"99999999");
             if (rows[i].sblb) {
               var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, "");
               var nclnum = sblb.split(" ")[0];
               nclnum = Number(nclnum);
-              console.log(nclnum);
               nclnum = this.ncldata[nclnum - 1].code + " " + this.ncldata[nclnum - 1].name;
               rows[i]["nclnum"] = nclnum;
             }
@@ -158,14 +156,12 @@
           that.total = d.data.count;
         }
       }).catch(function (e) {
-        console.log(e,"lslslslls");
         that.loading = false;
         that.$message.warning(`操作失败，请刷新页面后重新操作`);
       });
     },
     /**商标详情 */
     toTmDetail(tm){
-      console.log(tm.sblb);
       if (tm && tm.sblb && tm.sbzch) {
         var sblb = tm.sblb.replace(/(^\s*)|(\s*$)/g, "");
         var nclNum = sblb.split(" ")[0];
@@ -181,7 +177,6 @@
       }
     },
     currentChange(v){
-      console.log(v);
       this.currentPage = v;
       this.noticetmquery();
     }

embed_applications/app/front/vues/pages/wins/wins.js

@@ -120,7 +120,6 @@
                 }]
             }
         },
-
     methods: {
         /*字数长度 */
         selectedCharatCommand(v) {