Skip to content

S
shop-new
提交 4a5ebbfb authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

Merge branch '2.8关联bug' into test 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.018ae2b6.css
#	dist/static/css/app.7239b927.css
#	dist/static/css/app.981cdb47.css
#	dist/static/css/chunk-000b3ab4.9f670dd0.css
#	dist/static/css/chunk-1b9ca1bf.e539ec29.css
#	dist/static/css/chunk-395a9d81.6485bf58.css
#	dist/static/css/chunk-3c5d3e7a.d0adca96.css
#	dist/static/css/chunk-542b2550.d3829422.css
#	dist/static/css/chunk-5b4b2fda.6ab5ebe0.css
#	dist/static/css/chunk-8457bade.e539ec29.css
#	dist/static/css/chunk-bd8611ca.a3da7543.css
#	dist/static/css/chunk-d0560568.1d48f9b5.css
#	dist/static/css/chunk-d84713fc.208ad6b5.css
#	dist/static/js/chunk-1d0d7df2.985ae709.js
#	dist/static/js/chunk-3c5d3e7a.de3ef871.js
#	dist/static/js/chunk-41dc9244.f15022e4.js
#	dist/static/js/chunk-47c51416.42d1d71b.js
#	dist/static/js/chunk-7c2f4fe6.13bc5f69.js
#	dist/static/js/chunk-7c2f4fe6.33f71712.js
#	dist/static/js/chunk-7c2f4fe6.a6e494d8.js
#	dist/static/js/chunk-b0d57d44.a672684b.js
#	dist/static/js/chunk-b4915312.bc882284.js
#	dist/static/js/chunk-bd8611ca.0033f7f2.js
上级 c933dc16 7ebad944
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 729 行增加 和 112 行删除
dist/index.html
浏览文件 @ 4a5ebbfb
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.981cdb47.css 0 → 100644
浏览文件 @ 4a5ebbfb
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/chunk-1516e206.0934badc.css 0 → 100644
浏览文件 @ 4a5ebbfb
.fill-store-inf[data-v-f4b5db4c]{font-size:16px;width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-f4b5db4c]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-f4b5db4c] .el-card__body{height:calc(100% - 180px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-f4b5db4c]{height:60px;background:#1890ff}.logo-bg img[data-v-f4b5db4c]{height:44px;margin:8px 0 8px 20px}.steps[data-v-f4b5db4c]{height:70px;width:60%;margin:20px auto}.steps[data-v-f4b5db4c] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-f4b5db4c] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-f4b5db4c] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-f4b5db4c] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-f4b5db4c] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-f4b5db4c] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-f4b5db4c] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-f4b5db4c] .el-step__title.is-success{color:#000}.main-con[data-v-f4b5db4c]{width:70%;height:100%;margin:20px auto 0}.main-con .tips-text[data-v-f4b5db4c]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-f4b5db4c]:before{color:#e3c300}.main-con .uploadData[data-v-f4b5db4c]{display:inline-block}.main-con .uploadData[data-v-f4b5db4c] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-f4b5db4c] .el-upload,.main-con .uploadData[data-v-f4b5db4c] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-f4b5db4c] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-f4b5db4c] .avatar{width:100px;height:100px}.main-con .hiden-dom[data-v-f4b5db4c] .el-upload--picture-card{display:none!important}.main-con .auth-con[data-v-f4b5db4c]{width:100%;height:100%;display:flex;flex-direction:row;justify-content:normal;flex-wrap:wrap}.main-con .single-upload-con[data-v-f4b5db4c]{width:160px;height:140px;text-align:center;overflow:hidden}.main-con .single-auth-img[data-v-f4b5db4c]{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-f4b5db4c]{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-f4b5db4c]{width:100%;height:100%;border-radius:6px;cursor:pointer;position:relative;border:none}.main-con .span-img-del-loading[data-v-f4b5db4c]{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-f4b5db4c],.main-con .span-img-del-loading>.zoom-span-block[data-v-f4b5db4c]{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-f4b5db4c]{display:block}.main-con .single-title[data-v-f4b5db4c]{font-size:12px;color:#666;text-align:center}.main-con .confirm-btn[data-v-f4b5db4c]{width:50%;margin:40px auto 20px}.img-dialog-con[data-v-f4b5db4c] .el-dialog__body,.main-con .confirm-btn>div[data-v-f4b5db4c]{text-align:center}.img-spe[data-v-f4b5db4c]{margin:0 auto}
\ No newline at end of file
dist/static/css/chunk-17db7236.354a7711.css 0 → 100644
浏览文件 @ 4a5ebbfb
.to-review[data-v-7245e274]{font-size:16px;width:100%;height:100%;overflow:hidden}.to-review .logo-bg[data-v-7245e274]{height:60px;background:#1890ff}.to-review .logo-bg img[data-v-7245e274]{height:44px;margin:8px 0 8px 20px}.to-review .box-card[data-v-7245e274]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.to-review .steps[data-v-7245e274]{height:70px;width:60%;margin:40px auto 0}.to-review .steps[data-v-7245e274] .el-step__title{font-size:16px;line-height:18px;padding-top:20px;color:#333}.to-review .el-step[data-v-7245e274] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.to-review .el-step[data-v-7245e274] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.to-review .el-step[data-v-7245e274] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.to-review .el-step[data-v-7245e274] .el-step__title.is-process{color:#000;font-weight:400}.to-review .el-step[data-v-7245e274] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.to-review .el-step[data-v-7245e274] .el-step__head.is-success .el-step__line{background-color:#1890ff}.to-review .el-step[data-v-7245e274] .el-step__title.is-success{color:#000}.to-review .main[data-v-7245e274]{width:100%;height:calc(66% - 120px);display:table}.to-review .main .fuck[data-v-7245e274]{display:table-cell;vertical-align:middle}.to-review .main .fuck p[data-v-7245e274]{text-align:center}.to-review .main .fuck p[data-v-7245e274]:nth-child(2){font-size:24px;font-weight:700;padding:10px 0}
\ No newline at end of file
dist/static/css/chunk-1b9ca1bf.e539ec29.css 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/css/chunk-1d0d7df2.f9a06397.css 0 → 100644
浏览文件 @ 4a5ebbfb
.fill-brand-inf[data-v-cd65b72a]{font-size:16px;width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-brand-inf .box-card[data-v-cd65b72a]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.fill-brand-inf .box-card[data-v-cd65b72a] .el-card__body{height:calc(100% - 120px);overflow-x:hidden;overflow-y:scroll}.fill-brand-inf .logo-bg[data-v-cd65b72a]{height:60px;background:#1890ff}.fill-brand-inf .logo-bg img[data-v-cd65b72a]{height:44px;margin:8px 0 8px 20px}.fill-brand-inf .spe-brand-text[data-v-cd65b72a]{width:100%;height:50px;line-height:50px;margin:15px 0 15px 30px;font-size:18px;font-family:Microsoft YaHei;font-weight:700;color:#333;background-color:#fafafa}.steps[data-v-cd65b72a]{height:70px;width:60%;margin:20px auto}.steps[data-v-cd65b72a] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-cd65b72a] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-cd65b72a] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-cd65b72a] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-cd65b72a] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-cd65b72a] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-cd65b72a] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-cd65b72a] .el-step__title.is-success{color:#000}.main-con[data-v-cd65b72a]{width:70%;margin:30px auto 50px;overflow-x:hidden;overflow-y:scroll}.main-con .tips-text[data-v-cd65b72a]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-cd65b72a]:before{color:#e3c300}.main-con .no-brand[data-v-cd65b72a]{padding-left:60px}.main-con .no-brand p[data-v-cd65b72a]{color:#333;font-size:14px;line-height:20px;padding:10px 80px 0}.main-con .no-brand .no-brand-btn[data-v-cd65b72a]{padding-left:84px;padding-top:30px}.main-con .uploadData[data-v-cd65b72a]{display:inline-block}.main-con .uploadData[data-v-cd65b72a] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-cd65b72a] .el-upload,.main-con .uploadData[data-v-cd65b72a] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-cd65b72a] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-cd65b72a] .avatar{width:100px;height:100px}.main-con .download-Template-btn[data-v-cd65b72a]{width:145px;height:38px;line-height:38px;text-align:center;color:#1890ff;font-size:14px;border:1px solid #1890ff;border-radius:3px;cursor:pointer}.main-con .download-Template-btn[data-v-cd65b72a]:hover{color:#fff;border:1px solid #1890ff;background-color:#1890ff}
\ No newline at end of file
dist/static/css/chunk-47d1c267.49c4beab.css 0 → 100644
浏览文件 @ 4a5ebbfb
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/chunk-4b29491c.43a2482e.css 0 → 100644
浏览文件 @ 4a5ebbfb
.to-review[data-v-5e9840cc]{font-size:16px;width:100%;height:100%;overflow:hidden}.to-review .logo-bg[data-v-5e9840cc]{height:60px;background:#1890ff}.to-review .logo-bg img[data-v-5e9840cc]{height:44px;margin:8px 0 8px 20px}.to-review .box-card[data-v-5e9840cc]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.to-review .steps[data-v-5e9840cc]{height:70px;width:60%;margin:20px auto 20px}.to-review .el-step[data-v-5e9840cc] .el-step__title{font-size:16px;line-height:18px;padding-top:20px;color:#333}.to-review .el-step[data-v-5e9840cc] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.to-review .el-step[data-v-5e9840cc] .el-step__head.is-success .el-step__line{background-color:#1890ff}.to-review .el-step[data-v-5e9840cc] .el-step__head.is-process{color:red}.to-review .el-step[data-v-5e9840cc] .el-step__title.is-process{color:red;font-weight:400}.to-review .el-steps[data-v-5e9840cc] .el-step.is-horizontal .el-step__line{background-color:red}.to-review .el-step[data-v-5e9840cc] .el-step__title.is-success{color:#000}.to-review .el-step[data-v-5e9840cc] .el-step__title.is-error{color:red;font-weight:400}.to-review .main[data-v-5e9840cc]{width:100%;height:calc(66% - 120px);display:table}.to-review .main .main-con[data-v-5e9840cc]{display:table-cell;vertical-align:middle}.to-review .main .main-con p[data-v-5e9840cc]{text-align:center}.to-review .main .main-con p[data-v-5e9840cc]:nth-child(2){font-size:24px;font-weight:700;padding:0 0}
\ No newline at end of file
dist/static/css/chunk-64b639c7.7d5c00e2.css 0 → 100644
浏览文件 @ 4a5ebbfb
.entryDetails[data-v-d1c85880]{font-size:16px;width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-d1c85880]{height:60px;background:#1890ff}.logo-bg img[data-v-d1c85880]{height:44px;margin:8px 0 8px 20px}.main-con[data-v-d1c85880]{width:70%;margin:30px auto 0}.main-con img[data-v-d1c85880]{width:100%;height:calc(100% + 220px);margin:0 0}.confirm-btn[data-v-d1c85880]{height:100px;width:50%;margin:30px auto 0}.confirm-btn p[data-v-d1c85880]{text-align:center}.confirm-btn p[data-v-d1c85880]:nth-child(2){color:red;font-size:10px}
\ No newline at end of file
dist/static/css/chunk-b4915312.3fd47436.css 0 → 100644
浏览文件 @ 4a5ebbfb
.fill-store-inf[data-v-2b9ff0be]{font-size:16px;width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-2b9ff0be]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-2b9ff0be] .el-card__body{height:calc(100% - 140px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-2b9ff0be]{height:60px;background:#1890ff}.logo-bg img[data-v-2b9ff0be]{height:44px;margin:8px 0 8px 20px}.steps[data-v-2b9ff0be]{height:70px;width:60%;margin:20px auto}.steps[data-v-2b9ff0be] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-2b9ff0be] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-2b9ff0be] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-2b9ff0be] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-2b9ff0be] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-2b9ff0be] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-2b9ff0be] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-2b9ff0be] .el-step__title.is-success{color:#000}.main-con[data-v-2b9ff0be]{width:70%;margin:30px auto;overflow-y:scroll}.main-con .tips-text[data-v-2b9ff0be]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-2b9ff0be]:before{color:#e3c300}.main-con .uploadData[data-v-2b9ff0be]{display:inline-block}.main-con .uploadData[data-v-2b9ff0be] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-2b9ff0be] .el-upload,.main-con .uploadData[data-v-2b9ff0be] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-2b9ff0be] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-2b9ff0be] .avatar{width:100px;height:100px}.hiden-dom[data-v-2b9ff0be] .el-upload--picture-card{display:none!important}.idcard-tips-con[data-v-2b9ff0be]{display:flex;flex-direction:row;justify-content:normal;justify-items:center}.idcard-tips-con>p[data-v-2b9ff0be]{margin:0;padding:0 15px}.main-form-con[data-v-2b9ff0be]{margin-left:100px}.main-form-title[data-v-2b9ff0be]{color:#666;font-size:18px;font-weight:600;padding:0;margin:10px 0 10px -180px}.main-form-tips[data-v-2b9ff0be]{color:#aaa;font-size:14px;font-weight:400;padding:0}.confirm-btn[data-v-2b9ff0be]{width:50%;margin:40px auto 0}.confirm-btn p[data-v-2b9ff0be]{text-align:center}.read-fail-dialog[data-v-2b9ff0be] .el-dialog>.el-dialog__body>p{text-align:center;font-size:16px}.read-fail-dialog[data-v-2b9ff0be] .read-time-m{color:#f56c6c;font-size:18px;padding:0 5px}
\ No newline at end of file
dist/static/js/app.2bf93637.js 0 → 100644
浏览文件 @ 4a5ebbfb
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-1516e206.1c96bf19.js 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/js/chunk-17db7236.a8a97ccc.js 0 → 100644
浏览文件 @ 4a5ebbfb
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-17db7236"],{"0245":function(t,e,n){},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return u})),n.d(e,"i",(function(){return c})),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 p}));var a=n("b775");function u(t){return Object(a["a"])({url:"/system/index/getInfo",method:"get",params:t})}function c(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 p(t){return Object(a["a"])({url:"/local/qualification/list",method:"get",params:t})}},a0bf:function(t,e,n){"use strict";n("0245")},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)},u=[],c=n("6b1f"),r={name:"ReviewSuccess",data:function(){return{}},created:function(){var t=this;Object(c["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("a0bf"),n("2877")),l=Object(o["a"])(i,a,u,!1,null,"7245e274",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="}}]);
\ No newline at end of file
dist/static/js/chunk-1b9ca1bf.37bc6947.js 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/js/chunk-1d0d7df2.985ae709.js 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/js/chunk-47c51416.42d1d71b.js 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/js/chunk-47d1c267.91f52272.js 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/js/chunk-4b29491c.c369f469.js 0 → 100644
浏览文件 @ 4a5ebbfb
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4b29491c"],{"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=="},"4f84":function(t,e,n){},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return r})),n.d(e,"i",(function(){return c})),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 r(t){return Object(a["a"])({url:"/system/index/getInfo",method:"get",params:t})}function c(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)},r=[],c=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(c["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(c["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("e87f"),n("2877")),o=Object(i["a"])(s,a,r,!1,null,"5e9840cc",null);e["default"]=o.exports},e87f:function(t,e,n){"use strict";n("4f84")}}]);
\ No newline at end of file
dist/static/js/chunk-64b639c7.e6e10783.js 0 → 100644
浏览文件 @ 4a5ebbfb
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-64b639c7"],{"92fc":function(t,n,e){t.exports=e.p+"static/img/4.3f411af6.png"},a570:function(t,n,e){"use strict";e.r(n);var i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"entryDetails"},[e("div",{staticClass:"logo-bg"},[t.settitle&&t.settitle.topLogo?e("img",{attrs:{src:t.settitle.topLogo,alt:""}}):t._e()]),t._v(" "),t._m(0),t._v(" "),e("div",{staticClass:"confirm-btn"},[e("p",[e("el-button",{staticStyle:{padding:"8px 30px"},attrs:{type:"primary",round:""},on:{click:t.nextStep}},[t._v("\n 立即入驻  "),e("i",{staticClass:"el-icon-right"})])],1)])])},a=[function(){var t=this,n=t.$createElement,i=t._self._c||n;return i("div",{staticClass:"main-con"},[i("img",{attrs:{src:e("92fc"),alt:""}})])}],s=e("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,n=window.location.host,e={domain:n};Object(s["e"])(e).then((function(n){1==n.code&&(t.channel_id=n.data.channel_id,t.getWebSite())}))},getWebSite:function(){var t=this,n={channel_ids:this.channel_id};Object(s["f"])(n).then((function(n){1==n.code&&n.data.universal_lst&&"null"!=n.data.universal_lst&&(t.settitle=n.data.universal_lst)}))},nextStep:function(){this.$router.push("/fillMainInf")}}},o=c,l=(e("a8f3"),e("2877")),r=Object(l["a"])(o,i,a,!1,null,"d1c85880",null);n["default"]=r.exports},a8f3:function(t,n,e){"use strict";e("d167")},d167:function(t,n,e){}}]);
\ No newline at end of file
dist/static/js/chunk-7c2f4fe6.13bc5f69.js 0 → 100644
浏览文件 @ 4a5ebbfb
<<<<<<< HEAD:dist/static/js/chunk-7c2f4fe6.a6e494d8.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("2ca7"),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("cba8"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
//# sourceMappingURL=chunk-7c2f4fe6.a6e494d8.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}}]);
>>>>>>> 2.8关联bug:dist/static/js/chunk-7c2f4fe6.13bc5f69.js
dist/static/js/chunk-7c2f4fe6.a6e494d8.js
浏览文件 @ 4a5ebbfb
<<<<<<< HEAD:dist/static/js/chunk-7c2f4fe6.a6e494d8.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("2ca7"),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("cba8"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
//# sourceMappingURL=chunk-7c2f4fe6.a6e494d8.js.map
\ No newline at end of file
//# sourceMappingURL=chunk-7c2f4fe6.a6e494d8.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}}]);
>>>>>>> 2.8关联bug:dist/static/js/chunk-7c2f4fe6.13bc5f69.js
dist/static/js/chunk-b0d57d44.a672684b.js 0 → 100644
浏览文件 @ 4a5ebbfb
(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
dist/static/js/chunk-b4915312.bc882284.js 0 → 100644
浏览文件 @ 4a5ebbfb
差异被折叠。
dist/static/js/chunk-f18f73fa.4bb6d952.js 0 → 100644
浏览文件 @ 4a5ebbfb
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f18f73fa"],{"5a97":function(t,e,n){"use strict";n.d(e,"e",(function(){return r})),n.d(e,"i",(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})),n.d(e,"h",(function(){return m}));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})}function m(t){return Object(a["a"])({url:"/system/goodsNew/onsaleUpdate",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
package.json
浏览文件 @ 4a5ebbfb
......@@ -71,6 +71,7 @@
"vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0",
"vuex": "3.1.0",
"wangeditor": "^4.7.11",
"xlsx": "^0.17.0"
},
"devDependencies": {
......
src/api/module/goods.js
浏览文件 @ 4a5ebbfb
......@@ -18,7 +18,7 @@ export function GetCategory(query) {
})
}
// 经营类目
// 经营类目-12-23-bak
export function NewGetCategory(query) {
return request({
url: '/system/goodsNew/businessList',
......@@ -26,6 +26,16 @@ export function NewGetCategory(query) {
params: query
})
}
// 营业类目
export function NewGetCategoryData(data) {
return request({
url: '/local/getCategoryList',
method: 'post',
data: data
})
}
// 查询运费模板
export function GetFreight(query) {
return request({
......@@ -112,6 +122,15 @@ export function UploadImg(data) {
})
}
// 批量上传图片
export function batchUploadImage(data) {
return request({
url: '/system/goodsNew/batchUploadImage',
method: 'post',
data: data
})
}
// 根据类目 获取服务费
export function getByCategoryData(query) {
return request({
......
src/api/module/goodsgement.js
浏览文件 @ 4a5ebbfb
......@@ -71,3 +71,12 @@ export function cancelOnsaleAllData(data) {
data: data
})
}
// 保存 不下架编辑商品数据
export function saveHotEditGoodsData(data) {
return request({
url: '/system/goodsNew/onsaleUpdate',
method: 'post',
data: data
})
}
src/assets/icons/iconfont/iconfont.css 0 → 100644
浏览文件 @ 4a5ebbfb
@font-face {
font-family: "iconfont"; /* Project id 3034653 */
src: url('iconfont.woff2?t=1639989114597') format('woff2'),
url('iconfont.woff?t=1639989114597') format('woff'),
url('iconfont.ttf?t=1639989114597') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-iconset0435:before {
content: "\e73a";
}
src/assets/icons/iconfont/iconfont.js 0 → 100644
浏览文件 @ 4a5ebbfb
!function(e){var t,n,o,i,c,d='<svg><symbol id="icon-iconset0435" viewBox="0 0 1024 1024"><path d="M810.666667 640l-192 0L618.666667 128c0-46.933333-38.4-85.333333-85.333333-85.333333l-42.666667 0c-46.933333 0-85.333333 38.4-85.333333 85.333333l0 512-192 0c-12.8 0-21.333333 8.533333-21.333333 21.333333 0 6.4 2.133333 10.666667 6.4 14.933333l298.666667 298.666667c4.266667 4.266667 8.533333 6.4 14.933333 6.4 6.4 0 10.666667-2.133333 14.933333-6.4l298.666667-298.666667c4.266667-4.266667 6.4-8.533333 6.4-14.933333C832 648.533333 823.466667 640 810.666667 640zM512 930.133333 264.533333 682.666667 448 682.666667 448 128c0-23.466667 19.2-42.666667 42.666667-42.666667l42.666667 0c23.466667 0 42.666667 19.2 42.666667 42.666667l0 554.666667 183.466667 0L512 930.133333z" ></path></symbol></svg>',l=(l=document.getElementsByTagName("script"))[l.length-1].getAttribute("data-injectcss"),s=function(e,t){t.parentNode.insertBefore(e,t)};if(l&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(e){console&&console.log(e)}}function a(){c||(c=!0,o())}function r(){try{i.documentElement.doScroll("left")}catch(e){return void setTimeout(r,50)}a()}t=function(){var e,t;(t=document.createElement("div")).innerHTML=d,d=null,(e=t.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",t=e,(e=document.body).firstChild?s(t,e.firstChild):e.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(o=t,i=e.document,c=!1,r(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,a())})}(window);
\ No newline at end of file
src/assets/icons/iconfont/iconfont.json 0 → 100644
浏览文件 @ 4a5ebbfb
{
"id": "3034653",
"name": "STBZ",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "554469",
"name": "向下箭头",
"font_class": "iconset0435",
"unicode": "e73a",
"unicode_decimal": 59194
}
]
}
src/layout/index.vue
浏览文件 @ 4a5ebbfb
......@@ -66,6 +66,7 @@ export default {
position: relative;
height: 100%;
width: 100%;
font-size: 16px;
&.mobile.openSidebar {
position: fixed;
......
src/main.js
浏览文件 @ 4a5ebbfb
......@@ -25,6 +25,10 @@ import Pagination from "@/components/Pagination";
import VueAwesomeSwiper from 'vue-awesome-swiper' // 引入swiper
import 'swiper/css/swiper.min.css' // 引入swiper样式/
Vue.use(VueAwesomeSwiper) // 注册swiper
// 阿里图标
import './assets/icons/iconfont/iconfont.css';
// import '../../assets/icons/iconfont/iconfont.js'
// 全局方法挂载
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
......
src/utils/request.js
浏览文件 @ 4a5ebbfb
......@@ -39,7 +39,7 @@ service.interceptors.request.use(config => {
if (getToken() && !isToken) {
config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
//config.headers['Authorization'] = 'Bearer ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbk5hbWUiOiIxNTcxMTEzOTg5NSIsInVpZCI6NTI4MjgsImNoYW5uZWxJZCI6MCwiZXhwIjoxNjE5ODMzMzk3LCJpc3MiOiJnaW4tYmxvZyJ9.rh-WXSaFqgqY611Tm5dhba532OYEZvm06vUmgZknoy4'
return config
}, error => {
console.log("25reject");
......
src/views/entry/fillBrandInf.vue
浏览文件 @ 4a5ebbfb
......@@ -658,7 +658,9 @@
</script>
<style lang="scss" type="text/stylus" scoped>
.fill-brand-inf {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
src/views/entry/fillMainInf.vue
浏览文件 @ 4a5ebbfb
......@@ -797,6 +797,7 @@
<style lang="scss" type="text/stylus" scoped>
.fill-store-inf {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
src/views/entry/fillShopInf.vue
浏览文件 @ 4a5ebbfb
......@@ -565,6 +565,7 @@
<style lang="scss" type="text/stylus" scoped>
.fill-store-inf {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
src/views/entry/process.vue
浏览文件 @ 4a5ebbfb
......@@ -81,6 +81,7 @@
<style lang="scss" type="text/stylus" scoped>
.entryDetails {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
src/views/entry/reviewFail.vue
浏览文件 @ 4a5ebbfb
......@@ -79,6 +79,7 @@
<style lang="scss" type="text/stylus" scoped>
.to-review {
font-size : 16px;
width: 100%;
height: 100%;
overflow: hidden;
......
src/views/entry/reviewing.vue
浏览文件 @ 4a5ebbfb
......@@ -62,6 +62,7 @@
<style lang="scss" type="text/stylus" scoped>
.to-review {
font-size : 16px;
width: 100%;
height: 100%;
overflow: hidden;
......
src/views/system/asset/wddetails.vue
浏览文件 @ 4a5ebbfb
......@@ -30,7 +30,8 @@
<el-row class="row-title">
<el-col :span="4" class="text-r">手续费</el-col>
<el-col :span="9" class="text-l">{{ withdrawInfo.service_fee ? withdrawInfo.service_fee / 100 : 0 }} 元</el-col>
<el-col :span="9" class="text-l">{{ 0 }} 元</el-col>
<!-- <el-col :span="9" class="text-l">{{ withdrawInfo.service_fee ? withdrawInfo.service_fee / 100 : 0 }} 元</el-col>-->
</el-row>
<el-row class="row-title">
......
src/views/system/asset/withdraw/index.vue
浏览文件 @ 4a5ebbfb
......@@ -33,7 +33,7 @@
不允许手动输入，提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）。
提现金额至少为100元才可以操作提现
</span>
<p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p>
<p class="withdraw-tip-spe">当前提现手续费为：0 元</p>
</el-form-item>
<el-form-item label="提现密码：" prop="pay_pass">
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 4a5ebbfb
......@@ -66,7 +66,8 @@
@pagination="getList"
/>
<!-- 添加或修改freight对话框 -->
<el-dialog :title="title" :visible.sync="isOpen" v-if="isOpen" width="70%" class="freightTemplate-add">
<el-dialog :title="title" :visible.sync="isOpen" v-if="isOpen" width="70%" class="freightTemplate-add"
:close-on-click-modal="false" center>
<IndexBtn :option="form" @closeIndexbtn="closeDialog"/>
</el-dialog>
</el-card>
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 4a5ebbfb
......@@ -127,9 +127,10 @@
>
</el-form>
<el-dialog title="选择不配送省" :visible.sync="dialogVisible" width="30%" append-to-body>
<el-dialog :title="isPostageTitle" :visible.sync="dialogVisible" width="30%" append-to-body
:close-on-click-modal="false" center >
<div>
<el-checkbox-group v-model="checkList">
<el-checkbox-group v-model="checkList" class="spe-checkbox-group-con">
<el-checkbox
v-for="(item, index) in arrlist"
:key="index"
......@@ -139,8 +140,8 @@
</el-checkbox-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="btndisabled()">确 定</el-button>
<el-button @click="dialogVisible = false" size="small">取 消</el-button>
<el-button type="primary" @click="btndisabled()" size="small">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -199,6 +200,7 @@ export default {
checkList: [], //当前选择
disabledate: [], //不能选择
dialogVisible: false,
isPostageTitle: '',
goodsDate: {
id:0,
sort: 0,
......@@ -219,7 +221,7 @@ export default {
},
methods: {
btndisabled(){
//debugger
debugger
let checkListString = '';
if (this.btnindex == 99) {
checkListString = this.checkList.join();
......@@ -244,9 +246,21 @@ export default {
})
},
/** 选择 配送区域*/
/** 选择 配送区域
* i=0,配送区域；i= 1，是不配送区域
* */
opendias(type, i, index) {
//debugger
this.isPostageTitle = ''
if (i == 0) {
this.isPostageTitle = '选择配送区域'
}
if (i == 1) {
this.isPostageTitle = '选择不配送区域'
}
// 初始化 已经勾选的区域(包含，不配送 和 配送的)
this.disabledate = [];
this.goodsDate.dispatching.forEach((element) => {
if(element.a && element.a != '') {
......@@ -262,15 +276,19 @@ export default {
this.disabledate.push(arr[i]);
}
this.btnindex = index;
// 将全部 省的状态初始化为 未选中
this.arrlist.forEach(item => {
item.value = false;
})
// 已经选择过的 区域 array
this.checkList = type.split(",");
let disabledates = JSON.parse(JSON.stringify(this.disabledate)); //可以将json对象转换成json对符串
let disabarr = this.unique(disabledates, this.checkList) //去掉当前选择的disabled效果
// 所有已经勾选的 区域
let disabledates = JSON.parse(JSON.stringify(this.disabledate));
// 已经勾选的 配送区域
let disabarr = this.unique(disabledates, this.checkList)
this.arrlist.forEach(item => {
if (disabarr.includes(item.lable)) {
item.value = true
......@@ -421,4 +439,13 @@ li {
margin:0 auto;
display: block;
}
.spe-checkbox-group-con {
margin-left: 20px;
}
.spe-checkbox-group-con >>> .el-checkbox {
width: 70px;
margin: 0 6px 5px;
}
</style>
src/views/system/goods/add/components/goodsaftersale.vue
浏览文件 @ 4a5ebbfb
......@@ -18,7 +18,7 @@
<el-select v-model="goodsAfterSaleForm.delay_compensate" style="width:400px;" placeholder="请选择发货时效">
<el-option label="24小时" :value="24"></el-option>
<el-option label="48小时" :value="48"></el-option>
<el-option label="72小时" :value="72"></el-option>
<!-- <el-option label="72小时" :value="72"></el-option> -->
</el-select>
</el-form-item>
......
src/views/system/goods/add/components/goodsimg2.vue 0 → 100644
浏览文件 @ 4a5ebbfb
<template>
<div class="goods-img">
<div id="wangeditor" ref="editorElem"></div>
</div>
</template>
<script>
import E from "wangeditor";
import { batchUploadImage } from "@/api/module/goods";
export default {
props: {
description: {
type: String,
required: true,
},
},
data() {
return {
allImg: [],
editor: null,
};
},
mounted() {
let that = this;
// 富文本编辑器
const editor = new E("#wangeditor");
editor.config.height = 500;
editor.config.uploadImgShowBase64 = true;
editor.config.showLinkImg = false;
// editor.config.uploadImgMaxLength = 1
editor.config.customUploadImg = function (files, insertImgFn) {
// resultFiles 是 input 中选中的文件列表
// insertImgFn 是获取图片 url 后，插入到编辑器的方法
// 上传图片，返回结果，将图片插入到编辑器中
that.getAllImg(files).then((res) => {
let data = { data: [] };
let imgBase = "";
if (res.length > 0) {
for (let i = 0; i < res.length; i++) {
imgBase = "";
imgBase = res[i].split(",")[1];
if (imgBase) {
data.data.push({ img_data: imgBase });
}
}
batchUploadImage(data).then((res) => {
if (res.code == 1) {
if (
res.code == 1 &&
Array.isArray(res.data) &&
res.data.length > 0
) {
for (let i = 0; i < res.data.length; i++) {
if (res.data[i].image_url) {
insertImgFn(res.data[i].image_url);
}
}
}
}else {
this.$message({type: 'error',message: res.message ? res.message : '上传图片失败'});
}
});
} // res.length > 0 end
});
// });
};
editor.create();
this.editor = editor;
if (this.description) {
this.editor.txt.html(this.description);
}
},
methods: {
initInfo() {
this.editor = null;
},
getBase64(file) {
return new Promise(function (resolve, reject) {
let reader = new FileReader();
let imgResult = "";
reader.readAsDataURL(file);
reader.onload = function () {
imgResult = reader.result;
};
reader.onerror = function (error) {
reject(error);
};
reader.onloadend = function () {
resolve(imgResult);
};
});
},
async getAllImg(files) {
let imgObj = { img_data: "" };
let res = [];
let orgRes = "";
files.forEach((item) => {
res.push(
(async (item) => {
return await this.getBase64(item);
})(item)
);
});
return await Promise.all(res);
},
},
};
</script>
<style scoped>
.goods-img {
padding: 20px;
}
/deep/ .w-e-text-container {
z-index: 1000 !important;
}
/deep/ .w-e-toolbar {
z-index: 1001 !important;
}
</style>
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 4a5ebbfb
......@@ -2,23 +2,23 @@
<div class="goods-info">
<el-form :model="goodsInfoForm" :rules="goodsInfoRules" ref="goodsInfoForm" label-width="150px" class="demo-goodsInfoForm" size="small">
<el-form-item label="商品分类：" prop="categoryStr">
<el-input style="width:420px;" v-model="goodsInfoForm.categoryStr" :disabled="true"></el-input>
<el-input style="width:420px;" v-model.trim="goodsInfoForm.categoryStr" :disabled="true"></el-input>
<el-link class="edit-type-span el-icon-edit" type="primary" :underline="false" @click="editType">修改所在类目</el-link>
<span class="tip-span">该商品所在类目须支持七天无理由退货</span>
</el-form-item>
<el-form-item label='商品标题：' prop="goods_name">
<el-input v-model="goodsInfoForm.goods_name" placeholder="请输入商品标题" style="width:420px;"></el-input>
<el-input v-model.trim="goodsInfoForm.goods_name" placeholder="请输入商品标题" style="width:420px;"></el-input>
<span class="tip-span ml20">商品名称限制在50字以内，不要填写与商品无关的词</span>
</el-form-item>
<el-form-item label='商品关键词：' prop="goods_des">
<el-input v-model="goodsInfoForm.goods_des" placeholder="请输入商品关键词" style="width:420px;"></el-input>
<el-input v-model.trim="goodsInfoForm.goods_des" placeholder="请输入商品关键词" style="width:420px;"></el-input>
<span class="tip-span ml20">关键词之间用 <strong>英文逗号</strong> 分开，最多可以添加5个</span>
</el-form-item>
<el-form-item label="商品产地：" prop="producing_area">
<el-select v-model="goodsInfoForm.producing_area" placeholder="请选择商品产地" style="width: 420px;">
<el-select v-model.trim="goodsInfoForm.producing_area" placeholder="请选择商品产地" style="width: 420px;">
<el-option
v-for="item in areaOptions"
:key="item.id"
......@@ -29,7 +29,7 @@
</el-form-item>
<el-form-item label="商品发货地：" prop="deliver_area">
<el-select v-model="goodsInfoForm.deliver_area" placeholder="请选择商品发货地" style="width: 420px;">
<el-select v-model.trim="goodsInfoForm.deliver_area" placeholder="请选择商品发货地" style="width: 420px;">
<el-option
v-for="item in areaOptions"
:key="item.id"
......@@ -40,12 +40,12 @@
</el-form-item>
<el-form-item label='商品单位：' prop="unit">
<el-input v-model="goodsInfoForm.unit" placeholder="请输入商品单位" style="width:420px;"></el-input>
<el-input v-model.trim="goodsInfoForm.unit" placeholder="请输入商品单位" style="width:420px;"></el-input>
<!-- <span class="tip-span ml20">关键词之间用逗号分开，最多可以添加5个</span>-->
</el-form-item>
<el-form-item label="所属品牌：" prop="brand_id">
<el-select v-model="goodsInfoForm.brand_id" placeholder="请选择商品品牌" style="width: 420px;">
<el-select v-model.trim="goodsInfoForm.brand_id" placeholder="请选择商品品牌" style="width: 420px;">
<el-option
v-for="item in brandOptions"
:key="item.id"
......@@ -57,11 +57,11 @@
</el-form-item>
<el-form-item label='市场参考价链接：' prop="web_url">
<el-input v-model="goodsInfoForm.web_url" placeholder="请输入京东或者淘宝的商品链接" style="width:420px;"></el-input>
<el-input v-model.trim="goodsInfoForm.web_url" placeholder="请输入京东或者淘宝的商品链接" style="width:420px;"></el-input>
</el-form-item>
<el-form-item label='商品编码：' prop="out_goods_id">
<el-input v-model="goodsInfoForm.out_goods_id" placeholder="请输入商品编码（非必须）" style="width:420px;"></el-input>
<el-input v-model.trim="goodsInfoForm.out_goods_id" placeholder="请输入商品编码（非必须）" style="width:420px;"></el-input>
</el-form-item>
<el-form-item label="商品图片：" prop="imgs">
......@@ -102,7 +102,7 @@
width="60%"
center
>
<el-cascader-panel v-show="editGoodsTypeDialog" v-model="SSQGoodsList" :props='goodsprops' :options="fuckoptions" @active-item-change="SSQGoodsChange" ref="ssqGoodsCascader"></el-cascader-panel>
<el-cascader-panel v-show="editGoodsTypeDialog" v-model.trim="SSQGoodsList" :props='goodsprops' :options="fuckoptions" @active-item-change="SSQGoodsChange" ref="ssqGoodsCascader"></el-cascader-panel>
<span slot="footer" class="dialog-footer">
<el-button @click="cancelType" size="mini">取 消</el-button>
<el-button type="primary" @click="saveType" size="mini">确 定</el-button>
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 4a5ebbfb
......@@ -7,15 +7,16 @@
</p>
<div v-show="(!orgGoodsPam.pamTableList || orgGoodsPam.pamTableList.length === 0)">
<p style="margin: 10px 0;color: #333;font-size: 14px;font-weight: 400;">默认</p>
<el-table
border
size="small"
:data="singleSpecTable"
style="width: 80%;margin-right:10%;"
>
<el-table-column align="center" prop="js_price" label="协议价">
<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.trim="scope.row.js_price" placeholder="请输入协议价" ></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="sl_price" label="结算价">
......@@ -25,23 +26,23 @@
</el-table-column>
<el-table-column align="center" prop="price" label="指导价">
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.price" placeholder="请输入指导价"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.price" placeholder="请输入指导价"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="sc_price" label="市场价">
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.sc_price" placeholder="请输入市场价"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.sc_price" placeholder="请输入市场价"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="stock" label="库存量">
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.stock" placeholder="请输入库存量"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.stock" placeholder="请输入库存量"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="weight" label="重量">
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.weight" placeholder="请输入重量"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.weight" placeholder="请输入重量"></el-input>
</template>
</el-table-column>
......@@ -63,8 +64,7 @@
<!-- </el-table-column>-->
</el-table>
</div>
<div v-show="orgGoodsPam.pamTableList.length > 0" v-for="(item,index) in orgGoodsPam.pamTableList" :key="index"
<div v-if="orgGoodsPam.pamTableList.length > 0" v-for="(item,index) in orgGoodsPam.pamTableList" :key="index"
class="single-spe-con">
<p style="margin: 10px 0;color: #333;font-size: 14px;font-weight: 400;">
<span v-show="orgGoodsPam.pamNameList.length === 1">
......@@ -83,8 +83,15 @@
style="width: 80%"
>
<el-table-column align="center" prop="js_price" label="协议价">
<template slot="header">
<span>协议价</span>
<el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
<span slot="content">点击可批量设置价格</span>
<span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('js_price')"></span>
</el-tooltip>
</template>
<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.trim="scope.row.js_price" placeholder="请输入协议价"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="sl_price" label="结算价">
......@@ -93,23 +100,51 @@
</template>
</el-table-column>
<el-table-column align="center" prop="price" label="指导价">
<template slot="header">
<span>指导价</span>
<el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
<span slot="content">点击可批量设置价格</span>
<span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('price')"></span>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.price" placeholder="请输入指导价"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.price" placeholder="请输入指导价"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="sc_price" label="市场价">
<template slot="header">
<span>市场价</span>
<el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
<span slot="content">点击可批量设置价格</span>
<span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('sc_price')"></span>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.sc_price" placeholder="请输入市场价"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.sc_price" placeholder="请输入市场价"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="stock" label="库存量">
<template slot="header">
<span>库存量</span>
<el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
<span slot="content">点击可批量设置价格</span>
<span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('stock')"></span>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.stock" placeholder="请输入库存量"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.stock" placeholder="请输入库存量"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="weight" label="重量">
<template slot="header">
<span>重量</span>
<el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
<span slot="content">点击可批量设置价格</span>
<span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('weight')"></span>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-input size="mini" style="width:90%" v-model="scope.row.weight" placeholder="请输入重量"></el-input>
<el-input size="mini" style="width:90%" v-model.trim="scope.row.weight" placeholder="请输入重量"></el-input>
</template>
</el-table-column>
<el-table-column align="center" prop="thumb" label="图片">
......@@ -211,7 +246,6 @@ export default {
'parameterdata': function(val) {
//debugger
this.orgGoodsPam = val;
//console.log("监听",this.orgGoodsPam);
},
},
created() {
......@@ -352,6 +386,13 @@ export default {
// }
// }
},
/** 一键应用所有 */
applyAllTable(key) {
let val = this.orgGoodsPam.pamTableList[0][0][key]
this.orgGoodsPam.pamTableList.map(item => {
item[0][key] = val
})
},
// 删除 单个规格的图片
delSingleSpecImg(index,row) {
......@@ -366,8 +407,16 @@ export default {
speImgLeave(index, row) {
this.isHoverSpeImg = false;
},
renderHeaderJSPrice(h) {
return h(
<div>
<span>协议价</span>
<span>点击1</span>
</div>
)
},
// -- 通用 方法 --
// 图片转换为 base64
/** 图片转换为 base64*/
getBase64(file) {
return new Promise(function (resolve, reject) {
let reader = new FileReader();
......@@ -462,6 +511,12 @@ export default {
margin-left: -9px;
}
.spe-ali-icon0435 {
color: red;
vertical-align: middle;
margin-left: 3px;
}
.del-span-block {
display : none;
}
......
src/views/system/goods/add/components/goodsspecifications.vue
浏览文件 @ 4a5ebbfb
......@@ -7,7 +7,7 @@
<div>
<el-select
:ref="'speNameDom' + index "
v-model="speItem.spec_name"
v-model.trim="speItem.spec_name"
size="small"
style="width: 300px"
filterable
......@@ -23,6 +23,7 @@
:value="itemSN.name"
>
<span style="float: left" class="span-style">{{ itemSN.name }}</span>
<span style="float: right" class="spe-span-del el-icon-circle-close" @click.stop="deleteSpeOption(itemSN,index)"></span>
<div class="flag">
<svg-icon icon="edit" iconClass="template_edit_style" @click="addSpeName(index)"/>
</div>
......@@ -32,7 +33,7 @@
</div>
<div class="spe-params-con">
<div style="display: inline-block" v-for="(itemSV,indexSV) in speItem.spec_value" :key="indexSV">
<el-input v-model="itemSV.value" size="small" placeholder="请输入规格参数" class="spe-params-input-item" @blur="paramNameInputBlur(index,indexSV)">
<el-input v-model.trim="itemSV.value" size="small" placeholder="请输入规格参数" class="spe-params-input-item" @blur="paramNameInputBlur(index,indexSV)">
<i v-if="speItem.spec_value.length !== 1" slot="suffix" class="el-input__icon el-icon-delete el-icon-delete-h" @click="deleteSpeParam(index,indexSV)"></i>
</el-input>
</div>
......@@ -62,7 +63,7 @@
<p class="add-spec-dialog-con">
<span style="margin-right:30px;">输入规格名称：</span>
<span>
<el-input v-model="specName_sm" placeholder="请输入规格名称" size="small" style="width: 280px;"></el-input>
<el-input v-model.trim="specName_sm" placeholder="请输入规格名称" size="small" style="width: 280px;"></el-input>
</span>
</p>
</div>
......@@ -92,17 +93,10 @@ export default {
spec_name: '', // 规格名称
spec_value: []
},
speParamName:{
value: ''
},
speOptions: [{
id: '1',
name: '颜色'
}, {
id: '2',
name: '尺码'
}],
speOptions: [],
localSpeOptions: [],
// 规格名称，value组成的数组
speNameList: [],
......@@ -188,6 +182,7 @@ export default {
addSpeParam(index) {
let valueObj = { value: ''}
this.$set(this.speData[index].spec_value,this.speData[index].spec_value.length,valueObj);
// console.log(1111,this.speData);
},
/** 删除 规格参数 */
deleteSpeParam(index,indexSV) {
......@@ -229,7 +224,6 @@ export default {
el.onclick = () => {
// 底部按钮的点击事件
_this.addSpeName(index);
// localSttorage 存储 下拉数据
if(speNameDom.toggleDropDownVisible) {
speNameDom.toggleDropDownVisible(false);
......@@ -252,12 +246,23 @@ export default {
},
/* 增加 规格名称 */
addSpeName(index) {
this.specName_sm = '';
this.addSpecNameDialog = true;
},
/** 删除 规格名称 */
deleteSpeOption(indexItem,index) {
for(let i = 0; i < this.speOptions.length; i++) {
if (indexItem.id == this.speOptions[i].id) {
this.speOptions.splice(i,1)
break
}
}
let localJSON = JSON.stringify(this.speOptions);
window.localStorage.setItem('localSpeOptions',localJSON)
},
// 添加规格名称，对话框的退出
cancelSpec() {
this.specName_sm = '';
this.addSpecNameDialog = false;
},
// 规格名称，保存
......@@ -486,6 +491,12 @@ export default {
margin: 20px 0;
}
.spe-span-del {
color: red;
font-size: 14px;
margin-top: 10px;
}
/* 商品规格 - 规格名称 - 参数input */
.spe-params-input-item {
width: 150px;
......
src/views/system/goods/add/index.vue
浏览文件 @ 4a5ebbfb
......@@ -10,7 +10,8 @@
<p class="goods-type-tip">为商品设置正确的类目，能让商品快速的被搜索到</p>
</div>
<div class="goods-type-options">
<el-cascader-panel v-model="SSQList" :props='props' @change="SSQChange" ref="ssqCascader"></el-cascader-panel>
<!-- <el-cascader-panel v-model="SSQList" :props='props' @change="SSQChange" ref="ssqCascader"></el-cascader-panel>-->
<el-cascader-panel v-model="SSQList" :props='propsOptions' @change="SSQChange" ref="ssqCascader"></el-cascader-panel>
</div>
<el-button type="primary" class="next-step" :disabled="isNextStep" @click="nextStep">下一步</el-button>
</div>
......@@ -51,7 +52,7 @@
<div class="floor-item">
<div class="floor-item-box">
<p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品详情</p>
<Goodsimg ref="goodsdetailsimg" :imgdata="imgdata"/>
<Goodsimg ref="goodsdetailsimg" :description="description"/>
</div>
</div>
<!-- 售后及服务 -->
......@@ -78,21 +79,21 @@
</template>
<script>
import { NewGetCategory,addGoods,getGoodsNew,updateGoodsNew } from '@/api/module/goods';
import { NewGetCategory,NewGetCategoryData,addGoods,getGoodsNew,updateGoodsNew } from '@/api/module/goods';
import Goodsinfomation from './components/goodsinfomation';
import GoodsSpecifications from './components/goodsspecifications';
import GoodsParameter from './components/goodsparameter';
import Goodsimg from './components/goodsimg';
import Goodsimg from './components/goodsimg2';
import Goodsaftersale from './components/goodsaftersale';
export default {
name: 'Index',
props: {
option: {
type: Number,
required: true
}
},
// props: {
// option: {
// type: Number,
// required: true
// }
// },
components: {
Goodsinfomation,
GoodsSpecifications,
......@@ -105,12 +106,12 @@
goodsLoading: false,
SSQList: [], // 省市区
SSQStr: '', // 省市区 拼接
props: {
propsOptions: {
expandTrigger: 'click',
lazy: true,
lazyLoad: this.lazyLoad,
value: "id",
label: 'label',
label: 'title',
leaf: 'leaf'
},
isNextStep: true,
......@@ -140,9 +141,10 @@
singleSpecTable: []
},
/* 商品详情 */
imgdata: {
description: ''
},
// imgdata: {
// description: ''
// },
description: '',
/* 售后及服务 */
goodsaftersale: {
stags: [],
......@@ -155,12 +157,14 @@
}, // 商品所有数据
TIMER: null,
hehe: 0,
option: 0
} // return end
},
created() {
// option 商品的id
//debugger
this.option = Number(this.$route.query.goods_id)
if( this.option && this.option !== 0 ) {
let data = { goodsId: this.option};
getGoodsNew(data).then(res => {
......@@ -234,7 +238,7 @@
}
// 商品详情
this.imgdata.description = res.data.description;
this.description = res.data.description;
// 售后服务
this.goodsaftersale.freight_id = res.data.freight_id;
......@@ -330,19 +334,19 @@
const level = node.level;
let limboNode = {};
if(level === 0) {
limboNode = {id: 0}
limboNode = {parent_id: 0}
}
if(level === 1) {
limboNode = { id: node.value };
limboNode = { parent_id: node.value };
}
if(level === 2) {
limboNode = { id: node.value };
limboNode = { parent_id: node.value };
}
NewGetCategory(limboNode).then(res => {
NewGetCategoryData(limboNode).then(res => {
let result = {};
result = res.data
if (level === 0) {
result = res.data
result.forEach(item => {
item.value = item.id;
item.label = item.label;
......@@ -369,13 +373,9 @@
if (level === 2) {
for(let i = 0; i < res.data.length; i++) {
if( res.data[i].children.length > 0) {
for(let j = 0; j < res.data[i].children.length; j++) {
if( limboNode.id === res.data[i].children[j].id ) {
result = res.data[i].children[j].children;
break;
}
}
if( limboNode.id === res.data[i].id ) {
result = res.data[i].children;
break;
}
}
......@@ -451,7 +451,6 @@
}
}else {
// 无规格组合数据
debugger
let slingleSpeObj = spsjData1[0];
if ( !Number(slingleSpeObj['js_price']) || Number(slingleSpeObj['js_price']) <0 ) {
goodsPriceMsg = '[ 商品售价 ]中，协议价不能为空，并且只能填大于0的数值'
......@@ -472,7 +471,8 @@
}
// 商品详情 是否填写完整
let isGoodsDetailsImgMsg = (this.$refs.goodsdetailsimg.goodsDeForm.description.indexOf('img') > -1) ? true : false;
// let isGoodsDetailsImgMsg = (this.$refs.goodsdetailsimg.goodsDeForm.description.indexOf('img') > -1) ? true : false;
let isGoodsDetailsImgMsg = (this.$refs.goodsdetailsimg.editor.txt.html()) ? true : false
// 售后服务 是否填写完整
let isGoodsAfterSaleMsg = this.$refs['goodsaftersale'].validateGoodsAfterSaleForm();
......@@ -490,9 +490,8 @@
return
}
}
if(!isGoodsDetailsImgMsg) {
this.$message({type:'error',message:'请先上传描述商品详情的图片'});
this.$message({type:'error',message:'商品详情未填写完整'});
this.setFloorNavMountClick(3);
return
}
......@@ -561,13 +560,23 @@
// 商品详情 数据
let spxqData = this.$refs.goodsdetailsimg.goodsDeForm;
// let spxqData = this.$refs.goodsdetailsimg.goodsDeForm;
let spxqData = String(this.$refs.goodsdetailsimg.editor.txt.html())
// 售后服务 数据
let ssffData = this.$refs.goodsaftersale.goodsAfterSaleForm;
console.log(569,ssffData);
if (ssffData.delay_compensate == 72) {
this.$message({ type: 'warning',message: '发货时长不能超过48小时，请重新编辑' });
return
}
// return
// 所有数据合并
Object.assign( this.goodsAllData, spxxData, spsjData, spxqData, ssffData);
Object.assign( this.goodsAllData, spxxData, spsjData, ssffData);
this.goodsAllData.description = spxqData
// 经营类目，服务标签，需要单独处理数据格式
this.goodsAllData.category_id = spxxData.categoryList.slice(-1)[0] ? spxxData.categoryList.slice(-1)[0] : '';
......
src/views/system/order/index.vue
浏览文件 @ 4a5ebbfb
......@@ -171,7 +171,7 @@
<template slot-scope="scope">
<span>{{ timeFormatter(scope.row.created_time) }}</span><br/>
<span :class="{ 'red-text' : sendTimeFormatter(scope.row.send_time) == '未发货' }">{{ sendTimeFormatter(scope.row.send_time) }}</span><br/>
<span :class="{ 'red-text' : updatedTimeFormatter(scope.row.updated_time) == '未完成' }">{{ updatedTimeFormatter(scope.row.updated_time) }}</span>
<span :class="{ 'red-text' : updatedTimeFormatter(scope.row.updated_time) == '未完成' }">{{ updatedTimeFormatter(scope.row.updated_time, scope.row.goods_status) }}</span>
</template>
</el-table-column>
<el-table-column prop="dispatch_price" width="100" label="运费" align="center">
......@@ -461,8 +461,8 @@
},
/** 发货时间 格式化 */
updatedTimeFormatter(time) {
if(time) {
updatedTimeFormatter(time, status) {
if(time && status == 2) {
return dateFormat(time *1000, 'Y-m-d H:i:s')
} else {
return '未完成'
......@@ -735,9 +735,9 @@
// this.excelList = item[0].sheet
item[0].sheet.map((item, index) => {
this.excelList.push({
goods_order_sn: item['商品订单号'],
express_name: item['快递公司'],
express_sn: item['快递单号']
goods_order_sn: item['商品订单号'].toString().trim(),
express_name: item['快递公司'].toString().trim(),
express_sn: item['快递单号'].toString().trim()
})
})
}
......
src/views/system/settings/setpsd.vue
浏览文件 @ 4a5ebbfb
......@@ -238,6 +238,9 @@
},
// 修改 登录密码
editLogin() {
if (this.$refs.loginForm) {
this.$refs['loginForm'].resetFields();
}
this.isLogin = true;
},
// 修改 提现密码
......@@ -310,10 +313,10 @@
}, 1000)
}
getTelphoneCode(this.setForm.name).then(res => {
if(res.code === 1) {
if(res.code == 1) {
this.$message({type:"success",message: '验证码发送成功'});
}else {
this.$message({type:"error",message: '验证码发送失败'});
this.$message({type:"error",message: res.message ? res.message : '验证码发送失败'});
}
});
},
......@@ -383,7 +386,7 @@
},
// 登录密码 确定
submitLogin(formName) {
console.log(378,this.loginForm);
// console.log(378,this.loginForm);
this.$refs[formName].validate(valid => {
if (valid) {
changeLoginPassword(this.loginForm).then(res=> {
......
src/views/system/shop/brand.vue
浏览文件 @ 4a5ebbfb
......@@ -81,9 +81,9 @@
:limit.sync="queryParams.limit"
@pagination="getList"
></pagination>
</el-card>
</el-card>
<!-- 新增/修改/详情 -->
<el-dialog :title="brandTitle" :visible.sync="isOpen" width="70%" class="brandInf-add" center
<el-dialog :title="brandTitle" v-if="isOpen" :visible.sync="isOpen" width="70%" class="brandInf-add" center
:close-on-click-modal="false" :before-close="handleCancel">
<el-form :model="brandForm" :rules="brandRules" ref="brandForm" label-width="140px">
<el-row v-if="indexBrandId != 0 && brandForm.status != 3">
......@@ -547,6 +547,11 @@
},
/** 编辑 品牌 */
editBrand(row) {
this.brandImgFileList= [];
this.certImgFileList= [];
this.factoryImgFileList= [];
this.shopImgFileList= [];
// debugger
this.indexBrandId = row.id;
let data = {
id : this.indexBrandId
......@@ -565,6 +570,7 @@
let brandArr = [];
let brandUrl = {};
brandArr = this.brandForm.brand_logo.split(",");
// debugger
if (brandArr.length > 0) {
brandArr.forEach(item=> {
brandUrl = {};
......@@ -806,7 +812,7 @@
this.certImgFileList= [];
this.factoryImgFileList= [];
this.shopImgFileList= [];
// debugger
this.validityLongTermVal = false;
this.validityConcreteTime = ''
Object.assign(this.brandForm, this.$options.data().brandForm)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论