OPENTECH / yoho-node-ci · Commits

Go to a project

Authored by 周少峰
Commit 8e61c6030ff639319722538de4e014b853b23f66 2 parents 7d623b54 c1818ece

Merge branch 'feature/senUrls'

Inline Side-by-side
Showing 3 changed files with 1 additions and 8 deletions
@@ -157,7 +157,7 @@ class seoModel extends model { @@ -157,7 +157,7 @@ class seoModel extends model {
157 * 查看词根是否存在 157 * 查看词根是否存在
158 */ 158 */
159 queryKeyword(keyword) { 159 queryKeyword(keyword) {
160 - return this.mysql.query(`select * from seo_keywords_root where keyword = '${keyword}' limit 1`).then(res => { 160 + return this.mysql.query(`select * from seo_keywords_root where keyword = '${keyword}' and status = 1 limit 1`).then(res => {
161 return res; 161 return res;
162 }); 162 });
163 } 163 }
@@ -150,11 +150,6 @@ $(function(){ @@ -150,11 +150,6 @@ $(function(){
150 return; 150 return;
151 } 151 }
152 152
153 - if (msort == 0) {  
154 - alert('大分类必选');  
155 - return;  
156 - }  
157 -  
158 if (misort == 0) { 153 if (misort == 0) {
159 misort = msort; 154 misort = msort;
160 } 155 }
@@ -93,7 +93,6 @@ @@ -93,7 +93,6 @@
93 <th class="text-center">品类</th> 93 <th class="text-center">品类</th>
94 <th class="text-center">过滤词</th> 94 <th class="text-center">过滤词</th>
95 <th class="text-center">已拓词</th> 95 <th class="text-center">已拓词</th>
96 - <th class="text-center">是关键词</th>  
97 <th class="text-center" width="120">操作</th> 96 <th class="text-center" width="120">操作</th>
98 </tr> 97 </tr>
99 </thead> 98 </thead>
@@ -107,7 +106,6 @@ @@ -107,7 +106,6 @@
107 <td>{{sort_name}}</td> 106 <td>{{sort_name}}</td>
108 <td>{{filter_words}}</td> 107 <td>{{filter_words}}</td>
109 <td>{{#if is_expand}}是{{^}}否{{/if}}</td> 108 <td>{{#if is_expand}}是{{^}}否{{/if}}</td>
110 - <td>{{#if is_keyword}}是{{^}}否{{/if}}</td>  
111 <td class="text-center"> 109 <td class="text-center">
112 <a href="javascript:delRootWords({{id}});" class="del-tdk-btn">删除</a> 110 <a href="javascript:delRootWords({{id}});" class="del-tdk-btn">删除</a>
113 </td> 111 </td>