fix

4cbd9aaf · 王悦 · e9016f90 · 4cbd9aaf · e9016f90 · 4cbd9aaf
Commit 4cbd9aaf authored Sep 09, 2020 by 王悦
7 changed files
--- a/zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
+++ b/zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
@@ -38,15 +38,15 @@ class TrademarkCtl extends CtlBase {
        if (p.search) {
            if (p.search.name)
                query.actionBody.name = p.search.name;
-            else if (p.search.code)
+            if (p.search.code)
                query.actionBody.code = p.search.code;
-            else if (p.search.channel_name)
+            if (p.search.channel_name)
                query.actionBody.name = p.search.channel_name;
-            else if (p.search.tm_start_day)
+            if (p.search.tm_start_day)
                query.actionBody.tm_start_day = p.search.tm_start_day;
-            else if (p.search.tm_end_day)
+            if (p.search.tm_end_day)
                query.actionBody.tm_end_day = p.search.tm_end_day;
-            else if (p.search.ids)
+            if (p.search.ids)
                query.actionBody.tmList = p.search.ids;
        }
        let rtn = await this.execClient.execPost(query, tmurl);

--- a/zhiquanquan/app/front/entry/public/css/chunk-953e9550.9e8d26ba.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-953e9550.9e8d26ba.css
-.brand_content[data-v-02fa91a4]{width:100%}.brand_content .brand_header[data-v-02fa91a4]{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-02fa91a4]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-02fa91a4]: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-02fa91a4]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-02fa91a4]{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-02fa91a4]{color:#1890ff}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/css/chunk-9badb61a.fb6cfaf0.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-9badb61a.fb6cfaf0.css
+.brand_content[data-v-3ff09ce0]{width:100%}.brand_content .brand_header[data-v-3ff09ce0]{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-3ff09ce0]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-3ff09ce0]: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-3ff09ce0]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-3ff09ce0]{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-3ff09ce0]{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-05048d1e.544a3e1d.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-51d8db1f.84955839.css rel=prefetch><link href=/css/chunk-64606e9c.25bb1211.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-953e9550.9e8d26ba.css rel=prefetch><link href=/js/chunk-05048d1e.53f424c5.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-4fe8dd4f.c7f5a9a6.js rel=prefetch><link href=/js/chunk-51d8db1f.a77526ea.js rel=prefetch><link href=/js/chunk-64606e9c.16157db2.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-953e9550.0769a010.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.0389b214.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.0389b214.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-05048d1e.544a3e1d.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-51d8db1f.84955839.css rel=prefetch><link href=/css/chunk-64606e9c.25bb1211.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-9badb61a.fb6cfaf0.css rel=prefetch><link href=/js/chunk-05048d1e.53f424c5.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-4fe8dd4f.c7f5a9a6.js rel=prefetch><link href=/js/chunk-51d8db1f.a77526ea.js rel=prefetch><link href=/js/chunk-64606e9c.16157db2.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-9badb61a.658d3273.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.c477d7b7.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.c477d7b7.js></script></body></html>
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/app.0389b214.js
+++ b/zhiquanquan/app/front/entry/public/js/app.0389b214.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-953e9550.0769a010.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-953e9550.0769a010.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-953e9550"],{"959f":function(e,t,a){"use strict";var n=a("fb4e"),o=a.n(n);o.a},be4f:function(e,t,a){"use strict";a.r(t);var n=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",{attrs:{action:"","before-upload":e.beforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传Csv文件")]),e._v(" "+e._s(e.note)+" ")],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("p",[e._v("是否发布所有商标？")])])],1)},o=[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(" ，并严格按模板提供内容填入商标信息。 ")])}],s=(a("7f7f"),a("ac6a"),a("c1df")),c=a.n(s),r=a("06d3"),i=a("7e1e"),l=a("c276"),d={components:{BizTable:r["a"]},data:function(){return{note:"点击上传Csv文件",publishdata:[],modal1:!1}},methods:{goBack:function(){this.$router.go(-1)},beforeUpload:function(e){var t=this;return Object(l["e"])(e).then((function(e){e.forEach((function(e){e.channel_name=t.$store.state.user.userobj.company.name,e.channel_code=t.$store.state.user.userobj.company.id,e.execlName=e.name})),t.publishdata=e,t.note="文件已上传"})).catch((function(e){t.$Notice.warning({title:"上传出错",desc:"请检查文件格式"})})),!1},check:function(){if(0===this.publishdata.length)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){this.publish()},cancel:function(){},publish:function(){var e=this;Object(i["f"])("/web/trademark/trademarkCtl/publish",this.publishdata).then((function(t){-200!=t.data.status?(e.note="点击上传Csv文件",e.$Message.success("发布成功"),e.$refs.bt.fetchData()):(e.$Message.error("发布失败"),console.log("details err:",t))})).catch((function(t){e.$Message.error("发布失败"),console.log("details err:",t)}))},onexec:function(e,t){var a=this;"info"===e&&Object(i["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.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 n=e[t];return"created_at"===t?n=c()(n).format("YYYY-MM-DD"):"status"===t&&(n=0==n?"处理中":"处理完成"),n}},mounted:function(){},watch:{}},u=d,f=(a("959f"),a("2877")),h=Object(f["a"])(u,n,o,!1,null,"02fa91a4",null);t["default"]=h.exports},fb4e:function(e,t,a){}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-9badb61a.658d3273.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-9badb61a.658d3273.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-9badb61a"],{9081:function(t,e,a){},be4f:function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"brand_content"},[a("div",{staticClass:"brand_header"},[a("span",{on:{click:t.goBack}},[a("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),a("span",[t._v("Excel批量上传商标")])]),a("div",{staticClass:"brand_content_upload"},[t._m(0),a("div",[a("Upload",{attrs:{action:"","before-upload":t.beforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[t._v("上传Csv文件")]),t._v(" "+t._s(t.note)+" ")],1),a("Button",{attrs:{type:"primary"},on:{click:t.check}},[t._v("发布")])],1)]),a("BizTable",{ref:"bt",attrs:{formatCol:t.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:t.adjustHeight-120,isMulti:"",refvalidatemethod:t.validmethod,savebefore:t.beforesave,editbefore:t.beforedit,addbefore:t.beforeadd},on:{onexec:t.onexec,oninitbtn:t.oninitbtn}}),a("Modal",{attrs:{title:"提示"},on:{"on-ok":t.ok,"on-cancel":t.cancel},model:{value:t.modal1,callback:function(e){t.modal1=e},expression:"modal1"}},[a("p",[t._v("是否发布所有商标？")])])],1)},o=[function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("p",[t._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"}},[t._v("商标上传模板")]),t._v(" ，并严格按模板提供内容填入商标信息。 ")])}],c=(a("7f7f"),a("ac6a"),a("c1df")),r=a.n(c),s=a("06d3"),i=a("7e1e"),l=a("c276"),d={components:{BizTable:s["a"]},data:function(){return{note:"点击上传Csv文件",publishdata:[],modal1:!1}},methods:{goBack:function(){this.$router.go(-1)},beforeUpload:function(t){var e=this;return Object(l["e"])(t).then((function(t){t.forEach((function(t){t.channel_name=e.$store.state.user.userobj.company.name,t.channel_code=e.$store.state.user.userobj.company.id,t.execlName=t.name})),e.publishdata=t,e.note="文件已上传"})).catch((function(t){e.$Notice.warning({title:"上传出错",desc:"请检查文件格式"})})),!1},check:function(){if(0===this.publishdata.length)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){this.publish()},cancel:function(){},publish:function(){var t=this;Object(i["f"])("/web/trademark/trademarkCtl/publish",this.publishdata).then((function(e){-200!=e.data.status?(t.note="点击上传Csv文件",t.$Message.success("发布成功"),t.$refs.bt.fetchData()):(t.$Message.error("发布失败"),console.log("details err:",e))})).catch((function(e){t.$Message.error("发布失败"),console.log("details err:",e)}))},onexec:function(t,e){var a=this;"info"===t&&Object(i["f"])("/web/trademark/trademarkCtl/getidlist",{upload_id:e.id}).then((function(t){if(-200!=t.data.status){var e=t.data.data.map((function(t){return t.trademark_id}));a.$router.push({name:"originmanage_order",query:{ids:e}})}else console.log("details err:",t)})).catch((function(t){console.log("details err:",t)}))},formatCol:function(t,e,a){var n=t[e];return"created_at"===e?n=r()(n).format("YYYY-MM-DD"):"status"===e&&(n=0==n?"处理中":"处理完成"),n}},mounted:function(){},watch:{}},u=d,f=(a("c202"),a("2877")),h=Object(f["a"])(u,n,o,!1,null,"3ff09ce0",null);e["default"]=h.exports},c202:function(t,e,a){"use strict";var n=a("9081"),o=a.n(n);o.a}}]);
\ No newline at end of file