fix

0e675064 · 王悦 · 78b78c32 · 0e675064 · 0e675064 · 0e675064
Commit 0e675064 authored Sep 24, 2020 by 王悦
5 changed files
--- a/zhiquanquan/app/front/entry/public/css/chunk-bbc23892.7e4be69f.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-bbc23892.7e4be69f.css
-.brand_indentlist[data-v-66e75e89]{width:100%}.brand_indentlist .brand_header[data-v-66e75e89]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-66e75e89]{margin-right:10px}.brand_indentlist[data-v-66e75e89] .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-66e75e89] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.brand_indentlist[data-v-66e75e89] 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}
+.brand_indentlist[data-v-722c3b77]{width:100%}.brand_indentlist .brand_header[data-v-722c3b77]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-722c3b77]{margin-right:10px}.brand_indentlist[data-v-722c3b77] .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-722c3b77] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.brand_indentlist[data-v-722c3b77] 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
--- 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-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-39c52fdb.9e9f3cc1.css rel=prefetch><link href=/css/chunk-5a57b709.ee717d68.css rel=prefetch><link href=/css/chunk-6ab78853.938207ad.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-b19d69e2.067c914b.css rel=prefetch><link href=/css/chunk-bbc23892.7e4be69f.css rel=prefetch><link href=/css/chunk-ec96b2be.d51adf4c.css rel=prefetch><link href=/js/chunk-14b9857b.f18b7406.js rel=prefetch><link href=/js/chunk-2c359864.94ddcff1.js rel=prefetch><link href=/js/chunk-3385141a.01186988.js rel=prefetch><link href=/js/chunk-39c52fdb.aed7b524.js rel=prefetch><link href=/js/chunk-4fe8dd4f.a89b5545.js rel=prefetch><link href=/js/chunk-5a57b709.ef6e686d.js rel=prefetch><link href=/js/chunk-6ab78853.8b7595ca.js rel=prefetch><link href=/js/chunk-786333e2.eb817cf0.js rel=prefetch><link href=/js/chunk-b19d69e2.b926d17b.js rel=prefetch><link href=/js/chunk-bbc23892.0ce40a1d.js rel=prefetch><link href=/js/chunk-ec96b2be.f4a02fb4.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.9adac936.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.9adac936.js></script></body></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-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-24c556e8.c6383e38.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-39c52fdb.9e9f3cc1.css rel=prefetch><link href=/css/chunk-5a57b709.ee717d68.css rel=prefetch><link href=/css/chunk-6ab78853.938207ad.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-b19d69e2.067c914b.css rel=prefetch><link href=/css/chunk-ec96b2be.d51adf4c.css rel=prefetch><link href=/js/chunk-14b9857b.f18b7406.js rel=prefetch><link href=/js/chunk-24c556e8.c599ef97.js rel=prefetch><link href=/js/chunk-2c359864.94ddcff1.js rel=prefetch><link href=/js/chunk-3385141a.01186988.js rel=prefetch><link href=/js/chunk-39c52fdb.aed7b524.js rel=prefetch><link href=/js/chunk-4fe8dd4f.a89b5545.js rel=prefetch><link href=/js/chunk-5a57b709.ef6e686d.js rel=prefetch><link href=/js/chunk-6ab78853.8b7595ca.js rel=prefetch><link href=/js/chunk-786333e2.eb817cf0.js rel=prefetch><link href=/js/chunk-b19d69e2.b926d17b.js rel=prefetch><link href=/js/chunk-ec96b2be.f4a02fb4.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.e6c45844.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.e6c45844.js></script></body></html>
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/app.9adac936.js
+++ b/zhiquanquan/app/front/entry/public/js/app.9adac936.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-24c556e8.c599ef97.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-24c556e8.c599ef97.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-24c556e8"],{"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 n=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 n=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"operation",metaName:"operation_info",packageName:"trademark",tblheight:n-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,n){return a("Option",{key:n,attrs:{value:n}},[e._v(e._s(t))])})),1)],1)],1)},r=[],s=(a("7f7f"),a("6762"),a("2fdb"),a("ac6a"),a("06d3")),i=a("391e"),o=a("8770"),c=a("c1df"),u=a.n(c),l=a("db7f"),f=a("7e1e"),d=a("0139"),m=a.n(d),h={components:{BizTable:s["a"],DateTime:o["a"],PageSpace:i["a"]},data:function(){return{dic:l["a"],placeholder:m.a,marktype:"",modal1:!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.trademark_type_name}));Object(f["f"])("/web/trademark/trademarkctl/updatestrademarktype",{data:t}).then((function(t){1==t.data.status?(e.$refs.bt.fetchData(),e.$Message.success("设置成功"),e.marktype=""):e.$Message.error("设置失败"),e.marktype=""}))},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.trademark_type_name))return this.$Message.warning('只能更改状态为"停售"和"待审"的商标');"down"!==e&&0===this.$refs.bt.currentSels.length&&this.$Message.warning("请选择商标");var n=[];"lowershelf"!==e&&"uppershelf"!==e||this.$refs.bt.currentSels.filter((function(e){return["停售","待审"].includes(e.trademark_type_name)}));var r="down"===e?[t]:n;e="down"===e?"lowershelf":e,Object(f["j"])(r,e).then((function(t){1==t.data.status&&(a.$Message.success("".concat("lowershelf"===e?"下架":"上架","成功")),a.$refs.bt.fetchData())})).catch((function(t){a.$Message.error("".concat("lowershelf"===e?"下架":"上架","出错"))}))}else"uppershelf"===e||"settype"===e&&(0===this.$refs.bt.currentSels.length?this.$Message.warning("请选择商标"):this.modal1=!0)},formatCol:function(e,t,a){var n=e[t];if("created_at"===t)n=u()(n).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t]||m.a,'"/>');"deadline"===t?n=u()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+u()(e["tm_end_day"]||0).format("YYYY-MM-DD"):"publishinfo"===t?n=(e["contacts"]||"")+"<br/>"+(e["mobile"]||""):"name"===t?n=e["name"]||e["excelName"]:"publish_status"===t&&(n=e["publish_status_name"])}return n}}},p=h,g=(a("f716"),a("680e"),a("2877")),b=Object(g["a"])(p,n,r,!1,null,"722c3b77",null);t["default"]=b.exports},"391e":function(e,t,a){"use strict";var n=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)},r=[],s=a("6db5"),i=s["a"],o=a("2877"),c=Object(o["a"])(i,n,r,!1,null,null,null);t["a"]=c.exports},"680e":function(e,t,a){"use strict";var n=a("0368"),r=a.n(n);r.a},"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"),n=a.get()[0],r=window.innerHeight-n.offsetTop-t.advalue;t.frameHeight=r,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},c665:function(e,t,a){},f716:function(e,t,a){"use strict";var n=a("c665"),r=a.n(n);r.a}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-bbc23892.0ce40a1d.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-bbc23892.0ce40a1d.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-bbc23892"],{"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 n=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 n=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"operation",metaName:"operation_info",packageName:"trademark",tblheight:n-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,n){return a("Option",{key:n,attrs:{value:n}},[e._v(e._s(t))])})),1)],1)],1)},r=[],s=(a("7f7f"),a("6762"),a("2fdb"),a("ac6a"),a("06d3")),i=a("391e"),o=a("8770"),c=a("c1df"),u=a.n(c),l=a("db7f"),f=a("7e1e"),d=a("0139"),m=a.n(d),h={components:{BizTable:s["a"],DateTime:o["a"],PageSpace:i["a"]},data:function(){return{dic:l["a"],placeholder:m.a,marktype:"",modal1:!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.trademark_type_name}));Object(f["f"])("/web/trademark/trademarkctl/updatestrademarktype",{data:t}).then((function(t){1==t.data.status?(e.$refs.bt.fetchData(),e.$Message.success("设置成功"),marktype=""):e.$Message.error("设置失败"),marktype=""}))},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.trademark_type_name))return this.$Message.warning('只能更改状态为"停售"和"待审"的商标');"down"!==e&&0===this.$refs.bt.currentSels.length&&this.$Message.warning("请选择商标");var n=[];"lowershelf"!==e&&"uppershelf"!==e||this.$refs.bt.currentSels.filter((function(e){return["停售","待审"].includes(t.trademark_type_name)}));var r="down"===e?[t]:n;e="down"===e?"lowershelf":e,Object(f["j"])(r,e).then((function(t){1==t.data.status&&(a.$Message.success("".concat("lowershelf"===e?"下架":"上架","成功")),a.$refs.bt.fetchData())})).catch((function(t){a.$Message.error("".concat("lowershelf"===e?"下架":"上架","出错"))}))}else"uppershelf"===e||"settype"===e&&(0===this.$refs.bt.currentSels.length?this.$Message.warning("请选择商标"):this.modal1=!0)},formatCol:function(e,t,a){var n=e[t];if("created_at"===t)n=u()(n).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t]||m.a,'"/>');"deadline"===t?n=u()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+u()(e["tm_end_day"]||0).format("YYYY-MM-DD"):"publishinfo"===t?n=(e["contacts"]||"")+"<br/>"+(e["mobile"]||""):"name"===t?n=e["name"]||e["excelName"]:"publish_status"===t&&(n=e["publish_status_name"])}return n}}},p=h,b=(a("fb0d"),a("680e"),a("2877")),g=Object(b["a"])(p,n,r,!1,null,"66e75e89",null);t["default"]=g.exports},"391e":function(e,t,a){"use strict";var n=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)},r=[],s=a("6db5"),i=s["a"],o=a("2877"),c=Object(o["a"])(i,n,r,!1,null,null,null);t["a"]=c.exports},"680e":function(e,t,a){"use strict";var n=a("0368"),r=a.n(n);r.a},"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"),n=a.get()[0],r=window.innerHeight-n.offsetTop-t.advalue;t.frameHeight=r,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},"9b44":function(e,t,a){},fb0d:function(e,t,a){"use strict";var n=a("9b44"),r=a.n(n);r.a}}]);
\ No newline at end of file