update

4e1c88ad · 王悦 · 1911bb12 · 1911bb12 · 4e1c88ad · 4e1c88ad
Commit 4e1c88ad authored Sep 14, 2020 by 王悦
5 changed files
--- a/zhiquanquan/app/front/entry/public/css/chunk-0af0a551.4f679d9c.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-0af0a551.4f679d9c.css
-.brand_content[data-v-51de60a6]{width:100%}.brand_content .brand_header[data-v-51de60a6]{width:100%;height:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;-webkit-box-shadow:0 1px 0 0 #ddd;box-shadow:0 1px 0 0 #ddd;margin-bottom:10px}.brand_content .brand_header>span[data-v-51de60a6]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-51de60a6]:last-child{height:22px;font-size:16px;font-family:PingFangSC-Semibold,PingFang SC;font-weight:600;color:#000;line-height:22px;margin-left:10px}.brand_content .brand_content_upload[data-v-51de60a6]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-51de60a6]{width:460px;height:21px;font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#333;line-height:21px;margin-bottom:20px}.brand_content .brand_content_upload p span[data-v-51de60a6]{color:#1890ff}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/css/chunk-44bf6158.e583287e.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-44bf6158.e583287e.css
+.brand_content[data-v-2b820a40]{width:100%}.brand_content .brand_header[data-v-2b820a40]{width:100%;height:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;-webkit-box-shadow:0 1px 0 0 #ddd;box-shadow:0 1px 0 0 #ddd;margin-bottom:10px}.brand_content .brand_header>span[data-v-2b820a40]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-2b820a40]:last-child{height:22px;font-size:16px;font-family:PingFangSC-Semibold,PingFang SC;font-weight:600;color:#000;line-height:22px;margin-left:10px}.brand_content .brand_content_upload[data-v-2b820a40]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-2b820a40]{width:460px;height:21px;font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#333;line-height:21px;margin-bottom:20px}.brand_content .brand_content_upload p span[data-v-2b820a40]{color:#1890ff}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/index.html
+++ b/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-0932aaee.a4dc5d43.css rel=prefetch><link href=/css/chunk-0af0a551.4f679d9c.css rel=prefetch><link href=/css/chunk-0d735038.6e32707c.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-406d55f6.799c63e8.css rel=prefetch><link href=/css/chunk-649f2f34.66538457.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/js/chunk-0932aaee.987a0d9c.js rel=prefetch><link href=/js/chunk-0af0a551.5deca353.js rel=prefetch><link href=/js/chunk-0d735038.99ff9fc3.js rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-2c359864.1901a494.js rel=prefetch><link href=/js/chunk-3385141a.361ae46e.js rel=prefetch><link href=/js/chunk-406d55f6.f5ca81e9.js rel=prefetch><link href=/js/chunk-4fe8dd4f.0b4915be.js rel=prefetch><link href=/js/chunk-649f2f34.1c274443.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/css/app.d144942e.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.565e5109.js rel=preload as=script><link href=/js/chunk-vendors.0cce4d14.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.d144942e.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.0cce4d14.js></script><script src=/js/app.565e5109.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-0932aaee.a4dc5d43.css rel=prefetch><link href=/css/chunk-0d735038.6e32707c.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-406d55f6.799c63e8.css rel=prefetch><link href=/css/chunk-44bf6158.e583287e.css rel=prefetch><link href=/css/chunk-649f2f34.66538457.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/js/chunk-0932aaee.987a0d9c.js rel=prefetch><link href=/js/chunk-0d735038.99ff9fc3.js rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-2c359864.1901a494.js rel=prefetch><link href=/js/chunk-3385141a.361ae46e.js rel=prefetch><link href=/js/chunk-406d55f6.f5ca81e9.js rel=prefetch><link href=/js/chunk-44bf6158.1c8d756a.js rel=prefetch><link href=/js/chunk-4fe8dd4f.0b4915be.js rel=prefetch><link href=/js/chunk-649f2f34.1c274443.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/css/app.d144942e.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.5dca95d7.js rel=preload as=script><link href=/js/chunk-vendors.0cce4d14.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.d144942e.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.0cce4d14.js></script><script src=/js/app.5dca95d7.js></script></body></html>
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/app.565e5109.js
+++ b/zhiquanquan/app/front/entry/public/js/app.565e5109.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-0af0a551.5deca353.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-0af0a551.5deca353.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0af0a551"],{"4b082":function(e,t,a){"use strict";var o=a("b3e1"),n=a.n(o);n.a},b3e1:function(e,t,a){},be4f:function(e,t,a){"use strict";a.r(t);var o=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_content"},[a("div",{staticClass:"brand_header"},[a("span",{on:{click:e.goBack}},[a("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),a("span",[e._v("Excel批量上传商标")])]),a("div",{staticClass:"brand_content_upload"},[e._m(0),a("div",[a("Upload",{ref:"upload",attrs:{data:e.d,action:e.action,accept:".xls, .xlsx","on-success":e.handleSuccess,"before-upload":e.handleBeforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传Csv文件")])],1),a("Button",{attrs:{type:"primary"},on:{click:e.check}},[e._v("发布")])],1)]),a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}}),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("Form",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{model:e.formItem,"label-position":"left",rules:e.ruleValidate}},[a("FormItem",{attrs:{label:"批次名称",prop:"name"}},[a("Input",{attrs:{placeholder:""},model:{value:e.formItem.name,callback:function(t){e.$set(e.formItem,"name",t)},expression:"formItem.name"}})],1)],1),a("p",[e._v("发布后平台审核人员会在1个工作日内审核上架，请耐心等待")])],1)],1)},n=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("p",[e._v(" 第一次上传请下载 "),a("a",{attrs:{href:"https://gsb-zc.oss-cn-beijing.aliyuncs.com/%E5%95%86%E6%A0%87%E6%A8%A1%E7%89%88.csv",download:"商标上传模版.csv"}},[e._v("商标上传模板")]),e._v(" ，并严格按模板提供内容填入商标信息。 ")])}],r=(a("7f7f"),a("a481"),a("c1df")),s=a.n(r),c=a("0086"),i=a("60b7"),l=a("06d3"),u=a("7e1e"),d=(a("c276"),{components:{BizTable:l["a"],Forms:c["a"]},data:function(){return{fileurl:"",modal1:!1,action:"",d:{},formItem:{name:""},ruleValidate:{name:[{required:!1,message:"",trigger:"blur"}]}}},methods:{goBack:function(){this.$router.go(-1)},handleSuccess:function(e,t,a){var o=this.loadXML(e),n=o.documentElement.getElementsByTagName("Location")[0].textContent;this.fileurl=n},loadXML:function(e){var t=null;if(!window.DOMParser&&window.ActiveXObject)for(var a=["MSXML.2.DOMDocument.6.0","MSXML.2.DOMDocument.3.0","Microsoft.XMLDOM"],o=0;o<a.length;o++)try{t=new ActiveXObject(a[o]),t.async=!1,t.loadXML(e);break}catch(r){}else{if(!(window.DOMParser&&document.implementation&&document.implementation.createDocument))return null;try{var n=new DOMParser;t=n.parseFromString(e,"text/xml")}catch(r){console.log(r)}}return t},handleBeforeUpload:function(e){this.$refs.upload.clearFiles();var t=new Date;return this.d.key="zc_"+Math.round(500*Math.random())+t.getMonth()+t.getTime()+t.getFullYear()+t.getDate()+t.getHours()+t.getMinutes()+t.getSeconds()+t.getMilliseconds()+e.name.replace(" ",""),!0},check:function(){if(!this.fileurl)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){var e=this;this.$refs.forminfo.validate((function(t){t?e.publish(e.formItem.name):e.modal1=!0}))},cancel:function(){},publish:function(e){var t=this;Object(u["f"])("/web/trademark/trademarkCtl/excelpublish",{file_url:this.fileurl,name:e,channel_name:this.$store.state.user.userobj.company.name}).then((function(e){-200!=e.data.status?(t.$Message.success("发布成功"),t.$refs.bt.fetchData(),t.$refs.upload.clearFiles(),t.fileurl=""):(t.$Message.error("发布失败"),console.log("details err:",e))})).catch((function(e){t.$Message.error("发布失败"),console.log("details err:",e)}))},onexec:function(e,t){var a=this;"info"===e&&Object(u["f"])("/web/trademark/trademarkCtl/getidlist",{upload_id:t.id}).then((function(e){if(-200!=e.data.status){var t=e.data.data.map((function(e){return e.trademark_id}));a.$router.push({name:"originmanage_order",query:{ids:t}})}else console.log("details err:",e)})).catch((function(e){console.log("details err:",e)}))},formatCol:function(e,t,a){var o=e[t];return"created_at"===t?o=s()(o).format("YYYY-MM-DD"):"status"===t&&(o=0==o?"处理中":"处理完成"),o}},mounted:function(){var e=this,t="/web/common/uploadCtl/getOssConfig";Object(i["a"])(t,null).then((function(t){if(200==t.status){var a=t.data;e.d["key"]="key",e.d["Bucket"]=a.Bucket,e.d["OSSAccessKeyId"]=a.OSSAccessKeyId,e.d["Signature"]=a.Signature,e.d["policy"]=a.policy,e.d["success_action_status"]=a.success_action_status,e.action=a.url}else console.log("cofig fetch failuer")}))},watch:{}}),f=d,m=(a("4b082"),a("2877")),h=Object(m["a"])(f,o,n,!1,null,"51de60a6",null);t["default"]=h.exports}}]);
\ No newline at end of file
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-44bf6158"],{"242b":function(e,t,a){"use strict";var o=a("54a8"),n=a.n(o);n.a},"54a8":function(e,t,a){},be4f:function(e,t,a){"use strict";a.r(t);var o=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_content"},[a("div",{staticClass:"brand_header"},[a("span",{on:{click:e.goBack}},[a("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),a("span",[e._v("Excel批量上传商标")])]),a("div",{staticClass:"brand_content_upload"},[e._m(0),a("div",[a("Upload",{ref:"upload",attrs:{data:e.d,action:e.action,accept:".xls, .xlsx","on-success":e.handleSuccess,"before-upload":e.handleBeforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传文件")])],1),a("Button",{attrs:{type:"primary"},on:{click:e.check}},[e._v("发布")])],1)]),a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}}),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("Form",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{model:e.formItem,"label-position":"left",rules:e.ruleValidate}},[a("FormItem",{attrs:{label:"批次名称",prop:"name"}},[a("Input",{attrs:{placeholder:""},model:{value:e.formItem.name,callback:function(t){e.$set(e.formItem,"name",t)},expression:"formItem.name"}})],1)],1),a("p",[e._v("发布后平台审核人员会在1个工作日内审核上架，请耐心等待")])],1)],1)},n=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("p",[e._v(" 第一次上传请下载 "),a("a",{attrs:{href:"https://gsb-zc.oss-cn-beijing.aliyuncs.com/%E5%95%86%E6%A0%87%E6%A8%A1%E7%89%88.xlsx",download:"商标上传模版.xlsx"}},[e._v("商标上传模板")]),e._v(" ，并严格按模板提供内容填入商标信息。 ")])}],r=(a("7f7f"),a("a481"),a("c1df")),s=a.n(r),c=a("0086"),l=a("60b7"),i=a("06d3"),u=a("7e1e"),d=(a("c276"),{components:{BizTable:i["a"],Forms:c["a"]},data:function(){return{fileurl:"",modal1:!1,action:"",d:{},formItem:{name:""},ruleValidate:{name:[{required:!1,message:"",trigger:"blur"}]}}},methods:{goBack:function(){this.$router.go(-1)},handleSuccess:function(e,t,a){var o=this.loadXML(e),n=o.documentElement.getElementsByTagName("Location")[0].textContent;this.fileurl=n},loadXML:function(e){var t=null;if(!window.DOMParser&&window.ActiveXObject)for(var a=["MSXML.2.DOMDocument.6.0","MSXML.2.DOMDocument.3.0","Microsoft.XMLDOM"],o=0;o<a.length;o++)try{t=new ActiveXObject(a[o]),t.async=!1,t.loadXML(e);break}catch(r){}else{if(!(window.DOMParser&&document.implementation&&document.implementation.createDocument))return null;try{var n=new DOMParser;t=n.parseFromString(e,"text/xml")}catch(r){console.log(r)}}return t},handleBeforeUpload:function(e){this.$refs.upload.clearFiles();var t=new Date;return this.d.key="zc_"+Math.round(500*Math.random())+t.getMonth()+t.getTime()+t.getFullYear()+t.getDate()+t.getHours()+t.getMinutes()+t.getSeconds()+t.getMilliseconds()+e.name.replace(" ",""),!0},check:function(){if(!this.fileurl)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){var e=this;this.$refs.forminfo.validate((function(t){t?e.publish(e.formItem.name):e.modal1=!0}))},cancel:function(){},publish:function(e){var t=this;Object(u["f"])("/web/trademark/trademarkCtl/excelpublish",{file_url:this.fileurl,name:e,channel_name:this.$store.state.user.userobj.company.name}).then((function(e){-200!=e.data.status?(t.$Message.success("发布成功"),t.$refs.bt.fetchData(),t.$refs.upload.clearFiles(),t.fileurl=""):(t.$Message.error("发布失败"),console.log("details err:",e))})).catch((function(e){t.$Message.error("发布失败"),console.log("details err:",e)}))},onexec:function(e,t){var a=this;"info"===e&&Object(u["f"])("/web/trademark/trademarkCtl/getidlist",{upload_id:t.id}).then((function(e){if(-200!=e.data.status){var t=e.data.data.map((function(e){return e.trademark_id}));a.$router.push({name:"originmanage_order",query:{ids:t}})}else console.log("details err:",e)})).catch((function(e){console.log("details err:",e)}))},formatCol:function(e,t,a){var o=e[t];return"created_at"===t?o=s()(o).format("YYYY-MM-DD"):"status"===t&&(o=0==o?"处理中":"处理完成"),o}},mounted:function(){var e=this,t="/web/common/uploadCtl/getOssConfig";Object(l["a"])(t,null).then((function(t){if(200==t.status){var a=t.data;e.d["key"]="key",e.d["Bucket"]=a.Bucket,e.d["OSSAccessKeyId"]=a.OSSAccessKeyId,e.d["Signature"]=a.Signature,e.d["policy"]=a.policy,e.d["success_action_status"]=a.success_action_status,e.action=a.url}else console.log("cofig fetch failuer")}))},watch:{}}),f=d,m=(a("242b"),a("2877")),h=Object(m["a"])(f,o,n,!1,null,"2b820a40",null);t["default"]=h.exports}}]);
\ No newline at end of file