fe / yoho-shop-manage · Commits

Go to a project

Authored by 陈峰
Commit 3e55d609f9f131d853cd65f74d5023c3a8264e58 1 parent 67885604

bug修复

Inline Side-by-side
Showing 12 changed files with 171 additions and 5 deletions
@@ -7,7 +7,7 @@ import yohoPluginAuth from './plugins/yoho-plugin-auth'; @@ -7,7 +7,7 @@ import yohoPluginAuth from './plugins/yoho-plugin-auth';
7 import './filters'; 7 import './filters';
8 import './directives'; 8 import './directives';
9 import 'iview/dist/styles/iview.css'; 9 import 'iview/dist/styles/iview.css';
10 -import 'font-awesome/css/font-awesome.css'; 10 +import './fonts/iconfont.css';
11 11
12 Vue.use(yohoPluginCore); 12 Vue.use(yohoPluginCore);
13 Vue.use(yohoPluginRouter); 13 Vue.use(yohoPluginRouter);
@@ -23,6 +23,22 @@ const component = (resolve) => { @@ -23,6 +23,22 @@ const component = (resolve) => {
23 'full-screen', 23 'full-screen',
24 'info', 24 'info',
25 ], 25 ],
  26 + icons: {
  27 + text: 'iconfont icon-pencil',
  28 + color: 'iconfont icon-paintbrush',
  29 + font: 'iconfont icon-font',
  30 + align: 'iconfont icon-alignjustify',
  31 + list: 'iconfont icon-list',
  32 + link: 'iconfont icon-chain',
  33 + unlink: 'iconfont icon-chainbroken',
  34 + tabulation: 'iconfont icon-table',
  35 + image: 'iconfont icon-images',
  36 + 'multi-image': 'iconfont icon-images',
  37 + hr: 'iconfont icon-minus',
  38 + eraser: 'iconfont icon-eraser',
  39 + undo: 'iconfont icon-undo',
  40 + 'full-screen': 'iconfont icon-arrows-alt',
  41 + },
26 image: { 42 image: {
27 sizeLimit: 512 * 1024, 43 sizeLimit: 512 * 1024,
28 upload: { 44 upload: {
  1 +
  2 +@font-face {font-family: "iconfont";
  3 + src: url('iconfont.eot?t=1495163726758'); /* IE9*/
  4 + src: url('iconfont.eot?t=1495163726758#iefix') format('embedded-opentype'), /* IE6-IE8 */
  5 + url('iconfont.woff?t=1495163726758') format('woff'), /* chrome, firefox */
  6 + url('iconfont.ttf?t=1495163726758') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
  7 + url('iconfont.svg?t=1495163726758#iconfont') format('svg'); /* iOS 4.1- */
  8 +}
  9 +
  10 +.iconfont {
  11 + font-family:"iconfont" !important;
  12 + font-size:16px;
  13 + font-style:normal;
  14 + -webkit-font-smoothing: antialiased;
  15 + -moz-osx-font-smoothing: grayscale;
  16 +}
  17 +
  18 +.icon-alignjustify:before { content: "\e603"; }
  19 +
  20 +.icon-table:before { content: "\e7b5"; }
  21 +
  22 +.icon-minus:before { content: "\e6b5"; }
  23 +
  24 +.icon-font:before { content: "\e6e2"; }
  25 +
  26 +.icon-list:before { content: "\e728"; }
  27 +
  28 +.icon-paintbrush:before { content: "\e751"; }
  29 +
  30 +.icon-undo:before { content: "\e7f2"; }
  31 +
  32 +.icon-pencil:before { content: "\e604"; }
  33 +
  34 +.icon-images:before { content: "\e7ee"; }
  35 +
  36 +.icon-chain:before { content: "\ea36"; }
  37 +
  38 +.icon-eraser:before { content: "\ea9b"; }
  39 +
  40 +.icon-chainbroken:before { content: "\e679"; }
  41 +
  42 +.icon-arrows-alt:before { content: "\e700"; }
  43 +
No preview for this file type
  1 +<?xml version="1.0" standalone="no"?>
  2 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
  3 +<svg xmlns="http://www.w3.org/2000/svg">
  4 +<metadata>
  5 +Created by FontForge 20120731 at Fri May 19 11:15:26 2017
  6 + By admin
  7 +</metadata>
  8 +<defs>
  9 +<font id="iconfont" horiz-adv-x="1024" >
  10 + <font-face
  11 + font-family="iconfont"
  12 + font-weight="500"
  13 + font-stretch="normal"
  14 + units-per-em="1024"
  15 + panose-1="2 0 6 3 0 0 0 0 0 0"
  16 + ascent="896"
  17 + descent="-128"
  18 + x-height="792"
  19 + bbox="0 -212 1096.82 887"
  20 + underline-thickness="0"
  21 + underline-position="0"
  22 + unicode-range="U+0078-EA9B"
  23 + />
  24 +<missing-glyph
  25 + />
  26 + <glyph glyph-name=".notdef"
  27 + />
  28 + <glyph glyph-name=".notdef"
  29 + />
  30 + <glyph glyph-name=".null" horiz-adv-x="0"
  31 + />
  32 + <glyph glyph-name="nonmarkingreturn" horiz-adv-x="341"
  33 + />
  34 + <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
  35 +d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
  36 +t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
  37 +t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
  38 + <glyph glyph-name="alignjustify" unicode="&#xe603;"
  39 +d="M960 76v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-832q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h832q13 0 22.5 -9.5t9.5 -22.5zM960 268v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-832q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h832q13 0 22.5 -9.5
  40 +t9.5 -22.5zM960 460v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-832q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h832q13 0 22.5 -9.5t9.5 -22.5zM960 652v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-832q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h832q13 0 22.5 -9.5
  41 +t9.5 -22.5z" />
  42 + <glyph glyph-name="table" unicode="&#xe7b5;"
  43 +d="M329 26v109q0 8 -5 13.5t-13 5.5h-183q-8 0 -13 -5.5t-5 -13.5v-109q0 -8 5 -13.5t13 -5.5h183q8 0 13 5.5t5 13.5zM329 245v110q0 8 -5 13t-13 5h-183q-8 0 -13 -5t-5 -13v-110q0 -8 5 -13t13 -5h183q8 0 13 5t5 13zM622 26v109q0 8 -5.5 13.5t-13.5 5.5h-182
  44 +q-8 0 -13.5 -5.5t-5.5 -13.5v-109q0 -8 5.5 -13.5t13.5 -5.5h182q8 0 13.5 5.5t5.5 13.5zM329 465v109q0 8 -5 13.5t-13 5.5h-183q-8 0 -13 -5.5t-5 -13.5v-109q0 -8 5 -13.5t13 -5.5h183q8 0 13 5.5t5 13.5zM622 245v110q0 8 -5.5 13t-13.5 5h-182q-8 0 -13.5 -5t-5.5 -13
  45 +v-110q0 -8 5.5 -13t13.5 -5h182q8 0 13.5 5t5.5 13zM914 26v109q0 8 -5 13.5t-13 5.5h-183q-8 0 -13 -5.5t-5 -13.5v-109q0 -8 5 -13.5t13 -5.5h183q8 0 13 5.5t5 13.5zM622 465v109q0 8 -5.5 13.5t-13.5 5.5h-182q-8 0 -13.5 -5.5t-5.5 -13.5v-109q0 -8 5.5 -13.5
  46 +t13.5 -5.5h182q8 0 13.5 5.5t5.5 13.5zM914 245v110q0 8 -5 13t-13 5h-183q-8 0 -13 -5t-5 -13v-110q0 -8 5 -13t13 -5h183q8 0 13 5t5 13zM914 465v109q0 8 -5 13.5t-13 5.5h-183q-8 0 -13 -5.5t-5 -13.5v-109q0 -8 5 -13.5t13 -5.5h183q8 0 13 5.5t5 13.5zM987 647v-621
  47 +q0 -38 -26.5 -65t-64.5 -27h-768q-38 0 -64.5 27t-26.5 65v621q0 38 26.5 65t64.5 27h768q38 0 64.5 -27t26.5 -65z" />
  48 + <glyph glyph-name="minus" unicode="&#xe6b5;"
  49 +d="M914 358v-110q0 -22 -16 -38t-39 -16h-694q-23 0 -39 16t-16 38v110q0 23 16 39t39 16h694q23 0 39 -16t16 -39z" />
  50 + <glyph glyph-name="font" unicode="&#xe6e2;"
  51 +d="M451 493l-97 -258q19 0 78 -1t91 -1q11 0 33 1q-50 145 -105 259zM37 -139l1 45q13 4 32 7.5t32.5 6t28 8t25.5 16.5t18 29l135 352l160 414h73q5 -8 7 -12l117 -274q19 -45 60.5 -147.5t64.5 -156.5q9 -20 33.5 -83t41.5 -96q11 -26 20 -33q11 -8 50 -16.5t48 -11.5
  52 +q3 -22 3 -33q0 -2 3 -7.5t3 -7.5q-36 0 -108.5 4.5t-109.5 4.5q-43 0 -122.5 -4t-101.5 -4q0 24 2 44l75 16q1 0 7.5 1.5t8.5 2t8 2.5t8.5 4t6.5 4.5t5.5 6t1.5 8.5q0 9 -18 55t-41.5 101.5t-23.5 57.5l-257 1q-15 -33 -44 -112t-29 -93q0 -12 8 -21t25 -14t28 -8t32.5 -5
  53 +t23.5 -2v-33q0 -5 -1 -16q-33 0 -99.5 6t-99.5 6q-5 0 -15.5 -2.5t-12.5 -2.5q-45 -8 -107 -8h-6z" />
  54 + <glyph glyph-name="list" unicode="&#xe728;"
  55 +d="M146 62v-109q0 -8 -5.5 -13.5t-12.5 -5.5h-110q-7 0 -12.5 5.5t-5.5 13.5v109q0 8 5.5 13.5t12.5 5.5h110q7 0 12.5 -5.5t5.5 -13.5zM146 282v-110q0 -7 -5.5 -12.5t-12.5 -5.5h-110q-7 0 -12.5 5.5t-5.5 12.5v110q0 7 5.5 12.5t12.5 5.5h110q7 0 12.5 -5.5t5.5 -12.5z
  56 +M146 501v-110q0 -7 -5.5 -12.5t-12.5 -5.5h-110q-7 0 -12.5 5.5t-5.5 12.5v110q0 8 5.5 13t12.5 5h110q7 0 12.5 -5t5.5 -13zM1024 62v-109q0 -8 -5.5 -13.5t-12.5 -5.5h-768q-8 0 -13.5 5.5t-5.5 13.5v109q0 8 5.5 13.5t13.5 5.5h768q7 0 12.5 -5.5t5.5 -13.5zM146 721
  57 +v-110q0 -8 -5.5 -13t-12.5 -5h-110q-7 0 -12.5 5t-5.5 13v110q0 7 5.5 12.5t12.5 5.5h110q7 0 12.5 -5.5t5.5 -12.5zM1024 282v-110q0 -7 -5.5 -12.5t-12.5 -5.5h-768q-8 0 -13.5 5.5t-5.5 12.5v110q0 7 5.5 12.5t13.5 5.5h768q7 0 12.5 -5.5t5.5 -12.5zM1024 501v-110
  58 +q0 -7 -5.5 -12.5t-12.5 -5.5h-768q-8 0 -13.5 5.5t-5.5 12.5v110q0 8 5.5 13t13.5 5h768q7 0 12.5 -5t5.5 -13zM1024 721v-110q0 -8 -5.5 -13t-12.5 -5h-768q-8 0 -13.5 5t-5.5 13v110q0 7 5.5 12.5t13.5 5.5h768q7 0 12.5 -5.5t5.5 -12.5z" />
  59 + <glyph glyph-name="paintbrush" unicode="&#xe751;"
  60 +d="M923 812q40 0 70 -26.5t30 -66.5q0 -36 -26 -86q-190 -360 -266 -430q-55 -52 -124 -52q-72 0 -124 53t-52 125q0 73 53 121l365 331q33 31 74 31zM403 221q23 -43 61.5 -74t85.5 -44l1 -40q2 -122 -74 -198.5t-199 -76.5q-71 0 -125 26.5t-87 73t-49.5 104.5t-16.5 126
  61 +q4 -3 23.5 -17.5t35.5 -25.5t33.5 -20.5t26.5 -9.5q23 0 31 21q15 37 33.5 64t39.5 43.5t50 27t59 14.5t71 6z" />
  62 + <glyph glyph-name="undo" unicode="&#xe7f2;"
  63 +d="M951 300q0 -89 -35 -170t-94 -140t-140 -94t-170 -35q-98 0 -186.5 41.5t-151.5 116.5q-4 6 -3.5 13t4.5 12l79 79q5 5 14 5q9 -1 13 -7q42 -54 102.5 -84t128.5 -30q59 0 113 23.5t93.5 63t63 93.5t23.5 113t-23.5 113t-63 93.5t-93.5 63t-113 23.5q-56 0 -107.5 -20.5
  64 +t-91.5 -58.5l78 -79q18 -17 8 -39q-9 -23 -33 -23h-256q-15 0 -26 11t-11 26v256q0 24 23 33q22 10 39 -8l75 -73q61 57 139.5 89t162.5 32q89 0 170 -35t140 -94t94 -140t35 -170z" />
  65 + <glyph glyph-name="pencil" unicode="&#xe604;"
  66 +d="M33 811v-1022v1022zM65 811v-1022v1022zM97 811v-1022v1022zM129 811v-1022v1022zM161 811v-1022v1022zM193 811v-1022v1022zM225 811v-1022v1022zM256 811v-1022v1022zM288 811v-1022v1022zM320 811v-1022v1022zM352 811v-1022v1022zM384 811v-1022v1022zM416 811v-1022
  67 +v1022zM448 811v-1022v1022zM480 811v-1022v1022zM512 811v-1022v1022zM544 811v-1022v1022zM576 811v-1022v1022zM608 811v-1022v1022zM640 811v-1022v1022zM672 811v-1022v1022zM704 811v-1022v1022zM736 811v-1022v1022zM768 811v-1022v1022zM799 811v-1022v1022zM831 811
  68 +v-1022v1022zM863 811v-1022v1022zM895 811v-1022v1022zM927 811v-1022v1022zM959 811v-1022v1022zM991 811v-1022v1022zM1 779h1022h-1022zM1 747h1022h-1022zM1 715h1022h-1022zM1 683h1022h-1022zM1 651h1022h-1022zM1 619h1022h-1022zM1 587h1022h-1022zM1 556h1022
  69 +h-1022zM1 524h1022h-1022zM1 492h1022h-1022zM1 460h1022h-1022zM1 428h1022h-1022zM1 396h1022h-1022zM1 364h1022h-1022zM1 332h1022h-1022zM1 300h1022h-1022zM1 268h1022h-1022zM1 236h1022h-1022zM1 204h1022h-1022zM1 172h1022h-1022zM1 140h1022h-1022zM1 108h1022
  70 +h-1022zM1 76h1022h-1022zM1 44h1022h-1022zM1 13h1022h-1022zM1 -19h1022h-1022zM1 -51h1022h-1022zM1 -83h1022h-1022zM1 -115h1022h-1022zM1 -147h1022h-1022zM1 -179h1022h-1022zM863 811q66 0 113 -47t47 -113q0 -53 -32 -95l-64 -64l-223 223l64 64q42 32 95 32zM65 76
  71 +l-64 -287l287 64l591 591l-223 223zM715 448l-447 -447l-55 55l447 447z" />
  72 + <glyph glyph-name="images" unicode="&#xe7ee;"
  73 +d="M915 532l-165 8l-9 107q-2 17 -15 27.5t-31 9.5l-592 -49q-18 -1 -29 -13.5t-10 -29.5l42 -472q2 -17 15.5 -27.5t30.5 -8.5l30 2l-5 -92q0 -18 12.5 -32t32.5 -15l661 -31q19 -1 33.5 11.5t15.5 30.5l28 527q1 19 -12 32.5t-33 14.5zM205 521l-14 -270l-35 -49l-32 356
  74 +v1v1q1 8 6 13t13 6l522 43q8 0 14 -4.5t7 -11.5l0.5 -0.5l0.5 -0.5v-0.5v-0.5l6 -61l-438 21q-20 0 -34.5 -12t-15.5 -31zM873 47l-93 111l-55 65q-9 11 -21 11q-10 1 -22 -8l-33 -24q-12 -7 -20 -6q-11 0 -18 7l-3.5 3.5l-3.5 3.5l-86 98q-10 12 -27 13q-18 1 -30 -11
  75 +l-202 -218l-14 -14l1 13l13 258l7 126v1v1q5 19 24 18l408 -20l58 -3l116 -5q9 -1 15 -6.5t6 -14.5h0.5t0.5 -0.5v-0.5v-1zM746.5 287q29.5 0 50 21t20.5 50t-20.5 49.5t-50 20.5t-50 -20.5t-20.5 -49.5t20.5 -50t50 -21z" />
  76 + <glyph glyph-name="chain" unicode="&#xea36;"
  77 +d="M869 201q0 23 -16 39l-119 119q-16 16 -39 16q-24 0 -41 -18q1 -2 10.5 -11t12.5 -12.5t8.5 -11t7.5 -14.5t2 -15q0 -23 -16 -39t-39 -16q-9 0 -16 2t-14.5 7.5t-11 8.5t-12 12t-10.5 11q-19 -18 -19 -42q0 -23 16 -39l118 -118q15 -15 39 -15q22 0 38 14l84 84
  78 +q16 16 16 38h1zM467 604q0 23 -16 39l-118 118q-16 16 -39 16q-22 0 -39 -15l-83 -84q-16 -16 -16 -38q0 -23 16 -39l118 -119q16 -15 39 -15q24 0 41 18q-1 1 -10.5 10t-12.5 12.5t-8.5 11t-7.5 14.5t-2 16q0 22 16 38t39 16q9 0 16 -2t14.5 -7t11 -8.5t12 -12.5t10.5 -11
  79 +q19 18 19 42v0zM978 201.5q0 -68.5 -48 -116.5l-84 -83q-48 -48 -116 -48q-69 0 -117 49l-118 118q-47 48 -47 116q0 70 50 120l-50 50q-49 -50 -119 -50q-68 0 -116 48l-119 118q-48 48 -48 117t48 116l84 83q48 48 116 48q69 0 117 -49l118 -118q47 -47 47 -116
  80 +q0 -70 -50 -119l50 -51q49 51 119 51q68 0 116 -48l119 -119q48 -48 48 -116.5z" />
  81 + <glyph glyph-name="eraser" unicode="&#xea9b;" horiz-adv-x="1098"
  82 +d="M512 91l192 220h-439l-192 -220h439zM1091 707q8 -20 5 -41t-17 -37l-512 -586q-22 -25 -55 -25h-439q-22 0 -40 12t-27 31q-8 20 -5 41t17 37l512 586q22 25 55 25h439q22 0 40 -12t27 -31z" />
  83 + <glyph glyph-name="chainbroken" unicode="&#xe679;"
  84 +d="M287 86l-146 -147q-6 -5 -13 -5t-13 5q-5 6 -5 13.5t5 13.5l146 146q6 5 13.5 5t12.5 -5q6 -6 6 -13.5t-6 -12.5zM384 62v-183q0 -8 -5 -13t-13 -5t-13.5 5t-5.5 13v183q0 8 5.5 13.5t13.5 5.5t13 -5.5t5 -13.5zM256 190q0 -8 -5 -13t-13 -5h-183q-8 0 -13 5t-5 13
  85 +t5 13.5t13 5.5h183q8 0 13 -5.5t5 -13.5zM978 117q0 -68 -48 -116l-84 -83q-48 -48 -116 -48q-69 0 -117 49l-191 191q-12 12 -24 32l137 11l156 -157q15 -15 38.5 -15.5t39.5 14.5l84 84q16 16 16 38q0 23 -16 39l-157 157l10 137q20 -12 32 -24l192 -192q48 -49 48 -117z
  86 +M626 531l-137 -10l-156 156q-16 16 -39 16q-22 0 -39 -15l-84 -84q-16 -16 -16 -38q0 -23 16 -39l157 -156l-10 -138q-20 12 -32 24l-192 192q-48 50 -48 117q0 69 48 116l84 83q48 48 116 48q69 0 117 -49l191 -191q12 -12 24 -32zM987 483q0 -8 -5 -13t-13 -5h-183
  87 +q-8 0 -13 5t-5 13t5 13t13 5h183q8 0 13 -5t5 -13zM677 794v-183q0 -8 -5.5 -13t-13.5 -5t-13 5t-5 13v183q0 8 5 13t13 5t13.5 -5t5.5 -13zM909 707l-146 -146q-6 -5 -13 -5t-13 5q-6 6 -6 13.5t6 12.5l146 147q6 5 13 5t13 -5q5 -6 5 -13.5t-5 -13.5z" />
  88 + <glyph glyph-name="arrows-alt" unicode="&#xe700;"
  89 +d="M806 587l-203 -203l203 -203l83 82q16 18 40 8q22 -9 22 -33v-256q0 -15 -11 -26t-26 -11h-256q-24 0 -33 23q-10 22 8 39l82 83l-203 203l-203 -203l82 -83q18 -17 8 -39q-9 -23 -33 -23h-256q-15 0 -26 11t-11 26v256q0 24 23 33q22 10 39 -8l83 -82l203 203l-203 203
  90 +l-83 -82q-10 -11 -25 -11q-7 0 -14 3q-23 9 -23 33v256q0 15 11 26t26 11h256q24 0 33 -23q10 -22 -8 -39l-82 -83l203 -203l203 203l-82 83q-18 17 -8 39q9 23 33 23h256q15 0 26 -11t11 -26v-256q0 -24 -22 -33q-8 -3 -15 -3q-15 0 -25 11z" />
  91 + </font>
  92 +</defs></svg>
No preview for this file type
No preview for this file type
@@ -161,4 +161,7 @@ body { @@ -161,4 +161,7 @@ body {
161 .ivu-menu-item { 161 .ivu-menu-item {
162 color: #fff !important; 162 color: #fff !important;
163 } 163 }
  164 +.iconfont {
  165 + display: initial !important;
  166 +}
164 </style> 167 </style>
@@ -439,6 +439,8 @@ export default { @@ -439,6 +439,8 @@ export default {
439 return this.validate().then(() => { 439 return this.validate().then(() => {
440 this.beforeSubmit(); 440 this.beforeSubmit();
441 return api.saveBaseProductInfo(this.product); 441 return api.saveBaseProductInfo(this.product);
  442 + }, () => {
  443 + this.$Message.error('表单验证失败!');
442 }); 444 });
443 }, 445 },
444 nextStep: function() { 446 nextStep: function() {
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 115
116 <Row> 116 <Row>
117 <Col> 117 <Col>
118 - <editor :content="desc" z-index="2" @change="updateProductDesc"></editor> 118 + <editor :content="desc" :z-index="2" @change="updateProductDesc"></editor>
119 </Col> 119 </Col>
120 </Row> 120 </Row>
121 121
@@ -52,7 +52,19 @@ const plugin = { @@ -52,7 +52,19 @@ const plugin = {
52 routes = routes.concat(common); 52 routes = routes.concat(common);
53 Vue.$router = new Router({ 53 Vue.$router = new Router({
54 routes: routes, 54 routes: routes,
55 - mode: Vue.$config.historyMode 55 + mode: Vue.$config.historyMode,
  56 + scrollBehavior(to, from, savedPosition) {
  57 + console.log(savedPosition)
  58 + if (savedPosition) {
  59 + return savedPosition;
  60 + } else if (to.hash) {
  61 + return {
  62 + selector: to.hash
  63 + };
  64 + } else {
  65 + return { x: 0, y: 0 };
  66 + }
  67 + }
56 }); 68 });
57 } 69 }
58 }; 70 };
@@ -32,9 +32,7 @@ global.yoho = { @@ -32,9 +32,7 @@ global.yoho = {
32 app.use(cookieSession({ 32 app.use(cookieSession({
33 name: 'yoho-shop', 33 name: 'yoho-shop',
34 secret: 'yoho!shop@manage', 34 secret: 'yoho!shop@manage',
35 - cookie: {  
36 maxAge: 2 * 60 * 60 * 1000 35 maxAge: 2 * 60 * 60 * 1000
37 - }  
38 })); 36 }));
39 37
40 app.use(compression()); 38 app.use(compression());