Skip to content

Z
zhichan
Commit d33c125e by 王悦
Options

add new

parent d1f9990e
Showing with 132 additions and 36 deletions
zhiquanquan/app/base/controller/impl/trademark/operationCtl.js
......@@ -43,6 +43,8 @@ class OperationCtl extends trademarkCtl {
query.actionBody.tm_end_day = p.search.tm_end_day;
if (p.search.publish_status)
query.actionBody.publish_status = p.search.publish_status;
if (p.search.TmType)
query.actionBody.TmType = p.search.TmType;
if (p.search.ids)
query.actionBody.tmList = p.search.ids;
}
......
zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
......@@ -12,7 +12,10 @@ let pushClient = require("../../../utils/totxClient.js").trademark;
let notifyurl = settings.serviceurl() + "/web/trademark/trademarkCtl/notify";
let pushmyurl = settings.serviceurl() + "/web/trademark/trademarkCtl/process";
let pushurl = settings.tmtransactionurl() + "/tmtransaction/action/trademarktransaction/springBoard";
const amqp = require('amqplib');
const queName = 'zqq'
let Channel
const mq_url = 'amqp://zhichan:gsbMQ2020@123.57.217.203:30672/'
//标源管理
class TrademarkCtl extends CtlBase {
constructor() {
......@@ -22,6 +25,25 @@ class TrademarkCtl extends CtlBase {
this.restClient = system.getObject("util.restClient");
}
async consume() {
if (!Channel) {
const conn = await amqp.connect(mq_url);
Channel = await conn.createChannel()
Channel.assertQueue(queName, {durable: true});
Channel.prefetch(1);
console.log("开始接收队列消息");
Channel.consume(queName, async (msg) => {
const data = JSON.parse(msg.content.toString())
try {
await this.process({actionBody:data.actionBody})
Channel.ack(msg)
}catch (e){
Channel.nack(msg)
}
}, {noAck: false});
}
}
/**
* @api {post} /web/trademark/trademarkctl/findAndCountAll 获取我的列表
* @apiGroup 标源管理
......@@ -119,6 +141,26 @@ class TrademarkCtl extends CtlBase {
}
return system.getResult(rtn)
}
async addpublish(p, q, req) {
let body = {
"actionType": "tmAddUpload",
"actionBody": p
};
let rtn = await this.execClient.execPost(body, tmurl);
let data = JSON.parse(rtn.stdout);
if (data.status == 1) {
rtn = await this.service.create({
opath: p.opath,
user_id: p.userid,
company_id: p.company_id,
trademark_id: data.id,
type:p.data.type,
reason:p.data.reason,
tm_code: data.code
});
}
return system.getResult(rtn)
}
/**
* @api {post} /web/trademark/trademarkctl/publish 批量发布
......@@ -251,14 +293,14 @@ class TrademarkCtl extends CtlBase {
name: p.name,
file_url: p.file_url
});
this.process({actionBody:{
Channel.sendToQueue(queName, Buffer.from(JSON.stringify({actionBody:{
upload_id: upload.id,
file_url: p.file_url,
opath: p.opath,
userid: p.userid,
channel_name: p.channel_name,
company_id: p.company_id
},q,req})
}})), {persistent: true});
return system.getResultSuccess(rtn)
} catch (e) {
return system.getResultFail(-2, e)
......@@ -393,3 +435,5 @@ class TrademarkCtl extends CtlBase {
module.exports = TrademarkCtl;
const tc = new TrademarkCtl()
tc.consume()
\ No newline at end of file
zhiquanquan/app/config/settings.js
......@@ -65,7 +65,7 @@ var settings = {
},
tmtransactionurl: function () {
if (this.env == "dev") {
return "http://120.0.0.1:3004";
return "http://127.0.0.1:4006";
} else {
return "http://center-tmtransaction-service.chaolai";
}
......
zhiquanquan/app/front/entry/public/css/chunk-542aa0bf.aa810420.css → zhiquanquan/app/front/entry/public/css/chunk-4a1e7798.535cbb8d.css
.brand_indentlist[data-v-26d5cefa]{width:100%}.brand_indentlist .brand_header[data-v-26d5cefa]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-26d5cefa]{margin-right:10px}.brand_indentlist[data-v-26d5cefa] .ivu-btn>span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.brand_indentlist[data-v-26d5cefa] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.brand_indentlist[data-v-26d5cefa] thead .ivu-table-cell{white-space:nowrap}.ivu-checkbox-group{display:-webkit-box;display:-ms-flexbox;display:flex;width:226px;-ms-flex-wrap:wrap;flex-wrap:wrap}.ivu-table-filter-list-item .ivu-checkbox-wrapper+.ivu-checkbox-wrapper{margin-right:10px}
\ No newline at end of file
.brand_indentlist[data-v-5bfaf80c]{width:100%}.brand_indentlist .brand_header[data-v-5bfaf80c]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-5bfaf80c]{margin-right:10px}.brand_indentlist[data-v-5bfaf80c] .ivu-btn>span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.brand_indentlist[data-v-5bfaf80c] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.brand_indentlist[data-v-5bfaf80c] thead .ivu-table-cell{white-space:nowrap}.ivu-checkbox-group{display:-webkit-box;display:-ms-flexbox;display:flex;width:226px;-ms-flex-wrap:wrap;flex-wrap:wrap}.ivu-table-filter-list-item .ivu-checkbox-wrapper+.ivu-checkbox-wrapper{margin-right:10px}
\ No newline at end of file
zhiquanquan/app/front/entry/public/css/chunk-c1775eba.8f1a43ac.css 0 → 100644
.line[data-v-a12b39e6]{display:inline-block;width:3px;height:12px;margin-right:5px;background:#1966ff}.title[data-v-a12b39e6]{display:inline-block;margin-right:16px;font-size:13px;font-weight:700;color:#333;margin-bottom:10px}
\ No newline at end of file
zhiquanquan/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/ccc.png"><title></title><link href="/css/chunk-148cd3a8.0676f2ca.css" rel="prefetch"><link href="/css/chunk-14b9857b.0dc416de.css" rel="prefetch"><link href="/css/chunk-2c359864.0dc416de.css" rel="prefetch"><link href="/css/chunk-3385141a.0dc416de.css" rel="prefetch"><link href="/css/chunk-542aa0bf.aa810420.css" rel="prefetch"><link href="/css/chunk-605962ce.d38c164f.css" rel="prefetch"><link href="/css/chunk-635bdee9.1e75f0e2.css" rel="prefetch"><link href="/css/chunk-6ab78853.938207ad.css" rel="prefetch"><link href="/css/chunk-7a58c9dc.21020b18.css" rel="prefetch"><link href="/css/chunk-a2c78c42.992e1c54.css" rel="prefetch"><link href="/js/chunk-148cd3a8.463e2745.js" rel="prefetch"><link href="/js/chunk-14b9857b.895daf31.js" rel="prefetch"><link href="/js/chunk-2c359864.282825b7.js" rel="prefetch"><link href="/js/chunk-3385141a.a39e80b7.js" rel="prefetch"><link href="/js/chunk-4fe8dd4f.75072a0c.js" rel="prefetch"><link href="/js/chunk-542aa0bf.9e69c646.js" rel="prefetch"><link href="/js/chunk-605962ce.16754883.js" rel="prefetch"><link href="/js/chunk-635bdee9.96060bb3.js" rel="prefetch"><link href="/js/chunk-6ab78853.2d4b7ac1.js" rel="prefetch"><link href="/js/chunk-7a58c9dc.81702a0c.js" rel="prefetch"><link href="/js/chunk-a2c78c42.fe470163.js" rel="prefetch"><link href="/css/app.11089a5f.css" rel="preload" as="style"><link href="/css/chunk-vendors.1d90d08d.css" rel="preload" as="style"><link href="/js/app.7a406b53.js" rel="preload" as="script"><link href="/js/chunk-vendors.6953e2d6.js" rel="preload" as="script"><link href="/css/chunk-vendors.1d90d08d.css" rel="stylesheet"><link href="/css/app.11089a5f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.6953e2d6.js"></script><script src="/js/app.7a406b53.js"></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/ccc.png"><title></title><link href="/css/chunk-0244aa44.21020b18.css" rel="prefetch"><link href="/css/chunk-148cd3a8.0676f2ca.css" rel="prefetch"><link href="/css/chunk-14b9857b.0dc416de.css" rel="prefetch"><link href="/css/chunk-2c359864.0dc416de.css" rel="prefetch"><link href="/css/chunk-3385141a.0dc416de.css" rel="prefetch"><link href="/css/chunk-4a1e7798.535cbb8d.css" rel="prefetch"><link href="/css/chunk-605962ce.d38c164f.css" rel="prefetch"><link href="/css/chunk-635bdee9.1e75f0e2.css" rel="prefetch"><link href="/css/chunk-6ab78853.938207ad.css" rel="prefetch"><link href="/css/chunk-a2c78c42.992e1c54.css" rel="prefetch"><link href="/css/chunk-c1775eba.8f1a43ac.css" rel="prefetch"><link href="/js/chunk-0244aa44.40d472b4.js" rel="prefetch"><link href="/js/chunk-148cd3a8.5faa4c66.js" rel="prefetch"><link href="/js/chunk-14b9857b.febb5572.js" rel="prefetch"><link href="/js/chunk-2c359864.db10b8d2.js" rel="prefetch"><link href="/js/chunk-3385141a.2c27d988.js" rel="prefetch"><link href="/js/chunk-4a1e7798.3c4e7d5f.js" rel="prefetch"><link href="/js/chunk-4fe8dd4f.e1485c58.js" rel="prefetch"><link href="/js/chunk-605962ce.c6ec96ad.js" rel="prefetch"><link href="/js/chunk-635bdee9.76cd79a8.js" rel="prefetch"><link href="/js/chunk-6ab78853.9f72b840.js" rel="prefetch"><link href="/js/chunk-a2c78c42.c0ad1b19.js" rel="prefetch"><link href="/js/chunk-c1775eba.937397de.js" rel="prefetch"><link href="/css/app.11089a5f.css" rel="preload" as="style"><link href="/css/chunk-vendors.1d90d08d.css" rel="preload" as="style"><link href="/js/app.17db5874.js" rel="preload" as="script"><link href="/js/chunk-vendors.f296b9ce.js" rel="preload" as="script"><link href="/css/chunk-vendors.1d90d08d.css" rel="stylesheet"><link href="/css/app.11089a5f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.f296b9ce.js"></script><script src="/js/app.17db5874.js"></script></body></html>
\ No newline at end of file
zhiquanquan/app/front/entry/public/js/app.17db5874.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
zhiquanquan/app/front/entry/public/js/app.7a406b53.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
zhiquanquan/app/front/entry/public/js/chunk-4a1e7798.3c4e7d5f.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4a1e7798"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},"0368":function(e,t,a){},"0670":function(e,t,a){},"23a5":function(e,t,a){"use strict";a.r(t);var r=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_indentlist"},[a("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var r=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"operation",metaName:"operation_info",packageName:"trademark",tblheight:r-200,isMulti:""},on:{onexec:e.onexec}})]}}])}),a("Modal",{attrs:{title:"设置商标类型"},on:{"on-ok":e.ok,"on-cancel":e.cancel},model:{value:e.modal1,callback:function(t){e.modal1=t},expression:"modal1"}},[a("br"),a("Select",{model:{value:e.marktype,callback:function(t){e.marktype=t},expression:"marktype"}},e._l(e.dic.mark_type,(function(t,r){return a("Option",{key:r,attrs:{value:r}},[e._v(e._s(t))])})),1)],1),a("Modal",{attrs:{title:"强制更新"},on:{"on-ok":e.forceok,"on-cancel":e.forcecancel},model:{value:e.modal2,callback:function(t){e.modal2=t},expression:"modal2"}},[a("Form",{ref:"loginForm",attrs:{model:e.form2}},[a("FormItem",{attrs:{prop:"id"}},[a("span",{model:{value:e.form2.name,callback:function(t){e.$set(e.form2,"name",t)},expression:"form2.name"}})]),a("FormItem",{attrs:{prop:"price"}},[a("Input",{attrs:{type:"price",placeholder:"输入售价"},model:{value:e.form2.price,callback:function(t){e.$set(e.form2,"price",t)},expression:"form2.price"}})],1)],1)],1)],1)},s=[],n=(a("7f7f"),a("6762"),a("2fdb"),a("ac6a"),a("06d3")),i=a("391e"),o=a("8770"),c=a("c1df"),l=a.n(c),f=a("db7f"),u=a("7e1e"),m=a("0139"),d=a.n(m),h={components:{BizTable:n["a"],DateTime:o["a"],PageSpace:i["a"]},data:function(){return{form2:{id:"",name:"",price:""},dic:f["a"],placeholder:d.a,marktype:"",modal1:!1,modal2:!1,formItem:{type:""},ruleValidate:{type:[{required:!1,message:"",trigger:"blur"}]}}},mounted:function(){this.$route.query.ids?this.$refs.bt.fetchData({ids:this.$route.query.ids}):this.$refs.bt.fetchData()},methods:{ok:function(){var e=this;this.$refs.bt.currentSels.forEach((function(t){t.TmType=e.marktype}));var t=this.$refs.bt.currentSels;Object(u["f"])("/web/trademark/trademarkCtl/updatestrademarktype",{data:t}).then((function(t){1==t.data.status?(e.$refs.bt.fetchData(e.$refs.bt.searchModel),e.$Message.success("设置成功"),e.marktype=""):e.$Message.error("设置失败"),e.marktype=""}))},forceok:function(){var e=this;Object(u["f"])("/web/trademark/operationCtl/forceUpdate",this.form2).then((function(t){1==t.data.status?e.$Message.success("更新成功"):e.$Message.error(t.data.message)})),this.modal2=!1},forcecancel:function(){this.modal2=!1},cancel:function(){},onexec:function(e,t){var a=this;if("detail"===e)this.$router.push({name:"originmanage_detail",params:{id:t.id}});else if("down"===e||"lowershelf"===e||"uppershelf"===e){if("down"===e&&!["停售","待审"].includes(t.publish_status_name))return this.$Message.warning('只能更改状态为"停售"和"待审"的商标');if("down"!==e&&0===this.$refs.bt.currentSels.length)return this.$Message.warning("请选择商标");var r=[];if(("lowershelf"===e||"uppershelf"===e)&&(r=this.$refs.bt.currentSels.filter((function(e){return["停售","待审"].includes(e.publish_status_name)})),0==r.length))return this.$Message.warning('只能更改状态为"停售"和"待审"的商标');var s="down"===e?[t]:r;e="down"===e?"lowershelf":e,Object(u["j"])(s,e).then((function(t){1==t.data.status&&(a.$Message.success("".concat("lowershelf"===e?"下架":"上架","成功")),a.$refs.bt.fetchData(a.$refs.bt.searchModel))})).catch((function(t){a.$Message.error("".concat("lowershelf"===e?"下架":"上架","出错"))}))}else if("force"===e){if("NORMAL"!==t.TmType)return alert("不能强制更新");this.form2.id=t.id,this.form2.name=t.name,this.modal2=!0}else if("edito"===e){if("NORMAL"===t.TmType)return alert("不能编辑");this.$router.push({name:"operation_addtm",params:t})}else"settype"===e?0===this.$refs.bt.currentSels.length?this.$Message.warning("请选择商标"):this.modal1=!0:"addtm"===e&&this.$router.push({name:"operation_addtm"})},formatCol:function(e,t,a){var r=e[t];if("created_at"===t)r=l()(r).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t]||d.a,'"/>');if("deadline"===t)r=l()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+l()(e["tm_end_day"]||0).format("YYYY-MM-DD");else if("publishinfo"===t)r=(e["contacts"]||"")+"<br/>"+(e["mobile"]||"");else if("name"===t)r=e["name"]||e["excelName"];else if("TmType"===t)switch(r="普通商标",e["TmType"]){case"STORY":r="品牌商标";break;case"BARGAIN":r="特价商标";break;case"SELECTED":r="甄选商标";break}else"publish_status"===t&&(r="fail"===e["publish_status"]?e["publish_status_name"]+"(".concat(e["fail_reason"],")"):e["publish_status_name"])}return r}}},p=h,b=(a("fefd"),a("680e"),a("2877")),g=Object(b["a"])(p,r,s,!1,null,"5bfaf80c",null);t["default"]=g.exports},"391e":function(e,t,a){"use strict";var r=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},s=[],n=a("6db5"),i=n["a"],o=a("2877"),c=Object(o["a"])(i,r,s,!1,null,null,null);t["a"]=c.exports},"680e":function(e,t,a){"use strict";a("0368")},"6db5":function(e,t,a){"use strict";(function(e){a("c5f6");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var a=e("#framediv"),r=a.get()[0],s=window.innerHeight-r.offsetTop-t.advalue;t.frameHeight=s,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},fefd:function(e,t,a){"use strict";a("0670")}}]);
\ No newline at end of file
zhiquanquan/app/front/entry/public/js/chunk-542aa0bf.9e69c646.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-542aa0bf"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},"0368":function(e,t,a){},"23a5":function(e,t,a){"use strict";a.r(t);var r=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_indentlist"},[a("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var r=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"operation",metaName:"operation_info",packageName:"trademark",tblheight:r-200,isMulti:""},on:{onexec:e.onexec}})]}}])}),a("Modal",{attrs:{title:"设置商标类型"},on:{"on-ok":e.ok,"on-cancel":e.cancel},model:{value:e.modal1,callback:function(t){e.modal1=t},expression:"modal1"}},[a("p",[e._v('只能修改状态为"在售"的商标')]),a("br"),a("Select",{model:{value:e.marktype,callback:function(t){e.marktype=t},expression:"marktype"}},e._l(e.dic.mark_type,(function(t,r){return a("Option",{key:r,attrs:{value:r}},[e._v(e._s(t))])})),1)],1),a("Modal",{attrs:{title:"强制更新"},on:{"on-ok":e.forceok,"on-cancel":e.forcecancel},model:{value:e.modal2,callback:function(t){e.modal2=t},expression:"modal2"}},[a("Form",{ref:"loginForm",attrs:{model:e.form2}},[a("FormItem",{attrs:{prop:"id"}},[a("span",{model:{value:e.form2.name,callback:function(t){e.$set(e.form2,"name",t)},expression:"form2.name"}})]),a("FormItem",{attrs:{prop:"price"}},[a("Input",{attrs:{type:"price",placeholder:"输入售价"},model:{value:e.form2.price,callback:function(t){e.$set(e.form2,"price",t)},expression:"form2.price"}})],1)],1)],1)],1)},n=[],s=(a("7f7f"),a("6762"),a("2fdb"),a("ac6a"),a("06d3")),i=a("391e"),o=a("8770"),c=a("c1df"),l=a.n(c),f=a("db7f"),u=a("7e1e"),m=a("0139"),d=a.n(m),h={components:{BizTable:s["a"],DateTime:o["a"],PageSpace:i["a"]},data:function(){return{form2:{id:"",name:"",price:""},dic:f["a"],placeholder:d.a,marktype:"",modal1:!1,modal2:!1,formItem:{type:""},ruleValidate:{type:[{required:!1,message:"",trigger:"blur"}]}}},mounted:function(){this.$route.query.ids?this.$refs.bt.fetchData({ids:this.$route.query.ids}):this.$refs.bt.fetchData()},methods:{ok:function(){var e=this;this.$refs.bt.currentSels.forEach((function(t){t.trademark_type=e.marktype}));var t=this.$refs.bt.currentSels.filter((function(e){return"在售"==e.publish_status_name}));Object(u["f"])("/web/trademark/trademarkCtl/updatestrademarktype",{data:t}).then((function(t){1==t.data.status?(e.$refs.bt.fetchData(e.$refs.bt.searchModel),e.$Message.success("设置成功"),e.marktype=""):e.$Message.error("设置失败"),e.marktype=""}))},forceok:function(){var e=this;Object(u["f"])("/web/trademark/operationCtl/forceUpdate",this.form2).then((function(t){1==t.data.status?e.$Message.success("更新成功"):e.$Message.error(t.data.message)})),this.modal2=!1},forcecancel:function(){this.modal2=!1},cancel:function(){},onexec:function(e,t){var a=this;if("detail"===e)this.$router.push({name:"originmanage_detail",params:{id:t.id}});else if("down"===e||"lowershelf"===e||"uppershelf"===e){if("down"===e&&!["停售","待审"].includes(t.publish_status_name))return this.$Message.warning('只能更改状态为"停售"和"待审"的商标');if("down"!==e&&0===this.$refs.bt.currentSels.length)return this.$Message.warning("请选择商标");var r=[];if(("lowershelf"===e||"uppershelf"===e)&&(r=this.$refs.bt.currentSels.filter((function(e){return["停售","待审"].includes(e.publish_status_name)})),0==r.length))return this.$Message.warning('只能更改状态为"停售"和"待审"的商标');var n="down"===e?[t]:r;e="down"===e?"lowershelf":e,Object(u["j"])(n,e).then((function(t){1==t.data.status&&(a.$Message.success("".concat("lowershelf"===e?"下架":"上架","成功")),a.$refs.bt.fetchData(a.$refs.bt.searchModel))})).catch((function(t){a.$Message.error("".concat("lowershelf"===e?"下架":"上架","出错"))}))}else"force"===e?(this.form2.id=t.id,this.form2.name=t.name,this.modal2=!0):"settype"===e&&(0===this.$refs.bt.currentSels.length?this.$Message.warning("请选择商标"):this.modal1=!0)},formatCol:function(e,t,a){var r=e[t];if("created_at"===t)r=l()(r).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t]||d.a,'"/>');"deadline"===t?r=l()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+l()(e["tm_end_day"]||0).format("YYYY-MM-DD"):"publishinfo"===t?r=(e["contacts"]||"")+"<br/>"+(e["mobile"]||""):"name"===t?r=e["name"]||e["excelName"]:"publish_status"===t&&(r="fail"===e["publish_status"]?e["publish_status_name"]+"(".concat(e["fail_reason"],")"):e["publish_status_name"])}return r}}},p=h,b=(a("b4d3"),a("680e"),a("2877")),g=Object(b["a"])(p,r,n,!1,null,"26d5cefa",null);t["default"]=g.exports},"391e":function(e,t,a){"use strict";var r=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},n=[],s=a("6db5"),i=s["a"],o=a("2877"),c=Object(o["a"])(i,r,n,!1,null,null,null);t["a"]=c.exports},"680e":function(e,t,a){"use strict";a("0368")},"6db5":function(e,t,a){"use strict";(function(e){a("c5f6");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var a=e("#framediv"),r=a.get()[0],n=window.innerHeight-r.offsetTop-t.advalue;t.frameHeight=n,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},"83b7":function(e,t,a){},b4d3:function(e,t,a){"use strict";a("83b7")}}]);
\ No newline at end of file
zhiquanquan/app/front/entry/public/js/chunk-c1775eba.937397de.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-c1775eba"],{7299:function(e,t,i){"use strict";i.r(t);var n=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticStyle:{"background-color":"white",width:"100%",height:"100%",padding:"16px"}},[i("Row",{attrs:{type:"flex"}},[i("div",{staticClass:"line"}),i("div",{staticClass:"title"},[e._v("标源基本信息")]),i("Form",{ref:"form",attrs:{model:e.formInline,rules:e.ruleInline,inline:"","label-width":80,"label-position":"left"}},[i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"商标名称",prop:"name"}},[i("Input",{staticStyle:{width:"180px"},attrs:{disabled:e.edit},model:{value:e.formInline.name,callback:function(t){e.$set(e.formInline,"name",t)},expression:"formInline.name"}})],1),i("FormItem",{staticStyle:{"margin-left":"200px"},attrs:{label:"申请号",prop:"code"}},[i("Input",{staticStyle:{width:"180px"},attrs:{disabled:e.edit},model:{value:e.formInline.code,callback:function(t){e.$set(e.formInline,"code",e._n(t))},expression:"formInline.code"}})],1)],1),i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"卖家底价",prop:"business_quoted_price"}},[i("Input",{staticStyle:{width:"180px"},model:{value:e.formInline.business_quoted_price,callback:function(t){e.$set(e.formInline,"business_quoted_price",e._n(t))},expression:"formInline.business_quoted_price"}})],1),i("FormItem",{staticStyle:{"margin-left":"200px"},attrs:{label:"卖家姓名",prop:"contacts"}},[i("Input",{staticStyle:{width:"180px"},model:{value:e.formInline.contacts,callback:function(t){e.$set(e.formInline,"contacts",e._n(t))},expression:"formInline.contacts"}})],1)],1),i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"卖家电话",prop:"mobile"}},[i("Input",{staticStyle:{width:"180px"},model:{value:e.formInline.mobile,callback:function(t){e.$set(e.formInline,"mobile",t)},expression:"formInline.mobile"}})],1),i("FormItem",{staticStyle:{"margin-left":"200px"},attrs:{label:"商标类型",prop:"TmType"}},[i("Select",{staticStyle:{width:"180px"},attrs:{disabled:e.edit},model:{value:e.formInline.TmType,callback:function(t){e.$set(e.formInline,"TmType",t)},expression:"formInline.TmType"}},[i("Option",{attrs:{value:"SELECTED"}},[e._v("甄选商标")]),i("Option",{attrs:{value:"BARGAIN"}},[e._v("特价商标")]),i("Option",{attrs:{value:"STORY"}},[e._v("品牌商标")])],1)],1)],1),i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"转让类型"}},[i("Select",{staticStyle:{width:"180px"},model:{value:e.formInline.type,callback:function(t){e.$set(e.formInline,"type",t)},expression:"formInline.type"}},[i("Option",{attrs:{value:"经营不善"}},[e._v("经营不善")]),i("Option",{attrs:{value:"企业转型"}},[e._v("企业转型")]),i("Option",{attrs:{value:"其他"}},[e._v("其他")])],1)],1)],1),i("div",{staticClass:"line"}),i("div",{staticClass:"title"},[e._v("图文信息")]),i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"商标介绍",prop:"tmDetailSummary"}},[i("Input",{staticStyle:{width:"600px"},attrs:{type:"textarea",autosize:{minRows:1,maxRows:1},placeholder:"建议输入200-300字"},model:{value:e.formInline.tmDetailSummary,callback:function(t){e.$set(e.formInline,"tmDetailSummary",t)},expression:"formInline.tmDetailSummary"}})],1)],1),i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"商标图样",prop:"pic_url"}},[i("Uploads",{attrs:{multiple:!1,accept:"image/png, image/jpeg, image/jpg"},model:{value:e.formInline.pic_url,callback:function(t){e.$set(e.formInline,"pic_url",t)},expression:"formInline.pic_url"}}),i("span",[e._v("图片尺寸500*340，纯白色，需上传1张")])],1)],1),i("Col",{staticStyle:{"margin-left":"10px"},attrs:{span:"24"}},[i("FormItem",{attrs:{label:"商品图",prop:"goods_pic_url"}},[i("Uploads",{attrs:{multiple:!0,accept:"image/png, image/jpeg, image/jpg"},model:{value:e.formInline.goods_pic_url,callback:function(t){e.$set(e.formInline,"goods_pic_url",t)},expression:"formInline.goods_pic_url"}}),i("span",[e._v("图片尺寸1192*600，至少上传3张")])],1)],1)],1),i("Col",{staticStyle:{"margin-top":"20px",width:"70%","text-align":"right"}},[i("Button",{on:{click:e.cancel}},[e._v("取消")]),i("Button",{staticStyle:{"margin-left":"8px"},attrs:{type:"primary"},on:{click:e.updateinfo}},[e._v("申请上架")])],1)],1)],1)},a=[],r=(i("28a5"),i("7f7f"),i("a98b")),l=i("7e1e"),o={name:"addtm",props:{},components:{Uploads:r["a"]},data:function(){return{edit:!1,formInline:{name:"",code:"",business_quoted_price:"",contacts:"",mobile:"",type:"",TmType:"",tmDetailSummary:"",goods_pic_url:"",pic_url:""},ruleInline:{name:[{required:!0,message:"请输入商标名称",trigger:"blur"}],contacts:[{required:!0,message:"请输入卖家姓名",trigger:"blur"}],tmDetailSummary:[{required:!0,message:"请输入商标介绍",trigger:"blur"}],TmType:[{required:!0,message:"请选择商标类型",trigger:"change"}],code:[{required:!0,type:"number",message:"请输入申请号",trigger:"blur"}],business_quoted_price:[{required:!0,type:"number",message:"请输入价格",trigger:"blur"}],pic_url:[{required:!0,message:"请上传图片",trigger:"change"}],goods_pic_url:[{required:!0,message:"至少上传3张图片",trigger:"change"}],mobile:[{required:!0,pattern:/^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,message:"请输入电话",trigger:"blur"}]}}},mounted:function(){var e=this.$route.params;if(e.name){this.edit=!0;var t=e.TradeTmDetailJson||{};this.formInline={name:e.name,code:e.code,business_quoted_price:e.business_quoted_price,contacts:e.contacts,mobile:e.mobile,type:e.type,TmType:e.TmType,tmDetailSummary:t.tmDetailSummary,goods_pic_url:t.tmDetailPic,pic_url:e.pic_url}}},computed:{},methods:{deepclone:function(e){var t=JSON.stringify(e);return JSON.parse(t)},cancel:function(){this.$router.go(-1)},updateinfo:function(){var e=this;this.$refs.form.validate((function(t){var i=e.formInline.goods_pic_url.split(",").length;if(t){if(i<3)return alert("至少上传3张商品图"),!1;var n={name:e.formInline.name,code:e.formInline.code,business_quoted_price:e.formInline.business_quoted_price,contacts:e.formInline.contacts,mobile:e.formInline.mobile,type:e.formInline.type,TmType:e.formInline.TmType,pic_url:e.formInline.pic_url,TradeTmDetailJson:{tmMainPic:e.formInline.pic_url,tmDetailSummary:e.formInline.tmDetailSummary,tmDetailPic:e.formInline.goods_pic_url,tmBannerPic:e.formInline.goods_pic_url}};Object(l["f"])("/web/trademark/trademarkCtl/addpublish",n).then((function(t){0==t.data.status?(e.$Message.success(t.data.msg),e.$router.go(-1)):e.$Message.error(t.data.msg)}))}}))}}},s=o,m=(i("7da3"),i("2877")),c=Object(m["a"])(s,n,a,!1,null,"a12b39e6",null);t["default"]=c.exports},"7da3":function(e,t,i){"use strict";i("9360")},9360:function(e,t,i){}}]);
\ No newline at end of file
zhiquanquan/package-lock.json
......@@ -309,30 +309,27 @@
"dev": true
},
"amqplib": {
"version": "0.5.6",
"resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.6.tgz",
"integrity": "sha512-J4TR0WAMPBHN+tgTuhNsSObfM9eTVTZm/FNw0LyaGfbiLsBxqSameDNYpChUFXW4bnTKHDXy0ab+nuLhumnRrQ==",
"optional": true,
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.8.0.tgz",
"integrity": "sha512-icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA==",
"requires": {
"bitsyntax": "~0.1.0",
"bluebird": "^3.5.2",
"bluebird": "^3.7.2",
"buffer-more-ints": "~1.0.0",
"readable-stream": "1.x >=1.1.9",
"safe-buffer": "~5.1.2",
"url-parse": "~1.4.3"
"safe-buffer": "~5.2.1",
"url-parse": "~1.5.1"
},
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"optional": true
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
},
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"optional": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
......@@ -340,11 +337,15 @@
"string_decoder": "~0.10.x"
}
},
"safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"optional": true
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
}
}
},
......@@ -970,7 +971,6 @@
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz",
"integrity": "sha512-ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q==",
"optional": true,
"requires": {
"buffer-more-ints": "~1.0.0",
"debug": "~2.6.9",
......@@ -981,7 +981,6 @@
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"optional": true,
"requires": {
"ms": "2.0.0"
}
......@@ -989,8 +988,7 @@
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"optional": true
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}
}
},
......@@ -1156,8 +1154,7 @@
"buffer-more-ints": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz",
"integrity": "sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==",
"optional": true
"integrity": "sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg=="
},
"buffers": {
"version": "0.1.1",
......@@ -5273,6 +5270,56 @@
"semver": "^5.5.0",
"slack-node": "~0.2.0",
"streamroller": "0.7.0"
},
"dependencies": {
"amqplib": {
"version": "0.5.6",
"resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.6.tgz",
"integrity": "sha512-J4TR0WAMPBHN+tgTuhNsSObfM9eTVTZm/FNw0LyaGfbiLsBxqSameDNYpChUFXW4bnTKHDXy0ab+nuLhumnRrQ==",
"optional": true,
"requires": {
"bitsyntax": "~0.1.0",
"bluebird": "^3.5.2",
"buffer-more-ints": "~1.0.0",
"readable-stream": "1.x >=1.1.9",
"safe-buffer": "~5.1.2",
"url-parse": "~1.4.3"
}
},
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"optional": true
},
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"optional": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"optional": true
},
"url-parse": {
"version": "1.4.7",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
"integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
"optional": true,
"requires": {
"querystringify": "^2.1.1",
"requires-port": "^1.0.0"
}
}
}
},
"logalot": {
......@@ -7202,8 +7249,7 @@
"querystringify": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
"optional": true
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
},
"queue-microtask": {
"version": "1.2.3",
......@@ -7393,8 +7439,7 @@
"requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"optional": true
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
},
"resolve": {
"version": "1.21.0",
......@@ -8684,10 +8729,9 @@
}
},
"url-parse": {
"version": "1.4.7",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
"integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
"optional": true,
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
"requires": {
"querystringify": "^2.1.1",
"requires-port": "^1.0.0"
......
zhiquanquan/package.json
......@@ -14,6 +14,7 @@
"MD5": "1.3.0",
"after": "^0.8.2",
"ali-oss": "^4.12.2",
"amqplib": "^0.8.0",
"babel-polyfill": "^6.26.0",
"base64id": "^1.0.0",
"bluebird": "^3.5.1",
......
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