Showing
4 changed files
with
65 additions
and
8 deletions
@@ -97,7 +97,23 @@ export default { | @@ -97,7 +97,23 @@ export default { | ||
97 | renderHeader(h, params) { //eslint-disable-line | 97 | renderHeader(h, params) { //eslint-disable-line |
98 | return ( | 98 | return ( |
99 | <div> | 99 | <div> |
100 | - <span class="table-header-req">{params.column.title}<example-pop></example-pop></span> | 100 | + <span class="table-header-req"> |
101 | + {params.column.title} | ||
102 | + <poptip trigger="hover" placement="right-start"> | ||
103 | + <icon type="help-circled"></icon> | ||
104 | + <div class="example-pop" slot="content"> | ||
105 | + <div class="title"> | ||
106 | + 图片尺寸建议 1050*1400,不大于 500KB 。 | ||
107 | + </div> | ||
108 | + | ||
109 | + <div class="title"> | ||
110 | + 色卡图片会被自动设置为商品的正面图片,要求必须拍摄商品正面照,且图片底色为 <strong>F5F7F6</strong> 。 | ||
111 | + </div> | ||
112 | + | ||
113 | + <div class="text-center"><img class="image" /></div> | ||
114 | + </div> | ||
115 | + </poptip> | ||
116 | + </span> | ||
101 | </div> | 117 | </div> |
102 | ); | 118 | ); |
103 | } | 119 | } |
@@ -118,7 +134,18 @@ export default { | @@ -118,7 +134,18 @@ export default { | ||
118 | return null; | 134 | return null; |
119 | }, | 135 | }, |
120 | renderHeader(h) { //eslint-disable-line | 136 | renderHeader(h) { //eslint-disable-line |
121 | - return <span>款型编码</span>; | 137 | + return ( |
138 | + <div> | ||
139 | + <span>款型编码 | ||
140 | + <poptip trigger="hover" placement="right-start"> | ||
141 | + <icon type="help-circled"></icon> | ||
142 | + <div slot="content"> | ||
143 | + <span>入库识别码填写规范</span><a href="/instore_code_rule.pdf">下载</a> | ||
144 | + </div> | ||
145 | + </poptip> | ||
146 | + </span> | ||
147 | + </div> | ||
148 | + ); | ||
122 | } | 149 | } |
123 | }, | 150 | }, |
124 | { | 151 | { |
@@ -395,4 +422,28 @@ export default { | @@ -395,4 +422,28 @@ export default { | ||
395 | padding: 10px; | 422 | padding: 10px; |
396 | } | 423 | } |
397 | 424 | ||
425 | +.example-pop { | ||
426 | + padding: 10px; | ||
427 | + | ||
428 | + .title { | ||
429 | + color: #c90; | ||
430 | + width: 155px; | ||
431 | + white-space: normal; | ||
432 | + margin-bottom: 10px; | ||
433 | + } | ||
434 | + | ||
435 | + .text-center { | ||
436 | + text-align: center; | ||
437 | + } | ||
438 | + | ||
439 | + .image { | ||
440 | + width: 100px; | ||
441 | + height: 134px; | ||
442 | + background-image: url(../../statics/images/example/1.png); | ||
443 | + } | ||
444 | + | ||
445 | + .ivu-poptip-body { | ||
446 | + padding: 8px 16px; | ||
447 | + } | ||
448 | +} | ||
398 | </style> | 449 | </style> |
@@ -557,11 +557,9 @@ export default { | @@ -557,11 +557,9 @@ export default { | ||
557 | let newProduct = this.beforeSave(); | 557 | let newProduct = this.beforeSave(); |
558 | 558 | ||
559 | this.$Loading.start(); | 559 | this.$Loading.start(); |
560 | - | ||
561 | return this.productCreateService.updateProductAllInfo(newProduct).then((result) => { | 560 | return this.productCreateService.updateProductAllInfo(newProduct).then((result) => { |
562 | - this.$Loading.finish(); | ||
563 | - | ||
564 | if (result.code === 200) { | 561 | if (result.code === 200) { |
562 | + this.$Loading.finish(); | ||
565 | this.$Notice.success({ | 563 | this.$Notice.success({ |
566 | title: '修改成功', | 564 | title: '修改成功', |
567 | desc: '该商品保存成功!' | 565 | desc: '该商品保存成功!' |
@@ -569,9 +567,10 @@ export default { | @@ -569,9 +567,10 @@ export default { | ||
569 | 567 | ||
570 | this.go(this.from); | 568 | this.go(this.from); |
571 | } else { | 569 | } else { |
570 | + this.$Loading.error(); | ||
572 | this.$Notice.error({ | 571 | this.$Notice.error({ |
573 | title: '保存错误', | 572 | title: '保存错误', |
574 | - desc: result.data.join('\n') | 573 | + desc: result.message |
575 | }); | 574 | }); |
576 | 575 | ||
577 | } | 576 | } |
1 | <template> | 1 | <template> |
2 | - <layout-body> | 2 | + <layout-body class="output-page"> |
3 | <layout-filter :no-line="true" :col="1"> | 3 | <layout-filter :no-line="true" :col="1"> |
4 | <filter-item> | 4 | <filter-item> |
5 | <div class="import-title">导出</div> | 5 | <div class="import-title">导出</div> |
@@ -53,8 +53,9 @@ | @@ -53,8 +53,9 @@ | ||
53 | :on-error="onError" | 53 | :on-error="onError" |
54 | :on-progress="onProgress"> | 54 | :on-progress="onProgress"> |
55 | <Button type="ghost">浏览</Button> | 55 | <Button type="ghost">浏览</Button> |
56 | - <a @click="download">下载 Excel 模板</a> | ||
57 | </upload-xlsx> | 56 | </upload-xlsx> |
57 | + <a @click="download" class="download-a">下载Excel模板</a> | ||
58 | + <a href="/instore_code_rule.pdf" class="download-a">下载《入库识别码填写规范》</a> | ||
58 | </filter-item> | 59 | </filter-item> |
59 | 60 | ||
60 | <filter-item> | 61 | <filter-item> |
@@ -218,4 +219,10 @@ | @@ -218,4 +219,10 @@ | ||
218 | color: red; | 219 | color: red; |
219 | line-height: 25px; | 220 | line-height: 25px; |
220 | } | 221 | } |
222 | + | ||
223 | +.output-page { | ||
224 | + .download-a { | ||
225 | + margin-left: 10px; | ||
226 | + } | ||
227 | +} | ||
221 | </style> | 228 | </style> |
server/public/instore_code_rule.pdf
0 → 100644
No preview for this file type
-
Please register or login to post a comment