style: 修改富文本样式

0fb824e2 · 无尘 · da7fb7f3 · 0fb824e2 · 0fb824e2 · 0fb824e2
Commit 0fb824e2 authored Sep 27, 2018 by 无尘
10 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/app.7b7a55cae976e9f32e6e2c71438c7fe2.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.71066b8a71adb7764d0f.js></script><script type=text/javascript src=./static/js/vendor.4cd4c0383d262213acac.js></script><script type=text/javascript src=./static/js/app.b1c7dabf47171c9feb2f.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/app.85a742b7f0612a7c4599390ff536e1e0.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.66c51f1984828a786ae0.js></script><script type=text/javascript src=./static/js/vendor.4cd4c0383d262213acac.js></script><script type=text/javascript src=./static/js/app.b1c7dabf47171c9feb2f.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.7b7a55cae976e9f32e6e2c71438c7fe2.css
+++ b/dist/static/css/app.7b7a55cae976e9f32e6e2c71438c7fe2.css
--- a/dist/static/css/app.7b7a55cae976e9f32e6e2c71438c7fe2.css.map
+++ b/dist/static/css/app.7b7a55cae976e9f32e6e2c71438c7fe2.css.map
--- a/dist/static/js/7.163b5e84eb65a89dce5c.js
+++ b/dist/static/js/7.163b5e84eb65a89dce5c.js
--- a/dist/static/js/7.163b5e84eb65a89dce5c.js.map
+++ b/dist/static/js/7.163b5e84eb65a89dce5c.js.map
--- a/dist/static/js/manifest.71066b8a71adb7764d0f.js
+++ b/dist/static/js/manifest.71066b8a71adb7764d0f.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={32:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"941b7928ac3ec125dffe",1:"d84116ddb7da8d636dae",2:"898e902c03247d4950cd",3:"c2dbaee2092c89d6bb92",4:"b4dcc6aadf91150f66db",5:"5b1afe039b0196c0894f",6:"2a27b6ee8413b8c3f627",7:"163b5e84eb65a89dce5c",8:"9096407f900c9aa678f7",9:"60e70c9c28a47800f984",10:"cebbb8e9154d8ef1e3ef",11:"66faf6447c68bdfb2b8e",12:"307f9f525cdeb9f1be89",13:"54b4b712404c3abfa58d",14:"b5f2418cfc3bf7d551dd",15:"1696e0a820ec6ccdd638",16:"5507b252aed01700430a",17:"f526c53af29ca46ddba8",18:"d50da6b3aa6ec1a04b82",19:"140f790d5cfaf7a1a22d",20:"7fbac36b6ef5533ce2d7",21:"277323f041b094c2af24",22:"13039e67a29f5acf5284",23:"3c6f4c7ebe626e824f1e",24:"c48c0d80cea5ac5e96c0",25:"5071d842c7e8695018b6",26:"c123b380404075c91789",27:"3409d469887ed6070e50",28:"6c9c46d699892767a43e",29:"0312196bd03565605531"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={32:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"941b7928ac3ec125dffe",1:"d84116ddb7da8d636dae",2:"898e902c03247d4950cd",3:"c2dbaee2092c89d6bb92",4:"b4dcc6aadf91150f66db",5:"5b1afe039b0196c0894f",6:"2a27b6ee8413b8c3f627",7:"a056fbc1c0000aeee743",8:"9096407f900c9aa678f7",9:"60e70c9c28a47800f984",10:"cebbb8e9154d8ef1e3ef",11:"66faf6447c68bdfb2b8e",12:"307f9f525cdeb9f1be89",13:"54b4b712404c3abfa58d",14:"b5f2418cfc3bf7d551dd",15:"1696e0a820ec6ccdd638",16:"5507b252aed01700430a",17:"f526c53af29ca46ddba8",18:"d50da6b3aa6ec1a04b82",19:"140f790d5cfaf7a1a22d",20:"7fbac36b6ef5533ce2d7",21:"277323f041b094c2af24",22:"13039e67a29f5acf5284",23:"3c6f4c7ebe626e824f1e",24:"c48c0d80cea5ac5e96c0",25:"5071d842c7e8695018b6",26:"c123b380404075c91789",27:"3409d469887ed6070e50",28:"6c9c46d699892767a43e",29:"0312196bd03565605531"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.71066b8a71adb7764d0f.js.map
+//# sourceMappingURL=manifest.66c51f1984828a786ae0.js.map
\ No newline at end of file
--- a/dist/static/js/manifest.71066b8a71adb7764d0f.js.map
+++ b/dist/static/js/manifest.71066b8a71adb7764d0f.js.map
-{"version":3,"sources":["webpack:///webpack/bootstrap 5bdca34007fdf58d18aa"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","32","exports","module","l","e","installedChunkData","Promise","resolve","promise","reject","head","document","getElementsByTagName","script","createElement","type","charset","async","timeout","nc","setAttribute","src","p","0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","setTimeout","onScriptComplete","onerror","onload","clearTimeout","chunk","Error","undefined","appendChild","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,GAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAA,SAAApB,GACA,IAAAqB,EAAAhB,EAAAL,GACA,OAAAqB,EACA,WAAAC,QAAA,SAAAC,GAA0CA,MAI1C,GAAAF,EACA,OAAAA,EAAA,GAIA,IAAAG,EAAA,IAAAF,QAAA,SAAAC,EAAAE,GACAJ,EAAAhB,EAAAL,IAAAuB,EAAAE,KAEAJ,EAAA,GAAAG,EAGA,IAAAE,EAAAC,SAAAC,qBAAA,WACAC,EAAAF,SAAAG,cAAA,UACAD,EAAAE,KAAA,kBACAF,EAAAG,QAAA,QACAH,EAAAI,OAAA,EACAJ,EAAAK,QAAA,KAEArB,EAAAsB,IACAN,EAAAO,aAAA,QAAAvB,EAAAsB,IAEAN,EAAAQ,IAAAxB,EAAAyB,EAAA,aAAAtC,EAAA,KAAwEuC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,wBAA8zBpE,GAAA,MACt4B,IAAAkC,EAAAmC,WAAAC,EAAA,MAEA,SAAAA,IAEAzC,EAAA0C,QAAA1C,EAAA2C,OAAA,KACAC,aAAAvC,GACA,IAAAwC,EAAArE,EAAAL,GACA,IAAA0E,IACAA,GACAA,EAAA,OAAAC,MAAA,iBAAA3E,EAAA,aAEAK,EAAAL,QAAA4E,GAKA,OAfA/C,EAAA0C,QAAA1C,EAAA2C,OAAAF,EAaA5C,EAAAmD,YAAAhD,GAEAL,GAIAX,EAAAiE,EAAAnE,EAGAE,EAAAkE,EAAAhE,EAGAF,EAAAmE,EAAA,SAAA/D,EAAAgE,EAAAC,GACArE,EAAAsE,EAAAlE,EAAAgE,IACA1E,OAAA6E,eAAAnE,EAAAgE,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMArE,EAAA2E,EAAA,SAAAtE,GACA,IAAAgE,EAAAhE,KAAAuE,WACA,WAA2B,OAAAvE,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAmE,EAAAE,EAAA,IAAAA,GACAA,GAIArE,EAAAsE,EAAA,SAAAO,EAAAC,GAAsD,OAAApF,OAAAC,UAAAC,eAAAC,KAAAgF,EAAAC,IAGtD9E,EAAAyB,EAAA,KAGAzB,EAAA+E,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.71066b8a71adb7764d0f.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t32: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n \t// This file contains only the entry chunk.\n \t// The chunk loading function for additional chunks\n \t__webpack_require__.e = function requireEnsure(chunkId) {\n \t\tvar installedChunkData = installedChunks[chunkId];\n \t\tif(installedChunkData === 0) {\n \t\t\treturn new Promise(function(resolve) { resolve(); });\n \t\t}\n\n \t\t// a Promise means \"currently loading\".\n \t\tif(installedChunkData) {\n \t\t\treturn installedChunkData[2];\n \t\t}\n\n \t\t// setup Promise in chunk cache\n \t\tvar promise = new Promise(function(resolve, reject) {\n \t\t\tinstalledChunkData = installedChunks[chunkId] = [resolve, reject];\n \t\t});\n \t\tinstalledChunkData[2] = promise;\n\n \t\t// start chunk loading\n \t\tvar head = document.getElementsByTagName('head')[0];\n \t\tvar script = document.createElement('script');\n \t\tscript.type = \"text/javascript\";\n \t\tscript.charset = 'utf-8';\n \t\tscript.async = true;\n \t\tscript.timeout = 120000;\n\n \t\tif (__webpack_require__.nc) {\n \t\t\tscript.setAttribute(\"nonce\", __webpack_require__.nc);\n \t\t}\n \t\tscript.src = __webpack_require__.p + \"static/js/\" + chunkId + \".\" + {\"0\":\"941b7928ac3ec125dffe\",\"1\":\"d84116ddb7da8d636dae\",\"2\":\"898e902c03247d4950cd\",\"3\":\"c2dbaee2092c89d6bb92\",\"4\":\"b4dcc6aadf91150f66db\",\"5\":\"5b1afe039b0196c0894f\",\"6\":\"2a27b6ee8413b8c3f627\",\"7\":\"163b5e84eb65a89dce5c\",\"8\":\"9096407f900c9aa678f7\",\"9\":\"60e70c9c28a47800f984\",\"10\":\"cebbb8e9154d8ef1e3ef\",\"11\":\"66faf6447c68bdfb2b8e\",\"12\":\"307f9f525cdeb9f1be89\",\"13\":\"54b4b712404c3abfa58d\",\"14\":\"b5f2418cfc3bf7d551dd\",\"15\":\"1696e0a820ec6ccdd638\",\"16\":\"5507b252aed01700430a\",\"17\":\"f526c53af29ca46ddba8\",\"18\":\"d50da6b3aa6ec1a04b82\",\"19\":\"140f790d5cfaf7a1a22d\",\"20\":\"7fbac36b6ef5533ce2d7\",\"21\":\"277323f041b094c2af24\",\"22\":\"13039e67a29f5acf5284\",\"23\":\"3c6f4c7ebe626e824f1e\",\"24\":\"c48c0d80cea5ac5e96c0\",\"25\":\"5071d842c7e8695018b6\",\"26\":\"c123b380404075c91789\",\"27\":\"3409d469887ed6070e50\",\"28\":\"6c9c46d699892767a43e\",\"29\":\"0312196bd03565605531\"}[chunkId] + \".js\";\n \t\tvar timeout = setTimeout(onScriptComplete, 120000);\n \t\tscript.onerror = script.onload = onScriptComplete;\n \t\tfunction onScriptComplete() {\n \t\t\t// avoid mem leaks in IE.\n \t\t\tscript.onerror = script.onload = null;\n \t\t\tclearTimeout(timeout);\n \t\t\tvar chunk = installedChunks[chunkId];\n \t\t\tif(chunk !== 0) {\n \t\t\t\tif(chunk) {\n \t\t\t\t\tchunk[1](new Error('Loading chunk ' + chunkId + ' failed.'));\n \t\t\t\t}\n \t\t\t\tinstalledChunks[chunkId] = undefined;\n \t\t\t}\n \t\t};\n \t\thead.appendChild(script);\n\n \t\treturn promise;\n \t};\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 5bdca34007fdf58d18aa"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///webpack/bootstrap c4037b6719b71b3cce3e"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","32","exports","module","l","e","installedChunkData","Promise","resolve","promise","reject","head","document","getElementsByTagName","script","createElement","type","charset","async","timeout","nc","setAttribute","src","p","0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","setTimeout","onScriptComplete","onerror","onload","clearTimeout","chunk","Error","undefined","appendChild","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","oe","err","console","error"],"mappings":"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","file":"static/js/manifest.66c51f1984828a786ae0.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t32: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n \t// This file contains only the entry chunk.\n \t// The chunk loading function for additional chunks\n \t__webpack_require__.e = function requireEnsure(chunkId) {\n \t\tvar installedChunkData = installedChunks[chunkId];\n \t\tif(installedChunkData === 0) {\n \t\t\treturn new Promise(function(resolve) { resolve(); });\n \t\t}\n\n \t\t// a Promise means \"currently loading\".\n \t\tif(installedChunkData) {\n \t\t\treturn installedChunkData[2];\n \t\t}\n\n \t\t// setup Promise in chunk cache\n \t\tvar promise = new Promise(function(resolve, reject) {\n \t\t\tinstalledChunkData = installedChunks[chunkId] = [resolve, reject];\n \t\t});\n \t\tinstalledChunkData[2] = promise;\n\n \t\t// start chunk loading\n \t\tvar head = document.getElementsByTagName('head')[0];\n \t\tvar script = document.createElement('script');\n \t\tscript.type = \"text/javascript\";\n \t\tscript.charset = 'utf-8';\n \t\tscript.async = true;\n \t\tscript.timeout = 120000;\n\n \t\tif (__webpack_require__.nc) {\n \t\t\tscript.setAttribute(\"nonce\", __webpack_require__.nc);\n \t\t}\n \t\tscript.src = __webpack_require__.p + \"static/js/\" + chunkId + \".\" + {\"0\":\"941b7928ac3ec125dffe\",\"1\":\"d84116ddb7da8d636dae\",\"2\":\"898e902c03247d4950cd\",\"3\":\"c2dbaee2092c89d6bb92\",\"4\":\"b4dcc6aadf91150f66db\",\"5\":\"5b1afe039b0196c0894f\",\"6\":\"2a27b6ee8413b8c3f627\",\"7\":\"a056fbc1c0000aeee743\",\"8\":\"9096407f900c9aa678f7\",\"9\":\"60e70c9c28a47800f984\",\"10\":\"cebbb8e9154d8ef1e3ef\",\"11\":\"66faf6447c68bdfb2b8e\",\"12\":\"307f9f525cdeb9f1be89\",\"13\":\"54b4b712404c3abfa58d\",\"14\":\"b5f2418cfc3bf7d551dd\",\"15\":\"1696e0a820ec6ccdd638\",\"16\":\"5507b252aed01700430a\",\"17\":\"f526c53af29ca46ddba8\",\"18\":\"d50da6b3aa6ec1a04b82\",\"19\":\"140f790d5cfaf7a1a22d\",\"20\":\"7fbac36b6ef5533ce2d7\",\"21\":\"277323f041b094c2af24\",\"22\":\"13039e67a29f5acf5284\",\"23\":\"3c6f4c7ebe626e824f1e\",\"24\":\"c48c0d80cea5ac5e96c0\",\"25\":\"5071d842c7e8695018b6\",\"26\":\"c123b380404075c91789\",\"27\":\"3409d469887ed6070e50\",\"28\":\"6c9c46d699892767a43e\",\"29\":\"0312196bd03565605531\"}[chunkId] + \".js\";\n \t\tvar timeout = setTimeout(onScriptComplete, 120000);\n \t\tscript.onerror = script.onload = onScriptComplete;\n \t\tfunction onScriptComplete() {\n \t\t\t// avoid mem leaks in IE.\n \t\t\tscript.onerror = script.onload = null;\n \t\t\tclearTimeout(timeout);\n \t\t\tvar chunk = installedChunks[chunkId];\n \t\t\tif(chunk !== 0) {\n \t\t\t\tif(chunk) {\n \t\t\t\t\tchunk[1](new Error('Loading chunk ' + chunkId + ' failed.'));\n \t\t\t\t}\n \t\t\t\tinstalledChunks[chunkId] = undefined;\n \t\t\t}\n \t\t};\n \t\thead.appendChild(script);\n\n \t\treturn promise;\n \t};\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap c4037b6719b71b3cce3e"],"sourceRoot":""}
\ No newline at end of file
--- a/dist/static/tinymce/skins/lightgray/skin.min.css
+++ b/dist/static/tinymce/skins/lightgray/skin.min.css
@@ -24,6 +24,7 @@
  line-height: normal;
  font-weight: normal;
  text-align: left;
+  border-radius: 2px;
  -moz-box-sizing: content-box;
  -webkit-box-sizing: content-box;
  box-sizing: content-box;
@@ -137,7 +138,7 @@ div.mce-edit-area {
 .mce-charmap td {
  cursor: default;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  width: 20px;
  height: 20px;
  line-height: 20px;
@@ -155,7 +156,7 @@ div.mce-edit-area {
 }
 .mce-grid td.mce-grid-cell div {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  width: 15px;
  height: 15px;
  margin: 0;
@@ -190,7 +191,7 @@ div.mce-edit-area {
 }
 .mce-grid-border a {
-  border-color: #c5c5c5;
+  border-color: #dcdfe6;
  width: 13px;
  height: 13px
 }
@@ -432,14 +433,14 @@ div.mce-tinymce-inline {
 .mce-arrow.mce-arrow-up:before {
  top: -9px;
-  border-bottom-color: #c5c5c5;
+  border-bottom-color: #dcdfe6;
  border-width: 0 9px 9px;
  margin-left: -9px
 }
 .mce-arrow.mce-arrow-down:before {
  bottom: -9px;
-  border-top-color: #c5c5c5;
+  border-top-color: #dcdfe6;
  border-width: 9px 9px 0;
  margin-left: -9px
 }
@@ -488,7 +489,7 @@ div.mce-tinymce-inline {
 .mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:before {
  left: -9px;
  top: 50%;
-  border-right-color: #c5c5c5;
+  border-right-color: #dcdfe6;
  border-width: 9px 9px 9px 0;
  margin-top: -9px
 }
@@ -508,7 +509,7 @@ div.mce-tinymce-inline {
 .mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:before {
  right: -9px;
  top: 50%;
-  border-left-color: #c5c5c5;
+  border-left-color: #dcdfe6;
  border-width: 9px 0 9px 9px;
  margin-top: -9px
 }
@@ -555,7 +556,7 @@ div.mce-tinymce-inline {
 }
 .mce-sidebar-toolbar {
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  border-left-width: 1px
 }
@@ -578,7 +579,7 @@ div.mce-tinymce-inline {
 }
 .mce-sidebar-panel {
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  border-left-width: 1px
 }
@@ -639,7 +640,7 @@ div.mce-tinymce-inline {
 .mce-panel {
  border: 0 solid #f3f3f3;
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  background-color: #fff
 }
@@ -682,7 +683,7 @@ div.mce-tinymce-inline {
  top: 0;
  left: 0;
  background: #FFF;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  border: 1px solid rgba(0, 0, 0, 0.25)
 }
@@ -695,7 +696,7 @@ div.mce-tinymce-inline {
  left: 50%;
  margin-left: -11px;
  border-top-width: 0;
-  border-bottom-color: #c5c5c5;
+  border-bottom-color: #dcdfe6;
  border-bottom-color: rgba(0, 0, 0, 0.25);
  top: -11px
 }
@@ -716,7 +717,7 @@ div.mce-tinymce-inline {
  left: 50%;
  margin-left: -11px;
  border-bottom-width: 0;
-  border-top-color: #c5c5c5;
+  border-top-color: #dcdfe6;
  top: auto;
  bottom: -11px
 }
@@ -772,7 +773,7 @@ div.mce-fullscreen {
  top: 0;
  width: 100%;
  height: 100%;
-  background: #FFF
+  background: #000;
 }
 #mce-modal-block.mce-in {
@@ -797,7 +798,9 @@ div.mce-fullscreen {
  left: 0;
  opacity: 0;
  transform: scale(.1);
-  transition: transform 100ms ease-in, opacity 150ms ease-in
+  transition: transform 100ms ease-in, opacity 150ms ease-in;
+  border-radius: 2px;
+  border: none;
 }
 .mce-window.mce-in {
@@ -806,8 +809,8 @@ div.mce-fullscreen {
 }
 .mce-window-head {
-  padding: 9px 15px;
+  padding: 0px 20px;
-  border-bottom: 1px solid #c5c5c5;
+  border-bottom: 1px solid #dcdfe6;
  position: relative
 }
@@ -815,36 +818,50 @@ div.mce-fullscreen {
  position: absolute;
  right: 0;
  top: 0;
-  height: 38px;
+  height: 54px;
-  width: 38px;
+  width: 54px;
  text-align: center;
  cursor: pointer
 }
 .mce-window-head .mce-close i {
-  color: #9b9b9b
+  color: #909399;
 }
 .mce-close:hover i {
-  color: #bdbdbd
+  color: #1890ff;
 }
 .mce-window-head .mce-title {
-  line-height: 20px;
+  line-height: 54px;
-  font-size: 20px;
+  font-size: 18px;
-  font-weight: bold;
+  font-weight: normal;
  text-rendering: optimizelegibility;
-  padding-right: 20px
+  padding-right: 20px;
 }
 .mce-window .mce-container-body {
-  display: block
+  display: block;
+  /*padding: 0 20px;*/
 }
 .mce-foot {
  display: block;
  background-color: #FFF;
-  border-top: 1px solid #c5c5c5
+  border-top: 1px solid #dcdfe6;
+  border-radius: 0 0 2px 2px;
+}
+.mce-foot .mce-btn.mce-last:hover {
+  color: #1890ff;
+  border-color: #1890ff;
+  background-color: #fff;
+}
+.mce-foot .mce-btn.mce-last:hover button .mce-txt{
+  color: #1890ff;
+  border-color: #1890ff;
+  background-color: #fff;
 }
 .mce-window-head .mce-dragh {
@@ -866,7 +883,7 @@ div.mce-fullscreen {
 }
 .mce-window .mce-btn:hover {
-  border-color: #c5c5c5
+  border-color: #dcdfe6
 }
 .mce-window .mce-btn:focus {
@@ -875,7 +892,7 @@ div.mce-fullscreen {
 .mce-window-body .mce-btn,
 .mce-foot .mce-btn {
-  border-color: #c5c5c5
+  border-color: #dcdfe6
 }
 .mce-foot .mce-btn.mce-primary {
@@ -1075,7 +1092,7 @@ div.mce-fullscreen {
  margin-top: 5px;
  border-width: 1px;
  border-style: solid;
-  border-color: #c5c5c5;
+  border-color: #dcdfe6;
  transition: transform 100ms ease-in, opacity 150ms ease-in;
  opacity: 0;
  box-sizing: border-box
@@ -1149,7 +1166,7 @@ div.mce-fullscreen {
 }
 .mce-notification .mce-progress .mce-bar-container {
-  border-color: #c5c5c5
+  border-color: #dcdfe6
 }
 .mce-notification .mce-progress .mce-bar-container .mce-bar {
@@ -1240,6 +1257,7 @@ html .mce-abs-layout-item,
 .mce-btn {
  border: 1px solid #b3b3b3;
  border-color: transparent transparent transparent transparent;
+  border-radius: 4px;
  position: relative;
  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
  background: white;
@@ -1356,8 +1374,9 @@ html .mce-abs-layout-item,
 .mce-primary:hover,
 .mce-primary:focus {
-  background-color: #1e6abc;
+  background: #40a9ff;
-  border-color: transparent
+  border-color: #40a9ff;
+  color: #fff;
 }
 .mce-primary.mce-disabled button,
@@ -1527,7 +1546,7 @@ html .mce-abs-layout-item,
 i.mce-i-checkbox {
  margin: 0 3px 0 0;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none;
@@ -1581,9 +1600,10 @@ i.mce-i-checkbox {
 }
 .mce-combobox input {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
-  border-right-color: #c5c5c5;
+  border-right-color: #dcdfe6;
-  height: 28px
+  border-radius: 4px;
+  height: 30px
 }
 .mce-combobox.mce-disabled input {
@@ -1591,7 +1611,7 @@ i.mce-i-checkbox {
 }
 .mce-combobox .mce-btn {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  border-left: 0;
  margin: 0
 }
@@ -1666,7 +1686,7 @@ i.mce-i-checkbox {
 }
 .mce-colorbox i {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  width: 14px;
  height: 14px
 }
@@ -1733,7 +1753,7 @@ i.mce-i-checkbox {
  left: 0;
  width: 90%;
  height: 100%;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  cursor: crosshair;
  overflow: hidden
 }
@@ -1787,7 +1807,7 @@ i.mce-i-checkbox {
  right: 0;
  width: 6.5%;
  height: 100%;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  cursor: crosshair
 }
@@ -1912,7 +1932,7 @@ i.mce-i-checkbox {
 }
 .mce-iframe {
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  width: 100%;
  height: 100%
 }
@@ -2448,11 +2468,11 @@ i.mce-i-resize {
 .mce-selectbox {
  background: #fff;
-  border: 1px solid #c5c5c5
+  border: 1px solid #dcdfe6
 }
 .mce-slider {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  background: #fff;
  width: 100px;
  height: 10px;
@@ -2466,7 +2486,7 @@ i.mce-i-resize {
 }
 .mce-slider-handle {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  background: #e6e6e6;
  display: block;
  width: 13px;
@@ -2537,7 +2557,7 @@ i.mce-i-resize {
 .mce-tabs {
  display: block;
-  border-bottom: 1px solid #c5c5c5
+  border-bottom: 1px solid #dcdfe6
 }
 .mce-tabs,
@@ -2549,7 +2569,7 @@ i.mce-i-resize {
  display: inline-block;
  *display: inline;
  *zoom: 1;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  border-width: 0 1px 0 0;
  background: #fff;
  padding: 8px 15px;
@@ -2584,14 +2604,15 @@ i.mce-i-resize {
 .mce-textbox {
  background: #fff;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none;
  display: inline-block;
  -webkit-transition: border linear .2s, box-shadow linear .2s;
  transition: border linear .2s, box-shadow linear .2s;
-  height: 28px;
+  height: 30px;
  resize: none;
  padding: 0 4px 0 4px;
  white-space: pre-wrap;
@@ -2601,7 +2622,7 @@ i.mce-i-resize {
 .mce-textbox:focus,
 .mce-textbox.mce-focus {
-  border-color: #2276d2;
+  border-color: #1890ff;
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none

--- a/src/components/memberShip/point-form.vue
+++ b/src/components/memberShip/point-form.vue
@@ -37,6 +37,21 @@
        </el-form-item>
        <el-form-item label="积分有效期" prop="effectiveTime" class="padding-0">
          <el-input v-model="ruleForm.effectiveTime" @keyup.native="formatInput($event)"></el-input><label>天</label>
+          <!-- 新增需求 20180927 -->
+          <!-- <div class="radio-cell">
+             <el-radio v-model="ruleForm.integralGetDiscountControl" label="1">动态</el-radio>
+             <el-input v-model="ruleForm.integralGetDiscountControlLower" @change="formatInputChange($event)"></el-input>
+             <label>天</label>
+          </div>
+          <div class="radio-cell margin-20">
+            <el-radio v-model="ruleForm.integralGetDiscountControl" label="2">永久有效</el-radio>
+          </div>
+          <div class="radio-cell margin-20">
+            <el-radio v-model="ruleForm.integralGetDiscountControl" label="3">指定清零</el-radio>
+          </div>
+          <div class="radio-cell margin-20">
+            <el-radio v-model="ruleForm.integralGetDiscountControl" label="4">指定清零</el-radio>
+          </div> -->
        </el-form-item>
      </div>
      <el-form-item label="积分抵现规则" prop="integralUseStatus" class="margin-20">

--- a/static/tinymce/skins/lightgray/skin.min.css
+++ b/static/tinymce/skins/lightgray/skin.min.css
@@ -24,6 +24,7 @@
  line-height: normal;
  font-weight: normal;
  text-align: left;
+  border-radius: 2px;
  -moz-box-sizing: content-box;
  -webkit-box-sizing: content-box;
  box-sizing: content-box;
@@ -137,7 +138,7 @@ div.mce-edit-area {
 .mce-charmap td {
  cursor: default;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  width: 20px;
  height: 20px;
  line-height: 20px;
@@ -155,7 +156,7 @@ div.mce-edit-area {
 }
 .mce-grid td.mce-grid-cell div {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  width: 15px;
  height: 15px;
  margin: 0;
@@ -190,7 +191,7 @@ div.mce-edit-area {
 }
 .mce-grid-border a {
-  border-color: #c5c5c5;
+  border-color: #dcdfe6;
  width: 13px;
  height: 13px
 }
@@ -432,14 +433,14 @@ div.mce-tinymce-inline {
 .mce-arrow.mce-arrow-up:before {
  top: -9px;
-  border-bottom-color: #c5c5c5;
+  border-bottom-color: #dcdfe6;
  border-width: 0 9px 9px;
  margin-left: -9px
 }
 .mce-arrow.mce-arrow-down:before {
  bottom: -9px;
-  border-top-color: #c5c5c5;
+  border-top-color: #dcdfe6;
  border-width: 9px 9px 0;
  margin-left: -9px
 }
@@ -488,7 +489,7 @@ div.mce-tinymce-inline {
 .mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:before {
  left: -9px;
  top: 50%;
-  border-right-color: #c5c5c5;
+  border-right-color: #dcdfe6;
  border-width: 9px 9px 9px 0;
  margin-top: -9px
 }
@@ -508,7 +509,7 @@ div.mce-tinymce-inline {
 .mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:before {
  right: -9px;
  top: 50%;
-  border-left-color: #c5c5c5;
+  border-left-color: #dcdfe6;
  border-width: 9px 0 9px 9px;
  margin-top: -9px
 }
@@ -555,7 +556,7 @@ div.mce-tinymce-inline {
 }
 .mce-sidebar-toolbar {
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  border-left-width: 1px
 }
@@ -578,7 +579,7 @@ div.mce-tinymce-inline {
 }
 .mce-sidebar-panel {
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  border-left-width: 1px
 }
@@ -639,7 +640,7 @@ div.mce-tinymce-inline {
 .mce-panel {
  border: 0 solid #f3f3f3;
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  background-color: #fff
 }
@@ -682,7 +683,7 @@ div.mce-tinymce-inline {
  top: 0;
  left: 0;
  background: #FFF;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  border: 1px solid rgba(0, 0, 0, 0.25)
 }
@@ -695,7 +696,7 @@ div.mce-tinymce-inline {
  left: 50%;
  margin-left: -11px;
  border-top-width: 0;
-  border-bottom-color: #c5c5c5;
+  border-bottom-color: #dcdfe6;
  border-bottom-color: rgba(0, 0, 0, 0.25);
  top: -11px
 }
@@ -716,7 +717,7 @@ div.mce-tinymce-inline {
  left: 50%;
  margin-left: -11px;
  border-bottom-width: 0;
-  border-top-color: #c5c5c5;
+  border-top-color: #dcdfe6;
  top: auto;
  bottom: -11px
 }
@@ -772,7 +773,7 @@ div.mce-fullscreen {
  top: 0;
  width: 100%;
  height: 100%;
-  background: #FFF
+  background: #000;
 }
 #mce-modal-block.mce-in {
@@ -797,7 +798,9 @@ div.mce-fullscreen {
  left: 0;
  opacity: 0;
  transform: scale(.1);
-  transition: transform 100ms ease-in, opacity 150ms ease-in
+  transition: transform 100ms ease-in, opacity 150ms ease-in;
+  border-radius: 2px;
+  border: none;
 }
 .mce-window.mce-in {
@@ -806,8 +809,8 @@ div.mce-fullscreen {
 }
 .mce-window-head {
-  padding: 9px 15px;
+  padding: 0px 20px;
-  border-bottom: 1px solid #c5c5c5;
+  border-bottom: 1px solid #dcdfe6;
  position: relative
 }
@@ -815,36 +818,50 @@ div.mce-fullscreen {
  position: absolute;
  right: 0;
  top: 0;
-  height: 38px;
+  height: 54px;
-  width: 38px;
+  width: 54px;
  text-align: center;
  cursor: pointer
 }
 .mce-window-head .mce-close i {
-  color: #9b9b9b
+  color: #909399;
 }
 .mce-close:hover i {
-  color: #bdbdbd
+  color: #1890ff;
 }
 .mce-window-head .mce-title {
-  line-height: 20px;
+  line-height: 54px;
-  font-size: 20px;
+  font-size: 18px;
-  font-weight: bold;
+  font-weight: normal;
  text-rendering: optimizelegibility;
-  padding-right: 20px
+  padding-right: 20px;
 }
 .mce-window .mce-container-body {
-  display: block
+  display: block;
+  /*padding: 0 20px;*/
 }
 .mce-foot {
  display: block;
  background-color: #FFF;
-  border-top: 1px solid #c5c5c5
+  border-top: 1px solid #dcdfe6;
+  border-radius: 0 0 2px 2px;
+}
+.mce-foot .mce-btn.mce-last:hover {
+  color: #1890ff;
+  border-color: #1890ff;
+  background-color: #fff;
+}
+.mce-foot .mce-btn.mce-last:hover button .mce-txt{
+  color: #1890ff;
+  border-color: #1890ff;
+  background-color: #fff;
 }
 .mce-window-head .mce-dragh {
@@ -866,7 +883,7 @@ div.mce-fullscreen {
 }
 .mce-window .mce-btn:hover {
-  border-color: #c5c5c5
+  border-color: #dcdfe6
 }
 .mce-window .mce-btn:focus {
@@ -875,7 +892,7 @@ div.mce-fullscreen {
 .mce-window-body .mce-btn,
 .mce-foot .mce-btn {
-  border-color: #c5c5c5
+  border-color: #dcdfe6
 }
 .mce-foot .mce-btn.mce-primary {
@@ -1075,7 +1092,7 @@ div.mce-fullscreen {
  margin-top: 5px;
  border-width: 1px;
  border-style: solid;
-  border-color: #c5c5c5;
+  border-color: #dcdfe6;
  transition: transform 100ms ease-in, opacity 150ms ease-in;
  opacity: 0;
  box-sizing: border-box
@@ -1149,7 +1166,7 @@ div.mce-fullscreen {
 }
 .mce-notification .mce-progress .mce-bar-container {
-  border-color: #c5c5c5
+  border-color: #dcdfe6
 }
 .mce-notification .mce-progress .mce-bar-container .mce-bar {
@@ -1240,6 +1257,7 @@ html .mce-abs-layout-item,
 .mce-btn {
  border: 1px solid #b3b3b3;
  border-color: transparent transparent transparent transparent;
+  border-radius: 4px;
  position: relative;
  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
  background: white;
@@ -1356,8 +1374,9 @@ html .mce-abs-layout-item,
 .mce-primary:hover,
 .mce-primary:focus {
-  background-color: #1e6abc;
+  background: #40a9ff;
-  border-color: transparent
+  border-color: #40a9ff;
+  color: #fff;
 }
 .mce-primary.mce-disabled button,
@@ -1527,7 +1546,7 @@ html .mce-abs-layout-item,
 i.mce-i-checkbox {
  margin: 0 3px 0 0;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none;
@@ -1581,9 +1600,10 @@ i.mce-i-checkbox {
 }
 .mce-combobox input {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
-  border-right-color: #c5c5c5;
+  border-right-color: #dcdfe6;
-  height: 28px
+  border-radius: 4px;
+  height: 30px
 }
 .mce-combobox.mce-disabled input {
@@ -1591,7 +1611,7 @@ i.mce-i-checkbox {
 }
 .mce-combobox .mce-btn {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  border-left: 0;
  margin: 0
 }
@@ -1666,7 +1686,7 @@ i.mce-i-checkbox {
 }
 .mce-colorbox i {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  width: 14px;
  height: 14px
 }
@@ -1733,7 +1753,7 @@ i.mce-i-checkbox {
  left: 0;
  width: 90%;
  height: 100%;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  cursor: crosshair;
  overflow: hidden
 }
@@ -1787,7 +1807,7 @@ i.mce-i-checkbox {
  right: 0;
  width: 6.5%;
  height: 100%;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  cursor: crosshair
 }
@@ -1912,7 +1932,7 @@ i.mce-i-checkbox {
 }
 .mce-iframe {
-  border: 0 solid #c5c5c5;
+  border: 0 solid #dcdfe6;
  width: 100%;
  height: 100%
 }
@@ -2448,11 +2468,11 @@ i.mce-i-resize {
 .mce-selectbox {
  background: #fff;
-  border: 1px solid #c5c5c5
+  border: 1px solid #dcdfe6
 }
 .mce-slider {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  background: #fff;
  width: 100px;
  height: 10px;
@@ -2466,7 +2486,7 @@ i.mce-i-resize {
 }
 .mce-slider-handle {
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  background: #e6e6e6;
  display: block;
  width: 13px;
@@ -2537,7 +2557,7 @@ i.mce-i-resize {
 .mce-tabs {
  display: block;
-  border-bottom: 1px solid #c5c5c5
+  border-bottom: 1px solid #dcdfe6
 }
 .mce-tabs,
@@ -2549,7 +2569,7 @@ i.mce-i-resize {
  display: inline-block;
  *display: inline;
  *zoom: 1;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
  border-width: 0 1px 0 0;
  background: #fff;
  padding: 8px 15px;
@@ -2584,14 +2604,15 @@ i.mce-i-resize {
 .mce-textbox {
  background: #fff;
-  border: 1px solid #c5c5c5;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none;
  display: inline-block;
  -webkit-transition: border linear .2s, box-shadow linear .2s;
  transition: border linear .2s, box-shadow linear .2s;
-  height: 28px;
+  height: 30px;
  resize: none;
  padding: 0 4px 0 4px;
  white-space: pre-wrap;
@@ -2601,7 +2622,7 @@ i.mce-i-resize {
 .mce-textbox:focus,
 .mce-textbox.mce-focus {
-  border-color: #2276d2;
+  border-color: #1890ff;
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none