Merge branch 'master' into oem-51

# Conflicts:
#	dist/index.html
#	dist/static/css/app.018ae2b6.css
#	dist/static/css/app.62dc0ccb.css
#	dist/static/css/app.89952327.css
#	dist/static/css/chunk-2cf0247a.06132cc6.css
#	dist/static/css/chunk-31be90b5.5818f70b.css
#	dist/static/css/chunk-395601c8.ef8037a3.css
#	dist/static/css/chunk-5cf2064d.55ffd948.css
#	dist/static/css/chunk-62b69e44.e789a15d.css
#	dist/static/css/chunk-7cc066d4.3cd35b9f.css
#	dist/static/css/chunk-7f2f7f9d.ca8aeaeb.css
#	dist/static/css/chunk-fd635f10.35744973.css
#	dist/static/js/chunk-2cf0247a.a36532bf.js
#	dist/static/js/chunk-395601c8.6ecf2107.js
#	dist/static/js/chunk-5139a94e.c9df300b.js
#	dist/static/js/chunk-54b56470.f476669a.js
#	dist/static/js/chunk-7c2f4fe6.d4d563ad.js
#	dist/static/js/chunk-7f2f7f9d.e9179369.js

dist/static/css/chunk-07e45201.2123e5ba.css

+.panel-group[data-v-3bf1987b]{margin-top:18px}.panel-group .card-panel-col[data-v-3bf1987b]{margin-bottom:32px}.panel-group .card-panel[data-v-3bf1987b]{height:108px;cursor:pointer;font-size:12px;position:relative;overflow:hidden;color:#666;background:#fff;box-shadow:4px 4px 40px rgba(0,0,0,.05);border-color:rgba(0,0,0,.05)}.panel-group .card-panel:hover .card-panel-icon-wrapper[data-v-3bf1987b]{color:#fff}.panel-group .card-panel:hover .icon-people[data-v-3bf1987b]{background:#40c9c6}.panel-group .card-panel:hover .icon-message[data-v-3bf1987b]{background:#36a3f7}.panel-group .card-panel:hover .icon-money[data-v-3bf1987b]{background:#f4516c}.panel-group .card-panel:hover .icon-shopping[data-v-3bf1987b]{background:#34bfa3}.panel-group .card-panel .icon-people[data-v-3bf1987b]{color:#40c9c6}.panel-group .card-panel .icon-message[data-v-3bf1987b]{color:#36a3f7}.panel-group .card-panel .icon-money[data-v-3bf1987b]{color:#f4516c}.panel-group .card-panel .icon-shopping[data-v-3bf1987b]{color:#34bfa3}.panel-group .card-panel .card-panel-icon-wrapper[data-v-3bf1987b]{float:left;margin:14px 0 0 14px;padding:16px;transition:all .38s ease-out;border-radius:6px}.panel-group .card-panel .card-panel-icon[data-v-3bf1987b]{float:left;font-size:48px}.panel-group .card-panel .xz-tip[data-v-3bf1987b]{float:left;background-color:#f4516c;color:#fff;width:24px;height:24px;border-radius:12px;line-height:24px;text-align:center;margin-top:18px;margin-left:-24px;animation:xzTip-data-v-3bf1987b 3s}.panel-group .card-panel .card-panel-description[data-v-3bf1987b]{float:right;font-weight:700;margin:26px;margin-left:0}.panel-group .card-panel .card-panel-description .card-panel-text[data-v-3bf1987b]{line-height:18px;color:rgba(0,0,0,.45);font-size:16px;margin-bottom:12px}.panel-group .card-panel .card-panel-description .card-panel-num[data-v-3bf1987b]{font-size:20px}@media (max-width:550px){.card-panel-description[data-v-3bf1987b]{display:none}.card-panel-icon-wrapper[data-v-3bf1987b]{float:none!important;width:100%;height:100%;margin:0!important}.card-panel-icon-wrapper .svg-icon[data-v-3bf1987b]{display:block;margin:14px auto!important;float:none!important}}.dashboard-promote .el-row[data-v-55a18f0e]{margin-bottom:20px;font-size:14px}.dashboard-promote .el-row .jz[data-v-55a18f0e]{height:500px}.dashboard-promote .el-row .kj[data-v-55a18f0e]{height:300px}.dashboard-promote .el-row .xx[data-v-55a18f0e]{height:200px}.git-res[data-v-55a18f0e]{margin-top:20px}.git-res .el-link[data-v-55a18f0e]{margin-right:30px}li[data-v-55a18f0e],ul[data-v-55a18f0e]{padding:0;margin:0;list-style:none}.product li[data-v-55a18f0e]{margin-bottom:20px;float:left;width:150px}.dashboard-editor-container[data-v-55a18f0e]{padding:32px;background-color:#f0f2f5;position:relative}.dashboard-editor-container .chart-wrapper[data-v-55a18f0e]{background:#fff;padding:16px 16px 0;margin-bottom:32px}@media (max-width:1024px){.chart-wrapper[data-v-55a18f0e]{padding:8px}}
\ No newline at end of file

dist/static/css/chunk-30c771e6.6ab5ebe0.css

+.to-review[data-v-bbf9fafa]{width:100%;height:100%;overflow:hidden}.to-review .logo-bg[data-v-bbf9fafa]{height:60px;background:#1890ff}.to-review .logo-bg img[data-v-bbf9fafa]{height:44px;margin:8px 0 8px 20px}.to-review .box-card[data-v-bbf9fafa]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.to-review .steps[data-v-bbf9fafa]{height:70px;width:60%;margin:40px auto 0}.to-review .steps[data-v-bbf9fafa] .el-step__title{font-size:16px;line-height:18px;padding-top:20px;color:#333}.to-review .el-step[data-v-bbf9fafa] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.to-review .el-step[data-v-bbf9fafa] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.to-review .el-step[data-v-bbf9fafa] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.to-review .el-step[data-v-bbf9fafa] .el-step__title.is-process{color:#000;font-weight:400}.to-review .el-step[data-v-bbf9fafa] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.to-review .el-step[data-v-bbf9fafa] .el-step__head.is-success .el-step__line{background-color:#1890ff}.to-review .el-step[data-v-bbf9fafa] .el-step__title.is-success{color:#000}.to-review .main[data-v-bbf9fafa]{width:100%;height:calc(66% - 120px);display:table}.to-review .main .fuck[data-v-bbf9fafa]{display:table-cell;vertical-align:middle}.to-review .main .fuck p[data-v-bbf9fafa]{text-align:center}.to-review .main .fuck p[data-v-bbf9fafa]:nth-child(2){font-size:24px;font-weight:700;padding:10px 0}
\ No newline at end of file

dist/static/css/chunk-4899b686.3c74399b.css

+.fill-store-inf[data-v-5a25e0c2]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-5a25e0c2]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-5a25e0c2] .el-card__body{height:calc(100% - 140px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-5a25e0c2]{height:60px;background:#1890ff}.logo-bg img[data-v-5a25e0c2]{height:44px;margin:8px 0 8px 20px}.steps[data-v-5a25e0c2]{height:70px;width:60%;margin:20px auto}.steps[data-v-5a25e0c2] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-5a25e0c2] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-5a25e0c2] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-5a25e0c2] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__title.is-success{color:#000}.main-con[data-v-5a25e0c2]{width:70%;margin:30px auto;overflow-y:scroll}.main-con .tips-text[data-v-5a25e0c2]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-5a25e0c2]:before{color:#e3c300}.main-con .uploadData[data-v-5a25e0c2]{display:inline-block}.main-con .uploadData[data-v-5a25e0c2] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-5a25e0c2] .el-upload,.main-con .uploadData[data-v-5a25e0c2] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-5a25e0c2] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-5a25e0c2] .avatar{width:100px;height:100px}.hiden-dom[data-v-5a25e0c2] .el-upload--picture-card{display:none!important}.idcard-tips-con[data-v-5a25e0c2]{display:flex;flex-direction:row;justify-content:normal;justify-items:center}.idcard-tips-con>p[data-v-5a25e0c2]{margin:0;padding:0 15px}.main-form-con[data-v-5a25e0c2]{margin-left:100px}.main-form-title[data-v-5a25e0c2]{color:#666;font-size:18px;font-weight:600;padding:0;margin:10px 0 10px -180px}.main-form-tips[data-v-5a25e0c2]{color:#aaa;font-size:14px;font-weight:400;padding:0}.confirm-btn[data-v-5a25e0c2]{width:50%;margin:40px auto 0}.confirm-btn p[data-v-5a25e0c2]{text-align:center}.read-fail-dialog[data-v-5a25e0c2] .el-dialog>.el-dialog__body>p{text-align:center;font-size:16px}.read-fail-dialog[data-v-5a25e0c2] .read-time-m{color:#f56c6c;font-size:18px;padding:0 5px}
\ No newline at end of file

dist/static/css/chunk-5168c511.d3829422.css

+.to-review[data-v-7cad85af]{width:100%;height:100%;overflow:hidden}.to-review .logo-bg[data-v-7cad85af]{height:60px;background:#1890ff}.to-review .logo-bg img[data-v-7cad85af]{height:44px;margin:8px 0 8px 20px}.to-review .box-card[data-v-7cad85af]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.to-review .steps[data-v-7cad85af]{height:70px;width:60%;margin:20px auto 20px}.to-review .el-step[data-v-7cad85af] .el-step__title{font-size:16px;line-height:18px;padding-top:20px;color:#333}.to-review .el-step[data-v-7cad85af] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.to-review .el-step[data-v-7cad85af] .el-step__head.is-success .el-step__line{background-color:#1890ff}.to-review .el-step[data-v-7cad85af] .el-step__head.is-process{color:red}.to-review .el-step[data-v-7cad85af] .el-step__title.is-process{color:red;font-weight:400}.to-review .el-steps[data-v-7cad85af] .el-step.is-horizontal .el-step__line{background-color:red}.to-review .el-step[data-v-7cad85af] .el-step__title.is-success{color:#000}.to-review .el-step[data-v-7cad85af] .el-step__title.is-error{color:red;font-weight:400}.to-review .main[data-v-7cad85af]{width:100%;height:calc(66% - 120px);display:table}.to-review .main .main-con[data-v-7cad85af]{display:table-cell;vertical-align:middle}.to-review .main .main-con p[data-v-7cad85af]{text-align:center}.to-review .main .main-con p[data-v-7cad85af]:nth-child(2){font-size:24px;font-weight:700;padding:0 0}
\ No newline at end of file

dist/static/css/chunk-5be5b3e2.1d48f9b5.css

+.entryDetails[data-v-4f064fe3]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-4f064fe3]{height:60px;background:#1890ff}.logo-bg img[data-v-4f064fe3]{height:44px;margin:8px 0 8px 20px}.main-con[data-v-4f064fe3]{width:70%;margin:30px auto 0}.main-con img[data-v-4f064fe3]{width:100%;height:calc(100% + 220px);margin:0 0}.confirm-btn[data-v-4f064fe3]{height:100px;width:50%;margin:30px auto 0}.confirm-btn p[data-v-4f064fe3]{text-align:center}.confirm-btn p[data-v-4f064fe3]:nth-child(2){color:red;font-size:10px}
\ No newline at end of file

dist/static/css/chunk-c6fd9a34.ea684fe8.css

+.fill-store-inf[data-v-1069075c]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-1069075c]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-1069075c] .el-card__body{height:calc(100% - 180px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-1069075c]{height:60px;background:#1890ff}.logo-bg img[data-v-1069075c]{height:44px;margin:8px 0 8px 20px}.steps[data-v-1069075c]{height:70px;width:60%;margin:20px auto}.steps[data-v-1069075c] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-1069075c] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-1069075c] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-1069075c] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-1069075c] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-1069075c] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-1069075c] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-1069075c] .el-step__title.is-success{color:#000}.main-con[data-v-1069075c]{width:70%;height:100%;margin:20px auto 0}.main-con .tips-text[data-v-1069075c]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-1069075c]:before{color:#e3c300}.main-con .uploadData[data-v-1069075c]{display:inline-block}.main-con .uploadData[data-v-1069075c] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-1069075c] .el-upload,.main-con .uploadData[data-v-1069075c] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-1069075c] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-1069075c] .avatar{width:100px;height:100px}.main-con .hiden-dom[data-v-1069075c] .el-upload--picture-card{display:none!important}.main-con .auth-con[data-v-1069075c]{width:100%;height:100%;display:flex;flex-direction:row;justify-content:normal;flex-wrap:wrap}.main-con .single-upload-con[data-v-1069075c]{width:160px;height:140px;text-align:center;overflow:hidden}.main-con .single-auth-img[data-v-1069075c]{width:98px;height:98px;border-radius:6px;border:1px dashed #eee;margin:5px auto;cursor:pointer;color:#8c939d;line-height:98px;font-size:28px}.main-con .single-auth-img-con[data-v-1069075c]{margin:0;padding:0;display:inline-block;width:98px;height:98px;position:relative;cursor:pointer;border-radius:6px;border:1px solid #c0ccda}.main-con .auth-spec-img[data-v-1069075c]{width:100%;height:100%;border-radius:6px;cursor:pointer;position:relative;border:none}.main-con .span-img-del-loading[data-v-1069075c]{display:none;position:absolute;width:98px;height:98px;top:0;left:0;border-radius:5px;z-index:66;background-color:rgba(0,0,0,.5);opacity:.75;transition:opacity .3s}.main-con .span-img-del-loading>.del-span-block[data-v-1069075c],.main-con .span-img-del-loading>.zoom-span-block[data-v-1069075c]{color:#fff;font-size:20px;font-weight:500;margin:41px 4px 0;z-index:70}.main-con .single-auth-img-con:hover>.span-img-del-loading[data-v-1069075c]{display:block}.main-con .single-title[data-v-1069075c]{font-size:12px;color:#666;text-align:center}.main-con .confirm-btn[data-v-1069075c]{width:50%;margin:40px auto 20px}.img-dialog-con[data-v-1069075c] .el-dialog__body,.main-con .confirm-btn>div[data-v-1069075c]{text-align:center}.img-spe[data-v-1069075c]{margin:0 auto}
\ No newline at end of file

dist/static/js/chunk-2d22db58.4991ac92.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d22db58"],{f93b:function(n,e,o){"use strict";o.r(e);var t=function(){var n=this,e=n.$createElement,o=n._self._c||e;return o("div")},u=[],l={name:"returnurl",created:function(){},mounted:function(){window.opener=null,window.open("",self),window.close()}},c=l,r=o("2877"),i=Object(r["a"])(c,t,u,!1,null,null,null);e["default"]=i.exports}}]);
\ No newline at end of file

dist/static/js/chunk-30c771e6.dbb74e24.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-30c771e6"],{"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return c})),n.d(e,"i",(function(){return u})),n.d(e,"b",(function(){return r})),n.d(e,"d",(function(){return i})),n.d(e,"a",(function(){return o})),n.d(e,"l",(function(){return l})),n.d(e,"j",(function(){return s})),n.d(e,"c",(function(){return d})),n.d(e,"m",(function(){return h})),n.d(e,"e",(function(){return m})),n.d(e,"h",(function(){return b})),n.d(e,"f",(function(){return A})),n.d(e,"k",(function(){return f}));var a=n("b775");function c(t){return Object(a["a"])({url:"/system/index/getInfo",method:"get",params:t})}function u(t){return Object(a["a"])({url:"/local/getOrganization",method:"get",params:t})}function r(t){return Object(a["a"])({url:"/local/organization",method:"post",data:t})}function i(t){return Object(a["a"])({url:"/local/shopbrand",method:"get",params:t})}function o(t){return Object(a["a"])({url:"/local/brands",method:"post",data:t})}function l(t){return Object(a["a"])({url:"/local/upbrands",method:"post",data:t})}function s(t){return Object(a["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(a["a"])({url:"/local/addShopInfo",method:"post",data:t})}function h(t){return Object(a["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function m(t){return Object(a["a"])({url:"/local/cate",method:"get",params:t})}function b(t){return Object(a["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function A(t){return Object(a["a"])({url:"/local/check/idCard",method:"get",params:t})}function f(t){return Object(a["a"])({url:"/local/qualification/list",method:"get",params:t})}},"753d":function(t,e,n){"use strict";n("fe18")},e4dd:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"to-review"},[a("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[a("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success"}},[a("el-step",{attrs:{title:"注册账号"}}),t._v(" "),a("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),a("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),a("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),a("div",{staticClass:"main"},[a("div",{staticClass:"fuck"},[a("p",[a("img",{attrs:{src:n("e9f2"),alt:""}})]),t._v(" "),a("p",[t._v("资料已提交，工作人员审核中。。。")]),t._v(" "),a("p",{staticStyle:{"margin-top":"10px"}},[t._v("感谢您使用云仓！")]),t._v(" "),a("p",[t._v("您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。")]),t._v(" "),a("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系！")])])])])],1)},c=[],u=n("6b1f"),r={name:"ReviewSuccess",data:function(){return{}},created:function(){var t=this;Object(u["g"])().then((function(e){1==e.code&&e.data.user&&(1==e.data.user.state&&t.$router.push({path:"/home/index"}),2==e.data.user.state&&t.$router.push({path:"/reviewing"}),3==e.data.user.state&&t.$router.push({path:"/reviewFail"}))}))},mounted:function(){history.pushState(null,null,document.URL),window.addEventListener("popstate",(function(){history.pushState(null,null,document.URL)}))}},i=r,o=(n("753d"),n("2877")),l=Object(o["a"])(i,a,c,!1,null,"bbf9fafa",null);e["default"]=l.exports},e9f2:function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBRDQ3NzE4OTFFQjExRUJBN0JEQjU3QzUxQ0Q3QkQzIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBRDQ3NzE5OTFFQjExRUJBN0JEQjU3QzUxQ0Q3QkQzIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkFENDc3MTY5MUVCMTFFQkE3QkRCNTdDNTFDRDdCRDMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkFENDc3MTc5MUVCMTFFQkE3QkRCNTdDNTFDRDdCRDMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4rxvAYAAAE5UlEQVR42tybe2wUVRTGL0tRIA2KFChS/kABaQRaEggEhSYIgiKgtShYJBKqBAhKRINA9Z8uAlEeTWxV5BGFNghIwUYqEkhBjBFNCNhYHoqChmoiqKFNaGwJ38meqePd2e487p2d4Ut+SXc6c3e+nTtzzzn3Tof843cLjeoDBoIsMIg/pzOkRnAN/A7OgN/AT6BB1wmlaWiTjOWDB8AIkOnweDL/HTgO9oLzKk+ug6IrfDuYB54EeaCjovNrBbVgJ/gQ/Ou1wYgCo6+AOlAGxis0K7ith8AH4HuwFHRKleGnwWnwFhgg9Os+8DY4xT3JN8P9wH7uZoOE/8oGe/j+7qPb8FTwDZgmUq8n+Fwm6TL8IvjUza+qUdTbPgcLVBuOglIRXJWDlaoMR+02lmLReRZ7NbwkJGYNlfCt58rwRLBBhE+lPHY7MpzJw05YRefey4nh7eCuEBvOAFvtGn4WTBDh1xRQkMxwFw7fbhVtlGNv2fDLifp+SNUXLE5kOJ0zn6DrOlgNLtjcfzn33DjDc8GdATdbA3LBCvAM58t2HmCFVoYLA26WcuFHwVn+nOvg2DjD94ORATVKJZ4xYL1p2zvgPQfFhgdFrLbWZjhfQfVDhygTGgW+Nm37CCxy2E4ap5NtJvMCaJau4iPgL9O23RwnuNE4w3BmALvzq/JwImJFvAIPbY4GPehS54BuATJbBLZI294Eczy22wNkk+H+ATJLT9NKadt8HktV6F7q0vcE2OxEfhqrUn8y3DsAZudYmKV61T7F35NJhjun2OxiTkdlVYCuir8rnQx3T6HZ13n4kUWx8lgN33dHREHAsZMDl18cHkf3ZtRiO8UEr2n6gVvI7BUPDXwGZoEqDv9qbB53QFjXkml43KWxRzVGON1ya/Yx0+cGDu6jSY47x5mOlco05+NNEeFu8nm7ZFa+Lyn8a7L4H013Pg7+sfgf/VizNT8zGsjwzy4OrE7y/x380KmTtj8H6i32pwR9kw8PyYsRB5UDIWUsLyTZ5ySb3sOfN1uMtYZKuByjPdVM46vQKP5bd2FHNHa/z/Hp6nb2+xvM4MCiKsE+uZzc69ZVcMa4h0+4bISC+lKbPeJaO2mgH6Kc+ooxBh/10BDN5Xzicjw3Fr/4oS/NBQCa0W/10Fg+/2g9HRzTVfg3BdsiYnPbbYZp3cS3HhulutExB+kmRVNZPl7deiF1w0oFDQ/me2W4jWR8qfBPFcYfZsPbwJ8KGqd08yvBNaQEWqYhE0qkyxwXxBmmoWmdoi+hQOKQ4EqhpAyuYviltaDZyjBpg1C3zvE2EVtaVCRtf0n4V0O7BN41b5ANN/MJqRStojMvm1joc3Hhf8sVrRaXUu33C/Cwwi+mDOqGiM0U+DXRXm0MRckMk6ig9oPDcdVOVOaX/hAJyrqJoiN6Wj8lwqsZHMfbNkyqFfHV/zBokRFGOjVsBPYlITJLD8fy9nawE/C/AVaFwGyxnedExEFjSwJsdqHdi+IkpaPMZprQ+AKGC/0KJsvBhSrDxtg2ymp8S4Gq+FwOOjko4vJXnQ5miljJ1W9RmlfAObjj3uZl1uFjMEzEJq9/9MEoLWahZVU5XGFxJa/TLBR708q9ITz+HfFYObGqVBwGz4OhnM15epVH1YtazTz+EYF+UUvHm2l0X6/hvwP3Kt5NAQYA/pvkv1BL/nsAAAAASUVORK5CYII="},fe18:function(t,e,n){}}]);
\ No newline at end of file

dist/static/js/chunk-5168c511.90581123.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5168c511"],{"47af":function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM4MTU5MkY0OTFFQjExRUJBQkE3REQ0N0VCRUQzQzM1IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM4MTU5MkY1OTFFQjExRUJBQkE3REQ0N0VCRUQzQzM1Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzgxNTkyRjI5MUVCMTFFQkFCQTdERDQ3RUJFRDNDMzUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzgxNTkyRjM5MUVCMTFFQkFCQTdERDQ3RUJFRDNDMzUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7L2yVbAAAGLklEQVR42tRba2wUVRS+XXaBCiIo9dEYYjDGgA8UbKqiGB9BjSCixvhuMFarxWcTK9X6tiIVAQUREeUpaqwJqBH9oQaFEBFNFH80CBqjWKEoFKEtpa3fYb8hk8nOzt07d9qdk3zZdnf27vnm3Hte905B98RJKgLpDxQCZwOlQBEwBDgeKAaOAxLADuAPYCfwD1+/AzYC+4FW24olLY41EDgBOB84F7gAGElifiI34rQM7/8CrAW+5et2YI8NJQssWLiQSt8PTKAlbYpYeg0wB/gB2NtbFhbLnQncC0wGhqpo5AjgWuAy4CNgAbAB6OhJwsNJ9BrgZNUzMgi4BbgIWA3MBzabWClXkbX5IVDVg2TdciJv9ifAVbIsoyIsA08F3gdGqd6XYcA7wONAyjZhCTP1wAx64nwRmebPAK/rOksdwhI73+UULlT5KXcAq4BTwxIWy84FJqn8lwvpyAabEu4DPAtcp+IjFzNe9zMhXAk8pOInt9ORJXMhfD1QQyvHUcTf3JmJXybCsvCnM8GPq4hzfREYE0RYpkFFLyUUUYQsyRsGZCN8OlAW4kekqtkCtFtQ+ACwFWgKMcatQIkf4SQXvGm1I3XsJVwS04B9IRRtpeM5BRjH+ti0wJEZe1QmwlLH3mg48FccuBHoZmiQcnG3wVh76XRmcawtdEBrDHW7EhjvJdwXuNkgbexmkS6ZzibX+13AW/T0uUxvubaaCcRB1/s/smDYYLiWy9igOEx4qGE2tYvL4Fefz0Xx+zRr1w5eO9/nc/mNm4C/DPQc7xjTIXwGc2aTbkRjwDULmcS0B1i2ktdmk98MOx4plrUFCZK+wnB9SKx+IFsq5yL9GGeEV6R5V6tBVpS+CzjJUNfLhauQPYaJt4kI0To6maDuyUx6bzfpf+mN6zV+q5LX9TXUdazcLFFyNHtTYXpONfy7LuDaRQxXK/i/ePKVGr9RzZs1KGSnZFyS/amUCicDOC13BkzNLnYpnLi4XGPscuBpjWWjI8OF8LGWUjmpnefRJyzyhJVM3lunpSQR4FVLZEWKRLkii/lriklHVchZ04dr1ibZQ4STlgk7jqyWlpZsqc3gpkmS8SRwpGXdIiHsrOkakp6dQ15dyBS1VtnfwTiUYCUMEw4dkVTuKWBKDt+Zwjp2SEQ6FScCnEtYkeKhU+ntcCSYue2KUJ+OBENJFCLjPqHhsd0haznj7Z9R6SR3vjmCgZvpdN6ghXVFbsxikp+u7Df9m5MRWHg38+aFLB9NZCm/+5LFPOGwhW0SbmMfaYWFsZZxTcssOdom4R2WBmtnbqxD9h7NjKuBr2+qgB2FXAhvY/GdCjmNX9Ao8aTSuQ14zVX0LwuolRto4ToVftN9m3jp79lCMZU9dFAzNNLFB1V6r8qRuZqlpdzIR0OGLDk8szbBQb4OMY2rXRbLJo8wg+rvSUNr+FmQvM0WUJuhruukY5JgCDDtCEofeoFGnC1nTB6YpbQs14jTK9nmMZHPZAynp/WTMmt4S0FeokF2nseyfqVlEOnRhh5bfMU3EuoSrkRhlcFA0h5aojLs4VAqWOLpOMQUr63w+XwMHZxJXP5csdvpED7ATsR2g8FGMH08z6P8VDqyXOrZfux9VXlmxDmcASMN9GuhUf5zExZZD7xnuD5GkXQpOxWyr1xvWM9Kj+x54GGOVUKFSw11+5QWTrdRPCfxzgK+CFGeNfNOFivz7qJyzbomOjrTTEsc3aUqvRWkvBYW2cy7aVxgq3TfOCxZJ0kZFjKtlOpro7cG9VYrcgRoq4q/tDCx2ZeNsEgjs5q/Y0x2PxOiTZm6DJnkAzqOzpgSnsmCo0uXsGK6OCuGZJfSWAf9+kh+0smUryFGZL9U6c093+or6CSeU9CvjgHZdayzs5460DlrKbFQjkLMYWzMR1ms0hv6QXvV2qdpW5nuTVPRtlFNvPFzwN26euVyXlrW9MvADcr/iENPirSmyth80J55JifiJfWcwMrm914g2sS8/WqGz65cvhzmqRZnM13KuYkquoc8HJEc/WO2e9abdj7CPNUicU6OLP3MmB31YzyvqPRjPC1hBiuw+GSa+0EtqY3HquAHtfwkrx/U8mvZ5OWjeP8LMAADdln6uCsMhAAAAABJRU5ErkJggg=="},"4c4e":function(t,e,n){"use strict";n("51cb")},"51cb":function(t,e,n){},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return c})),n.d(e,"i",(function(){return r})),n.d(e,"b",(function(){return u})),n.d(e,"d",(function(){return s})),n.d(e,"a",(function(){return i})),n.d(e,"l",(function(){return o})),n.d(e,"j",(function(){return l})),n.d(e,"c",(function(){return d})),n.d(e,"m",(function(){return m})),n.d(e,"e",(function(){return p})),n.d(e,"h",(function(){return h})),n.d(e,"f",(function(){return b})),n.d(e,"k",(function(){return A}));var a=n("b775");function c(t){return Object(a["a"])({url:"/system/index/getInfo",method:"get",params:t})}function r(t){return Object(a["a"])({url:"/local/getOrganization",method:"get",params:t})}function u(t){return Object(a["a"])({url:"/local/organization",method:"post",data:t})}function s(t){return Object(a["a"])({url:"/local/shopbrand",method:"get",params:t})}function i(t){return Object(a["a"])({url:"/local/brands",method:"post",data:t})}function o(t){return Object(a["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(a["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(a["a"])({url:"/local/addShopInfo",method:"post",data:t})}function m(t){return Object(a["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function p(t){return Object(a["a"])({url:"/local/cate",method:"get",params:t})}function h(t){return Object(a["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function b(t){return Object(a["a"])({url:"/local/check/idCard",method:"get",params:t})}function A(t){return Object(a["a"])({url:"/local/qualification/list",method:"get",params:t})}},"83f1":function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"to-review"},[a("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[a("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success","process-status":"error"}},[a("el-step",{attrs:{title:"注册账号"}}),t._v(" "),a("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),a("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),a("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),a("div",{staticClass:"main"},[a("div",{staticClass:"main-con"},[a("p",[a("img",{attrs:{src:n("47af"),alt:""}})]),t._v(" "),a("p",[t._v("非常抱歉，您的资料审核不通过！")]),t._v(" "),a("p",[t._v("不通过原因："+t._s(t.msg)+"！请您重新提交认证资料！")]),t._v(" "),a("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系")]),t._v(" "),a("p",{staticStyle:{"padding-top":"40px"}},[a("el-button",{attrs:{type:"primary"},on:{click:t.reSubmit}},[t._v("重新提交")])],1)])])])],1)},c=[],r=n("6b1f"),u={name:"ReviewFail",data:function(){return{msg:"具体原因，请联系售后"}},created:function(){var t=this;this.$route.params.msg&&(this.msg=this.$route.params.msg),Object(r["g"])().then((function(e){1==e.code&&e.data.user&&(1==e.data.user.state&&t.$router.push({path:"/home/index"}),2==e.data.user.state&&t.$router.push({path:"/reviewing"}),3==e.data.user.state&&(t.$router.push({path:"/reviewFail"}),Object(r["j"])().then((function(e){1==e.code&&""!=e.data.Apply.content&&(t.msg=e.data.Apply.content)}))))}))},mounted:function(){history.pushState(null,null,document.URL),window.addEventListener("popstate",(function(){history.pushState(null,null,document.URL)}))},methods:{reSubmit:function(){this.$router.push({path:"/process"})}}},s=u,i=(n("4c4e"),n("2877")),o=Object(i["a"])(s,a,c,!1,null,"7cad85af",null);e["default"]=o.exports}}]);
\ No newline at end of file

dist/static/js/chunk-5be5b3e2.1bcac1ef.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5be5b3e2"],{5189:function(t,e,n){},"92fc":function(t,e,n){t.exports=n.p+"static/img/4.3f411af6.png"},a570:function(t,e,n){"use strict";n.r(e);var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"entryDetails"},[n("div",{staticClass:"logo-bg"},[t.settitle&&t.settitle.topLogo?n("img",{attrs:{src:t.settitle.topLogo,alt:""}}):t._e()]),t._v(" "),t._m(0),t._v(" "),n("div",{staticClass:"confirm-btn"},[n("p",[n("el-button",{staticStyle:{padding:"8px 30px"},attrs:{type:"primary",round:""},on:{click:t.nextStep}},[t._v("\n        立即入驻  "),n("i",{staticClass:"el-icon-right"})])],1)])])},s=[function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"main-con"},[i("img",{attrs:{src:n("92fc"),alt:""}})])}],a=n("5302"),c={name:"Index",data:function(){return{channel_id:0,settitle:{bottomCopyright:"",businessHours:1,companyAddress:"",contactTel:"",custServiceQrcode:"",hotlineTel1:"",hotlineTel2:"",onlineTimeEnd:"18:00",onlineTimeStart:"09:00",recordNum:"",topLogo:""}}},created:function(){},mounted:function(){},methods:{getIndexInfo:function(){var t=this,e=window.location.host,n={domain:e};Object(a["e"])(n).then((function(e){1==e.code&&(t.channel_id=e.data.channel_id,t.getWebSite())}))},getWebSite:function(){var t=this,e={channel_ids:this.channel_id};Object(a["f"])(e).then((function(e){1==e.code&&e.data.universal_lst&&"null"!=e.data.universal_lst&&(t.settitle=e.data.universal_lst)}))},nextStep:function(){this.$router.push("/fillMainInf")}}},o=c,l=(n("e3dc"),n("2877")),r=Object(l["a"])(o,i,s,!1,null,"4f064fe3",null);e["default"]=r.exports},e3dc:function(t,e,n){"use strict";n("5189")}}]);
\ No newline at end of file

dist/static/js/chunk-7c2f4fe6.33f71712.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+"/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+"/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}}]);
\ No newline at end of file

dist/static/js/chunk-f18f73fa.50d829cb.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f18f73fa"],{"5a97":function(t,e,n){"use strict";n.d(e,"e",(function(){return r})),n.d(e,"h",(function(){return o})),n.d(e,"c",(function(){return s})),n.d(e,"d",(function(){return c})),n.d(e,"g",(function(){return u})),n.d(e,"f",(function(){return i})),n.d(e,"a",(function(){return l})),n.d(e,"b",(function(){return d}));var a=n("b775");function r(t){return Object(a["a"])({url:"/system/goodsNew/list",method:"get",params:t})}function o(t){return Object(a["a"])({url:"/system/goodsNew/shelvesStatus",method:"post",data:t})}function s(t){return Object(a["a"])({url:"/system/goodsNew/goodsStatus",method:"post",data:t})}function c(t){return Object(a["a"])({url:"/system/goodsNew/info",method:"get",params:t})}function u(t){return Object(a["a"])({url:"/system/goodsNew/businessList",method:"get",params:t})}function i(t){return Object(a["a"])({url:"/system/goodsNew/collect",method:"post",data:t})}function l(t){return Object(a["a"])({url:"/system/goodsNew/cancelOnsale",method:"post",data:t})}function d(t){return Object(a["a"])({url:"/system/goodsNew/cancelOnsaleAll",method:"post",data:t})}},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return r})),n.d(e,"i",(function(){return o})),n.d(e,"b",(function(){return s})),n.d(e,"d",(function(){return c})),n.d(e,"a",(function(){return u})),n.d(e,"l",(function(){return i})),n.d(e,"j",(function(){return l})),n.d(e,"c",(function(){return d})),n.d(e,"m",(function(){return m})),n.d(e,"e",(function(){return f})),n.d(e,"h",(function(){return h})),n.d(e,"f",(function(){return p})),n.d(e,"k",(function(){return g}));var a=n("b775");function r(t){return Object(a["a"])({url:"/system/index/getInfo",method:"get",params:t})}function o(t){return Object(a["a"])({url:"/local/getOrganization",method:"get",params:t})}function s(t){return Object(a["a"])({url:"/local/organization",method:"post",data:t})}function c(t){return Object(a["a"])({url:"/local/shopbrand",method:"get",params:t})}function u(t){return Object(a["a"])({url:"/local/brands",method:"post",data:t})}function i(t){return Object(a["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(a["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(a["a"])({url:"/local/addShopInfo",method:"post",data:t})}function m(t){return Object(a["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function f(t){return Object(a["a"])({url:"/local/cate",method:"get",params:t})}function h(t){return Object(a["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function p(t){return Object(a["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(a["a"])({url:"/local/qualification/list",method:"get",params:t})}},"9c36":function(t,e,n){},e3b2:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"app-container"},[n("el-card",{staticClass:"box-card"},[n("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[t._v("商品导入")]),t._v(" "),n("h3",{staticClass:"cton_h3"},[t._v("剩余次数："+t._s(t.collect_num)+" / 1000次")]),t._v(" "),n("div",{staticClass:"cton_text"},[n("p",[t._v("功能介绍：")]),t._v(" "),n("p",[t._v("\n      商品导入是为了商家快速、方便地将其它平台上已有的商品，一键导入到您的云仓平台，不再用手动输入编写商品信息\n    ")]),t._v(" "),n("p",[t._v("使用方法：")]),t._v(" "),n("p",[t._v("\n      复制其它电商平台的商品链接，粘贴至商品链接输入框内，为该商品选择对应的商品分类，选择完成后点击立即获取按钮即可\n    ")]),t._v(" "),n("p",[t._v("示例：")]),t._v(" "),n("p",[t._v("京东商品链接如：https://item.jd.com/10684560542.html")]),t._v(" "),n("p",[t._v("温馨提示：")]),t._v(" "),n("p",[t._v("商品在获取过程中，请不要进行其它操作")]),t._v(" "),n("p",[t._v("\n      商品抓取后，默认放入到下架商品中，请手动修改商品相关信息，再提交申请上架\n    ")]),t._v(" "),n("p",[t._v("请确保不要将多个平台的商品链接混合输入")]),t._v(" "),n("p",[t._v("每个用户默认拥有1000次商品导入的机会，请慎重使用")])]),t._v(" "),n("el-form",{ref:"form",attrs:{model:t.form,"label-width":"180px"}},[n("el-form-item",{attrs:{label:"商品链接："}},[n("el-input",{staticStyle:{width:"700px"},attrs:{type:"textarea",autosize:{minRows:4,maxRows:8},placeholder:"请输入其它平台商品的链接，单次最多允许输入10条链接，以英文逗号隔开"},model:{value:t.form.desc,callback:function(e){t.$set(t.form,"desc",e)},expression:"form.desc"}})],1),t._v(" "),n("el-form-item",{attrs:{label:"商品分类："}},[t.el_valuestatus?n("el-cascader",{ref:"cascaderDom",staticStyle:{width:"350px"},attrs:{props:t.props,options:t.options,placeholder:"请选择"},on:{change:t.elvalueclick},model:{value:t.el_value,callback:function(e){t.el_value=e},expression:"el_value"}}):t._e()],1),t._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:t.onSubmit}},[t._v("立即导入")])],1)],1)],1)],1)},r=[],o=(n("6b54"),n("c5f6"),n("28a5"),n("5c96"),n("6b1f")),s=n("5a97"),c=(n("ed08"),{name:"freight",data:function(){return{collect_num:0,form:{desc:""},el_valuestatus:!0,el_value:[],options:[],props:{checkStrictly:!1,expandTrigger:"click",emitPath:!0,value:"id",label:"label"}}},components:{},created:function(){this.getData(),this.info()},watch:{},methods:{info:function(){var t=this;Object(o["j"])().then((function(e){1==e.code&&(t.collect_num=e.data.collect_num)}))},onSubmit:function(){var t=this;if(this.collect_num<=0)this.$message({type:"warning",message:"您好，您的导入次数已用完，请您联系我们的工作人员操作充值"});else{var e;if(!this.form.desc)return this.$message.error("请填写需要导入的商品链接！"),!1;if(e=this.form.desc.split(","),!(e.length>0&&e.length<=10))return e.length>10?(this.$message({message:"您单次输入的链接数量超过10条！",type:"warning"}),!1):(this.$message.error("请填写需要导入的商品链接！"),!1);if(Number(e.length)>Number(this.collect_num))this.$message({type:"warning",message:"您好，准备导入的商品条数过多，当前剩余次数不足，请重新输入"});else{if(3!=this.el_value.length)return this.$message.error("请选择商品分类！"),!1;var n={category_id:this.el_value[2],third_url:e};Object(s["f"])(n).then((function(n){var a=0,r=Number(e.length),o="";1===n.code?(1===r?1===Number(n.data)?t.$message({type:"success",message:"您好，商品已导入成功，请在仓库中进行编辑后申请上架"}):t.$message({type:"error",message:"您好，商品导入失败，请您重新导入"}):r>1&&(a=Number(n.data),o="您好，一共导入"+r+"条商品，"+a+"条导入成功，请在仓库中进行编辑后申请上架",t.$message({type:"warning",message:o})),t.el_value=[],t.$refs.cascaderDom.$refs.panel.activePath=[],t.form.desc=""):(o=n.message?n.message:"导入失败",t.$message({type:"error",message:o})),t.info()}))}}},add:function(t,e){var n,a,r,o;try{n=t.toString().split(".")[1].length,a=e.toString().split(".")[1].length}catch(s){n=0,a=0}return r=Math.pow(10,Math.max(n,a)),o=(t*r+e*r)/r,o=o.toFixed(2),o},minus:function(t,e){return this.add(t,-e)},elvalueclick:function(){},getData:function(){var t=this;Object(s["g"])().then((function(e){1==e.code&&(t.options=e.data)}))}}}),u=c,i=(n("fe8e"),n("2877")),l=Object(i["a"])(u,a,r,!1,null,"9269e492",null);e["default"]=l.exports},fe8e:function(t,e,n){"use strict";n("9c36")}}]);
\ No newline at end of file

src/api/module/brand/brand.js

@@ -9,7 +9,7 @@ export function getBrandsInf(query) {
 }
 
 // 新增品牌
-export function addBrand(data) {
+export function addBrandData(data) {
   return request({
     url: '/local/brands',
     method: 'post',
@@ -17,12 +17,29 @@ export function addBrand(data) {
   });
 }
 
+// 删除 品牌
+export function delBrandData(data) {
+  return request({
+    url: '/local/brand/deleteBrand',
+    method: 'post',
+    data: data
+  });
+}
+
 // 获取品牌详情
-export function getDetails (id) {
+// export function  (id) {
+//   return request({
+//     url: '?id='+id,
+//     method: 'get'
+//   })
+// }
+
+export function getDetails(query) {
   return request({
-    url: '/local/brandsInfo?id='+id,
-    method: 'get'
-  })
+    url: '/local/brandsInfo',
+    method: 'get',
+    params: query
+  });
 }
 
 // 修改品牌信息

src/api/module/entry.js

 import request from '@/utils/request';
+// 获取用户详细信息
+export function getInfo(param) {
+  return request({
+    url: '/system/index/getInfo',
+    method: 'get',
+    params: param
+  })
+}
 
 // 获取主体信息
 export function getMainInf(query) {
@@ -69,14 +77,6 @@ export function upLoadImg (data) {
   });
 }
 
-// old
-// export function upLoadImg (data) {
-//   return request({
-//     url: '/system/goods/uploadImg',
-//     method: 'post',
-//     data: data
-//   });
-// }
 // 获取商品类目
 export function getGoodsType(query) {
   return request({
@@ -85,3 +85,30 @@ export function getGoodsType(query) {
     params: query
   });
 }
+
+// 营业执照 图片识别信息
+export function getLicenseImgInfoData(query) {
+  return request({
+    url: '/local/check/businessLicense',
+    method: 'get',
+    params: query
+  });
+}
+
+// 身份证 正/反 图片识别信息
+export function getIdcardImgInfoData(query) {
+  return request({
+    url: '/local/check/idCard',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询 入驻类目资质
+export function getUploadQualificationListData(query) {
+  return request({
+    url: '/local/qualification/list',
+    method: 'get',
+    params: query
+  });
+}

src/api/module/goods.js

@@ -111,3 +111,12 @@ export function UploadImg(data) {
         data: data
     })
 }
+
+// 根据类目 获取服务费
+export function getByCategoryData(query) {
+  return request({
+    url: '/local/serviceFee/getByCategory',
+    method: 'get',
+    params: query
+  })
+}

src/api/securityFund.js

+import request from '@/utils/request'
+
+// 获取店铺信息
+export const shopInfo = () => {
+  return request({
+    url: '/local/getShopInfo',
+    method: 'get'
+  })
+}
+
+// 获取交易流水
+export const bondDetail = (params) => {
+  return request({
+    url: '/local/shop/bond/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 充值保证金
+export const addBond = (data) => {
+  return request({
+    url: '/system/addBond',
+    method: 'post',
+    data
+  })
+}
+
+// 保证金额度说明
+export const bondByCate = (params) => {
+  return request({
+    url: '/local/getBondByCate',
+    method: 'get',
+    params
+  })
+}
+
+// 账户/列表
+export const accountList = (data) => {
+  return request({
+    url: '/system/bank/account/list',
+    method: 'post',
+    data
+  })
+}
+
+// 申请退保
+export const bondApply = (data) => {
+  return request({
+    url: '/local/bondApply',
+    method: 'post',
+    data
+  })
+}
+
+// 获取支付账户
+export const payDetails = (params) => {
+  return request({
+    url: '/system/payDetails',
+    method: 'get',
+    params
+  })
+}
+
+// 保证金申请详情
+export const applyDetail = (params) => {
+  return request({
+    url: '/local/bond/apply/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 发送验证码
+export const sendMobile = (params) => {
+  return request({
+    url: '/local/seller/sendMobile',
+    method: 'get',
+    params
+  })
+}
+
+

src/layout/components/Navbar.vue

@@ -136,14 +136,14 @@ export default {
                 })
   },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          var ssa = window.location.host
-           var ht = document.location.protocol
+          let ssa = window.location.host
+          let ht = document.location.protocol
           if(ssa =='localhost:1024'){
             window.location.href=ht+'//'+this.ssourl +'/logout?redirect='+ht+'//'+ssa+'/login'
           }else{

src/permission.js

@@ -11,18 +11,15 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login','/platformlogin','/', '/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
-  //debugger
+  // debugger
   NProgress.start()
   const hasToken = getToken()
   // console.log("getToken()",getToken())
   if (hasToken) {
-    
     getPageTitle()
 
-    //
     /* has token*/
     if (to.path === '/platformlogin') {
-        // return false
       next({ path: '/home/index' })
       NProgress.done()
     } else {
@@ -30,21 +27,31 @@ router.beforeEach((to, from, next) => {
         //debugger
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
-          // return false
           // 拉取user_info
           const roles = res.data.roles
-          //debugger
+          // debugger
+          const userInfo = res.data.user
           store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
-          // 测试 默认静态页面
-          // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            router.addRoutes(accessRoutes)
+            // debugger
+            if (userInfo.state == 1) {
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            } else if (userInfo.state == 2){
+              next({path:'/reviewing',replace: true});
+            } else if (userInfo.state == 0){
+              if (userInfo.status == 0) {
+                next({path:'/process',replace: true});
+              }else if (userInfo.status == 1) {
+                next({path:'/fillShopInf',replace: true});
+              }
+            } else if (userInfo.state == 3) {
+              next({path:'/reviewFail',replace: true,params: {...to.params.msg}});
+            }
           })
         }).catch(err => {
             store.dispatch('FedLogOut').then(() => {
               Message.error(err)
-              //debugger
               next({ path: '/home/index' })
             })
           })
@@ -60,16 +67,13 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    //debugger
     // 没有token
+    // 在免登录白名单，直接进入
     if (whiteList.indexOf(to.path) !== -1) {
-      console.log("在免登录白名单，直接进入")
       // 在免登录白名单，直接进入
       next()
     } else {
-      //debugger
       next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
-      // next(`/newyuncang?redirect=${to.path}`) // 否则全部重定向到登录页
       NProgress.done()
     }
   }

src/router/index.js

@@ -77,6 +77,11 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  {
+    path: '/returnurl',
+    component: () => import('@/views/returnurl'),
+    hidden: true
+  },
   {
     path: '/',
     component: (resolve) => require(['@/views/entry/newyuncang'], resolve),

src/store/modules/user.js

@@ -10,7 +10,14 @@ const user = {
     sellerid:0,
     roles: [],
     permissions: [],
-    ssourl:''
+    ssourl:'',
+    // 客户信息中，入驻审核状态
+    // 0-未提交信息；
+    // 1-审核成；
+    // 2-审核中；
+    // 3-审核拒绝；
+    applyState: -1,
+    cateFee: 0,
   },
 
   mutations: {
@@ -34,6 +41,12 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_APPLYSTATE: (state, applyState) => {
+      state.applyState = applyState
+    },
+    SET_CATEFEE: (state, cateFee) => {
+      state.cateFee = cateFee
     }
   },
 
@@ -98,6 +111,7 @@ const user = {
           }
           commit('SET_NAME', user.Username)
           commit('SET_SELLERID', user.SellerId)
+          commit('SET_APPLYSTATE', user.state) // 记录 商户入驻后的审核状态
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

src/views/dashboard/PanelGroup.vue

 <template>
-  <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            总商品
+  <div>
+    <el-row :gutter="40" class="panel-group">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+          <div class="card-panel-icon-wrapper icon-people">
+            <svg-icon icon-class="peoples" class-name="card-panel-icon" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.goods_total" :duration="2600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            总订单
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              总商品
+            </div>
+            <count-to :start-val="0" :end-val="panelData.goods_total" :duration="2600" class="card-panel-num" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.order_total" :duration="3000" class="card-panel-num" />
         </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            总收入
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('messages')">
+          <div class="card-panel-icon-wrapper icon-message">
+            <svg-icon icon-class="message" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              总订单
+            </div>
+            <count-to :start-val="0" :end-val="panelData.order_total" :duration="3000" class="card-panel-num" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.total_price" :decimals="2" :duration="3200" class="card-panel-num" />
         </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
-        <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('purchases')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon icon-class="money" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              总收入
+            </div>
+            <count-to :start-val="0" :end-val="panelData.total_price" :decimals="2" :duration="3200" class="card-panel-num" />
+          </div>
         </div>
-        <div class="xz-tip">{{(panelData.refund_total < 100)? panelData.refund_total : '99+' }}</div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            售后订单
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+          <div class="card-panel-icon-wrapper icon-shopping">
+            <svg-icon icon-class="shopping" class-name="card-panel-icon" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.refund_total" :duration="3600" class="card-panel-num" />
+          <div class="xz-tip">{{(panelData.refund_total < 100)? panelData.refund_total : '99+' }}</div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              售后订单
+            </div>
+            <count-to :start-val="0" :end-val="panelData.refund_total" :duration="3600" class="card-panel-num" />
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 保证金充值提醒 -->
+    <el-dialog
+      style="margin-top: 200px;"
+      title="保证金充值提醒"
+      :visible.sync="dialogVisible"
+      :destroy-on-close="true"
+      width="35%"
+      center
+      :close-on-click-modal="false" 
+      append-to-body
+    >
+      <div>
+        <div style="background: rgba(58, 160, 255, .05); padding: 20px; line-height: 24px; text-align: center;">
+          <div>当前保证金余额不足，部分功能受限，请您及时充值保证金</div>
         </div>
       </div>
-    </el-col>
-  </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="goPay">去充值</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import CountTo from 'vue-count-to'
+import { shopInfo } from '@/api/securityFund';
 
 export default {
   data() {
-    return {}
+    return {
+      dialogVisible: false
+    }
   },
   props: {
     panelData: {
@@ -73,10 +98,30 @@ export default {
   },
   mounted() {
     // console.log(75,this.panelData);
+    this.getShopInfo()
   },
   methods: {
+    // 获取店铺信息
+    getShopInfo() {
+      shopInfo().then(res => {
+        if (res.code == 1) {
+          // 是否需要缴纳保证金 0否 1是
+          if (res.data.is_take_bond == 1 && res.data.bond < res.data.cate_bond / 2) {
+            this.dialogVisible = true
+          } else {
+            this.dialogVisible = false
+          }
+        }
+      })
+    },
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
+    },
+    goPay() {
+      this.dialogVisible = false
+      this.$router.push({
+        path: '/system/asset/securityFund'
+      })
     }
   }
 }

src/views/entry/newyuncang.vue

@@ -807,59 +807,6 @@
 </script>
 
 <style lang="scss" type="text/stylus" scoped>
-  /* 手机竖屏时，可视区域的最大宽度为 480 */
-  //@media screen and (max-width: 480px) and (orientation: portrait) {
-  //  .pc-content {
-  //    display: none!important;
-  //  }
-  //  .mobile-show {
-  //    display: none!important;
-  //  }
-  //}
-
-  /* 手机横屏和pc最小宽度为 812px */
-  /* 手机横屏 812px 为iphoneX 横屏的设备独立像素*/
-  //@media screen and (max-width: 961px) and (orientation: landscape) {
-  //  .pc-content {
-  //    display: none !important;
-  //  }
-  //
-  //  .mobile-content {
-  //    display: block!important;
-  //    font-size: 0.16rem;
-  //  }
-  //}
-
-  @media screen and (min-width: 750px) {
-    html {
-      font-size: 100px;
-    }
-  }
-
-  @media screen and (min-width: 640px) and (max-width: 749) {
-    html {
-      font-size: 85.333px;
-    }
-  }
-
-  @media screen and (min-width: 414px) and (max-width: 639) {
-    html {
-      font-size: 61.333px;
-    }
-  }
-
-  @media screen and (min-width: 375px) and (max-width: 413) {
-    html {
-      font-size: 50px;
-    }
-  }
-
-  @media screen and (min-width: 320px) and (max-width: 374) {
-    html {
-      font-size: 42.6667px;
-    }
-  }
-
   @media screen and (max-width: 961px) {
     .pc-content {
       display: none !important;

src/views/entry/process.vue

@@ -73,7 +73,6 @@
         })
       },
       nextStep() {
-        // this.$router.push("/agreement");
         this.$router.push("/fillMainInf");
       },
     }

src/views/entry/reviewFail.vue

@@ -6,9 +6,8 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix steps">
         <el-steps :active="3" align-center finish-status="success" process-status="error">
-<!--          <el-step title="签署入驻协议"></el-step>-->
+          <el-step title="注册账号"></el-step>
           <el-step title="填写主体信息"></el-step>
-          <el-step title="填写品牌信息"></el-step>
           <el-step title="填写店铺信息"></el-step>
           <el-step title="提交入驻审核"></el-step>
         </el-steps>
@@ -24,15 +23,13 @@
 <!--          <p>服务电话：4000-188-199</p>-->
           <p style="padding-top: 40px;"><el-button type="primary" @click="reSubmit">重新提交</el-button></p>
         </div>
-
       </div>
     </el-card>
-
-
   </div>
 </template>
 
 <script>
+  import { getInfo,getShopInf } from '@/api/module/entry';
   export default {
     name: "ReviewFail",
     data() {
@@ -40,10 +37,36 @@
         msg: '具体原因，请联系售后'
       }
     },
-    mounted() {
+    created() {
       if(this.$route.params.msg) {
         this.msg = this.$route.params.msg;
       }
+      /** 页面刷新，更新 客户审核状态 */
+      getInfo().then(res=> {
+        if (res.code == 1 && res.data.user) {
+          if (res.data.user.state == 1) {
+            this.$router.push({path: '/home/index'});
+          }
+          if (res.data.user.state == 2) {
+            this.$router.push({path: '/reviewing'})
+          }
+          if (res.data.user.state == 3) {
+            this.$router.push({path: '/reviewFail'});
+            getShopInf().then(res=> {
+              if (res.code == 1 && res.data.Apply.content != '') {
+                this.msg = res.data.Apply.content;
+              }
+            });
+          }
+        }
+      });
+    },
+    mounted() {
+      /** 禁止 浏览器 后退 */
+      history.pushState(null,null,document.URL);
+      window.addEventListener('popstate', function () {
+        history.pushState(null, null, document.URL);
+      })
     },
     methods: {
       // 重新提交审核

src/views/entry/reviewing.vue

@@ -6,9 +6,8 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix steps">
         <el-steps :active="3" align-center finish-status="success">
-<!--          <el-step title="签署入驻协议" ></el-step>-->
+          <el-step title="注册账号" ></el-step>
           <el-step title="填写主体信息" ></el-step>
-          <el-step title="填写品牌信息" ></el-step>
           <el-step title="填写店铺信息" ></el-step>
           <el-step title="提交入驻审核" ></el-step>
         </el-steps>
@@ -19,7 +18,7 @@
             <img src="../../../public/images/entry/reviewSuccess.png" alt="">
           </p>
           <p>资料已提交，工作人员审核中。。。</p>
-<!--          <p>感谢您使用云仓！</p>-->
+          <p style="margin-top: 10px;">感谢您使用云仓！</p>
           <p>您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。</p>
           <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系！</p>
 <!--          <p>服务电话：4000-188-199</p>-->
@@ -30,10 +29,33 @@
 </template>
 
 <script>
+  import { getInfo } from '@/api/module/entry';
   export default {
     name: "ReviewSuccess",
     data() {
       return {}
+    },
+    created() {
+      getInfo().then(res=> {
+        if (res.code == 1 && res.data.user) {
+          if (res.data.user.state == 1) {
+            this.$router.push({path: '/home/index'});
+          }
+          if (res.data.user.state == 2) {
+            this.$router.push({path: '/reviewing'})
+          }
+          if (res.data.user.state == 3) {
+            this.$router.push({path: '/reviewFail'});
+          }
+        }
+      });
+    },
+    mounted() {
+      /** 禁止 浏览器 后退 */
+      history.pushState(null,null,document.URL);
+      window.addEventListener('popstate', function () {
+        history.pushState(null, null, document.URL);
+      })
     }
   }
 </script>

src/views/platformlogin.vue

@@ -41,7 +41,6 @@
             // 获取客户是否有审核信息
             getShopInf().then(res => {
               if(res.code === 1) {
-                //debugger
                 switch(res.data.state) {
                   case 0:
                     switch(res.data.status){
@@ -49,10 +48,7 @@
                         this.$router.push({path: '/process'});
                         break;
                       case(1):
-                        this.$router.push({path: '/fillBrandInf'});
-                        break;
-                      case(2):
-                        this.$router.push({path: '/fillShopInf',});
+                        this.$router.push({path: '/fillShopInf'});
                         break;
                     }
                     break;

src/views/returnurl.vue

+<template>
+    
+</template>
+<script>
+export default {
+  name:'returnurl',
+  created(){
+  
+  },
+   mounted() {
+    window.opener = null
+    window.open('', self)
+    window.close()
+  },
+}
+</script>

src/views/system/goods/add/components/goodsimg.vue

@@ -61,6 +61,7 @@
                 'image': function (value) {
                   if (value) {
                     // 触发input框选择图片文件
+                    document.querySelector('#file').value = ''; // 清空是为了解决，连续上传同一张图片时，后续图片上传失效问题
                     document.querySelector('#file').click()
                   } else {
                     this.quill.format('image', false);

src/views/system/goods/add/components/goodsinfomation.vue

@@ -44,8 +44,8 @@
 <!--        <span class="tip-span ml20">关键词之间用逗号分开，最多可以添加5个</span>-->
       </el-form-item>
 
-      <el-form-item label="所属品牌：" prop="goods_brand">
-        <el-select v-model="goodsInfoForm.goods_brand" placeholder="请选择商品品牌" style="width: 420px;">
+      <el-form-item label="所属品牌：" prop="brand_id">
+        <el-select v-model="goodsInfoForm.brand_id" placeholder="请选择商品品牌" style="width: 420px;">
           <el-option
             v-for="item in brandOptions"
             :key="item.id"
@@ -112,7 +112,7 @@
 </template>
 
 <script>
-  import { NewGetCategory, GetFreight, UploadImg } from '@/api/module/goods'
+  import { NewGetCategory, GetFreight, UploadImg, getByCategoryData } from '@/api/module/goods'
   import { getBrandsInf } from '@/api/module/brand/brand'
   import { getAreaList } from '@/api/module/retreat/address'
   export default {
@@ -153,9 +153,6 @@
         }
       }
       return {
-        //loading: false,
-        // categoryStr: '',
-        goodsInfoDataClone: {},
         areaOptions: [], // 地址 省
         brandOptions: [], // 商品品牌
         goodsInfoForm: {
@@ -169,6 +166,7 @@
           deliver_area: '',     // 发货地
           unit: '',             // 单位
           goods_brand: '',      // 品牌
+          brand_id: '',          // 品牌id
           web_url: '',          // 外部链接
           out_goods_id: '',     // 商品编码
           imgs: []              // 商品图片
@@ -204,7 +202,7 @@
           // checkStrictly: true
         },
         fuckoptions: [],
-
+        catefee: 0,
       } // return end
     },
     components: {},
@@ -225,8 +223,6 @@
       this.getSSQArea();
     },
     mounted() {
-      //深拷贝一份最开始的数据，为初始化准备
-      //this.goodsInfoDataClone = this.deepClone(this.goodsinfodata);
       if(this.goodsinfodata.goods_id) {
         this.goodsInfoForm = this.goodsinfodata;
         if( this.goodsInfoForm.imgs.length > 0 ) {
@@ -240,6 +236,9 @@
         this.goodsInfoForm.categoryStr = this.goodsinfodata.categoryStr;
         this.goodsInfoForm.categoryList = this.goodsinfodata.categoryList;
       }
+
+      // 初始化 服务费率
+      this.getByCategoryFee(this.goodsInfoForm.categoryList)
     },
     methods: {
       // 数据初始化
@@ -262,25 +261,16 @@
       },
       // 获取 商品品牌
       getBrands() {
-        getBrandsInf().then( res => {
-          if(res.data) {
-            this.brandOptions = res.data.data;
+        // 增加入参
+        let data = {
+          status: 1
+        }
+        getBrandsInf(data).then( res => {
+          if(res.code == 1 ) {
+            this.brandOptions = res.data.data ? res.data.data : [];
           }else {
             this.brandOptions = [];
           }
-
-          // let num_goods_brand = Number(this.goodsInfoForm.goods_brand);
-          //
-          // if( this.goodsInfoForm.goods_brand !== '') {
-          //   let result = this.brandOptions.find( item => {
-          //     return item.id === num_goods_brand;
-          //   });
-          //   //console.log(315,result)
-          //   if( result == undefined) {
-          //     this.goodsInfoForm.goods_brand = '';
-          //   }
-          // }
-
         });
       },
       /* 修改 商品分类 类目 */
@@ -288,7 +278,6 @@
         this.SSQGoodsList = [];
         this.editGoodsTypeDialog = true;
         this.SSQGoodsList = this.goodsInfoForm.categoryList
-        //console.log('点击修改类目数据：',this.SSQGoodsList);
       },
 
       getSSQArea(node, resolve) {
@@ -309,6 +298,8 @@
           this.goodsInfoForm.categoryStr = ssqLabelList[0] + '/' + ssqLabelList[1] + '/' + ssqLabelList[2];
           this.editGoodsTypeDialog = false;
           this.$message({type:'success',message:'修改成功'});
+          // 修改类目后更新 服务费率
+          this.getByCategoryFee(this.goodsInfoForm.categoryList)
         }else {
           this.$message({type: 'warning',message: '请选择完整三级类目'});
         }
@@ -429,7 +420,27 @@
         this.$router.push({path: '/system/shop/brand'});
       },
 
-      // 通用 方法
+      /** 根据类目 获取服务费率
+       * 传一级类目
+       * */
+      getByCategoryFee(cateList) {
+        let data = {
+          category_id: ''
+        }
+        this.cateFee = 0;
+
+        if (Array.isArray(cateList) && cateList.length > 0) {
+          data.category_id = cateList[0];
+        }
+        // console.log(8888,data);
+        getByCategoryData(data).then(res=> {
+          if ( res.code == 1 ) {
+            this.cateFee = res.data.service_fee_ratio
+            this.$store.commit('SET_CATEFEE',this.cateFee);
+          }
+        });
+      },
+
       // 图片转换为 base64
       getBase64(file) {
         return new Promise(function (resolve, reject) {
@@ -447,9 +458,6 @@
           };
         });
       },
-
-
-
     } // methods end
   }
 </script>

src/views/system/goods/add/components/goodsparameter.vue

@@ -15,13 +15,12 @@
       >
         <el-table-column align="center" prop="js_price" label="协议价">
           <template slot-scope="scope">
-            <el-input size="mini" style="width:90%" v-model="scope.row.js_price" placeholder="请输入协议价"></el-input>
+            <el-input size="mini" style="width:90%" v-model="scope.row.js_price" placeholder="请输入协议价" ></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="sl_price" label="结算价">
           <template slot-scope="scope">
-            <span
-              class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
+            <span>{{ settleSLPriceFormatter(scope.row.js_price) }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="price" label="指导价">
@@ -90,9 +89,7 @@
         </el-table-column>
         <el-table-column align="center" prop="sl_price" label="结算价">
           <template slot-scope="scope">
-            <!--              <el-input size="mini" style="width:90%" v-model="scope.row.hh2" :disabled="true" placeholder="根据结算价自动计算"></el-input>-->
-            <span
-              class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
+            <span class="sl-price-span-input">{{ settleSLPriceFormatter(scope.row.js_price) }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="price" label="指导价">
@@ -206,7 +203,8 @@ export default {
         }
       ],
       singleSpecImgList: [],
-      isViewPriceExp: false
+      isViewPriceExp: false,
+      cateFee: 0,
     } // return end
   },
   watch:{
@@ -217,7 +215,7 @@ export default {
     },
   },
   created() {
-    //this.orgGoodsPam = this.parameterdata;
+    this.cateFee = this.$store.state.user.cateFee;
   },
   mounted() {
     if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
@@ -387,6 +385,27 @@ export default {
       });
     },
 
+    /** 结算价格计算 */
+    settleSLPriceFormatter(jsPriceVal) {
+      this.cateFee = this.$store.state.user.cateFee ? this.$store.state.user.cateFee : 0;
+
+      let slPriceNum = ""
+
+      if (jsPriceVal > 0) {
+        if (this.cateFee == 0) {
+          slPriceNum = jsPriceVal
+        }
+        if (this.cateFee > 0) {
+          slPriceNum = (1000 - this.cateFee) * (jsPriceVal * 1000) /1000000
+        }
+      }else if (jsPriceVal == 0) {
+        slPriceNum = 0;
+      }else {
+        slPriceNum = ''
+      }
+
+      return slPriceNum
+    },
   } // methods end
 }
 </script>

src/views/system/goods/add/index.vue

@@ -178,13 +178,12 @@
               deliver_area: res.data.deliver_area,     // 发货地
               unit: res.data.unit,             // 单位
               goods_brand: res.data.goods_brand,      // 品牌
+              brand_id: res.data.brand_id,      // 品牌
               web_url: res.data.web_url,          // 外部链接
               out_goods_id: (res.data.out_goods_id == 0) ? '' : res.data.out_goods_id ,     // 商品编码
               imgs: res.data.imgs              // 商品图片
             }
             this.goodsinfodata.categoryStr = res.data.category_first_name + '/' + res.data.category_first_name + '/' + res.data.category_three_name;
-            // 发货地 需要 处理
-            // this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
 
             let arr = [];
             arr[0] = res.data.category_first_id;
@@ -271,8 +270,10 @@
         this.isShowGoodsDetails = false;
       }
     },
-    mounted() {},
+    mounted() {
+    },
     methods: {
+
       // 规格子组件，传给父组件的数据
       calcSpeTable(data) {
         //console.log('原始值',data);
@@ -419,12 +420,13 @@
 
         // 如果有，则说明有规格组合数据
         if ( spsjData2.pamTableList && spsjData2.pamTableList.length > 0 ) {
+          debugger
           for(let i = 0; i < spsjData2.pamTableList.length; i++) {
             let itemObj = spsjData2.pamTableList[i][0];
             for (let itemKey in itemObj) {
               // 有多余字段，可能为空，需要对有效字段单独判断
               // Number后，有三中情况：0，正数，负数，NaN
-              if( !Number(itemObj['sl_price']) ||  Number(itemObj['sl_price']) <0 ) {
+              if( !Number(itemObj['js_price']) ||  Number(itemObj['js_price']) <0 ) {
                 goodsPriceMsg = '[ 商品售价 ]中，协议价不能为空，并且只能填大于0的数值'
                 isGoodsPrice = false;
                 break
@@ -449,8 +451,9 @@
           }
         }else {
           // 无规格组合数据
+          debugger
           let slingleSpeObj = spsjData1[0];
-          if ( !Number(slingleSpeObj['sl_price']) ||  Number(slingleSpeObj['sl_price']) <0 ) {
+          if ( !Number(slingleSpeObj['js_price']) ||  Number(slingleSpeObj['js_price']) <0 ) {
             goodsPriceMsg = '[ 商品售价 ]中，协议价不能为空，并且只能填大于0的数值'
             isGoodsPrice = false;
           } else if ( !Number(slingleSpeObj['price']) ||  Number(slingleSpeObj['price']) <0 ) {
@@ -505,13 +508,18 @@
         let spxxData = this.$refs.goodsInfo.goodsInfoForm;
         // 品牌处理  goods_brand
         let brandOptions = this.$refs.goodsInfo.brandOptions;
-        for(let bi = 0; bi < brandOptions.length; bi++) {
-          if( Number(spxxData.goods_brand) === Number(brandOptions[bi].id) ) {
-            spxxData.goods_brand = brandOptions[bi].brand_cn;
-            break;
+        debugger
+        // goods_brand
+        if (Array.isArray(brandOptions) && brandOptions.length > 0) {
+          for(let bi = 0; bi < brandOptions.length; bi++) {
+            if( Number(spxxData.brand_id) === Number(brandOptions[bi].id) ) {
+              spxxData.goods_brand = brandOptions[bi].brand_cn;
+              break;
+            }
           }
         }
 
+
         // 产地数据处理
         let areaOptions = this.$refs.goodsInfo.areaOptions;
         for(let ai = 0; ai < areaOptions.length; ai++) {

src/views/system/order/index.vue

@@ -162,9 +162,9 @@
               </el-table-column>
               <el-table-column label="规格/数量/金额" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.goods_option_title }}<br/>
-                  {{ scope.row.goods_price / 100 }} 元<br/>
-                  x {{ scope.row.total }}<br/>
+                  {{ scope.row.goods_option_title ? scope.row.goods_option_title : '--' }}<br/>
+                  x {{ scope.row.total ? scope.row.total : '--' }}<br/>
+                  {{ scope.row.goods_price / 100 ? scope.row.goods_price / 100 : '--' }} 元<br/>
                 </template>
               </el-table-column>
               <el-table-column prop="created_time" label="下单时间" width="180" align="center">