Merge branch 'test' into develop

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 正式环境
-VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
+#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
 
 # 测试环境
 VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'

dist/static/css/chunk-000b7a4b.1de74879.css

+.fill-brand-inf[data-v-f32bd074]{font-size:16px;width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-brand-inf .box-card[data-v-f32bd074]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.fill-brand-inf .box-card[data-v-f32bd074] .el-card__body{height:calc(100% - 120px);overflow-x:hidden;overflow-y:scroll}.fill-brand-inf .logo-bg[data-v-f32bd074]{height:60px;background:#1890ff}.fill-brand-inf .logo-bg img[data-v-f32bd074]{height:44px;margin:8px 0 8px 20px}.fill-brand-inf .spe-brand-text[data-v-f32bd074]{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-f32bd074]{height:70px;width:60%;margin:20px auto}.steps[data-v-f32bd074] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-f32bd074] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-f32bd074] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-f32bd074] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-f32bd074] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-f32bd074] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-f32bd074] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-f32bd074] .el-step__title.is-success{color:#000}.main-con[data-v-f32bd074]{width:70%;margin:30px auto 50px;overflow-x:hidden;overflow-y:scroll}.main-con .tips-text[data-v-f32bd074]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-f32bd074]:before{color:#e3c300}.main-con .no-brand[data-v-f32bd074]{padding-left:60px}.main-con .no-brand p[data-v-f32bd074]{color:#333;font-size:14px;line-height:20px;padding:10px 80px 0}.main-con .no-brand .no-brand-btn[data-v-f32bd074]{padding-left:84px;padding-top:30px}.main-con .uploadData[data-v-f32bd074]{display:inline-block}.main-con .uploadData[data-v-f32bd074] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-f32bd074] .el-upload,.main-con .uploadData[data-v-f32bd074] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-f32bd074] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-f32bd074] .avatar{width:100px;height:100px}.main-con .download-Template-btn[data-v-f32bd074]{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-f32bd074]:hover{color:#fff;border:1px solid #1890ff;background-color:#1890ff}
\ No newline at end of file

dist/static/css/chunk-0382b59d.780f52b0.css

+.freightTemplate-add[data-v-83efcd1a] .el-dialog{height:80%;overflow:hidden}.freightTemplate-add[data-v-83efcd1a] .el-dialog__body{height:calc(100% - 60px);overflow-x:hidden;overflow-y:scroll}.radiomodels .el-radio-button[data-v-83efcd1a]{margin:0 10px}[data-v-83efcd1a] .radiomodels .el-radio-button .el-radio-button__inner{border:1px solid #dcdfe6!important;border-radius:4px!important}[data-v-83efcd1a] .radiomodels .el-radio-button .el-radio-button__orig-radio:checked+.el-radio-button__inner{box-shadow:none}.queryFormInline[data-v-83efcd1a]{padding-bottom:20px}.cton_h3[data-v-83efcd1a]{margin-left:170px;color:#1890ff}.cton_text[data-v-83efcd1a]{width:80%;margin:0 0 30px 170px}.cton_text p[data-v-83efcd1a]{font-size:14px;padding:0;margin:5px 0}[data-v-83efcd1a] .el-card__body{height:calc(100% - 40px);overflow-y:auto}
\ No newline at end of file

dist/static/css/chunk-d2bffd5a.b3923dfc.css

+.entry[data-v-64138cba]{width:100%;height:100%;overflow:hidden}.entry .box-card[data-v-64138cba]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.entry .box-card[data-v-64138cba] .el-card__body{height:calc(100% - 120px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-64138cba]{height:60px;background-color:#1890ff}.logo-bg img[data-v-64138cba]{height:44px;margin:8px 0 8px 20px}.steps[data-v-64138cba]{height:70px;width:60%;margin:20px auto}.steps[data-v-64138cba] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-64138cba] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-64138cba] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-64138cba] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-64138cba] .el-step__title.is-process{color:#000;font-weight:400}.entry-main[data-v-64138cba]{width:60%;margin:40px auto 30px}.entry-main .main-text[data-v-64138cba]{width:100%;overflow-y:scroll}.entry-main .main-text h2[data-v-64138cba]{margin:10px 0;text-align:center}.entry-main .main-text h4[data-v-64138cba],.entry-main .main-text h5[data-v-64138cba]{text-indent:2em}.entry-main .main-text p[data-v-64138cba]{text-indent:2em;font-size:14px;line-height:30px;padding:10px 80px 0}.entry-main .main-text .download-Template-btn[data-v-64138cba]{color:red;text-decoration:underline}.confirm-btn[data-v-64138cba]{height:100px;width:50%;margin:0 auto 40px}.confirm-btn p[data-v-64138cba]{text-align:center}.confirm-btn p[data-v-64138cba]:nth-child(2){color:#fa7200;font-size:10px}
\ No newline at end of file

dist/static/css/chunk-d585dbc8.9f06e5c2.css

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

dist/static/css/chunk-e11d247e.2f7b5683.css

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

dist/static/css/chunk-ff0474da.c9812cf2.css

+.dashboard-promote .el-row[data-v-25504f30]{margin-bottom:20px;font-size:14px}.dashboard-promote[data-v-25504f30]{margin-left:21px}.header[data-v-25504f30]{width:100%;overflow:hidden;margin-top:20px;background:#fff;border-radius:8px}.header .header-top[data-v-25504f30]{margin-top:29px}.header .sp[data-v-25504f30]{width:63px;height:16px;margin-left:24px;font:400 16px/5px Alibaba PuHuiTi;color:#000}.header-foot[data-v-25504f30]{width:100%;height:100px;margin-top:39px;overflow:hidden}.foot-le[data-v-25504f30]{width:66%;text-align:center;display:inline-block}.header-img[data-v-25504f30]{vertical-align:middle}.header-span[data-v-25504f30]{font:600 14px/11px Lantinghei SC;color:#333}.header-p[data-v-25504f30]{font:600 24px/17px Lantinghei SC;color:#344750}.foot-ri[data-v-25504f30]{width:33%;height:80px;display:inline-block;text-align:center;border-left:2px solid #e6edfe}@media screen and (max-width:1600px){.main-left-top .tp-col .tp-img[data-v-25504f30]{display:none}}@media screen and (max-width:1490px){.footer-top-two[data-v-25504f30]{margin-top:15px}}@media screen and (max-width:1637px){.footer-top-two[data-v-25504f30]{margin-top:15px}}@media screen and (max-width:1200px){.main-left-top .tp-le[data-v-25504f30]{width:100%;text-align:center}.footer-right[data-v-25504f30],.main-right-top[data-v-25504f30]{margin-top:20px;margin-left:-15px}.main-right-foot[data-v-25504f30]{margin-left:-15px}.footer-top-one[data-v-25504f30]{margin-top:15px}}.main[data-v-25504f30]{width:100%;margin-top:20px}.main .main-left[data-v-25504f30]{height:592px}.main-left-top .tp-le[data-v-25504f30],.tp-img[data-v-25504f30]{display:inline-block;text-align:center;margin-top:27px}.main-left-top .tp-col[data-v-25504f30]{cursor:pointer;height:106px;background:linear-gradient(180deg,#fff,#f5f8ff);border-radius:4px}.main-left-top .tp-le[data-v-25504f30]{width:163px}.main-left-top .tp-col span[data-v-25504f30]{font:400 14px/11px Alibaba PuHuiTi;color:#333}.main-left-top .tp-col p[data-v-25504f30]{font:700 24px/17px Alibaba PuHuiTi;color:#19191a}.main-left-foot[data-v-25504f30]{height:466px;margin-top:20px;background:#fff;border-radius:4px;overflow:hidden}.main-left-foot .ft-sp[data-v-25504f30]{font:400 16px/5px Alibaba PuHuiTi;color:#000}.main-left-foot-top[data-v-25504f30]{float:right;margin-right:49px}.main-right[data-v-25504f30]{z-index:10000;height:592px;margin-left:15px}.main-right-top[data-v-25504f30]{height:198px;background:#fff;border-radius:4px}.main-right-top .sa[data-v-25504f30]{display:inline-block;margin:30px 0 0 26px;font:400 16px/5px Alibaba PuHuiTi;color:#000}.main-right-top .right-top-item[data-v-25504f30]{width:70px;height:70px;margin:auto;display:flex;justify-content:center;align-items:center;background:#f0f6ff;border-radius:10px}.main-right-top-point[data-v-25504f30]{cursor:pointer}.main-right-foot[data-v-25504f30]{height:374px;margin-top:20px;background:#fff;border-radius:4px}.main-right-foot ul[data-v-25504f30]{margin:24px 0 0 25px}.main-right-foot ul li[data-v-25504f30]{margin-bottom:16px;cursor:pointer}.main-right-foot-sn[data-v-25504f30]{display:inline-block;margin:30px 0 0 25px;cursor:pointer;font:400 16px Alibaba PuHuiTi;color:#000}.main-right-foot .main-right-foot-sa[data-v-25504f30]{float:right;margin:30px 25px 0 0;cursor:pointer;font:400 14px Alibaba PuHuiTi;color:#999}.main-right-foot .main-right-foot-le[data-v-25504f30]{display:none;width:37px;height:22px;display:inline-block;background:#fff5f6;border-radius:4px}.main-right-foot .main-right-foot-ri[data-v-25504f30]{display:none;width:23px;height:22px;display:inline-block;border-radius:4px}.foot-color[data-v-25504f30]{background:#fff6ed}.main-right-foot-le[data-v-25504f30],.main-right-foot-ri div[data-v-25504f30]{text-align:center;line-height:22px;font:400 14px Alibaba PuHuiTi;font-style:italic}.main-right-foot .foot-le-text[data-v-25504f30]{margin-left:46px;font:400 14px Alibaba PuHuiTi;color:#000}.footer-left[data-v-25504f30]{height:448px;background:#fff;border-radius:4px}.footer-left .footer-sp[data-v-25504f30]{margin:30px 0 0 23px;display:inline-block;font:400 16px/5px Alibaba PuHuiTi;color:#000}.footer-right-top[data-v-25504f30]{width:100%;background:#fff;border-radius:4px;display:inline-block;margin-left:15px}.footer-right-top-text[data-v-25504f30]{font:400 16px Alibaba PuHuiTi;color:#000;line-height:5px;display:inline-block;margin:30px 0 0 24px}.footer-right-top-item[data-v-25504f30]{width:88%;display:flex;justify-content:space-between;align-items:center;flex-wrap:wrap;margin:24px auto}.footer-right-top-img[data-v-25504f30]{cursor:pointer;width:177px;height:81px;border:1px dotted #000}.footer-top-one[data-v-25504f30]{background-image:url(../../static/img/background-item1.c6868d4e.png)}.footer-top-two[data-v-25504f30]{background-image:url(../../static/img/background-item2.4120fb67.png)}.footer-top-thr[data-v-25504f30]{background-image:url(../../static/img/background-item3.8679f57b.png)}.footer-right-top-img span[data-v-25504f30]{display:inline-block;font:400 14px/2px Microsoft YaHei;color:#000;margin:20px 0 0 23px}.footer-right-top-img p[data-v-25504f30]{font:400 14px/2px FZZhengHeiS-B-GB;color:#c7cad7;margin:14px 0 0 23px}.footer-right-bot[data-v-25504f30]{width:100%;margin-top:20px;display:inline-block;margin-left:15px}.foot-table-img[data-v-25504f30]{position:absolute;vertical-align:middle;left:36%;top:14%}.foot-table-imgone[data-v-25504f30]{position:absolute;vertical-align:middle;left:41%;top:14%}.foot-table[data-v-25504f30]{position:relative}.dia-text[data-v-25504f30]{text-align:center;font:600 24px FZZhengHeiS-B-GB;color:#000}.foot-index[data-v-25504f30]{margin:auto;width:48px;height:19px;background:#feeee5;border-radius:10px}.foot-indexone[data-v-25504f30]{margin:auto;width:48px;height:19px;background:#f5f7fa;border-radius:10px}li[data-v-25504f30],ul[data-v-25504f30]{padding:0;margin:0;list-style:none}.dashboard-editor-container[data-v-25504f30]{background-color:#f1f4fa;position:relative;height:100%;overflow-y:scroll;overflow-x:hidden}
\ No newline at end of file

dist/static/js/chunk-0382b59d.0e37475c.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0382b59d"],{"280e":function(t,e,n){},"3d17":function(t,e,n){"use strict";n.d(e,"j",(function(){return a})),n.d(e,"b",(function(){return o})),n.d(e,"a",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"g",(function(){return c})),n.d(e,"i",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"e",(function(){return d})),n.d(e,"f",(function(){return f})),n.d(e,"h",(function(){return m}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/goods/uploadVideo",method:"post",data:t})}function o(t){return Object(r["a"])({url:"/local/getCategoryList",method:"post",data:t})}function s(t){return Object(r["a"])({url:"/system/freightNew/getFreight",method:"get",params:t})}function u(t){return Object(r["a"])({url:"/system/goodsNew/addGoods",method:"post",data:t})}function c(t){return Object(r["a"])({url:"/system/goodsNew/info",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/system/goodsNew/goodsEdit",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function d(t){return Object(r["a"])({url:"/system/goodsNew/batchUploadImage",method:"post",data:t})}function f(t){return Object(r["a"])({url:"/local/serviceFee/getByCategory",method:"get",params:t})}function m(t){return Object(r["a"])({url:"/system/goodsNew/synthesisList",method:"post",data:t})}},"5a97":function(t,e,n){"use strict";n.d(e,"e",(function(){return a})),n.d(e,"h",(function(){return o})),n.d(e,"c",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"f",(function(){return c})),n.d(e,"a",(function(){return i})),n.d(e,"b",(function(){return l})),n.d(e,"g",(function(){return d}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/goodsNew/list",method:"get",params:t})}function o(t){return Object(r["a"])({url:"/system/goodsNew/shelvesStatus",method:"post",data:t})}function s(t){return Object(r["a"])({url:"/system/goodsNew/goodsStatus",method:"post",data:t})}function u(t){return Object(r["a"])({url:"/system/goodsNew/info",method:"get",params:t})}function c(t){return Object(r["a"])({url:"/system/goodsNew/collect",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/system/goodsNew/cancelOnsale",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/system/goodsNew/cancelOnsaleAll",method:"post",data:t})}function d(t){return Object(r["a"])({url:"/system/goodsNew/onsaleUpdate",method:"post",data:t})}},"61da":function(t,e,n){"use strict";n("280e")},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return a})),n.d(e,"i",(function(){return o})),n.d(e,"b",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"a",(function(){return c})),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 f})),n.d(e,"e",(function(){return m})),n.d(e,"h",(function(){return h})),n.d(e,"f",(function(){return p})),n.d(e,"k",(function(){return g}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/index/getInfo",method:"get",params:t})}function o(t){return Object(r["a"])({url:"/local/getOrganization",method:"get",params:t})}function s(t){return Object(r["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(r["a"])({url:"/local/shopbrand",method:"get",params:t})}function c(t){return Object(r["a"])({url:"/local/brands",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(r["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(r["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function m(t){return Object(r["a"])({url:"/local/cate",method:"get",params:t})}function h(t){return Object(r["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function p(t){return Object(r["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(r["a"])({url:"/local/qualification/list",method:"get",params:t})}},e3b2:function(t,e,n){"use strict";n.r(e);var r=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("p",[t._v("支持平台：")]),t._v(" "),n("p",[t._v("京东、天猫、淘宝 ")])]),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)},a=[],o=(n("1bc7"),n("4057"),n("e680"),n("fc02"),n("2ca7"),n("6b1f")),s=n("5a97"),u=n("3d17"),c=(n("ed08"),{name:"freight",data:function(){return{collect_num:0,form:{desc:""},el_valuestatus:!0,el_value:[],options:[],props:{expandTrigger:"click",lazy:!0,lazyLoad:this.lazyLoad,value:"id",label:"title",leaf:"leaf"}}},components:{},created:function(){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 r=0,a=Number(e.length),o="";1===n.code?(1===a?1===Number(n.data)?t.$message({type:"success",message:"您好，商品已导入成功，请在仓库中进行编辑后申请上架"}):t.$message({type:"error",message:"您好，商品导入失败，请您重新导入"}):a>1&&(r=Number(n.data),o="您好，一共导入"+a+"条商品，"+r+"条导入成功，请在仓库中进行编辑后申请上架",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,r,a,o;try{n=t.toString().split(".")[1].length,r=e.toString().split(".")[1].length}catch(s){n=0,r=0}return a=Math.pow(10,Math.max(n,r)),o=(t*a+e*a)/a,o=o.toFixed(2),o},minus:function(t,e){return this.add(t,-e)},elvalueclick:function(){},lazyLoad:function(t,e){this.SSQList=[],this.SSQStr="",this.getArea(t,e),this.SSQList&&this.SSQList.length>0?this.isNextStep=!1:this.isNextStep=!0},getArea:function(t,e){var n=t.level,r={};0===n&&(r={parent_id:0}),n>0&&(r={parent_id:t.value}),Object(u["b"])(r).then((function(t){var r={};r=t.data,r.forEach((function(t){t.value=t.id,t.label=t.label,t.children=[],t.leaf=n>=2})),e(r)}))}}}),i=c,l=(n("61da"),n("cba8")),d=Object(l["a"])(i,r,a,!1,null,"83efcd1a",null);e["default"]=d.exports}}]);
+//# sourceMappingURL=chunk-0382b59d.0e37475c.js.map
\ No newline at end of file

dist/static/js/chunk-2a78bde0.88b1e39d.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2a78bde0"],{7793:function(t,e,n){"use strict";n("d0ad")},"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)])])},o=[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,{type:2,site_type:4});Object(a["e"])(e).then((function(e){1==e.code&&(t.channel_id=e.data.channel.id,t.settitle.topLogo=e.data.channel_site[0].logo)}))},getWebSite:function(){var t=this,e={domain:window.location.host,type:2,site_type:4};Object(a["f"])(e).then((function(e){1==e.code&&(t.settitle.topLogo=e.data.channel_site[0].logo)}))},nextStep:function(){this.$router.push("/fillMainInf")}}},s=c,l=(n("7793"),n("cba8")),r=Object(l["a"])(s,i,o,!1,null,"38a02556",null);e["default"]=r.exports},d0ad:function(t,e,n){}}]);
+//# sourceMappingURL=chunk-2a78bde0.88b1e39d.js.map
\ No newline at end of file

dist/static/js/chunk-2a78bde0.88b1e39d.js.map

+{"version":3,"sources":["webpack:///./src/views/entry/process.vue?d0e2","webpack:///./public/images/4.png","webpack:///./src/views/entry/process.vue?b098","webpack:///./src/views/entry/process.vue?26d9","webpack:///./src/views/entry/process.vue?3731","webpack:///./src/views/entry/process.vue"],"names":["module","exports","render","_vm","this","_h","$createElement","_c","_self","staticClass","settitle","topLogo","attrs","_e","_v","_m","staticStyle","on","nextStep","staticRenderFns","name","data","channel_id","bottomCopyright","businessHours","companyAddress","contactTel","custServiceQrcode","hotlineTel1","hotlineTel2","onlineTimeEnd","onlineTimeStart","recordNum","created","mounted","methods","getIndexInfo","_this","window","location","host","type","site_type","then","res","code","channel","id","channel_site","logo","getWebSite","_this2","params","domain","webSite","$router","push","component"],"mappings":"gHAAA,W,uBCAAA,EAAOC,QAAU,IAA0B,6B,yCCA3C,IAAIC,EAAS,WAAa,IAAIC,EAAIC,KAASC,EAAGF,EAAIG,eAAmBC,EAAGJ,EAAIK,MAAMD,IAAIF,EAAG,OAAOE,EAAG,MAAM,CAACE,YAAY,gBAAgB,CAACF,EAAG,MAAM,CAACE,YAAY,WAAW,CAAEN,EAAIO,UAAYP,EAAIO,SAASC,QAASJ,EAAG,MAAM,CAACK,MAAM,CAAC,IAAMT,EAAIO,SAASC,QAAQ,IAAM,MAAMR,EAAIU,OAAOV,EAAIW,GAAG,KAAKX,EAAIY,GAAG,GAAGZ,EAAIW,GAAG,KAAKP,EAAG,MAAM,CAACE,YAAY,eAAe,CAACF,EAAG,IAAI,CAACA,EAAG,YAAY,CAACS,YAAY,CAAC,QAAU,YAAYJ,MAAM,CAAC,KAAO,UAAU,MAAQ,IAAIK,GAAG,CAAC,MAAQd,EAAIe,WAAW,CAACf,EAAIW,GAAG,oBAAoBP,EAAG,IAAI,CAACE,YAAY,qBAAqB,QACthBU,EAAkB,CAAC,WAAa,IAAIhB,EAAIC,KAASC,EAAGF,EAAIG,eAAmBC,EAAGJ,EAAIK,MAAMD,IAAIF,EAAG,OAAOE,EAAG,MAAM,CAACE,YAAY,YAAY,CAACF,EAAG,MAAM,CAACK,MAAM,CAAC,IAAM,EAAQ,QAAgC,IAAM,U,YCkBnM,GACbQ,KAAM,QACNC,KAAM,WACJ,MAAO,CACLC,WAAY,EACZZ,SAAU,CACRa,gBAAiB,GACjBC,cAAe,EACfC,eAAgB,GAChBC,WAAY,GACZC,kBAAmB,GACnBC,YAAa,GACbC,YAAa,GACbC,cAAe,QACfC,gBAAiB,QACjBC,UAAW,GACXrB,QAAS,MAIfsB,QAAS,aAETC,QAAS,aAETC,QAAS,CAEPC,aAAc,WACZ,IAAIC,EAAQjC,KAIRiB,GADMiB,OAAOC,SAASC,KACf,CACTC,KAAM,EACNC,UAAW,IAGb,eAAUrB,GAAMsB,MAAK,SAAUC,GACb,GAAZA,EAAIC,OACNR,EAAMf,WAAasB,EAAIvB,KAAKyB,QAAQC,GACpCV,EAAM3B,SAASC,QAAUiC,EAAIvB,KAAK2B,aAAa,GAAGC,UAMxDC,WAAY,WACV,IAAIC,EAAS/C,KAETgD,EAAS,CACXC,OAAQf,OAAOC,SAASC,KACxBC,KAAM,EACNC,UAAW,GAEb,OAAAY,EAAA,MAAQF,GAAQT,MAAK,SAAUC,GACb,GAAZA,EAAIC,OAINM,EAAOzC,SAASC,QAAUiC,EAAIvB,KAAK2B,aAAa,GAAGC,UAIzD/B,SAAU,WACRd,KAAKmD,QAAQC,KAAK,mBClF4a,I,wBCQhcC,EAAY,eACd,EACAvD,EACAiB,GACA,EACA,KACA,WACA,MAIa,aAAAsC,E","file":"static/js/chunk-2a78bde0.88b1e39d.js","sourcesContent":["export * from \"-!../../../node_modules/_mini-css-extract-plugin@0.5.0@mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/_css-loader@1.0.1@css-loader/index.js??ref--8-oneOf-1-1!../../../node_modules/_vue-loader@15.9.8@vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/_sass-loader@7.3.1@sass-loader/dist/cjs.js??ref--8-oneOf-1-2!../../../node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/_vue-loader@15.9.8@vue-loader/lib/index.js??vue-loader-options!./process.vue?vue&type=style&index=0&id=38a02556&lang=scss&scoped=true&\"","module.exports = __webpack_public_path__ + \"static/img/4.3f411af6.png\";","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"entryDetails\"},[_c('div',{staticClass:\"logo-bg\"},[(_vm.settitle && _vm.settitle.topLogo)?_c('img',{attrs:{\"src\":_vm.settitle.topLogo,\"alt\":\"\"}}):_vm._e()]),_vm._v(\" \"),_vm._m(0),_vm._v(\" \"),_c('div',{staticClass:\"confirm-btn\"},[_c('p',[_c('el-button',{staticStyle:{\"padding\":\"8px 30px\"},attrs:{\"type\":\"primary\",\"round\":\"\"},on:{\"click\":_vm.nextStep}},[_vm._v(\"\\n        立即入驻  \"),_c('i',{staticClass:\"el-icon-right\"})])],1)])])}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"main-con\"},[_c('img',{attrs:{\"src\":require(\"../../../public/images/4.png\"),\"alt\":\"\"}})])}]\n\nexport { render, staticRenderFns }","//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nimport { indexInfo, companyCounsel, webSite, getdomain, getallCloudList } from '@/api/webSite';\nexport default {\n  name: \"Index\",\n  data: function data() {\n    return {\n      channel_id: 0,\n      settitle: {\n        bottomCopyright: \"\",\n        businessHours: 1,\n        companyAddress: \"\",\n        contactTel: \"\",\n        custServiceQrcode: \"\",\n        hotlineTel1: \"\",\n        hotlineTel2: \"\",\n        onlineTimeEnd: \"18:00\",\n        onlineTimeStart: \"09:00\",\n        recordNum: \"\",\n        topLogo: \"\"\n      }\n    };\n  },\n  created: function created() {// this.getIndexInfo();\n  },\n  mounted: function mounted() {//this.nextStep();\n  },\n  methods: {\n    /** 获取 channel_id */\n    getIndexInfo: function getIndexInfo() {\n      var _this = this;\n\n      var op = 'open';\n      var ssa = window.location.host;\n      var data = {\n        type: 2,\n        site_type: 4 // domain: ssa,\n\n      };\n      indexInfo(data).then(function (res) {\n        if (res.code == 1) {\n          _this.channel_id = res.data.channel.id;\n          _this.settitle.topLogo = res.data.channel_site[0].logo; // this.getWebSite()\n        }\n      });\n    },\n\n    /** 获取通用设置 */\n    getWebSite: function getWebSite() {\n      var _this2 = this;\n\n      var params = {\n        domain: window.location.host,\n        type: 2,\n        site_type: 4\n      };\n      webSite(params).then(function (res) {\n        if (res.code == 1) {\n          // if (res.data.universal_lst && res.data.universal_lst != 'null') {\n          //   this.settitle = res.data.universal_lst\n          // }\n          _this2.settitle.topLogo = res.data.channel_site[0].logo;\n        }\n      });\n    },\n    nextStep: function nextStep() {\n      this.$router.push(\"/fillMainInf\");\n    }\n  }\n};","import mod from \"-!../../../node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!../../../node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!../../../node_modules/_babel-loader@8.2.2@babel-loader/lib/index.js!../../../node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/_vue-loader@15.9.8@vue-loader/lib/index.js??vue-loader-options!./process.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!../../../node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!../../../node_modules/_babel-loader@8.2.2@babel-loader/lib/index.js!../../../node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/_vue-loader@15.9.8@vue-loader/lib/index.js??vue-loader-options!./process.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./process.vue?vue&type=template&id=38a02556&scoped=true&\"\nimport script from \"./process.vue?vue&type=script&lang=js&\"\nexport * from \"./process.vue?vue&type=script&lang=js&\"\nimport style0 from \"./process.vue?vue&type=style&index=0&id=38a02556&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/_vue-loader@15.9.8@vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  \"38a02556\",\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file

dist/static/js/chunk-2d0f012d.7a9a98ab.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f012d"],{"9b8f":function(e,r,n){"use strict";n.r(r);n("8dee");var t,u,a={created:function(){var e=this.$route,r=e.params,n=e.query,t=r.path;this.$router.replace({path:"/"+t,query:n})},render:function(e){return e()}},c=a,o=n("cba8"),p=Object(o["a"])(c,t,u,!1,null,null,null);r["default"]=p.exports}}]);
+//# sourceMappingURL=chunk-2d0f012d.7a9a98ab.js.map
\ No newline at end of file

src/api/module/freight.js

@@ -45,3 +45,12 @@ export function delFreight(ids) {
     })
 }
 
+
+// 获取全部地址
+export function addressList(data) {
+    return request({
+        url: '/local/address/getAddressList',
+        method: 'post',
+        data: data
+    })
+}

src/api/module/retreat/address.js

@@ -43,5 +43,11 @@ export function getAreaList(query) {
   });
 }
 
-
+export function getnewAreaList(query) {
+  return request({
+    url: '/local/address/typeList',
+    method: 'get',
+    params: query
+  });
+}
 //

src/api/module/settlementbill.js

@@ -24,3 +24,12 @@ export function getVerifyrecord(query) {
     params: query
   })
 }
+
+
+export function updaterecord(data) {
+  return request({
+    url: '/local/asset/excel',
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file

src/components/HeaderSearch/index.vue

@@ -159,7 +159,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep  .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

src/components/upfile/index.vue

@@ -102,7 +102,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 ul.el-upload-list li {
   padding-left: 8px;
   height: 45px;

src/layout/components/TagsView/ScrollPane.vue

@@ -73,7 +73,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep  {
     .el-scrollbar__bar {
       bottom: 0px;
     }

src/views/entry/newyuncang.vue

@@ -1262,7 +1262,7 @@
     overflow: hidden;
   }
 
-  /deep/ .is-active {
+  ::v-deep  .is-active {
     border: 1px solid #e9e9e9;
     background: #fff;
     overflow: hidden;

src/views/system/asset/explain/index.vue

@@ -87,7 +87,7 @@
 </script>
 
 <style scoped>
-  /deep/.explain .el-card__body {
+  ::v-deep .explain .el-card__body {
     height: 100%;
     /*padding: 30px 20px;*/
     overflow: auto;