Skip to content

S
shop-new
提交 24247e13 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

Merge branch 'master_1009' into test 

# Conflicts:
#	dist/index.html
#	dist/static/js/app.6eef84e9.js
上级 0aa7e06e 6083486d
隐藏空白字符变更
内嵌 并排
正在显示 包含 869 行增加 和 22 行删除
.env.development
浏览文件 @ 24247e13
......@@ -2,11 +2,9 @@
ENV = 'development'
# 正式环境
#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
# 开发环境
#VUE_APP_BASE_API = 'http://192.168.111.34:8200'
VUE_APP_BASE_API = 'http://192.168.26.179:8200'
#VUE_APP_BASE_API = 'http://192.168.111.36:8200'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
.env.production
浏览文件 @ 24247e13
......@@ -2,5 +2,6 @@
ENV = 'production'
# gfast管理系统/生产环境
#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
VUE_APP_BASE_API = 'http://192.168.26.179:8200'
\ No newline at end of file
VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
#VUE_APP_BASE_API = 'http://192.168.26.179:8200'
.env.staging
浏览文件 @ 24247e13
......@@ -4,4 +4,4 @@ NODE_ENV = production
ENV = 'staging'
#gfast管理系统/测试环境
VUE_APP_BASE_API = 'http://192.168.26.179:8200'
VUE_APP_BASE_API = '/stage-api'
dist.zip 0 → 100644
浏览文件 @ 24247e13
File added
dist/index.html
浏览文件 @ 24247e13
......@@ -181,7 +181,11 @@
font-size: 13px;
color: #FFF;
opacity: 0.5;
<<<<<<< HEAD
}</style><link href=/static/css/chunk-libs.61976a7c.css rel=stylesheet><link href=/static/css/app.1464b283.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.c1dc07ee.js></script><script src=/static/js/chunk-libs.da7e8854.js></script><script>(function(e){function n(n){for(var t,u,d=n[0],a=n[1],o=n[2],h=0,i=[];h<d.length;h++)u=d[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(e[t]=a[t]);k&&k(n);while(i.length)i.shift()();return f.push.apply(f,o||[]),c()}function c(){for(var e,n=0;n<f.length;n++){for(var c=f[n],t=!0,u=1;u<c.length;u++){var d=c[u];0!==r[d]&&(t=!1)}t&&(f.splice(n--,1),e=a(a.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},f=[];function d(e){return a.p+"static/js/"+({}[e]||e)+"."+{"chunk-0623a910":"2ff168d2","chunk-0a90d205":"0189bbe0","chunk-1182e268":"5f7d89f1","chunk-2804fbbd":"5b480fa1","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-f1a6e090":"87b6e501","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-524fda91":"46c9af00","chunk-68d5bf9e":"9d2db11e","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"a40b81e7","chunk-2d0f012d":"c5cdd7ec","chunk-3f29a21f":"eaf9f1d4","chunk-4dda007c":"060d7633","chunk-6014318b":"b6a8d506","chunk-6c237b40":"54fd57df","chunk-6df11ba6":"89b74b84","chunk-7c2f4fe6":"b1b23ecf","chunk-e43c581e":"8da442bc","chunk-f18f73fa":"4162e24b","chunk-3a35df6c":"03f135d2"}[e]+".js"}function a(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,a),c.l=!0,c.exports}a.e=function(e){var n=[],c={"chunk-0623a910":1,"chunk-0a90d205":1,"chunk-1182e268":1,"chunk-2804fbbd":1,"chunk-524fda91":1,"chunk-68d5bf9e":1,"chunk-3f29a21f":1,"chunk-4dda007c":1,"chunk-6014318b":1,"chunk-6c237b40":1,"chunk-6df11ba6":1,"chunk-e43c581e":1,"chunk-f18f73fa":1,"chunk-3a35df6c":1};u[e]?n.push(u[e]):0!==u[e]&&c[e]&&n.push(u[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-0623a910":"0f99a037","chunk-0a90d205":"9183fc08","chunk-1182e268":"4f92804f","chunk-2804fbbd":"a939a6d1","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-f1a6e090":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-524fda91":"faae391b","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-3f29a21f":"3f857bd8","chunk-4dda007c":"4f737292","chunk-6014318b":"0705476d","chunk-6c237b40":"fe6be668","chunk-6df11ba6":"2f1d0a74","chunk-7c2f4fe6":"31d6cfe0","chunk-e43c581e":"d828d766","chunk-f18f73fa":"0615606c","chunk-3a35df6c":"04b54fdb"}[e]+".css",r=a.p+t,f=document.getElementsByTagName("link"),d=0;d<f.length;d++){var o=f[d],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){o=i[d],h=o.getAttribute("data-href");if(h===t||h===r)return n()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=n,k.onerror=function(n){var t=n&&n.target&&n.target.src||r,f=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");f.request=t,delete u[e],k.parentNode.removeChild(k),c(f)},k.href=r;var b=document.getElementsByTagName("head")[0];b.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)n.push(t[2]);else{var f=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=f);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,a.nc&&h.setAttribute("nonce",a.nc),h.src=d(e),o=function(n){h.onerror=h.onload=null,clearTimeout(i);var c=r[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),u=n&&n.target&&n.target.src,f=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");f.type=t,f.request=u,c[1](f)}r[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(n)},a.m=e,a.c=t,a.d=function(e,n,c){a.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},a.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,n){if(1&n&&(e=a(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(a.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)a.d(c,t,function(n){return e[n]}.bind(null,t));return c},a.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/",a.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=n,o=o.slice();for(var i=0;i<o.length;i++)n(o[i]);var k=h;c()})([]);</script><script src=/static/js/app.6eef84e9.js></script></body><script>window.onload = function() {
=======
}</style><link href=/static/css/chunk-libs.61976a7c.css rel=stylesheet><link href=/static/css/app.fdf17a7e.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.c1dc07ee.js></script><script src=/static/js/chunk-libs.da7e8854.js></script><script>(function(e){function n(n){for(var t,u,d=n[0],a=n[1],o=n[2],h=0,i=[];h<d.length;h++)u=d[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(e[t]=a[t]);k&&k(n);while(i.length)i.shift()();return f.push.apply(f,o||[]),c()}function c(){for(var e,n=0;n<f.length;n++){for(var c=f[n],t=!0,u=1;u<c.length;u++){var d=c[u];0!==r[d]&&(t=!1)}t&&(f.splice(n--,1),e=a(a.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},f=[];function d(e){return a.p+"static/js/"+({}[e]||e)+"."+{"chunk-0623a910":"2ff168d2","chunk-0a90d205":"0189bbe0","chunk-1182e268":"5f7d89f1","chunk-2804fbbd":"5b480fa1","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-f1a6e090":"87b6e501","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-3478654b":"fc8a2821","chunk-68d5bf9e":"9d2db11e","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"ce91dabf","chunk-2d0f012d":"c5cdd7ec","chunk-3f29a21f":"eaf9f1d4","chunk-4dda007c":"060d7633","chunk-6014318b":"924ccdf4","chunk-6c237b40":"54fd57df","chunk-6df11ba6":"89b74b84","chunk-7c2f4fe6":"7a118e6f","chunk-e43c581e":"8da442bc","chunk-f18f73fa":"4162e24b","chunk-3a35df6c":"03f135d2"}[e]+".js"}function a(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,a),c.l=!0,c.exports}a.e=function(e){var n=[],c={"chunk-0623a910":1,"chunk-0a90d205":1,"chunk-1182e268":1,"chunk-2804fbbd":1,"chunk-3478654b":1,"chunk-68d5bf9e":1,"chunk-3f29a21f":1,"chunk-4dda007c":1,"chunk-6014318b":1,"chunk-6c237b40":1,"chunk-6df11ba6":1,"chunk-e43c581e":1,"chunk-f18f73fa":1,"chunk-3a35df6c":1};u[e]?n.push(u[e]):0!==u[e]&&c[e]&&n.push(u[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-0623a910":"0f99a037","chunk-0a90d205":"9183fc08","chunk-1182e268":"4f92804f","chunk-2804fbbd":"a939a6d1","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-f1a6e090":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-3478654b":"ff5cdfd1","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-3f29a21f":"3f857bd8","chunk-4dda007c":"4f737292","chunk-6014318b":"0705476d","chunk-6c237b40":"fe6be668","chunk-6df11ba6":"2f1d0a74","chunk-7c2f4fe6":"31d6cfe0","chunk-e43c581e":"d828d766","chunk-f18f73fa":"0615606c","chunk-3a35df6c":"04b54fdb"}[e]+".css",r=a.p+t,f=document.getElementsByTagName("link"),d=0;d<f.length;d++){var o=f[d],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){o=i[d],h=o.getAttribute("data-href");if(h===t||h===r)return n()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=n,k.onerror=function(n){var t=n&&n.target&&n.target.src||r,f=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");f.request=t,delete u[e],k.parentNode.removeChild(k),c(f)},k.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)n.push(t[2]);else{var f=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=f);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,a.nc&&h.setAttribute("nonce",a.nc),h.src=d(e),o=function(n){h.onerror=h.onload=null,clearTimeout(i);var c=r[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),u=n&&n.target&&n.target.src,f=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");f.type=t,f.request=u,c[1](f)}r[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(n)},a.m=e,a.c=t,a.d=function(e,n,c){a.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},a.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,n){if(1&n&&(e=a(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(a.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)a.d(c,t,function(n){return e[n]}.bind(null,t));return c},a.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/",a.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=n,o=o.slice();for(var i=0;i<o.length;i++)n(o[i]);var k=h;c()})([]);</script><script src=/static/js/app.ee1e7dc3.js></script></body><script>window.onload = function() {
>>>>>>> master_1009
var op = 'open'
var ssa = window.location.host
......
dist/static/css/app.1464b283.css → dist/static/css/app.fdf17a7e.css
浏览文件 @ 24247e13
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/chunk-3478654b.ff5cdfd1.css 0 → 100644
浏览文件 @ 24247e13
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ee1e7dc3.js 0 → 100644
浏览文件 @ 24247e13
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-08486bce.a40b81e7.js → dist/static/js/chunk-08486bce.ce91dabf.js
浏览文件 @ 24247e13
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-08486bce"],{"1e8b":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"用户昵称",prop:"user_nickname"}},[r("el-input",{model:{value:e.user.user_nickname,callback:function(t){e.$set(e.user,"user_nickname",t)},expression:"user.user_nickname"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"手机号码",prop:"mobile"}},[r("el-input",{attrs:{maxlength:"11"},model:{value:e.user.mobile,callback:function(t){e.$set(e.user,"mobile",t)},expression:"user.mobile"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"邮箱",prop:"user_email"}},[r("el-input",{attrs:{maxlength:"50"},model:{value:e.user.user_email,callback:function(t){e.$set(e.user,"user_email",t)},expression:"user.user_email"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"性别"}},[r("el-radio-group",{model:{value:e.user.sex,callback:function(t){e.$set(e.user,"sex",t)},expression:"user.sex"}},[r("el-radio",{attrs:{label:0}},[e._v("保密")]),e._v(" "),r("el-radio",{attrs:{label:1}},[e._v("男")]),e._v(" "),r("el-radio",{attrs:{label:2}},[e._v("女")])],1)],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),r("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=r("c0c7"),o={props:{user:{type:Object}},data:function(){return{rules:{user_nickname:[{required:!0,message:"用户昵称不能为空",trigger:"blur"}],user_email:[{required:!0,message:"邮箱地址不能为空",trigger:"blur"},{type:"email",message:"'请输入正确的邮箱地址",trigger:["blur","change"]}],mobile:[{required:!0,message:"手机号码不能为空",trigger:"blur"},{pattern:/^1[3|4|5|6|7|8|9][0-9]\d{8}$/,message:"请输入正确的手机号码",trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["l"])(e.user).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},n=o,l=r("2877"),u=Object(l["a"])(n,s,a,!1,null,null,null);t["default"]=u.exports},"4c1b":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"app-container"},[r("el-row",{attrs:{gutter:20}},[r("el-col",{attrs:{span:6,xs:24}},[r("el-card",{staticClass:"box-card"},[r("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[r("span",[e._v("个人信息")])]),e._v(" "),r("div",[r("div",{staticClass:"text-center"},[r("userAvatar",{attrs:{user:e.user}})],1),e._v(" "),r("ul",{staticClass:"list-group list-group-striped"},[r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"user"}}),e._v("用户名称\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_name))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"phone"}}),e._v("手机号码\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.mobile))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"email"}}),e._v("用户邮箱\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_email))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"tree"}}),e._v("所属部门\n "),e.user.dept_info?r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.dept_info.deptName)+" / "+e._s(e.postGroup))]):e._e()],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"peoples"}}),e._v("所属角色\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.roleGroup))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"date"}}),e._v("创建日期\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.parseTime(e.user.create_time)))])],1)])])])],1),e._v(" "),r("el-col",{attrs:{span:18,xs:24}},[r("el-card",[r("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[r("span",[e._v("基本资料")])]),e._v(" "),r("el-tabs",{model:{value:e.activeTab,callback:function(t){e.activeTab=t},expression:"activeTab"}},[r("el-tab-pane",{attrs:{label:"基本资料",name:"userinfo"}},[r("userInfo",{attrs:{user:e.user}})],1),e._v(" "),r("el-tab-pane",{attrs:{label:"修改密码",name:"resetPwd"}},[r("resetPwd",{attrs:{user:e.user}})],1)],1)],1)],1)],1)],1)},a=[],i=(r("7f7f"),r("9429")),o=r("1e8b"),n=r("ee46"),l=r("c0c7"),u={name:"Profile",components:{userAvatar:i["default"],userInfo:o["default"],resetPwd:n["default"]},data:function(){return{user:{},activeTab:"userinfo"}},created:function(){this.getUser()},computed:{postGroup:function(){return Array.isArray(this.user.posts)?this.user.posts.reduce((function(e,t,r,s){return e+t.post_name+" "}),""):""},roleGroup:function(){return Array.isArray(this.user.roles)?this.user.roles.reduce((function(e,t,r,s){return e+t.name+" "}),""):""}},methods:{getUser:function(){var e=this;Object(l["g"])().then((function(t){e.user=t.data}))}}},c=u,d=r("2877"),p=Object(d["a"])(c,s,a,!1,null,null,null);t["default"]=p.exports},9429:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("img",{staticClass:"img-circle img-lg",attrs:{src:e.options.img,title:"点击上传头像"},on:{click:function(t){return e.editCropper()}}}),e._v(" "),r("el-dialog",{attrs:{title:e.title,visible:e.open,width:"800px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[r("el-row",[r("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[r("vue-cropper",{ref:"cropper",attrs:{img:e.options.img,info:!0,autoCrop:e.options.autoCrop,autoCropWidth:e.options.autoCropWidth,autoCropHeight:e.options.autoCropHeight,fixedBox:e.options.fixedBox},on:{realTime:e.realTime}})],1),e._v(" "),r("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[r("div",{staticClass:"avatar-upload-preview"},[r("img",{style:e.previews.img,attrs:{src:e.previews.url}})])])],1),e._v(" "),r("br"),e._v(" "),r("el-row",[r("el-col",{attrs:{lg:2,md:2}},[r("el-upload",{attrs:{action:"#","http-request":e.requestUpload,"show-file-list":!1,"before-upload":e.beforeUpload}},[r("el-button",{attrs:{size:"small"}},[e._v("\n 上传\n "),r("i",{staticClass:"el-icon-upload el-icon--right"})])],1)],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:2},md:2}},[r("el-button",{attrs:{icon:"el-icon-plus",size:"small"},on:{click:function(t){return e.changeScale(1)}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-minus",size:"small"},on:{click:function(t){return e.changeScale(-1)}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-refresh-left",size:"small"},on:{click:function(t){return e.rotateLeft()}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-refresh-right",size:"small"},on:{click:function(t){return e.rotateRight()}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:2,offset:6},md:2}},[r("el-button",{attrs:{type:"primary",size:"small"},on:{click:function(t){return e.uploadImg()}}},[e._v("提 交")])],1)],1)],1)],1)},a=[],i=r("ade3"),o=r("4360"),n=r("7e79"),l=r("c0c7"),u={components:{VueCropper:n["VueCropper"]},props:{user:{type:Object}},data:function(){var e;return{open:!1,title:"修改头像",options:(e={img:o["a"].getters.avatar},Object(i["a"])(e,"img",""),Object(i["a"])(e,"autoCrop",!0),Object(i["a"])(e,"autoCropWidth",200),Object(i["a"])(e,"autoCropHeight",200),Object(i["a"])(e,"fixedBox",!0),e),previews:{}}},methods:{editCropper:function(){this.open=!0},requestUpload:function(){},rotateLeft:function(){this.$refs.cropper.rotateLeft()},rotateRight:function(){this.$refs.cropper.rotateRight()},changeScale:function(e){e=e||1,this.$refs.cropper.changeScale(e)},beforeUpload:function(e){var t=this;if(-1==e.type.indexOf("image/"))this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");else{var r=new FileReader;r.readAsDataURL(e),r.onload=function(){t.options.img=r.result}}},uploadImg:function(){var e=this;this.$refs.cropper.getCropBlob((function(t){var r=t.type,s={"image/jpeg":"jpeg","image/png":"png"},a="temp.jpg";s[r]&&(a="temp."+s[r]);var i=new FormData;i.append("avatarfile",t,a),Object(l["n"])(i).then((function(t){0===t.code?(e.open=!1,e.options.img="http://192.168.26.179:8200/"+t.data.fileInfo.fileUrl,e.msgSuccess("修改成功")):e.msgError(t.msg),e.$refs.cropper.clearCrop()}))}))},realTime:function(e){this.previews=e},setAvatarBase64:function(e,t){var r=this,s=new Image;s.src=e+"?v="+Math.random(),s.crossOrigin="*",s.onload=function(){var e=r.transBase64FromImage(s);t&&t(e)}},transBase64FromImage:function(e){var t=document.createElement("canvas");t.width=e.width,t.height=e.height;var r=t.getContext("2d");return r.drawImage(e,0,0,e.width,e.height),t.toDataURL("image/png")}},watch:{user:function(e){var t=this;e.avatar&&this.setAvatarBase64("http://192.168.26.179:8200/"+e.avatar,(function(e){t.options.img=e}))}}},c=u,d=r("2877"),p=Object(d["a"])(c,s,a,!1,null,null,null);t["default"]=p.exports},c0c7:function(e,t,r){"use strict";r.d(t,"i",(function(){return a})),r.d(t,"f",(function(){return i})),r.d(t,"e",(function(){return o})),r.d(t,"a",(function(){return n})),r.d(t,"k",(function(){return l})),r.d(t,"c",(function(){return u})),r.d(t,"d",(function(){return c})),r.d(t,"j",(function(){return d})),r.d(t,"b",(function(){return p})),r.d(t,"g",(function(){return m})),r.d(t,"l",(function(){return f})),r.d(t,"m",(function(){return g})),r.d(t,"n",(function(){return v})),r.d(t,"h",(function(){return h}));var s=r("b775");r("c38a");function a(e){return Object(s["a"])({url:"/system/auth/userList",method:"get",params:e})}function i(){return Object(s["a"])({url:"/system/auth/addUser",method:"get"})}function o(e){return Object(s["a"])({url:"/system/auth/editUser?id="+e,method:"get"})}function n(e){return Object(s["a"])({url:"/system/auth/addUser",method:"post",data:e})}function l(e){return Object(s["a"])({url:"/system/auth/editUser",method:"post",data:e})}function u(e){return Object(s["a"])({url:"/system/auth/deleteAdmin",method:"delete",params:{ids:e}})}function c(e){return Object(s["a"])({url:"/system/user/export",method:"get",params:e})}function d(e,t){var r={userId:e,password:t};return Object(s["a"])({url:"/system/auth/resetUserPwd",method:"put",data:r})}function p(e,t){var r={userId:e,status:t};return Object(s["a"])({url:"/system/auth/changeUserStatus ",method:"put",data:r})}function m(){return Object(s["a"])({url:"/system/user/profile",method:"get"})}function f(e){return Object(s["a"])({url:"/system/user/edit",method:"post",data:e})}function g(e,t){var r={oldPassword:e,newPassword:t};return Object(s["a"])({url:"/system/user/updatePwd",method:"post",data:r})}function v(e){return Object(s["a"])({url:"/system/user/avatar",method:"post",data:e})}function h(){return Object(s["a"])({url:"/system/user/importTemplate",method:"get"})}},ee46:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"旧密码",prop:"oldPassword"}},[r("el-input",{attrs:{placeholder:"请输入旧密码",type:"password"},model:{value:e.user.oldPassword,callback:function(t){e.$set(e.user,"oldPassword",t)},expression:"user.oldPassword"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"新密码",prop:"newPassword"}},[r("el-input",{attrs:{placeholder:"请输入新密码",type:"password"},model:{value:e.user.newPassword,callback:function(t){e.$set(e.user,"newPassword",t)},expression:"user.newPassword"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"确认密码",prop:"confirmPassword"}},[r("el-input",{attrs:{placeholder:"请确认密码",type:"password"},model:{value:e.user.confirmPassword,callback:function(t){e.$set(e.user,"confirmPassword",t)},expression:"user.confirmPassword"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),r("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=r("c0c7"),o={data:function(){var e=this,t=function(t,r,s){e.user.newPassword!==r?s(new Error("两次输入的密码不一致")):s()};return{test:"1test",user:{oldPassword:void 0,newPassword:void 0,confirmPassword:void 0},rules:{oldPassword:[{required:!0,message:"旧密码不能为空",trigger:"blur"}],newPassword:[{required:!0,message:"新密码不能为空",trigger:"blur"},{min:6,max:20,message:"长度在 6 到 20 个字符",trigger:"blur"}],confirmPassword:[{required:!0,message:"确认密码不能为空",trigger:"blur"},{required:!0,validator:t,trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["m"])(e.user.oldPassword,e.user.newPassword).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},n=o,l=r("2877"),u=Object(l["a"])(n,s,a,!1,null,null,null);t["default"]=u.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-08486bce"],{"1e8b":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"用户昵称",prop:"user_nickname"}},[r("el-input",{model:{value:e.user.user_nickname,callback:function(t){e.$set(e.user,"user_nickname",t)},expression:"user.user_nickname"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"手机号码",prop:"mobile"}},[r("el-input",{attrs:{maxlength:"11"},model:{value:e.user.mobile,callback:function(t){e.$set(e.user,"mobile",t)},expression:"user.mobile"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"邮箱",prop:"user_email"}},[r("el-input",{attrs:{maxlength:"50"},model:{value:e.user.user_email,callback:function(t){e.$set(e.user,"user_email",t)},expression:"user.user_email"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"性别"}},[r("el-radio-group",{model:{value:e.user.sex,callback:function(t){e.$set(e.user,"sex",t)},expression:"user.sex"}},[r("el-radio",{attrs:{label:0}},[e._v("保密")]),e._v(" "),r("el-radio",{attrs:{label:1}},[e._v("男")]),e._v(" "),r("el-radio",{attrs:{label:2}},[e._v("女")])],1)],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),r("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=r("c0c7"),o={props:{user:{type:Object}},data:function(){return{rules:{user_nickname:[{required:!0,message:"用户昵称不能为空",trigger:"blur"}],user_email:[{required:!0,message:"邮箱地址不能为空",trigger:"blur"},{type:"email",message:"'请输入正确的邮箱地址",trigger:["blur","change"]}],mobile:[{required:!0,message:"手机号码不能为空",trigger:"blur"},{pattern:/^1[3|4|5|6|7|8|9][0-9]\d{8}$/,message:"请输入正确的手机号码",trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["l"])(e.user).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},n=o,l=r("2877"),u=Object(l["a"])(n,s,a,!1,null,null,null);t["default"]=u.exports},"4c1b":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"app-container"},[r("el-row",{attrs:{gutter:20}},[r("el-col",{attrs:{span:6,xs:24}},[r("el-card",{staticClass:"box-card"},[r("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[r("span",[e._v("个人信息")])]),e._v(" "),r("div",[r("div",{staticClass:"text-center"},[r("userAvatar",{attrs:{user:e.user}})],1),e._v(" "),r("ul",{staticClass:"list-group list-group-striped"},[r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"user"}}),e._v("用户名称\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_name))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"phone"}}),e._v("手机号码\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.mobile))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"email"}}),e._v("用户邮箱\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_email))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"tree"}}),e._v("所属部门\n "),e.user.dept_info?r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.dept_info.deptName)+" / "+e._s(e.postGroup))]):e._e()],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"peoples"}}),e._v("所属角色\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.roleGroup))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"date"}}),e._v("创建日期\n "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.parseTime(e.user.create_time)))])],1)])])])],1),e._v(" "),r("el-col",{attrs:{span:18,xs:24}},[r("el-card",[r("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[r("span",[e._v("基本资料")])]),e._v(" "),r("el-tabs",{model:{value:e.activeTab,callback:function(t){e.activeTab=t},expression:"activeTab"}},[r("el-tab-pane",{attrs:{label:"基本资料",name:"userinfo"}},[r("userInfo",{attrs:{user:e.user}})],1),e._v(" "),r("el-tab-pane",{attrs:{label:"修改密码",name:"resetPwd"}},[r("resetPwd",{attrs:{user:e.user}})],1)],1)],1)],1)],1)],1)},a=[],i=(r("7f7f"),r("9429")),o=r("1e8b"),n=r("ee46"),l=r("c0c7"),u={name:"Profile",components:{userAvatar:i["default"],userInfo:o["default"],resetPwd:n["default"]},data:function(){return{user:{},activeTab:"userinfo"}},created:function(){this.getUser()},computed:{postGroup:function(){return Array.isArray(this.user.posts)?this.user.posts.reduce((function(e,t,r,s){return e+t.post_name+" "}),""):""},roleGroup:function(){return Array.isArray(this.user.roles)?this.user.roles.reduce((function(e,t,r,s){return e+t.name+" "}),""):""}},methods:{getUser:function(){var e=this;Object(l["g"])().then((function(t){e.user=t.data}))}}},c=u,d=r("2877"),p=Object(d["a"])(c,s,a,!1,null,null,null);t["default"]=p.exports},9429:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("img",{staticClass:"img-circle img-lg",attrs:{src:e.options.img,title:"点击上传头像"},on:{click:function(t){return e.editCropper()}}}),e._v(" "),r("el-dialog",{attrs:{title:e.title,visible:e.open,width:"800px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[r("el-row",[r("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[r("vue-cropper",{ref:"cropper",attrs:{img:e.options.img,info:!0,autoCrop:e.options.autoCrop,autoCropWidth:e.options.autoCropWidth,autoCropHeight:e.options.autoCropHeight,fixedBox:e.options.fixedBox},on:{realTime:e.realTime}})],1),e._v(" "),r("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[r("div",{staticClass:"avatar-upload-preview"},[r("img",{style:e.previews.img,attrs:{src:e.previews.url}})])])],1),e._v(" "),r("br"),e._v(" "),r("el-row",[r("el-col",{attrs:{lg:2,md:2}},[r("el-upload",{attrs:{action:"#","http-request":e.requestUpload,"show-file-list":!1,"before-upload":e.beforeUpload}},[r("el-button",{attrs:{size:"small"}},[e._v("\n 上传\n "),r("i",{staticClass:"el-icon-upload el-icon--right"})])],1)],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:2},md:2}},[r("el-button",{attrs:{icon:"el-icon-plus",size:"small"},on:{click:function(t){return e.changeScale(1)}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-minus",size:"small"},on:{click:function(t){return e.changeScale(-1)}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-refresh-left",size:"small"},on:{click:function(t){return e.rotateLeft()}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-refresh-right",size:"small"},on:{click:function(t){return e.rotateRight()}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:2,offset:6},md:2}},[r("el-button",{attrs:{type:"primary",size:"small"},on:{click:function(t){return e.uploadImg()}}},[e._v("提 交")])],1)],1)],1)],1)},a=[],i=r("ade3"),o=r("4360"),n=r("7e79"),l=r("c0c7"),u={components:{VueCropper:n["VueCropper"]},props:{user:{type:Object}},data:function(){var e;return{open:!1,title:"修改头像",options:(e={img:o["a"].getters.avatar},Object(i["a"])(e,"img",""),Object(i["a"])(e,"autoCrop",!0),Object(i["a"])(e,"autoCropWidth",200),Object(i["a"])(e,"autoCropHeight",200),Object(i["a"])(e,"fixedBox",!0),e),previews:{}}},methods:{editCropper:function(){this.open=!0},requestUpload:function(){},rotateLeft:function(){this.$refs.cropper.rotateLeft()},rotateRight:function(){this.$refs.cropper.rotateRight()},changeScale:function(e){e=e||1,this.$refs.cropper.changeScale(e)},beforeUpload:function(e){var t=this;if(-1==e.type.indexOf("image/"))this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");else{var r=new FileReader;r.readAsDataURL(e),r.onload=function(){t.options.img=r.result}}},uploadImg:function(){var e=this;this.$refs.cropper.getCropBlob((function(t){var r=t.type,s={"image/jpeg":"jpeg","image/png":"png"},a="temp.jpg";s[r]&&(a="temp."+s[r]);var i=new FormData;i.append("avatarfile",t,a),Object(l["n"])(i).then((function(t){0===t.code?(e.open=!1,e.options.img="http://sjapi.jxhh.com/"+t.data.fileInfo.fileUrl,e.msgSuccess("修改成功")):e.msgError(t.msg),e.$refs.cropper.clearCrop()}))}))},realTime:function(e){this.previews=e},setAvatarBase64:function(e,t){var r=this,s=new Image;s.src=e+"?v="+Math.random(),s.crossOrigin="*",s.onload=function(){var e=r.transBase64FromImage(s);t&&t(e)}},transBase64FromImage:function(e){var t=document.createElement("canvas");t.width=e.width,t.height=e.height;var r=t.getContext("2d");return r.drawImage(e,0,0,e.width,e.height),t.toDataURL("image/png")}},watch:{user:function(e){var t=this;e.avatar&&this.setAvatarBase64("http://sjapi.jxhh.com/"+e.avatar,(function(e){t.options.img=e}))}}},c=u,d=r("2877"),p=Object(d["a"])(c,s,a,!1,null,null,null);t["default"]=p.exports},c0c7:function(e,t,r){"use strict";r.d(t,"i",(function(){return a})),r.d(t,"f",(function(){return i})),r.d(t,"e",(function(){return o})),r.d(t,"a",(function(){return n})),r.d(t,"k",(function(){return l})),r.d(t,"c",(function(){return u})),r.d(t,"d",(function(){return c})),r.d(t,"j",(function(){return d})),r.d(t,"b",(function(){return p})),r.d(t,"g",(function(){return m})),r.d(t,"l",(function(){return f})),r.d(t,"m",(function(){return g})),r.d(t,"n",(function(){return v})),r.d(t,"h",(function(){return h}));var s=r("b775");r("c38a");function a(e){return Object(s["a"])({url:"/system/auth/userList",method:"get",params:e})}function i(){return Object(s["a"])({url:"/system/auth/addUser",method:"get"})}function o(e){return Object(s["a"])({url:"/system/auth/editUser?id="+e,method:"get"})}function n(e){return Object(s["a"])({url:"/system/auth/addUser",method:"post",data:e})}function l(e){return Object(s["a"])({url:"/system/auth/editUser",method:"post",data:e})}function u(e){return Object(s["a"])({url:"/system/auth/deleteAdmin",method:"delete",params:{ids:e}})}function c(e){return Object(s["a"])({url:"/system/user/export",method:"get",params:e})}function d(e,t){var r={userId:e,password:t};return Object(s["a"])({url:"/system/auth/resetUserPwd",method:"put",data:r})}function p(e,t){var r={userId:e,status:t};return Object(s["a"])({url:"/system/auth/changeUserStatus ",method:"put",data:r})}function m(){return Object(s["a"])({url:"/system/user/profile",method:"get"})}function f(e){return Object(s["a"])({url:"/system/user/edit",method:"post",data:e})}function g(e,t){var r={oldPassword:e,newPassword:t};return Object(s["a"])({url:"/system/user/updatePwd",method:"post",data:r})}function v(e){return Object(s["a"])({url:"/system/user/avatar",method:"post",data:e})}function h(){return Object(s["a"])({url:"/system/user/importTemplate",method:"get"})}},ee46:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"旧密码",prop:"oldPassword"}},[r("el-input",{attrs:{placeholder:"请输入旧密码",type:"password"},model:{value:e.user.oldPassword,callback:function(t){e.$set(e.user,"oldPassword",t)},expression:"user.oldPassword"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"新密码",prop:"newPassword"}},[r("el-input",{attrs:{placeholder:"请输入新密码",type:"password"},model:{value:e.user.newPassword,callback:function(t){e.$set(e.user,"newPassword",t)},expression:"user.newPassword"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"确认密码",prop:"confirmPassword"}},[r("el-input",{attrs:{placeholder:"请确认密码",type:"password"},model:{value:e.user.confirmPassword,callback:function(t){e.$set(e.user,"confirmPassword",t)},expression:"user.confirmPassword"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),r("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=r("c0c7"),o={data:function(){var e=this,t=function(t,r,s){e.user.newPassword!==r?s(new Error("两次输入的密码不一致")):s()};return{test:"1test",user:{oldPassword:void 0,newPassword:void 0,confirmPassword:void 0},rules:{oldPassword:[{required:!0,message:"旧密码不能为空",trigger:"blur"}],newPassword:[{required:!0,message:"新密码不能为空",trigger:"blur"},{min:6,max:20,message:"长度在 6 到 20 个字符",trigger:"blur"}],confirmPassword:[{required:!0,message:"确认密码不能为空",trigger:"blur"},{required:!0,validator:t,trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["m"])(e.user.oldPassword,e.user.newPassword).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},n=o,l=r("2877"),u=Object(l["a"])(n,s,a,!1,null,null,null);t["default"]=u.exports}}]);
\ No newline at end of file
dist/static/js/chunk-3478654b.fc8a2821.js 0 → 100644
浏览文件 @ 24247e13
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-6014318b.924ccdf4.js 0 → 100644
浏览文件 @ 24247e13
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6014318b"],{"037c":function(t,a){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAPCAYAAAA/I0V3AAAC/0lEQVQ4TzWLW0hUeQCHf/85c2bGc+Y+41yyMi+zaZTd1Mkgsi26WCJRLtFLFFRQUbG7sHSlkh6Eegsi7aJrtCAOPXSBMossKWNKXGOz26hTGjOTx7k7c+ac84+N+p6+h+8j+AGlnUwsWFQYS0qVgeFXG0JCtKR8ceVTG6t/UFDsGCIGT+RnS/4XSimJC6PezpYrh7Pv+1a4xJCZyzdqc0WlydGIJeSt9N7y/jqvmRiWfB8JpZRJR8Yqum5cP9HbfaeuMRfQFkcy0Ds4iDMs6HH9gsGQLbJvz6azc8udHcS0XCDZbLysq/XS+Yt/P1/T5B3VVPSO4Ou4ChlKwStx8FsqcMFaRT8H6MTZM9vOFZTXtpLJib7dv5/sbvrv1ajz9qJeqLqCCNkdUDgWCIRQWKrFw20NONCRp7Q019yrq288TmJ9fz052q6qGfqQZXy1PUh2vIdQPQfG5W4wj8fhZNN4VLUaB9usuHpaNbVyQ0MbSfq2Tl4eKLE2+yzw7exG0ccAJjJ6aIutcJIctG4tjj2bh57XVtw68VGZ5SrpJ7GOdalhjYerP+XBrkw7Ti0eQRhG5Ex6zOazGHmTw9pntajZUYqL9X4qSvYREvNtSTCzzfqDvmrcO3cXpzU9cFm04NwGcFDj5hCLa/b1aLugwSrbZyXFlL0kwfbN01ZDRhfkF+JQqw3+px+wUBfFfGMSd4N2CDo39m5ncGTjIHJpkcJV9ZZ8uv/Hp+l3L11GZNRKiQfvYINaTCIfUfybKIBM1VgqvgWfm6DKzKKUeUHDY5KN+o+EB1r2p4YGC0y8DvnVM0FFGbJIwebnQZ6axuTrMNJ5Bsm8oO6+1dPYRKTE8G/xsbbm9JfBOTRJoDPkAWoNoFDI0SkokgQYNaC8SeHdm7pMM1b9SaTUwMZM1H8oFXyxlCaiPJFljSKDgFLIWQmEU0usxZRmnR5BZ6/8R8d6LhEq+E3TDMrEsFCbGOtfpsqOFxMxbWJYwsDoiLPWwrDaOH9Aa3c8kajQz3Hmr98ADYdOjKeqoB8AAAAASUVORK5CYII="},"32c8":function(t,a,s){},aad8:function(t,a,s){"use strict";s.r(a);var i=function(){var t=this,a=t.$createElement,i=t._self._c||a;return i("div",{ref:"searchBar",staticClass:"yc-content"},[i("header",{class:{"head-scroll":t.isScroll}},[i("div",{staticClass:"header-con"},[i("ul",{staticClass:"nav"},[t.settitle&&t.settitle.toplogo?i("li",[i("img",{staticStyle:{width:"114px",height:"35px"},attrs:{src:t.settitle.topLogo,alt:""}})]):t._e(),t._v(" "),t._m(0),t._v(" "),t.navigationObj.open?i("li",[i("a",{attrs:{href:"//"+t.navigationObj.open,target:"_blank"}},[t._v("开放平台")])]):t._e(),t._v(" "),t.navigationObj.shop?i("li",[i("a",{attrs:{href:"//"+t.navigationObj.shop}},[t._v("云仓")])]):t._e(),t._v(" "),i("li",[i("a",{attrs:{href:"//"+t.navigationObj.aboutUs+"/user",target:"_blank"}},[t._v("关于我们")])])]),t._v(" "),i("div",{staticClass:"register-login-btn"},[i("div",{staticClass:"register-btn",on:{click:t.toRegister}},[t._v("注 册")]),t._v(" "),i("div",{staticClass:"login-btn",on:{click:t.toLogin}},[t._v("登 录")])])])]),t._v(" "),i("section",{staticClass:"banner"},[t.bannerList&&t.bannerList.length>0?i("swiper",{attrs:{options:t.swiperOption}},t._l(t.bannerList,(function(t,a){return i("swiper-slide",{key:a},[i("a",{attrs:{href:"//"+t.redirect_url,target:"_blank"}},[i("img",{staticStyle:{width:"100%",height:"562px"},attrs:{src:t.image_url,alt:""}})])])})),1):t._e()],1),t._v(" "),i("section",{staticStyle:{"margin-bottom":"100px"}},[i("div",{staticClass:"advantage",class:{mgB100:t.isAdHover}},[i("p",{staticClass:"advantage-title"},[t._v("核心优势")]),t._v(" "),i("div",{staticClass:"advantage-con",class:{mgT20:t.isAdHover}},t._l(t.cloud_advantage_lst,(function(a,s){return i("div",{key:s,staticClass:"pre-advantage",style:{zIndex:t.cloud_advantage_lst.length-s},on:{mouseover:function(a){return t.adHover(s+1)},mouseleave:function(a){return t.adLeave(s+1)}}},[i("dl",{staticClass:"dl-con",class:{noDlCon:t.indexAddom===s+1}},[i("dt",{class:"dl-con-ad"+(s+1)}),t._v(" "),i("dd",[t._v(t._s(a.title))])]),t._v(" "),i("div",{staticClass:"pre-advantage-details",class:{"up-ad-details":t.indexAddom===s+1}},[i("p",{staticClass:"ad-details-title"},[t._v(t._s(a.title))]),t._v(" "),i("p",{staticClass:"ad-details"},[t._v(t._s(a.content_summary))])])])})),0)])]),t._v(" "),t._m(1),t._v(" "),i("section",{staticClass:"brand"},[i("p",{staticClass:"brands-title"},[t._v("这些品牌都已入驻")]),t._v(" "),i("p",{staticClass:"brands-tip"},[t._v("我们已与各行业领域的优秀品牌达成合作")]),t._v(" "),i("div",[i("p",{staticClass:"brand-type"},[i("span",{staticClass:"clothes",class:{"light-word":0===t.isLight},on:{click:function(a){return t.brandTypeChange(0)}}},[t._v(t._s(t.detail_img1.type))]),t._v(" "),i("span",{staticClass:"electrical",class:{"light-word":1===t.isLight},on:{click:function(a){return t.brandTypeChange(1)}}},[t._v(t._s(t.detail_img2.type))]),t._v(" "),i("span",{staticClass:"food",class:{"light-word":2===t.isLight},on:{click:function(a){return t.brandTypeChange(2)}}},[t._v(t._s(t.detail_img3.type))]),t._v(" "),i("span",{staticClass:"maternal",class:{"light-word":3===t.isLight},on:{click:function(a){return t.brandTypeChange(3)}}},[t._v(t._s(t.detail_img4.type))])]),t._v(" "),i("div",{staticClass:"brand-carousel"},[i("el-carousel",{ref:"cardShow",staticClass:"card-show",attrs:{autoplay:!1,arrow:"never","indicator-position":"none",type:"card",height:"400px"},on:{change:function(a){return t.brandCarChange()}}},[i("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"1"}},t._l(t.detail_img1.logo_urls,(function(t,a){return i("div",{key:a,staticClass:"pre-img-con"},[i("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0),t._v(" "),i("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"2"}},t._l(t.detail_img2.logo_urls,(function(t,a){return i("div",{key:a,staticClass:"pre-img-con"},[i("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0),t._v(" "),i("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"3"}},t._l(t.detail_img3.logo_urls,(function(t,a){return i("div",{key:a,staticClass:"pre-img-con"},[i("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0),t._v(" "),i("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"4"}},t._l(t.detail_img4.logo_urls,(function(t,a){return i("div",{key:a,staticClass:"pre-img-con"},[i("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0)],1)],1)])]),t._v(" "),i("footer",[i("div",{staticClass:"contact"},[t._m(2),t._v(" "),i("p",[t._v(t._s(t.settitle.contactTel))])]),t._v(" "),i("div",{staticClass:"about-con"},[i("div",{staticClass:"about-list"},[i("ul",t._l(t.footerList,(function(a,s){return i("li",{key:s,on:{click:function(s){return t.goToUser(a.id)}}},[t._v(t._s(a.title))])})),0),t._v(" "),i("p",{staticClass:"about-gs"},[t._v("\n "+t._s(t.settitle.bottomCopyright)+"  "),i("img",{staticClass:"icon-image",staticStyle:{"margin-right":"4px"},attrs:{src:s("037c")}}),t._v(t._s(t.settitle.recordNum)+"\n ")])]),t._v(" "),i("div",{staticClass:"about-us"},[i("p",{staticClass:"us-title"},[t._v("联系我们")]),t._v(" "),i("p",[t._v("联系电话："+t._s(t.settitle.contactTel))]),t._v(" "),i("p",[t._v("公司地址:"+t._s(t.settitle.companyAddress))])])])])])},e=[function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("li",[s("a",{attrs:{href:"/"}},[t._v("首页")])])},function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("section",{staticStyle:{"padding-bottom":"90px","background-color":"#f9f9fa"}},[s("p",{staticClass:"process-title"},[t._v("入驻流程和材料")]),t._v(" "),s("div",{staticClass:"process-con"},[s("div",{staticClass:"process-steps"},[s("div",{staticClass:"pro-step"},[s("dl",[s("dt",{staticClass:"step-one"}),t._v(" "),s("dd",[t._v("第一步：注册账号")])]),t._v(" "),s("span",[t._v("无需等待")]),t._v(" "),s("p",[t._v("进入云仓官网，注册账号")]),t._v(" "),s("p",[t._v("注册完成后，填写相关信息")])]),t._v(" "),s("div",{staticClass:"pro-step"},[s("dl",[s("dt",{staticClass:"step-two"}),t._v(" "),s("dd",[t._v("第二步：填写信息")])]),t._v(" "),s("span",[t._v("约20分钟")]),t._v(" "),s("p",[t._v("确认在线协议填写公司主体信息")]),t._v(" "),s("p",[t._v("填写店铺信息提交相关资质")])]),t._v(" "),s("div",{staticClass:"pro-step"},[s("dl",[s("dt",{staticClass:"step-three"}),t._v(" "),s("dd",[t._v("第三步：等待审核")])]),t._v(" "),s("span",[t._v("约1-3个工作日")]),t._v(" "),s("p",[t._v("云仓工作人员会在1-3个工作日内")]),t._v(" "),s("p",[t._v("反馈审核结果，商家可通过登录查询审核进度")])]),t._v(" "),s("div",{staticClass:"pro-step"},[s("dl",[s("dt",{staticClass:"step-four"}),t._v(" "),s("dd",[t._v("第四步：发布商品")])]),t._v(" "),s("span",[t._v("无需等待")]),t._v(" "),s("p",[t._v("审核通过，商家登录后台")]),t._v(" "),s("p",[t._v("商家发布商品并上架")])])]),t._v(" "),s("div",{staticClass:"process-mater"},[s("div",{staticClass:"pro-ma"},[s("p",{staticClass:"set-in-ma m-bg"},[t._v("入驻必备材料")]),t._v(" "),s("div",{staticClass:"optional"},[s("ul",[s("li",[t._v("营业执照电子版")]),t._v(" "),s("li",[t._v("法人证件电子版")])])])]),t._v(" "),s("div",{staticClass:"pro-ma"},[s("p",{staticClass:"set-in-ma n-m-bg"},[t._v("入驻选填材料")]),t._v(" "),s("div",{staticClass:"optional"},[s("ul",[s("li",[t._v("品牌LOGO")]),t._v(" "),s("li",[t._v("其它行业资质")])]),t._v(" "),s("ul",[s("li",[t._v("品牌授权（代理品需提供）")]),t._v(" "),s("li",[t._v("店铺LOGO")])])])])])])])},function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("p",[t._v("如果你想要更多的"),s("span",[t._v("了解")]),t._v("，请联系我们")])}],l=s("4360"),n=s("b775");function o(t){return Object(n["a"])({url:"http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel",method:"get",params:t})}function r(t){return Object(n["a"])({url:"http://sysapi.jxhh.com/api/v1/oem/channel/domainFront",method:"get",params:t})}function c(t){return Object(n["a"])({url:"http://sysapi.jxhh.com/api/v1/oem/common/counsel",method:"get",params:t})}function d(t){return Object(n["a"])({url:"http://sysapi.jxhh.com/api/v1/oem/front/CloudList",method:"get",params:t})}var u={name:"newyuncang",data:function(){return{bannerList:[],cloud_advantage_lst:[],settitle:{bottomCopyright:"",businessHours:1,companyAddress:"",contactTel:"",custServiceQrcode:"",hotlineTel1:"",hotlineTel2:"",onlineTimeEnd:"18:00",onlineTimeStart:"09:00",recordNum:"",topLogo:""},channel_id:0,isScroll:!1,isAdHover:!1,isHasBorder:!1,indexAddom:!1,isLight:0,navigationObj:{home:"",open:"",shop:"",aboutUs:""},gwToken:"",swiperOption:{loop:!0,pagination:{el:".swiper-pagination",clickable:!0,bulletActiveClass:"my-bullet"},autoplay:{delay:6e3,disableOnInteraction:!1},initialSlide:0,direction:"horizontal",slidesPerView:1},detail_img1:{index:1,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},detail_img2:{index:2,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},detail_img3:{index:3,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},detail_img4:{index:4,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},footerList:[{id:1,title:"企业简介"},{id:2,title:"发展历程"},{id:3,title:"荣誉资质"},{id:4,title:"团队介绍"},{id:5,title:"新闻动态"}]}},mounted:function(){this.getIndexInfo(),window.addEventListener("scroll",this.handleScroll,!0)},destroyed:function(){window.removeEventListener("scroll",this.handleScroll)},methods:{getIndexInfo:function(){var t=this,a=window.location.host,s={domain:a};o(s).then((function(a){1==a.code&&(t.channel_id=a.data.channel_id,t.getWebSite(),t.getDomain(),t.getAllcloud())}))},getWebSite:function(){var t=this,a={channel_ids:this.channel_id};c(a).then((function(a){1==a.code&&a.data.universal_lst&&"null"!=a.data.universal_lst&&(t.settitle=a.data.universal_lst)}))},getDomain:function(){var t=this,a={channel_ids:this.channel_id};r(a).then((function(a){1==a.code&&a.data&&(t.navigationObj.home="",t.navigationObj.open=a.data.Open.domain,t.navigationObj.shop=a.data.Cloud.domain,t.navigationObj.aboutUs=a.data.Official.domain)}))},getAllcloud:function(){var t=this,a={new_channel_id:this.channel_id};d(a).then((function(a){1==a.code&&a.data&&(a.data.cloud_advantage_lst&&a.data.cloud_advantage_lst.length>0&&(t.cloud_advantage_lst=a.data.cloud_advantage_lst),a.data.cloud_banner_lst&&a.data.cloud_banner_lst.banners_json&&a.data.cloud_banner_lst.banners_json.length>0&&(t.bannerList=a.data.cloud_banner_lst.banners_json),a.data.cloud_supplier_lst&&a.data.cloud_supplier_lst.detail_json&&(t.detail_img1=a.data.cloud_supplier_lst.detail_json[0],t.detail_img2=a.data.cloud_supplier_lst.detail_json[1],t.detail_img3=a.data.cloud_supplier_lst.detail_json[2],t.detail_img4=a.data.cloud_supplier_lst.detail_json[3]))}))},handleScroll:function(){var t=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop;this.isScroll=t>100},brandTypeChange:function(t){this.$refs.cardShow.setActiveItem(t),this.isLight=t},brandCarChange:function(){this.isLight=this.$refs.cardShow.activeIndex},adHover:function(t){this.isAdHover=!0,this.indexAddom=t},adLeave:function(t){this.isAdHover=!1,this.indexAddom=-1},goToUser:function(t){var a="";this.navigationObj.aboutUs&&(a=this.navigationObj.aboutUs+"/user?id="+t,window.location.href="//"+a)},toRegister:function(){l["a"].dispatch("LogOut").then((function(){window.location.host;window.location.href="http://sso.jxhh.com/login?redirect=http://"+window.location.host+"/platformlogin"}))},toLogin:function(){window.location.href="http://sso.jxhh.com/login?redirect=http://"+window.location.host+"/platformlogin"}}},_=u,v=(s("cfa8"),s("2877")),p=Object(v["a"])(_,i,e,!1,null,"3fee90d8",null);a["default"]=p.exports},cfa8:function(t,a,s){"use strict";s("32c8")}}]);
\ No newline at end of file
src/api/webSite.js
浏览文件 @ 24247e13
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 获取渠道id
export function indexInfo(params) {
return request({
url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get',
params
......@@ -12,7 +12,7 @@ export function indexInfo(params) {
// 获取所有域名
export function getdomain(params) {
return request({
url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get',
params
......@@ -21,7 +21,7 @@ export function getdomain(params) {
// 获取官网设置接口
export function webSite(params) {
return request({
url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
method: 'get',
params
})
......@@ -30,7 +30,7 @@ export function webSite(params) {
// 云仓所有列表——Banner和域名/产品和服务/供应商入驻
export function getallCloudList(params) {
return request({
url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
method: 'get',
params
})
......
src/layout/components/Navbar.vue
浏览文件 @ 24247e13
......@@ -5,7 +5,10 @@
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
<div style="position:fixed;height: 100%;line-height: 50px;font-size:16px; right: 100px;">
<el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>
<!-- <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>-->
<el-tooltip class="item" effect="dark" content="查看历史订单及财务数据" placement="bottom-end">
<a href="http://oldpop.jxhh.com/" style="color:red;font-size:14px;">查看历史数据</a>
</el-tooltip>
</div>
<div class="right-menu">
<!-- <template v-if="device!=='mobile'">
......
src/views/entry/newyuncang.vue
浏览文件 @ 24247e13
......@@ -4,7 +4,7 @@
<header :class="{ 'head-scroll': isScroll }">
<div class="header-con">
<ul class="nav">
<li v-if="settitle && settitle.toplogo">
<li v-if="settitle && settitle.topLogo">
<img style="width:114px;height:35px;" :src="settitle.topLogo" alt="">
</li>
<li>
......@@ -226,6 +226,11 @@
<script>
import store from '@/store';
import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite'
/** HACK
* 解决 swiper 轮播图不自动轮播问题
* */
import Swiper2,{Autoplay} from 'swiper';
Swiper2.use([Autoplay]);
export default {
name: "newyuncang",
......@@ -270,7 +275,7 @@
bulletActiveClass: 'my-bullet'
},
autoplay: {
delay: 6000,
delay: 4000,
disableOnInteraction: false
},
// 设定初始化时slide的索引
......@@ -670,16 +675,25 @@
}
.ad-details {
width:100%;
padding: 30px;
color: #333333;
font-size: 16px;
font-weight: 400;
line-height: 28px;
word-wrap:break-word;
text-align: justify;
text-align-last: center;
-ms-text-align-last: center;
-moz-text-align-last: center;
}
//.ad-details:after {
// content: '';
// display : inline-block;
// overflow : hidden;
// height:0;
// width: 100%;
//}
/* hover 时候的效果 class */
.mgT20 {
......
src/views/platformlogin.vue
浏览文件 @ 24247e13
......@@ -13,6 +13,7 @@
gotosso() {
var ticket = this.$route.query.ticket;
this.$store.dispatch('Login', {"ticket": ticket}).then((res) => {
debugger
if (res.token != "") {
// 获取客户是否有审核信息
getShopInf().then(res => {
......
src/views/system/asset/withdraw/index.vue
浏览文件 @ 24247e13
......@@ -56,7 +56,7 @@
<div class="footer-btn">
<el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
<!-- <el-button @click="resetAssetForm">取 消</el-button>-->
<!-- <el-button @click="resetAssetForm">取 消</el-button>-->
</div>
</el-card>
</div>
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 24247e13
......@@ -379,6 +379,7 @@
if(res.data) {
urlObj.url = res.data.image_url;
this.goodsImgFileList.push(urlObj);
this.goodsInfoForm.imgs = []; // 1009 hxz 初始化img
this.goodsImgFileList.forEach(item=> {
this.goodsInfoForm.imgs.push(item.url)
})
......
src/views/system/goods/add/components/guide.vue 0 → 100644
浏览文件 @ 24247e13
<template>
<div class="app-container">
<div>
<!-- <div slot="header" class="clearfix">
<span>商品规格</span>
<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
</div> -->
<el-checkbox v-model="checked">启用商品规格</el-checkbox>
<p style='font-size:14px;'>启用商品规格后，商品的价格及库存以商品规格为准</p>
<p style='font-size:14px;'>
操作顺序：添加新规格 (<span style="color: red">必填</span>) -&gt;
添加规格项 (<span style="color: red">必填</span>) -&gt; 生成产品规格表
-&gt; 修改数值 -&gt; 保存商品规格
<span style="color: red">注意：商品价格金额必须小于指导价格</span>
</p>
<ul class="tab_list" v-if="checked">
<li
class="ullist"
v-for="(item, index) in shopType"
:key="index"
v-dragging="{ list: shopType, item: item, group: 'knowTab' }"
>
<div class="tab_list_left">
<div style="margin-top: 15px">
<el-input placeholder="请输入内容" v-model="item.specName" >
<template slot="append">
<el-button
type="primary"
class="addbtn"
@click="addlistguied(index)"
><i class="el-icon-plus"></i>添加规格项</el-button
>
</template>
</el-input>
<el-button
type="danger"
icon="el-icon-delete"
class="eldelbtn"
@click="deletearrinput(index)"
></el-button>
</div>
<el-row :gutter="20" class="tab_list childlist">
<el-col
:span="4"
v-for="(items, indexs) in item.specValue"
:key="indexs"
v-dragging="{
list: item.specValue,
item: items,
group: 'itemchild',
}"
style="margin: 5px 0; min-width: 205px"
>
<el-input
placeholder=""
v-model="items.value"
@input="guidInput"
style="
width: 100%;
min-width: 200px;
padding: 0;
text-align: center;
"
>
<template slot="append">
<!-- <img :src="nopeimg" alt="" style="width:29px;height:29px;display:inline-block;"/> -->
<!-- -->
<el-button
type="primary"
class="dfbtn"
icon="el-icon-delete"
>
<input
style="
display: none;
width: 29px;
height: 29px;
position: absolute;
left: 0;
top: 0;
"
@change="inputimg()"
accept="image/*"
:id="imagesid(index, indexs)"
type="file"
/>
<img
v-if="!items.img"
:src="nopeimg"
alt=""
style="
width: 25px;
height: 25px;
position: absolute;
left: 2px;
top: 2px;
"
@click="updateimg(index, indexs)"
/>
<img
v-if="items.img"
:src="items.img"
alt=""
style="
width: 33px;
height: 33px;
position: absolute;
left: 0;
top: 0;
"
/>
</el-button>
<el-button
type="primary"
icon="el-icon-delete"
@click="deleteinput(index, indexs)"
></el-button>
<el-button type="primary" icon="el-icon-rank"></el-button>
</template>
</el-input>
</el-col>
</el-row>
</div>
</li>
</ul>
<el-button
type="primary"
v-if="checked"
icon="el-icon-search"
@click="addguild()"
>添加新规格</el-button
>
<el-button
type="primary"
v-if="checked"
icon="el-icon-search"
@click="processing()"
>生成产品规格表</el-button
>
<div class="table_box" v-if="checked">
<!-- <div class="mark">
操作顺序：添加新规格 (<span style="color: red">必填</span>) -&gt;
添加规格项 (<span style="color: red">必填</span>) -&gt; 生成产品规格表
-&gt; 修改数值 -&gt; 保存商品规格
<span style="color: red">注意：商品价格金额必须小于指导价格</span>
</div> -->
<!-- 我记得有个scope属性的 -->
<el-table
:data="tableData7"
:span-method="objectSpanMethod1"
border
style="width: 100%; margin-top: 20px"
>
<el-table-column
header-align="center"
align="center"
v-for="(item, index) in tablearr"
:key="index"
:prop="item"
:label="item"
></el-table-column>
<el-table-column prop="moany" label="市场价" align="center">
<template slot="header" slot-scope="scope">
<p class="table_p">市场价</p>
<el-input placeholder="" v-model="scPrice"
><el-button
slot="append"
@click="scPriceall"
icon="el-icon-bottom"
></el-button
></el-input>
</template>
<template slot-scope="scope" align="center">
<el-input placeholder="" v-model="scope.row.scPrice"></el-input>
</template>
</el-table-column>
<el-table-column prop="moany" label="指导价" align="center">
<template slot="header" slot-scope="scope">
<p class="table_p">指导价</p>
<el-input placeholder="" v-model="price"
><el-button
slot="append"
@click="priceall"
icon="el-icon-bottom"
></el-button
></el-input>
</template>
<template slot-scope="scope" align="center">
<el-input placeholder="" v-model="scope.row.price"></el-input>
</template>
</el-table-column>
<el-table-column prop="moany" label="结算价" align="center">
<template slot="header" slot-scope="scope">
<p class="table_p">结算价</p>
<el-input placeholder="" v-model="jsPrice"
><el-button
slot="append"
@click="jsPriceall"
icon="el-icon-bottom"
></el-button
></el-input>
</template>
<template slot-scope="scope" align="center">
<el-input placeholder="" v-model="scope.row.jsPrice"></el-input>
</template>
</el-table-column>
<el-table-column prop="kucun" label="库存" align="center">
<template slot="header" slot-scope="scope">
<p class="table_p">库存</p>
<el-input placeholder="" v-model="goodsNowStock"
><el-button
slot="append"
@click="goodsNowStockall"
icon="el-icon-bottom"
></el-button
></el-input>
</template>
<template slot-scope="scope" align="center">
<el-input
placeholder=""
v-model="scope.row.goodsNowStock"
></el-input>
</template>
</el-table-column>
<el-table-column prop="moany" label="重量（克）" align="center">
<template slot="header" slot-scope="scope">
<p class="table_p">重量（克）</p>
<el-input placeholder="" v-model="weight"
><el-button
slot="append"
@click="weightall"
icon="el-icon-bottom"
></el-button
></el-input>
</template>
<template slot-scope="scope" align="center">
<el-input placeholder="" v-model="scope.row.weight"></el-input>
</template>
</el-table-column>
</el-table>
<el-button style="margin-top: 20px;">重 置</el-button>
</div>
</div>
</div>
</template>
<script>
import descartes from "@/utils/dikaerjs.js";
// import { onlodaimg } from "@/api/date";
import { UploadImg } from '@/api/module/goods'
export default {
name: "goods",
props: {
guidedata: {
type: Object,
required: true
}
},
data() {
return {
arrtdall:[],
nopeimg: require("@/assets/image/nopic100.jpg"),
checked: false,
type: "",
imgname: "",
indeximg: "",
indexsimg: "",
shopType: [],
shopTypes: [],
newList: [],
newData: [],
tableData7: [], // 规格列表表格
goodsNowStock: "",
jsPrice: "", //协议价
price: "", //指导价
scPrice: "", //市场价
weight: "",
spanArr: [],
pos: "",
spanArr1: [],
pos1: "",
tablearr: [],
spanArrS: {
spanArr0: [],
spanArr1: [],
},
posS: {
pos0: "",
pos1: "",
},
};
},
components: {
hello: {
render: function (createElement) {
return createElement("h" + this.level, this.$se);
},
},
},
mounted() {
// this.driver = new Driver()
this.$dragging.$on("dragged", (value) => {
//因为我这在排序的时候不需要做处理，所以空着就行
});
},
watch:{
tableData7:{
handler(val, oldVal){
let arrlist = JSON.stringify(val);
let listarr = JSON.parse(arrlist);
this.processguidelist(listarr);
this.$emit('guideclicks',this.arrtdall,this.shopType)
// this.$emit('parameterclicks',val)
},
deep:true
},
// 父组件传给 子组件的 值
guidedata(curVal,oldVal){
if(curVal){
if(curVal.goodsSpec){
this.checked = true;
}else {
this.checked = false;
}
if(curVal.specName && curVal.specName.length > 0) {
this.shopType = curVal.specName;
this.shopType.forEach((item, index) => {
this.shopType[index]['specValue'] = []
if(curVal.specValue) {
curVal.specValue.forEach((itemName, nindex) => {
if(itemName.specNameId == item.id){
this.shopType[index]['specValue'].push(itemName)
}
})
}
})
this.clgoodspace(curVal);
//笛卡尔积值
this.tableData7 = curVal.specOption;
}
}
},
},
methods: {
guidInput(val){
this.$forceUpdate()
},
// 处理回显数据
clgoodspace(goodsspace){
this.shopTypes = JSON.parse(JSON.stringify(this.shopType));
let specName = goodsspace.specName;
let specValue = goodsspace.specValue;
let specOption = goodsspace.specOption;
if(specName) {
specName.forEach((item)=>{
this.tablearr.push(item.specName)
specValue.forEach((itemchild)=>{
if(item.id ==itemchild.specNameId){
itemchild['specName'] =item.specName
}
})
})
}
if(specOption) {
specOption.forEach(item=>{
let goodsarr = item.specValueIds.split('_')
if(item.title){
item['spaceval'] = item.title.split('+_')
}
goodsarr.forEach(itemchild=>{
specValue.forEach(itemgoodschild=>{
if(itemchild == itemgoodschild.id){
item[itemgoodschild.specName] = itemgoodschild.value
}
})
})
})
}
this.tableData7 = specOption;
this.getSpanArr(this.tableData7);
},
// 不能删
descartes,
processguidelist(obj) {
let arrtdall = []
if(obj) {
obj.forEach((item, index) => {
let objtd = {}
let arrtd = []
for(let key in item){
if(key=='goodsNowStock'||key=='jsPrice'||key=='price'||key=='scPrice'||key=='wlPrice'||key=='pywlPrice'||key=='weight'){
objtd[key] = item[key]
}else{
if( item.spaceval){
objtd['specValues'] = item.spaceval
}else{
arrtd.push(item[key])
objtd['specValues'] = arrtd
}
}
}
arrtdall.push(objtd)
});
}
this.arrtdall = arrtdall
debugger
},
deletearrinput(index) {
this.shopType.splice(index, 1);
},
jsPriceall() {
this.tableData7.forEach((element, index) => {
this.tableData7[index].jsPrice = this.jsPrice;
});
},
priceall() {
this.tableData7.forEach((element, index) => {
this.tableData7[index].price = this.price;
});
},
scPriceall() {
this.tableData7.forEach((element, index) => {
this.tableData7[index].scPrice = this.scPrice;
});
},
// 一键 库存
goodsNowStockall() {
this.tableData7.forEach((element, index) => {
this.tableData7[index].goodsNowStock = this.goodsNowStock;
});
},
// 一键 重量
weightall() {
this.tableData7.forEach((element, index) => {
this.tableData7[index].weight = this.weight;
});
},
//删除规格项
deleteinput(index, indexs) {
this.shopType[index].specValue.splice(indexs, 1);
this.$forceUpdate()
},
//添加规格项
addlistguied(index) {
let childlist = {
value: "",
img: "",
};
this.$set(this.shopType[index].specValue,this.shopType[index].specValue.length,childlist);
this.$forceUpdate()
},
// 添加新规格
addguild() {
let arrchild = {
specName: "",
score: "",
specValue: [],
};
this.$set(this.shopType, this.shopType.length, arrchild);
},
guide() {
this.driver.defineSteps(steps);
this.driver.start();
},
imagesid(index, indexs) {
return index.toString() + indexs.toString() + "ss";
},
updateimg(index, indexs) {
let id = index.toString() + indexs.toString() + "ss";
this.imgname = id;
this.indeximg = index;
this.indexsimg = indexs;
document.getElementById(id).value = "";
document.getElementById(id).click();
},
inputimg() {
let file = document.getElementById(this.imgname).files[0];
// let formdata=new FormData()
if (file.size > 1024 * 1024 * 3) {
return false;
} else {
// formdata.append("file", file);
}
// var image = new Image();
// image.src = window.URL.createObjectURL(file);
// console.log(image);
// image.onload = () => {
// console.log(this.getBase64Img(image));
// //this.getBase64Img(image)即为转换为base64格式的图片形式
// let date={
// imgData:this.getBase64Img(image)
// }
// onlodaimg(date).then(res=>{
// })
// };
this.getBase64(file).then((res) => {
var result = res.split(",");
let Base64img = result[1];
let data = {"image": Base64img}
UploadImg(data).then((res) => {
if (res.data.code == 1) {
this.shopType[this.indeximg].specValue[this.indexsimg].img =
res.data.data.imageUrl
this.$forceUpdate()
}
});
});
},
getBase64(file) {
return new Promise(function(resolve, reject) {
let reader = new FileReader();
let imgResult = "";
reader.readAsDataURL(file);
reader.onload = function() {
imgResult = reader.result;
};
reader.onerror = function(error) {
reject(error);
};
reader.onloadend = function() {
resolve(imgResult);
};
});
},
getBase64Img(img) {
var canvas = document.createElement("canvas");
canvas.width = img.width;
canvas.height = img.height;
var ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0, img.width, img.height);
var ext = img.src.substring(img.src.lastIndexOf(".") + 1).toLowerCase();
var dataURL = canvas.toDataURL("image/" + ext);
return dataURL;
},
//返回所属规格名字
retName(index) {
// if (index == 1) {
// if (this.shopType.length > 1) {
// return this.shopType[0].name;
// }
// } else if (index == 2) {
// if (this.shopType.length > 1) {
// return this.shopType[1].name;
// }
// } else if (index == 3) {
// if (this.shopType.length > 1) {
// return this.shopType[2].name;
// }
// } else {
// return "";
// }
},
//处理数据
processing() {
this.newData = [];
this.tablearr = [];
this.shopTypes = JSON.parse(JSON.stringify(this.shopType));
if(this.shopTypes && this.shopTypes.length > 0) {
for (let i = 0; i < this.shopTypes.length; i++) {
var newlist = [];
for (
let index = 0;
index < this.shopTypes[i].specValue.length;
index++
) {
newlist.push(this.shopTypes[i].specValue[index].value);
}
this.newData.push(newlist);
}
}
this.getList();
},
//转换数据
getList() {
this.tableData7 = [];
this.newList = this.descartes(this.newData);
if(this.shopTypes && this.shopTypes.length > 0) {
for (let i = 0; i < this.shopTypes.length; i++) {
this.tablearr.push(this.shopTypes[i].specName);
}
}
for (let index = 0; index < this.newList.length; index++) {
var listobj = {};
for (let i = 0; i < this.shopTypes.length; i++) {
if(this.shopTypes.length>1){
listobj[this.shopTypes[i].specName] = this.newList[index][i];
}
if(this.shopTypes.length==1){
listobj[this.shopTypes[i].specName] = this.newList[index];
}
listobj["goodsNowStock"] = "";
listobj["jsPrice"] = "";
listobj["price"] = "";
listobj["scPrice"] = "";
listobj["weight"] = "";
}
this.tableData7.push(listobj);
}
this.getSpanArr(this.tableData7);
let arrlist = JSON.stringify(this.tableData7); //可以将json对象转换成json对符串
let listarr = JSON.parse(arrlist); //可以将json字符串转换成json对象
this.processguidelist(listarr);
},
//计算位置的方法
getSpanArr(data) {
this.spanArrS = {};
this.spanArr = [];
this.pos = "";
this.spanArr1 = [];
this.pos1 = "";
if(this.shopTypes && this.shopTypes.length > 0) {
for (let s = 0; s < this.shopTypes.length; s++) {
this.spanArrS["spanArr" + s] = [];
for (var i = 0; i < data.length; i++) {
if (i === 0) {
this.spanArrS["spanArr" + s].push(1);
this.posS["pos" + s] = 0;
} else {
// 判断当前元素与上一个元素是否相同
if (
data[i][this.shopTypes[s].specName] ==
data[i - 1][this.shopTypes[s].specName]
) {
this.spanArrS["spanArr" + s][this.posS["pos" + s]] += 1;
this.spanArrS["spanArr" + s].push(0);
} else {
this.spanArrS["spanArr" + s].push(1);
this.posS["pos" + s] = i;
}
}
}
}
}
// for (var i = 0; i < data.length; i++) {
// if (i === 0) {
// this.spanArr1.push(1);
// this.pos1 = 0;
// } else {
// //如果笛卡尔积一直递增下去的话 这是一个很蠢的方法 由于我的要求层数是已知的 这里偷懒了 不然应该用for循环
// if (data[i].cailiao === data[i - 1].cailiao) {
// this.spanArr1[this.pos1] += 1;
// this.spanArr1.push(0);
// } else {
// this.spanArr1.push(1);
// this.pos1 = i;
// }
// }
// }
},
// 合并行数
objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
if(this.shopTypes && this.shopTypes.length > 0) {
for (let s = 0; s < this.shopTypes.length; s++) {
if (columnIndex == s) {
const _row = this.spanArrS["spanArr" + s][rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
// columnIndex === 1 找到第二列，合并他的列数
}
}
}
// columnIndex === 0 找到第一列，实现合并随机出现的行数
// if (columnIndex === 0) {
// const _row = this.spanArr[rowIndex];
// const _col = _row > 0 ? 1 : 0;
// return {
// rowspan: _row,
// colspan: _col
// };
// // columnIndex === 1 找到第二列，合并他的列数
// } else if (columnIndex === 1) {
// const _row = this.spanArr1[rowIndex];
// const _col = _row > 0 ? 1 : 0;
// return {
// rowspan: _row,
// colspan: _col
// };
// }
},
},
};
</script>
<style scoped>
ul,
li {
list-style: none;
margin: 0;
padding: 0;
}
.ullist {
border: 1px solid #e7eaec;
padding: 10px;
margin-bottom: 10px;
}
.el-input-group {
width: calc(100% - 60px);
}
.table_box .el-input-group {
width: 100%;
}
.addbtn {
background-color: #5bc0de !important;
color: #fff !important;
border-radius: 0 4px 4px 0;
}
.eldelbtn {
height: 30px;
padding: 5px 20px !important;
margin-left: -3px;
}
.childlist {
margin-top: 10px;
}
.childlist .el-input-group--append .el-input__inner {
padding: 0;
}
.el-button--medium {
padding: 10px 12px;
}
.dfbtn {
position: relative;
}
.table_p {
margin: 0;
text-align: center;
}
.mark {
background-color: #fcf8e3;
padding: 5px;
/* font-size: 12px; */
margin-top: 20px;
}
</style>
src/views/system/goods/add/index.vue
浏览文件 @ 24247e13
......@@ -42,9 +42,9 @@
<div class="floor-item">
<div class="floor-item-box">
<p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品售价</p>
<!-- <keep-alive>-->
<GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" />
<!-- </keep-alive>-->
<!-- <keep-alive>-->
<GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" />
<!-- </keep-alive>-->
</div>
</div>
<!-- 商品详情 -->
......@@ -243,16 +243,24 @@
this.goodsaftersale.aftersale_time = res.data.aftersale_time;
let stagArr = [];
// 后台返回数据格式 ‘2,3’或者‘[]’都是字符串，处理兼容一下
//debugger
if( res.data.stags && !Array.isArray(res.data.stags)) {
if( res.data.stags.indexOf(',') > -1 ) {
stagArr = res.data.stags.split(',');
stagArr.forEach(item => {
if (item) {
this.goodsaftersale.stags.push(Number(item));
if(Number(item)) {
this.goodsaftersale.stags.push(Number(item));
}
}
})
}else {
this.goodsaftersale.stags.push( Number(res.data.stags) )
if(Number(res.data.stags)) {
this.goodsaftersale.stags.push( Number(res.data.stags) )
}else {
this.goodsaftersale.stags = [];
}
}
}else {
this.goodsaftersale.stags = [];
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论