Merge branch 'center-tmtransaction' of…

Merge branch 'center-tmtransaction' of http://gitlab.gongsibao.com/jiangyong/zhichan into center-tmtransaction

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -667,7 +667,9 @@ class TrademarktransactionService extends ServiceBase {
     // } else {
     // } else {
     var codeList = []
     var codeList = []
     for (let i = 0; i < objlist.length; i++) {
     for (let i = 0; i < objlist.length; i++) {
-      codeList.push(objlist[i].code);
+      if(objlist[i].code){
+        codeList.push(objlist[i].code);
+      }
     }
     }
     // }
     // }
     var params = {
     var params = {

center-tmtransaction/app/config/platform.js

@@ -30,7 +30,7 @@ module.exports = {
                 "330":"已作废"},
                 "330":"已作废"},
             need_status:{1:"已提交",2:"待顾问反馈",3:"待用户确认",4:"已完成",5:"已关闭"},
             need_status:{1:"已提交",2:"待顾问反馈",3:"待用户确认",4:"已完成",5:"已关闭"},
             license_type:{"1":"ICP资质",2:"EDI资质"},
             license_type:{"1":"ICP资质",2:"EDI资质"},
-            publish_status: {"audit": "审核中", "uppershelf": "上架", "lowershelf": "下架", "haltsales":"停售","oversales":"已出售","addbaseinfo":"待补充信息","fail":"发布失败"},// 剩余几个人是什么？fail，success
-            trademark_type: {"ordinary":"普通商标","specialoffer":"特价","highquality":"精品","hot":"热门","recommended":"推荐"}
+            publish_status: {"audit": "待审", "uppershelf": "在售", "lowershelf": "停售","oversales":"成交","addbaseinfo":"待补充信息","fail":"发布失败"},// 剩余几个人是什么？fail，success
+            trademark_type: {"ordinary":"普通商标","specialoffer":"特价商标","highquality":"精品商标","hot":"热门商标","recommended":"推荐商标"}
         }
         }
     }
     }
\ No newline at end of file