Merge branch 'fix-master-tips' into test

dist/static/js/chunk-7c2f4fe6.13bc5f69.js

+<<<<<<< HEAD:dist/static/js/chunk-7c2f4fe6.e0382123.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,o,e){"use strict";e.d(o,"g",(function(){return r})),e.d(o,"i",(function(){return a})),e.d(o,"b",(function(){return c})),e.d(o,"d",(function(){return u})),e.d(o,"a",(function(){return i})),e.d(o,"l",(function(){return s})),e.d(o,"j",(function(){return l})),e.d(o,"c",(function(){return d})),e.d(o,"m",(function(){return f})),e.d(o,"e",(function(){return h})),e.d(o,"h",(function(){return p})),e.d(o,"f",(function(){return m})),e.d(o,"k",(function(){return g}));var n=e("b775");function r(t){return Object(n["a"])({url:"/system/index/getInfo",method:"get",params:t})}function a(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function c(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(n["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function h(t){return Object(n["a"])({url:"/local/cate",method:"get",params:t})}function p(t){return Object(n["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function m(t){return Object(n["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(n["a"])({url:"/local/qualification/list",method:"get",params:t})}},"74bc":function(t,o,e){"use strict";e.r(o);var n=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("div")},r=[],a=e("5c96"),c=e("6b1f"),u=(e("b775"),{name:"Platformlogin",data:function(){return{ssourl:""}},created:function(){this.getssourl()},methods:{getssourl:function(){var t=this,o=window.location.host,e={domain:o};this.$store.dispatch("getssourl",e).then((function(o){1==o.code&&(t.ssourl=o.data.sso_url,t.gotosso())})).catch((function(){}))},gotosso:function(){var t=this,o=this.$route.query.ticket;this.$store.dispatch("Login",{ticket:o}).then((function(o){if(""!=o.token)Object(c["j"])().then((function(o){if(1===o.code)switch(o.data.state){case 0:switch(o.data.status){case 0:t.$router.push({path:"/process"});break;case 1:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var e=o.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:e}});break}else o&&o.msg?a["Notification"].error({title:"提示：",message:o.msg}):a["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var e=window.location.host,n=document.location.protocol,r=t;setTimeout((function(){window.location.href=n+"//"+r.ssourl+"/api/v2/logout?redirect="+n+"//"+e+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var o=window.location.host,e=document.location.protocol,n=t;setTimeout((function(){window.location.href=e+"//"+n.ssourl+"/api/v2/logout?redirect="+e+"//"+o+"/login"}),1e3),t.loading=!1}))}}}),i=u,s=e("2877"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
+//# sourceMappingURL=chunk-7c2f4fe6.e0382123.js.map
+=======
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,o,e){"use strict";e.d(o,"g",(function(){return r})),e.d(o,"i",(function(){return a})),e.d(o,"b",(function(){return c})),e.d(o,"d",(function(){return u})),e.d(o,"a",(function(){return i})),e.d(o,"l",(function(){return s})),e.d(o,"j",(function(){return l})),e.d(o,"c",(function(){return d})),e.d(o,"m",(function(){return f})),e.d(o,"e",(function(){return h})),e.d(o,"h",(function(){return p})),e.d(o,"f",(function(){return m})),e.d(o,"k",(function(){return g}));var n=e("b775");function r(t){return Object(n["a"])({url:"/system/index/getInfo",method:"get",params:t})}function a(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function c(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(n["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function h(t){return Object(n["a"])({url:"/local/cate",method:"get",params:t})}function p(t){return Object(n["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function m(t){return Object(n["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(n["a"])({url:"/local/qualification/list",method:"get",params:t})}},"74bc":function(t,o,e){"use strict";e.r(o);var n=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("div")},r=[],a=e("5c96"),c=e("6b1f"),u=(e("b775"),{name:"Platformlogin",data:function(){return{ssourl:""}},created:function(){this.getssourl()},methods:{getssourl:function(){var t=this,o=window.location.host,e={domain:o};this.$store.dispatch("getssourl",e).then((function(o){1==o.code&&(t.ssourl=o.data.sso_url,t.gotosso())})).catch((function(){}))},gotosso:function(){var t=this,o=this.$route.query.ticket;this.$store.dispatch("Login",{ticket:o}).then((function(o){if(""!=o.token)Object(c["j"])().then((function(o){if(1===o.code)switch(o.data.state){case 0:switch(o.data.status){case 0:t.$router.push({path:"/process"});break;case 1:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var e=o.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:e}});break}else o&&o.msg?a["Notification"].error({title:"提示：",message:o.msg}):a["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var e=window.location.host,n=document.location.protocol,r=t;setTimeout((function(){window.location.href=n+"//"+r.ssourl+"/api/v2/logout?redirect="+n+"//"+e+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var o=window.location.host,e=document.location.protocol,n=t;setTimeout((function(){window.location.href=e+"//"+n.ssourl+"/api/v2/logout?redirect="+e+"//"+o+"/login"}),1e3),t.loading=!1}))}}}),i=u,s=e("2877"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
+>>>>>>> fix-master-tips:dist/static/js/chunk-7c2f4fe6.13bc5f69.js

dist/static/js/chunk-7c2f4fe6.e0382123.js

+<<<<<<< HEAD:dist/static/js/chunk-7c2f4fe6.e0382123.js
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,o,e){"use strict";e.d(o,"g",(function(){return r})),e.d(o,"i",(function(){return a})),e.d(o,"b",(function(){return c})),e.d(o,"d",(function(){return u})),e.d(o,"a",(function(){return i})),e.d(o,"l",(function(){return s})),e.d(o,"j",(function(){return l})),e.d(o,"c",(function(){return d})),e.d(o,"m",(function(){return f})),e.d(o,"e",(function(){return h})),e.d(o,"h",(function(){return p})),e.d(o,"f",(function(){return m})),e.d(o,"k",(function(){return g}));var n=e("b775");function r(t){return Object(n["a"])({url:"/system/index/getInfo",method:"get",params:t})}function a(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function c(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(n["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function h(t){return Object(n["a"])({url:"/local/cate",method:"get",params:t})}function p(t){return Object(n["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function m(t){return Object(n["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(n["a"])({url:"/local/qualification/list",method:"get",params:t})}},"74bc":function(t,o,e){"use strict";e.r(o);var n=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("div")},r=[],a=e("5c96"),c=e("6b1f"),u=(e("b775"),{name:"Platformlogin",data:function(){return{ssourl:""}},created:function(){this.getssourl()},methods:{getssourl:function(){var t=this,o=window.location.host,e={domain:o};this.$store.dispatch("getssourl",e).then((function(o){1==o.code&&(t.ssourl=o.data.sso_url,t.gotosso())})).catch((function(){}))},gotosso:function(){var t=this,o=this.$route.query.ticket;this.$store.dispatch("Login",{ticket:o}).then((function(o){if(""!=o.token)Object(c["j"])().then((function(o){if(1===o.code)switch(o.data.state){case 0:switch(o.data.status){case 0:t.$router.push({path:"/process"});break;case 1:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var e=o.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:e}});break}else o&&o.msg?a["Notification"].error({title:"提示：",message:o.msg}):a["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var e=window.location.host,n=document.location.protocol,r=t;setTimeout((function(){window.location.href=n+"//"+r.ssourl+"/api/v2/logout?redirect="+n+"//"+e+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var o=window.location.host,e=document.location.protocol,n=t;setTimeout((function(){window.location.href=e+"//"+n.ssourl+"/api/v2/logout?redirect="+e+"//"+o+"/login"}),1e3),t.loading=!1}))}}}),i=u,s=e("2877"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
-//# sourceMappingURL=chunk-7c2f4fe6.e0382123.js.map
+//# sourceMappingURL=chunk-7c2f4fe6.e0382123.js.map
\ No newline at end of file
+=======
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,o,e){"use strict";e.d(o,"g",(function(){return r})),e.d(o,"i",(function(){return a})),e.d(o,"b",(function(){return c})),e.d(o,"d",(function(){return u})),e.d(o,"a",(function(){return i})),e.d(o,"l",(function(){return s})),e.d(o,"j",(function(){return l})),e.d(o,"c",(function(){return d})),e.d(o,"m",(function(){return f})),e.d(o,"e",(function(){return h})),e.d(o,"h",(function(){return p})),e.d(o,"f",(function(){return m})),e.d(o,"k",(function(){return g}));var n=e("b775");function r(t){return Object(n["a"])({url:"/system/index/getInfo",method:"get",params:t})}function a(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function c(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(n["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function h(t){return Object(n["a"])({url:"/local/cate",method:"get",params:t})}function p(t){return Object(n["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function m(t){return Object(n["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(n["a"])({url:"/local/qualification/list",method:"get",params:t})}},"74bc":function(t,o,e){"use strict";e.r(o);var n=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("div")},r=[],a=e("5c96"),c=e("6b1f"),u=(e("b775"),{name:"Platformlogin",data:function(){return{ssourl:""}},created:function(){this.getssourl()},methods:{getssourl:function(){var t=this,o=window.location.host,e={domain:o};this.$store.dispatch("getssourl",e).then((function(o){1==o.code&&(t.ssourl=o.data.sso_url,t.gotosso())})).catch((function(){}))},gotosso:function(){var t=this,o=this.$route.query.ticket;this.$store.dispatch("Login",{ticket:o}).then((function(o){if(""!=o.token)Object(c["j"])().then((function(o){if(1===o.code)switch(o.data.state){case 0:switch(o.data.status){case 0:t.$router.push({path:"/process"});break;case 1:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var e=o.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:e}});break}else o&&o.msg?a["Notification"].error({title:"提示：",message:o.msg}):a["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var e=window.location.host,n=document.location.protocol,r=t;setTimeout((function(){window.location.href=n+"//"+r.ssourl+"/api/v2/logout?redirect="+n+"//"+e+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var o=window.location.host,e=document.location.protocol,n=t;setTimeout((function(){window.location.href=e+"//"+n.ssourl+"/api/v2/logout?redirect="+e+"//"+o+"/login"}),1e3),t.loading=!1}))}}}),i=u,s=e("2877"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
+>>>>>>> fix-master-tips:dist/static/js/chunk-7c2f4fe6.13bc5f69.js

dist/static/js/chunk-b0d57d44.a672684b.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-b0d57d44"],{"8dd8":function(o,e,t){},dd7b:function(o,e,t){"use strict";t.r(e);t("7ded"),t("a78e"),t("720d");var n,i,c={name:"Login",data:function(){return{codeUrl:"",cookiePassword:"",gwToken:"",loginForm:{username:"demo",password:"123456",rememberMe:!1,code:"",uuid:""},loginRules:{},loading:!1,redirect:void 0}},watch:{$route:{handler:function(o){this.redirect=o.query&&o.query.redirect},immediate:!0}},created:function(){this.getssourl()},methods:{getssourl:function(){var o=this,e=window.location.host,t={domain:e};this.$store.dispatch("getssourl",t).then((function(e){1==e.code&&(o.ssourl=e.data.sso_url,o.tiaozuan())})).catch((function(){}))},tiaozuan:function(){if(console.log(this.gwToken),""==this.gwToken||null==this.gwToken){var o=window.location.host,e=document.location.protocol,t=this;setTimeout((function(){window.location.href=e+"//"+t.ssourl+"/login.html?redirect="+e+"//"+o+"/platformlogin"}),1e3)}}}},s=c,d=(t("eecc"),t("2877")),r=Object(d["a"])(s,n,i,!1,null,null,null);e["default"]=r.exports},eecc:function(o,e,t){"use strict";t("8dd8")}}]);
-//# sourceMappingURL=chunk-b0d57d44.a672684b.js.map
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-b0d57d44"],{"8dd8":function(o,e,t){},dd7b:function(o,e,t){"use strict";t.r(e);t("7ded"),t("a78e"),t("720d");var n,i,c={name:"Login",data:function(){return{codeUrl:"",cookiePassword:"",gwToken:"",loginForm:{username:"demo",password:"123456",rememberMe:!1,code:"",uuid:""},loginRules:{},loading:!1,redirect:void 0}},watch:{$route:{handler:function(o){this.redirect=o.query&&o.query.redirect},immediate:!0}},created:function(){this.getssourl()},methods:{getssourl:function(){var o=this,e=window.location.host,t={domain:e};this.$store.dispatch("getssourl",t).then((function(e){1==e.code&&(o.ssourl=e.data.sso_url,o.tiaozuan())})).catch((function(){}))},tiaozuan:function(){if(console.log(this.gwToken),""==this.gwToken||null==this.gwToken){var o=window.location.host,e=document.location.protocol,t=this;setTimeout((function(){window.location.href=e+"//"+t.ssourl+"/login.html?redirect="+e+"//"+o+"/platformlogin"}),1e3)}}}},s=c,d=(t("eecc"),t("2877")),r=Object(d["a"])(s,n,i,!1,null,null,null);e["default"]=r.exports},eecc:function(o,e,t){"use strict";t("8dd8")}}]);
\ No newline at end of file
\ No newline at end of file

src/views/system/settings/setpsd.vue

@@ -313,7 +313,7 @@
           if(res.code === 1) {
             this.$message({type:"success",message: '验证码发送成功'});
           }else {
-            this.$message({type:"error",message: '验证码发送失败'});
+            this.$message({type:"error",message: res.message ? res.message : '验证码发送失败'});
           }
         });
       },