冲突解决

dist/static/js/chunk-0a90d205.ed4c9710.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0a90d205"],{"514f":function(t,e,n){},cc6c:function(t,e,n){t.exports=n.p+"static/img/401.089007e7.gif"},ec55: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:"errPage-container"},[n("el-button",{staticClass:"pan-back-btn",attrs:{icon:"arrow-left"},on:{click:t.back}},[t._v("\n    返回\n  ")]),t._v(" "),n("el-row",[n("el-col",{attrs:{span:12}},[n("h1",{staticClass:"text-jumbo text-ginormous"},[t._v("\n        401错误!\n      ")]),t._v(" "),n("h2",[t._v("您没有访问权限！")]),t._v(" "),n("h6",[t._v("对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面")]),t._v(" "),n("ul",{staticClass:"list-unstyled"},[n("li",{staticClass:"link-type"},[n("router-link",{attrs:{to:"/"}},[t._v("\n            回首页\n          ")])],1)])]),t._v(" "),n("el-col",{attrs:{span:12}},[n("img",{attrs:{src:t.errGif,width:"313",height:"428",alt:"Girl has dropped her ice cream."}})])],1)],1)},s=[],c=n("cc6c"),r=n.n(c),i={name:"Page401",data:function(){return{errGif:r.a+"?"+ +new Date}},methods:{back:function(){this.$route.query.noGoBack?this.$router.push({path:"/"}):this.$router.go(-1)}}},o=i,l=(n("ecf6"),n("2877")),u=Object(l["a"])(o,a,s,!1,null,"f2e02586",null);e["default"]=u.exports},ecf6:function(t,e,n){"use strict";n("514f")}}]);
\ No newline at end of file

dist/static/js/chunk-2d0c7ece.45001674.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c7ece"],{5360:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"app-container"},[a("el-form",{ref:"queryForm",attrs:{model:t.queryParams,inline:!0}},[a("el-form-item",{attrs:{label:"字典类型",prop:"dictType"}},[a("el-input",{attrs:{placeholder:"请输入字典类型",clearable:"",size:"small"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.handleQuery(e)}},model:{value:t.queryParams.dictType,callback:function(e){t.$set(t.queryParams,"dictType",e)},expression:"queryParams.dictType"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"字典标签",prop:"dictLabel"}},[a("el-input",{attrs:{placeholder:"请输入字典标签",clearable:"",size:"small"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.handleQuery(e)}},model:{value:t.queryParams.dictLabel,callback:function(e){t.$set(t.queryParams,"dictLabel",e)},expression:"queryParams.dictLabel"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"状态",prop:"status"}},[a("el-select",{attrs:{placeholder:"数据状态",clearable:"",size:"small"},model:{value:t.queryParams.status,callback:function(e){t.$set(t.queryParams,"status",e)},expression:"queryParams.status"}},t._l(t.statusOptions.values,(function(t){return a("el-option",{key:t.key,attrs:{label:t.value,value:t.key}})})),1)],1),t._v(" "),a("el-form-item",[a("el-button",{attrs:{type:"primary",icon:"el-icon-search",size:"mini"},on:{click:t.handleQuery}},[t._v("搜索")]),t._v(" "),a("el-button",{attrs:{icon:"el-icon-refresh",size:"mini"},on:{click:t.resetQuery}},[t._v("重置")])],1)],1),t._v(" "),a("el-row",{staticClass:"mb8",attrs:{gutter:10}},[a("el-col",{attrs:{span:1.5}},[a("el-button",{attrs:{type:"primary",icon:"el-icon-plus",size:"mini"},on:{click:t.handleAdd}},[t._v("新增")])],1),t._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{attrs:{type:"success",icon:"el-icon-edit",size:"mini",disabled:t.single},on:{click:t.handleUpdate}},[t._v("修改")])],1),t._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{attrs:{type:"danger",icon:"el-icon-delete",size:"mini",disabled:t.multiple},on:{click:t.handleDelete}},[t._v("删除")])],1)],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],attrs:{data:t.dataList},on:{"selection-change":t.handleSelectionChange}},[a("el-table-column",{attrs:{type:"selection",width:"55",align:"center"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典编码",align:"center",prop:"dict_code"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典标签",align:"center",prop:"dict_label"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典键值",align:"center",prop:"dict_value"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典排序",align:"center",prop:"dict_sort"}}),t._v(" "),a("el-table-column",{attrs:{label:"状态",align:"center",prop:"status",formatter:t.statusFormat}}),t._v(" "),a("el-table-column",{attrs:{label:"备注",align:"center",prop:"remark","show-overflow-tooltip":!0}}),t._v(" "),a("el-table-column",{attrs:{label:"创建时间",align:"center",prop:"create_time",width:"180"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",[t._v(t._s(t.parseTime(e.row.create_time)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{size:"mini",type:"text",icon:"el-icon-edit"},on:{click:function(a){return t.handleUpdate(e.row)}}},[t._v("修改")]),t._v(" "),a("el-button",{attrs:{size:"mini",type:"text",icon:"el-icon-delete"},on:{click:function(a){return t.handleDelete(e.row)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("pagination",{directives:[{name:"show",rawName:"v-show",value:t.total>0,expression:"total>0"}],attrs:{total:t.total,page:t.queryParams.pageNum,limit:t.queryParams.pageSize},on:{"update:page":function(e){return t.$set(t.queryParams,"pageNum",e)},"update:limit":function(e){return t.$set(t.queryParams,"pageSize",e)},pagination:t.getList}}),t._v(" "),a("el-dialog",{attrs:{title:t.title,visible:t.open,width:"500px","append-to-body":""},on:{"update:visible":function(e){t.open=e}}},[a("el-form",{ref:"form",attrs:{model:t.form,rules:t.rules,"label-width":"80px"}},[a("el-form-item",{attrs:{label:"字典类型"}},[a("el-input",{attrs:{disabled:!0},model:{value:t.form.dictType,callback:function(e){t.$set(t.form,"dictType",e)},expression:"form.dictType"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"数据标签",prop:"dictLabel"}},[a("el-input",{attrs:{placeholder:"请输入数据标签"},model:{value:t.form.dictLabel,callback:function(e){t.$set(t.form,"dictLabel",e)},expression:"form.dictLabel"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"数据键值",prop:"dictValue"}},[a("el-input",{attrs:{placeholder:"请输入数据键值"},model:{value:t.form.dictValue,callback:function(e){t.$set(t.form,"dictValue",e)},expression:"form.dictValue"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"显示排序",prop:"dictSort"}},[a("el-input-number",{attrs:{"controls-position":"right",min:0},model:{value:t.form.dictSort,callback:function(e){t.$set(t.form,"dictSort",e)},expression:"form.dictSort"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"系统默认"}},[a("el-switch",{attrs:{"active-text":"是","inactive-text":"否","active-value":"1","inactive-value":"0"},model:{value:t.form.isDefault,callback:function(e){t.$set(t.form,"isDefault",e)},expression:"form.isDefault"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"状态",prop:"status"}},[a("el-radio-group",{model:{value:t.form.status,callback:function(e){t.$set(t.form,"status",e)},expression:"form.status"}},t._l(t.statusOptions.values,(function(e){return a("el-radio",{key:e.key,attrs:{label:e.key}},[t._v(t._s(e.value))])})),1)],1),t._v(" "),a("el-form-item",{attrs:{label:"备注",prop:"remark"}},[a("el-input",{attrs:{type:"textarea",placeholder:"请输入内容"},model:{value:t.form.remark,callback:function(e){t.$set(t.form,"remark",e)},expression:"form.remark"}})],1)],1),t._v(" "),a("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("确 定")]),t._v(" "),a("el-button",{on:{click:t.cancel}},[t._v("取 消")])],1)],1)],1)},l=[],r=(a("ac6a"),a("aa3a")),s={name:"Data",data:function(){return{loading:!0,ids:[],single:!0,multiple:!0,total:0,dataList:[],defaultDictType:"",title:"",open:!1,statusOptions:[],typeOptions:[],queryParams:{pageNum:1,pageSize:10,dictName:void 0,dictType:void 0,status:void 0},form:{},rules:{dictLabel:[{required:!0,message:"数据标签不能为空",trigger:"blur"}],dictValue:[{required:!0,message:"数据键值不能为空",trigger:"blur"}],dictSort:[{required:!0,message:"数据顺序不能为空",trigger:"blur"}]}}},created:function(){var t=this.$route.params&&this.$route.params.dictType;this.queryParams.dictType=t,this.getList()},methods:{getList:function(){var t=this;this.loading=!0,Object(r["f"])(this.queryParams).then((function(e){t.dataList=e.data.list,t.statusOptions=e.data.searchStatus,t.total=e.data.total,t.loading=!1}))},statusFormat:function(t,e){return this.selectDictLabel(this.statusOptions.values,t.status)},cancel:function(){this.open=!1,this.reset()},reset:function(){this.form={dictCode:void 0,dictLabel:void 0,dictValue:void 0,dictSort:0,isDefault:"0",status:"1",remark:void 0},this.resetForm("form")},handleQuery:function(){this.queryParams.pageNum=1,this.getList()},resetQuery:function(){this.resetForm("queryForm"),this.queryParams.dictType=this.defaultDictType,this.handleQuery()},handleAdd:function(){this.reset(),this.open=!0,this.title="添加字典数据",this.form.dictType=this.queryParams.dictType},handleSelectionChange:function(t){this.ids=t.map((function(t){return t.dict_code})),this.single=1!=t.length,this.multiple=!t.length},handleUpdate:function(t){var e=this;this.reset();var a=t.dict_code||this.ids;Object(r["d"])(a).then((function(t){e.form={dictType:t.data.dict_type,dictCode:t.data.dict_code,dictLabel:t.data.dict_label,dictValue:t.data.dict_value,dictSort:t.data.dict_sort,isDefault:""+t.data.is_default,status:""+t.data.status,remark:t.data.remark},e.open=!0,e.title="修改字典数据"}))},submitForm:function(){var t=this;this.$refs["form"].validate((function(e){e&&(void 0!=t.form.dictCode?Object(r["g"])(t.form).then((function(e){0===e.code?(t.msgSuccess("修改成功"),t.open=!1,t.getList()):t.msgError(e.msg)})):Object(r["a"])(t.form).then((function(e){0===e.code?(t.msgSuccess("新增成功"),t.open=!1,t.getList()):t.msgError(e.msg)})))}))},handleDelete:function(t){var e=this,a=t.dict_code||this.ids;this.$confirm('是否确认删除字典编码为"'+a+'"的数据项?',"警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return Object(r["b"])(a)})).then((function(){e.getList(),e.msgSuccess("删除成功")})).catch((function(){}))},handleExport:function(){var t=this,e=this.queryParams;this.$confirm("是否确认导出所有数据项?","警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return Object(r["c"])(e)})).then((function(e){t.download(e.msg)})).catch((function(){}))}}},n=s,o=a("2877"),c=Object(o["a"])(n,i,l,!1,null,null,null);e["default"]=c.exports}}]);
\ No newline at end of file

dist/static/js/chunk-2d0d67a2.2faff61e.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d67a2"],{"735e":function(e,t,a){"use strict";a.r(t);var o=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-container"},[a("el-form",{ref:"queryForm",attrs:{model:e.queryParams,inline:!0,"label-width":"68px"}},[a("el-form-item",{attrs:{label:"任务名称",prop:"jobName"}},[a("el-input",{staticStyle:{width:"240px"},attrs:{placeholder:"请输入任务名称",clearable:"",size:"small"},nativeOn:{keyup:function(t){return!t.type.indexOf("key")&&e._k(t.keyCode,"enter",13,t.key,"Enter")?null:e.handleQuery(t)}},model:{value:e.queryParams.jobName,callback:function(t){e.$set(e.queryParams,"jobName",t)},expression:"queryParams.jobName"}})],1),e._v(" "),a("el-form-item",{attrs:{label:"任务组名",prop:"jobGroup"}},[a("el-select",{staticStyle:{width:"240px"},attrs:{placeholder:"请任务组名",clearable:"",size:"small"},model:{value:e.queryParams.jobGroup,callback:function(t){e.$set(e.queryParams,"jobGroup",t)},expression:"queryParams.jobGroup"}},e._l(e.jobGroupOptions,(function(e){return a("el-option",{key:e.dictValue,attrs:{label:e.dictLabel,value:e.dictValue}})})),1)],1),e._v(" "),a("el-form-item",{attrs:{label:"执行状态",prop:"status"}},[a("el-select",{staticStyle:{width:"240px"},attrs:{placeholder:"请选择执行状态",clearable:"",size:"small"},model:{value:e.queryParams.status,callback:function(t){e.$set(e.queryParams,"status",t)},expression:"queryParams.status"}},e._l(e.statusOptions,(function(e){return a("el-option",{key:e.dictValue,attrs:{label:e.dictLabel,value:e.dictValue}})})),1)],1),e._v(" "),a("el-form-item",{attrs:{label:"执行时间"}},[a("el-date-picker",{staticStyle:{width:"240px"},attrs:{size:"small","value-format":"yyyy-MM-dd",type:"daterange","range-separator":"-","start-placeholder":"开始日期","end-placeholder":"结束日期"},model:{value:e.dateRange,callback:function(t){e.dateRange=t},expression:"dateRange"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{type:"primary",icon:"el-icon-search",size:"mini"},on:{click:e.handleQuery}},[e._v("搜索")]),e._v(" "),a("el-button",{attrs:{icon:"el-icon-refresh",size:"mini"},on:{click:e.resetQuery}},[e._v("重置")])],1)],1),e._v(" "),a("el-row",{staticClass:"mb8",attrs:{gutter:10}},[a("el-col",{attrs:{span:1.5}},[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:job:remove"],expression:"['monitor:job:remove']"}],attrs:{type:"danger",icon:"el-icon-delete",size:"mini",disabled:e.multiple},on:{click:e.handleDelete}},[e._v("删除")])],1),e._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:job:remove"],expression:"['monitor:job:remove']"}],attrs:{type:"danger",icon:"el-icon-delete",size:"mini"},on:{click:e.handleClean}},[e._v("清空")])],1),e._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:jobLog:export"],expression:"['monitor:jobLog:export']"}],attrs:{type:"warning",icon:"el-icon-download",size:"mini"},on:{click:e.handleExport}},[e._v("导出")])],1)],1),e._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],attrs:{data:e.jobLogList},on:{"selection-change":e.handleSelectionChange}},[a("el-table-column",{attrs:{type:"selection",width:"55",align:"center"}}),e._v(" "),a("el-table-column",{attrs:{label:"日志编号",width:"80",align:"center",prop:"jobLogId"}}),e._v(" "),a("el-table-column",{attrs:{label:"任务名称",align:"center",prop:"jobName","show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"任务组名",align:"center",prop:"jobGroup",formatter:e.jobGroupFormat,"show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"调用目标字符串",align:"center",prop:"invokeTarget","show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"日志信息",align:"center",prop:"jobMessage","show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"执行状态",align:"center",prop:"status",formatter:e.statusFormat}}),e._v(" "),a("el-table-column",{attrs:{label:"执行时间",align:"center",prop:"createTime",width:"180"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("span",[e._v(e._s(e.parseTime(t.row.createTime)))])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:job:query"],expression:"['monitor:job:query']"}],attrs:{size:"mini",type:"text",icon:"el-icon-view"},on:{click:function(a){return e.handleView(t.row)}}},[e._v("详细")])]}}])})],1),e._v(" "),a("pagination",{directives:[{name:"show",rawName:"v-show",value:e.total>0,expression:"total>0"}],attrs:{total:e.total,page:e.queryParams.pageNum,limit:e.queryParams.pageSize},on:{"update:page":function(t){return e.$set(e.queryParams,"pageNum",t)},"update:limit":function(t){return e.$set(e.queryParams,"pageSize",t)},pagination:e.getList}}),e._v(" "),a("el-dialog",{attrs:{title:"调度日志详细",visible:e.open,width:"700px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[a("el-form",{ref:"form",attrs:{model:e.form,"label-width":"100px",size:"mini"}},[a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{label:"日志序号："}},[e._v(e._s(e.form.jobLogId))]),e._v(" "),a("el-form-item",{attrs:{label:"任务名称："}},[e._v(e._s(e.form.jobName))])],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{label:"任务分组："}},[e._v(e._s(e.form.jobGroup))]),e._v(" "),a("el-form-item",{attrs:{label:"执行时间："}},[e._v(e._s(e.form.createTime))])],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"调用方法："}},[e._v(e._s(e.form.invokeTarget))])],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"日志信息："}},[e._v(e._s(e.form.jobMessage))])],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"执行状态："}},[0==e.form.status?a("div",[e._v("正常")]):1==e.form.status?a("div",[e._v("失败")]):e._e()])],1),e._v(" "),a("el-col",{attrs:{span:24}},[1==e.form.status?a("el-form-item",{attrs:{label:"异常信息："}},[e._v(e._s(e.form.exceptionInfo))]):e._e()],1)],1)],1),e._v(" "),a("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(t){e.open=!1}}},[e._v("关 闭")])],1)],1)],1)},r=[],n=a("ade3"),l=a("b775");function i(e){return Object(l["a"])({url:"/monitor/jobLog/list",method:"get",params:e})}function s(e){return Object(l["a"])({url:"/monitor/jobLog/"+e,method:"delete"})}function u(){return Object(l["a"])({url:"/monitor/jobLog/clean",method:"delete"})}function c(e){return Object(l["a"])({url:"/monitor/jobLog/export",method:"get",params:e})}var m={name:"JobLog",data:function(){return Object(n["a"])({loading:!0,ids:[],multiple:!0,total:0,jobLogList:[],open:!1,dateRange:[],form:{},statusOptions:[],jobGroupOptions:[],queryParams:{pageNum:1,pageSize:10,jobName:void 0,jobGroup:void 0,status:void 0}},"form",{})},created:function(){var e=this;this.getList(),this.getDicts("sys_job_status").then((function(t){e.statusOptions=t.data})),this.getDicts("sys_job_group").then((function(t){e.jobGroupOptions=t.data}))},methods:{getList:function(){var e=this;this.loading=!0,i(this.addDateRange(this.queryParams,this.dateRange)).then((function(t){e.jobLogList=t.rows,e.total=t.total,e.loading=!1}))},statusFormat:function(e,t){return this.selectDictLabel(this.statusOptions,e.status)},jobGroupFormat:function(e,t){return this.selectDictLabel(this.jobGroupOptions,e.jobGroup)},handleQuery:function(){this.queryParams.pageNum=1,this.getList()},resetQuery:function(){this.dateRange=[],this.resetForm("queryForm"),this.handleQuery()},handleSelectionChange:function(e){this.ids=e.map((function(e){return e.jobLogId})),this.multiple=!e.length},handleView:function(e){this.open=!0,this.form=e},handleDelete:function(e){var t=this,a=this.ids;this.$confirm('是否确认删除调度日志编号为"'+a+'"的数据项?',"警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return s(a)})).then((function(){t.getList(),t.msgSuccess("删除成功")})).catch((function(){}))},handleClean:function(){var e=this;this.$confirm("是否确认清空所有调度日志数据项?","警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return u()})).then((function(){e.getList(),e.msgSuccess("清空成功")})).catch((function(){}))},handleExport:function(){var e=this,t=this.queryParams;this.$confirm("是否确认导出所有调度日志数据项?","警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return c(t)})).then((function(t){e.download(t.msg)})).catch((function(){}))}}},p=m,d=a("2877"),b=Object(d["a"])(p,o,r,!1,null,null,null);t["default"]=b.exports}}]);
\ No newline at end of file

dist/static/js/chunk-2f2393fa.52eaad38.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7f2f7f9d"],{"47af":function(t,s){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=="},"6bf3":function(t,s,i){},"83f1":function(t,s,i){"use strict";i.r(s);var c=function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"to-review"},[c("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),c("el-card",{staticClass:"box-card"},[c("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[c("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success","process-status":"error"}},[c("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),c("el-step",{attrs:{title:"填写品牌信息"}}),t._v(" "),c("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),c("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),c("div",{staticClass:"main"},[c("div",{staticClass:"main-con"},[c("p",[c("img",{attrs:{src:i("47af"),alt:""}})]),t._v(" "),c("p",[t._v("非常抱歉，您的资料审核不通过！")]),t._v(" "),c("p",[t._v("不通过原因："+t._s(t.msg)+"！请您重新提交认证资料！")]),t._v(" "),c("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系")]),t._v(" "),c("p",{staticStyle:{"padding-top":"40px"}},[c("el-button",{attrs:{type:"primary"},on:{click:t.reSubmit}},[t._v("重新提交")])],1)])])])],1)},e=[],a={name:"ReviewFail",data:function(){return{msg:"具体原因，请联系售后"}},mounted:function(){this.$route.params.msg&&(this.msg=this.$route.params.msg)},methods:{reSubmit:function(){this.$router.push({path:"/process"})}}},A=a,n=(i("f037"),i("cba8")),l=Object(n["a"])(A,c,e,!1,null,"038cd2fa",null);s["default"]=l.exports},f037:function(t,s,i){"use strict";i("6bf3")}}]);
\ No newline at end of file

dist/static/js/chunk-6c237b40.c1d15112.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6c237b40"],{"26fc":function(t,s,i){t.exports=i.p+"static/img/404_cloud.0f4bc32b.png"},2754:function(t,s,i){"use strict";i.r(s);var a=function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"wscn-http404-container"},[i("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),i("div",{staticClass:"bullshit"},[i("div",{staticClass:"bullshit__oops"},[t._v("\n        404错误!\n      ")]),t._v(" "),i("div",{staticClass:"bullshit__headline"},[t._v("\n        "+t._s(t.message)+"\n      ")]),t._v(" "),i("div",{staticClass:"bullshit__info"},[t._v("\n        对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。\n      ")]),t._v(" "),i("router-link",{staticClass:"bullshit__return-home",attrs:{to:"/"}},[t._v("\n        返回首页\n      ")])],1)])])},c=[function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"pic-404"},[a("img",{staticClass:"pic-404__parent",attrs:{src:i("a36b"),alt:"404"}}),t._v(" "),a("img",{staticClass:"pic-404__child left",attrs:{src:i("26fc"),alt:"404"}}),t._v(" "),a("img",{staticClass:"pic-404__child mid",attrs:{src:i("26fc"),alt:"404"}}),t._v(" "),a("img",{staticClass:"pic-404__child right",attrs:{src:i("26fc"),alt:"404"}})])}],n={name:"Page404",computed:{message:function(){return"找不到网页！"}}},l=n,e=(i("61b6"),i("2877")),_=Object(e["a"])(l,a,c,!1,null,"279ea4b2",null);s["default"]=_.exports},"61b6":function(t,s,i){"use strict";i("bf69")},a36b:function(t,s,i){t.exports=i.p+"static/img/404.a57b6f31.png"},bf69:function(t,s,i){}}]);
\ No newline at end of file

dist/static/js/chunk-727a03af.fe0f68ca.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-727a03af"],{"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("b296"),e("2877")),r=Object(l["a"])(o,i,a,!1,null,"0802b7d9",null);n["default"]=r.exports},b296:function(t,n,e){"use strict";e("ca32")},ca32:function(t,n,e){}}]);
\ No newline at end of file

dist/static/js/chunk-792fc926.c82f674a.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-792fc926"],{a07f:function(t,e,i){},e4dd:function(t,e,i){"use strict";i.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:i("e9f2"),alt:""}})]),t._v(" "),A("p",[t._v("资料已提交，工作人员审核中。。。")]),t._v(" "),A("p",[t._v("您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。")]),t._v(" "),A("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系！")])])])])],1)},c=[],l={name:"ReviewSuccess",data:function(){return{}}},a=l,s=(i("fc37"),i("2877")),n=Object(s["a"])(a,A,c,!1,null,"61915260",null);e["default"]=n.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="},fc37:function(t,e,i){"use strict";i("a07f")}}]);
\ No newline at end of file

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

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,o,e){"use strict";e.d(o,"f",(function(){return r})),e.d(o,"b",(function(){return a})),e.d(o,"d",(function(){return c})),e.d(o,"a",(function(){return u})),e.d(o,"h",(function(){return i})),e.d(o,"g",(function(){return s})),e.d(o,"c",(function(){return l})),e.d(o,"i",(function(){return d})),e.d(o,"e",(function(){return h}));var n=e("b775");function r(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function a(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function c(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function u(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function i(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function l(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function d(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})}},"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["g"])().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:"/fillBrandInf"});break;case 2:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var e=o.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:e}});break}else o&&o.msg?a["Notification"].error({title:"提示：",message:o.msg}):a["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var e=window.location.host,n=document.location.protocol,r=t;setTimeout((function(){window.location.href=n+"//"+r.ssourl+"/logout?redirect="+n+"//"+e+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var o=window.location.host,e=document.location.protocol;setTimeout((function(){window.location.href=e+"//"+that.ssourl+"/logout?redirect="+e+"//"+o+"/login"}),1e3),t.loading=!1}))}}}),i=u,s=e("2877"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
\ No newline at end of file

dist/static/js/chunk-f18f73fa.72dc7274.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f18f73fa"],{"5a97":function(t,e,n){"use strict";n.d(e,"d",(function(){return r})),n.d(e,"g",(function(){return s})),n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return c})),n.d(e,"f",(function(){return u})),n.d(e,"e",(function(){return i})),n.d(e,"a",(function(){return l}));var a=n("b775");function r(t){return Object(a["a"])({url:"/system/goodsNew/list",method:"get",params:t})}function s(t){return Object(a["a"])({url:"/system/goodsNew/shelvesStatus",method:"post",data:t})}function o(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})}},"6b1f":function(t,e,n){"use strict";n.d(e,"f",(function(){return r})),n.d(e,"b",(function(){return s})),n.d(e,"d",(function(){return o})),n.d(e,"a",(function(){return c})),n.d(e,"h",(function(){return u})),n.d(e,"g",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"i",(function(){return d})),n.d(e,"e",(function(){return m}));var a=n("b775");function r(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 o(t){return Object(a["a"])({url:"/local/shopbrand",method:"get",params:t})}function c(t){return Object(a["a"])({url:"/local/brands",method:"post",data:t})}function u(t){return Object(a["a"])({url:"/local/upbrands",method:"post",data:t})}function i(t){return Object(a["a"])({url:"/local/getShopInfo",method:"get",params:t})}function l(t){return Object(a["a"])({url:"/local/addShopInfo",method:"post",data:t})}function d(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})}},"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=[],s=(n("6b54"),n("c5f6"),n("28a5"),n("5c96"),n("6b1f")),o=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(s["g"])().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(o["e"])(n).then((function(n){var a=0,r=Number(e.length),s="";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),s="您好，一共导入"+r+"条商品，"+a+"条导入成功，请在仓库中进行编辑后申请上架",t.$message({type:"warning",message:s})),t.el_value=[],t.$refs.cascaderDom.$refs.panel.activePath=[],t.form.desc=""):(s=n.message?n.message:"导入失败",t.$message({type:"error",message:s})),t.info()}))}}},add:function(t,e){var n,a,r,s;try{n=t.toString().split(".")[1].length,a=e.toString().split(".")[1].length}catch(o){n=0,a=0}return r=Math.pow(10,Math.max(n,a)),s=(t*r+e*r)/r,s=s.toFixed(2),s},minus:function(t,e){return this.add(t,-e)},elvalueclick:function(){},getData:function(){var t=this;Object(o["f"])().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

public/index.html

@@ -228,8 +228,9 @@
           }
         }
       };
-      xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
-      // xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
+      //xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
+      // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
+      xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试
       xhttp.send();
     }
   </script>

src/api/module/settlementbill.js

+import request from '@/utils/request'
+
+// 结算列表
+export function listVerifyrecord(data) {
+  return request({
+    url: '/local/asset/getSellerBalanceLogList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 结算详情
+// export function getVerifyrecord (id) {
+//   return request({
+//     url: '/system/order/getOrderSellerListInfo?id='+id,
+//     method: 'get'
+//   })
+// }
+
+export function getVerifyrecord(query) {
+  return request({
+    url: '/system/order/getOrderSellerListInfo',
+    method: 'get',
+    params: query
+  })
+}

src/api/module/verifyrecord.js

 import request from '@/utils/request'
 
-// 查询verifyrecord列表
-export function listVerifyrecord(query) {
+// 结算列表
+export function listVerifyrecord(data) {
     return request({
-        url: '/system/verifyrecord/list',
-        method: 'get',
-        params: query
+      url: '/local/asset/getSellerBalanceLogList',
+      method: 'post',
+      data: data
     })
 }
 
-// 查询verifyrecord详细
+// 详情
 export function getVerifyrecord (id) {
     return request({
-        url: '/system/verifyrecord/getDetail?id='+id,
+        url: '/system/order/getOrderSellerListInfo?id='+id,
         method: 'get'
     })
 }

src/api/webSite.js

@@ -3,28 +3,29 @@ import request from '@/utils/request'
 // 获取渠道id
 export function indexInfo(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
+    url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
     method: 'get',
     params
-
   })
 }
 // 获取所有域名
 export function getdomain(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
+    url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
     method: 'get',
     params
-
   })
 }
 // 获取官网设置接口
 export function webSite(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
+    url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
     method: 'get',
     params
   })
@@ -33,8 +34,9 @@ export function webSite(params) {
 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
 export function getallCloudList(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
+    url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
     method: 'get',
     params
   })
@@ -42,9 +44,19 @@ export function getallCloudList(params) {
 //获取sso域名
 export function getssoUrl(data) {
   return request({
-    url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
-    // url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
+    // url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
+    url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
     method: 'get',
     params: data
   })
 }
+
+// 获取logo
+export function backDetailsView(params) {
+  return request({
+    url: '/local/oem/backDetails',
+    method: 'get',
+    params
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -3,11 +3,11 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="false" :src="logo" class="sidebar-logo">
-<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+       <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+       <img v-if="logo" :src="logo" class="sidebar-logo">
         <img v-if="false" :src="logo" class="sidebar-logo">
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>
@@ -18,6 +18,7 @@
 <script>
 // import logoImg from '@/assets/logo/logo.png';
 import logoImg from '@/assets/logo/logo_white.png';
+import { backDetailsView } from '@/api/webSite'
 
 export default {
   name: 'SidebarLogo',
@@ -32,6 +33,22 @@ export default {
       title: '云仓',
       logo: logoImg
     }
+  },
+  mounted() {
+    this.getBackDetailsView()
+  },
+  methods: {
+    getBackDetailsView() {
+      let params = {
+        type: 'SHOP',
+      }
+      backDetailsView(params).then(res => {
+        if (res.code == 1) {
+          this.title = res.data[0]['SHOP'].shop_name
+          this.logo = res.data[0]['SHOP'].shop_logo
+        }
+      })
+    }
   }
 }
 </script>

src/store/modules/user.js

@@ -42,7 +42,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getssoUrl(data).then(response => {
           const date = response.data
-          debugger
+          //debugger
           if (response.code == 1) {
             commit('SET_SSOURL', date.access_token)
           }

src/views/dashboard/LineChart.vue

@@ -57,33 +57,31 @@ export default {
     this.chart = null
   },
   methods: {
-    moneyMax(num){
+    moneyMax(num) {
       let prec = 2
       let ceil = true
       const len = String(num).length;
-        if (len <= prec) { return num };
+      if (len <= prec) {
+        return num
+      }
       const mult = Math.pow(10, prec);
-        return ceil ?
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
-
+      return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
     },
     numberMax(num1,num2){
       let num = ''
-      if(num1>=num2){
+      if (num1 >= num2) {
         num = num1
-      }else{
+      } else {
         num = num2
       }
       let prec = 2
       let ceil = true
       const len = String(num).length;
-        if (len <= prec) { return num };
+      if (len <= prec) {
+        return num
+      }
       const mult = Math.pow(10, prec);
-        return ceil ?
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
-
+      return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
     },
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons')
@@ -92,7 +90,6 @@ export default {
       }
     },
     setOptions({ expectedData, actualData, moneyData, months} = {}) {
-      console.log(months)
       this.chart.setOption({
         xAxis: {
           data: months,
@@ -131,7 +128,7 @@ export default {
           	name: '收益',
           	min: 0,
           	max: this.moneyMax(this.chartData.maxMoneyData),
-          	interval: (this.moneyMax(this.chartData.maxMoneyData)/5),
+          	interval: (this.moneyMax(this.chartData.maxMoneyData) / 5),
           	axisLabel: {
           		formatter: '{value} 元'
           	}

src/views/entry/newyuncang.vue

@@ -31,8 +31,9 @@
 
         <swiper :options="swiperOption" v-if="bannerList && bannerList.length > 0">
           <swiper-slide v-for="(item,index) in bannerList" :key="index">
-            <a :href=" '//' + item.redirect_url" target="_blank"><img style="width: 100%;height: 562px;" :src="item.image_url"
-                                                                      alt=""></a>
+            <a :href="aLinkRes(item.redirect_url) " :target="returnBlank(item.redirect_url)">
+              <img style="width: 100%;height: 562px;" :src="item.image_url" alt="">
+            </a>
           </swiper-slide>
         </swiper>
       </section>
@@ -493,14 +494,25 @@
             }
             // banner图
             if (res.data.cloud_banner_lst && res.data.cloud_banner_lst.banners_json && res.data.cloud_banner_lst.banners_json.length > 0) {
-              
-              let bannerarr = []
+// <<<<<<< HEAD
+//
+//               let bannerarr = []
+//               res.data.cloud_banner_lst.banners_json.forEach(element => {
+//                 if(element.image_url){
+//                   bannerarr.push(element)
+//                 }
+//               });
+//               this.bannerList = bannerarr
+// =======
+              // this.bannerList = res.data.cloud_banner_lst.banners_json;
+              let bannerArr = []
               res.data.cloud_banner_lst.banners_json.forEach(element => {
-                if(element.image_url){
-                  bannerarr.push(element)
+                if(element.image_url) {
+                  bannerArr.push(element);
                 }
               });
-              this.bannerList = bannerarr
+              this.bannerList = bannerArr
+// >>>>>>> dev_hxz
             }
             // logo 图
             if (res.data.cloud_supplier_lst && res.data.cloud_supplier_lst.detail_json) {
@@ -512,6 +524,26 @@
           }
         })
       },
+      /** banner 图是否能跳转链接 处理 */
+      aLinkRes(link) {
+        let resLink = ''
+        if ( link ) {
+          resLink = link
+        }else {
+          resLink = 'javascript:void(0);'
+        }
+
+        return resLink
+      },
+      returnBlank(val) {
+        let res = ''
+        if ( val ) {
+          res = '_blank'
+        }else {
+          res = ''
+        }
+        return res
+      },
       // 监听浏览器滚动
       handleScroll() {
         let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop

src/views/index.vue

@@ -55,7 +55,7 @@
     <panel-group @handleSetLineChartData="handleSetLineChartData" :panel-data="panelData"/>
 
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
+      <line-chart :chart-data="lineChartData"/>
     </el-row>
 
     <!-- <el-row :gutter="32"> -->
@@ -81,14 +81,14 @@
 </template>
 
 <script>
-import { getStatistics } from "@/api/login";
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
+  import {getStatistics} from "@/api/login";
+  import PanelGroup from './dashboard/PanelGroup'
+  import LineChart from './dashboard/LineChart'
+  import RaddarChart from './dashboard/RaddarChart'
+  import PieChart from './dashboard/PieChart'
+  import BarChart from './dashboard/BarChart'
+
+  const lineChartData = {
     newVisitis: {
       expectedData: [100, 120, 161, 134, 105, 160, 161],
       actualData: [120, 82, 91, 154, 162, 140, 145]
@@ -108,9 +108,9 @@ const lineChartData = {
     //   // expectedData: [130, 140, 141, 142, 145, 150, 160], //期望
     //   actualData: [120, 82, 91, 154, 162, 140, 130]  //实际
     // }
-}
+  }
 
-export default {
+  export default {
     name: 'Index',
     components: {
       PanelGroup,
@@ -121,21 +121,21 @@ export default {
     },
     data() {
       return {
-      panelData:{
-        goods_total:0, //商品总数
-        order_total:0,//订单总数
-        total_price:0,//金额总数
-        refund_total:0,//售后总数
+        panelData: {
+          goods_total: 0, //商品总数
+          order_total: 0,//订单总数
+          total_price: 0,//金额总数
+          refund_total: 0,//售后总数
 
         },
 
         lineChartData: {
-        moneyData:[], //金额折线
-        actualData:[], //订单折线
+          moneyData: [], //金额折线
+          actualData: [], //订单折线
           // countData:[],
-        maxChannelData:0, //左边订单数量最大值
-        maxMoneyData:0,  //金额最大值
-        months:[]   //下面日志
+          maxChannelData: 0, //左边订单数量最大值
+          maxMoneyData: 0,  //金额最大值
+          months: []   //下面日志
         }
       }
     },
@@ -143,45 +143,47 @@ export default {
       this.GetStatistics();
     },
     methods: {
-    //首页统计
-    GetStatistics(){
+      /** 首页所有数据
+       * order_total（总订单数量，总金额）
+       * */
+      GetStatistics() {
         getStatistics().then(response => {
           let money = []
           let count = []
           let actual = []
-        if(response.data && response.data.line && response.data.line.length > 0) {
-          response.data.line.forEach(function(item, index) {
-            money.unshift(item.price)
+          if (response.data && response.data.line && response.data.line.length > 0) {
+            response.data.line.forEach(function (item, index) {
+              money.unshift(item.price/100) // 后台返回单位是 分，所以需要除以100
               actual.unshift(item.date)
               count.unshift(item.count)
             })
           }
 
           //最大订单数
-        var maxOrderNum=this.lineChartData.maxChannelData;
-        for(var n=1;n<count.length;n++){
-          if(count[n]>maxOrderNum){
-            maxOrderNum=count[n];
+          var maxOrderNum = this.lineChartData.maxChannelData;
+          for (var n = 1; n < count.length; n++) {
+            if (count[n] > maxOrderNum) {
+              maxOrderNum = count[n];
             }
           }
           this.lineChartData.maxChannelData = maxOrderNum
-        //最大金额
-        var maxMoney=this.lineChartData.maxMoneyData;
-        for(var n=1;n<money.length;n++){
-          if(money[n]>maxMoney){
-            maxMoney=money[n];
+          //最大金额,后台返回单位是 分，所以需要除以100
+          var maxMoney = this.lineChartData.maxMoneyData/100;
+          for (var n = 1; n < money.length; n++) {
+            if (money[n] > maxMoney) {
+              maxMoney = money[n];
             }
           }
 
           this.lineChartData.maxMoneyData = maxMoney
           this.lineChartData.moneyData = money
           this.lineChartData.actualData = count
-         this.lineChartData.months= actual
+          this.lineChartData.months = actual
 
-        this.panelData.goods_total= response.data.goods_total
-        this.panelData.refund_total= response.data.rettotal
-        this.panelData.order_total= response.data.order_total.count
-        this.panelData.total_price= response.data.order_total.total_price / 100
+          this.panelData.goods_total = response.data.goods_total
+          this.panelData.refund_total = response.data.rettotal
+          this.panelData.order_total = response.data.order_total.count
+          this.panelData.total_price = response.data.order_total.total_price / 100
         });
       },
       handleSetLineChartData(type) {
@@ -189,41 +191,49 @@ export default {
         this.lineChartData = lineChartData[type]
       }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped type="text/stylus">
 
-.dashboard-promote .el-row{
+  .dashboard-promote .el-row {
     margin-bottom: 20px;
     font-size: 14px;
-}
-.dashboard-promote .el-row .jz{
+  }
+
+  .dashboard-promote .el-row .jz {
     height: 500px;
-}
-.dashboard-promote .el-row .kj{
+  }
+
+  .dashboard-promote .el-row .kj {
     height: 300px;
-}
-.dashboard-promote .el-row .xx{
+  }
+
+  .dashboard-promote .el-row .xx {
     height: 200px;
-}
+  }
 
-.git-res{
+  .git-res {
     margin-top: 20px;
-}
-.git-res .el-link{
+  }
+
+  .git-res .el-link {
     margin-right: 30px;
-}
+  }
 
-ul,li{ padding:0;margin:0;list-style:none}
+  ul, li {
+    padding: 0;
+    margin: 0;
+    list-style: none
+  }
 
-.product li{
+  .product li {
     margin-bottom: 20px;
     float: left;
     width: 150px;
-}
+  }
 
-.dashboard-editor-container {
+  .dashboard-editor-container {
     padding: 32px;
     background-color: rgb(240, 242, 245);
     position: relative;
@@ -233,11 +243,11 @@ ul,li{ padding:0;margin:0;list-style:none}
       padding: 16px 16px 0;
       margin-bottom: 32px;
     }
-}
+  }
 
-@media (max-width:1024px) {
+  @media (max-width: 1024px) {
     .chart-wrapper {
       padding: 8px;
     }
-}
+  }
 </style>

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

@@ -175,7 +175,7 @@
               goods_name: res.data.goods_name,      // 商品标题
               category_id: res.data.category_id,
               producing_area: res.data.producing_area,   // 产地
-              deliver_area: Number(res.data.deliver_area),     // 发货地
+              deliver_area: res.data.deliver_area,     // 发货地
               unit: res.data.unit,             // 单位
               goods_brand: res.data.goods_brand,      // 品牌
               web_url: res.data.web_url,          // 外部链接
@@ -184,7 +184,7 @@
             }
             this.goodsinfodata.categoryStr = res.data.category_first_name + '/' + res.data.category_first_name + '/' + res.data.category_three_name;
             // 发货地 需要 处理
-            this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
+            // this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
 
             let arr = [];
             arr[0] = res.data.category_first_id;
@@ -521,6 +521,14 @@
           }
         }
 
+        // 发货地数据处理
+        for(let ai = 0; ai < areaOptions.length; ai++) {
+          if ( Number(spxxData.deliver_area) === Number(areaOptions[ai].id) ) {
+            spxxData.deliver_area = areaOptions[ai].name;
+            break;
+          }
+        }
+
         // console.log(500,spxxData);
         if( spxxData.imgs.length > 5 ) {
           this.$message({ type: 'warning',message: '商品信息中，商品图片最大数量为5张，请检查' });

src/views/system/order/components/orderDetail.vue

@@ -716,14 +716,16 @@ export default {
         return
       }
 
-      this.dialogCheck = true
       let params = {
         goods_order_sn: row.goods_order_sn,
         sku_id: row.goods_option_id
       }
       expressInfoNew(params).then(res => {
         if (res.code == 1 && res.data) {
+          this.dialogCheck = true
           this.activities = res.data.order_track ? res.data.order_track : [];
+        }else {
+          this.$message({type:'error',message: res.message ? res.message : '获取数据失败' });
         }
       })
     },

src/views/system/retreat/edit.vue

@@ -88,6 +88,24 @@
           </el-row>
         </div>
       </div>
+      <!-- 买家信息 -->
+      <div>
+        <div class="card-header-title">
+          <span class="blue-block blue-block-goods-title"></span>买家信息
+        </div>
+        <div>
+          <el-row class="row-title">
+            <el-col :span="4" class="text-r text-c">收货人姓名</el-col>
+            <el-col :span="4" class="text-r text-c">联系电话</el-col>
+            <el-col :span="10" class="text-r text-c">收货地址</el-col>
+          </el-row>
+          <el-row class="row-title">
+            <el-col :span="4" class="text-l text-c">{{ orderConsignee.real_name }}</el-col>
+            <el-col :span="4" class="text-l text-c">{{ orderConsignee.mobile }}</el-col>
+            <el-col :span="10" class="text-l text-c">{{ orderConsignee.provice + orderConsignee.city + orderConsignee.district + orderConsignee.street + orderConsignee.address }}</el-col>
+          </el-row>
+        </div>
+      </div>
       <!-- 买家退货凭证 -->
       <div v-if="asOrderType == 2">
         <div class="card-header-title">
@@ -280,6 +298,16 @@
           goods_option_title: '', // 商品规格
           total: '', // 商品数量
         },
+        // 买家信息
+        orderConsignee: {
+          real_name: '',
+          mobile: '',
+          provice: '',
+          city: '',
+          district: '',
+          street: '',
+          address: '',
+        },
         // 售后申请 图片 list
         asSrcList: [],
         asApplyList: [],
@@ -498,6 +526,11 @@
               this.goodsOrderDetail.goods_price = res.data.order_goods.goods_price / 100
             }
 
+            // 买家 信息
+            if (res.data.order_consignee) {
+              this.orderConsignee = res.data.order_consignee;
+            }
+
             // 退款凭证 list 数据
             this.returnInfoTableData = [];
             if(res.data.order_refund.return_info && res.data.order_refund.return_info.express_code) {
@@ -843,6 +876,10 @@
     text-align: left;
   }
 
+  .text-c {
+    justify-content: center!important;
+  }
+
   .count-down-con {
     padding: 10px 20px;
     margin: 0;