fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit c169d2fb0f10840342f1209f164fd93ef54a9b66 1 parent 6057446d

build

Inline Side-by-side
Showing 8 changed files with 7 additions and 7 deletions
@@ -9,7 +9,7 @@ webpackJsonp([132],[ @@ -9,7 +9,7 @@ webpackJsonp([132],[
9 $('input[type="file"]').after('<div class="file-name btn btn-default">请选择文件</div>'); 9 $('input[type="file"]').after('<div class="file-name btn btn-default">请选择文件</div>');
10 10
11 var loadModal = null; 11 var loadModal = null;
12 - 12 + //导入
13 function batchImport(el, type) { 13 function batchImport(el, type) {
14 return { 14 return {
15 params: { 15 params: {
@@ -45,7 +45,7 @@ webpackJsonp([133],[ @@ -45,7 +45,7 @@ webpackJsonp([133],[
45 { display: "起购件数", render: function(items) { 45 { display: "起购件数", render: function(items) {
46 return items.minCount; 46 return items.minCount;
47 }}, 47 }},
48 - { display: "促销短语", render: function(items) { 48 + { display: "促销名称", render: function(items) {
49 return items.promotionPhrase; 49 return items.promotionPhrase;
50 }}, 50 }},
51 { display: "状态", render: function(items) { 51 { display: "状态", render: function(items) {
1 module.exports = function (app) { 1 module.exports = function (app) {
2 - 2 + //量贩
3 app.get("/product/batch/index", "product.productBatch.Index", function(req, res) { 3 app.get("/product/batch/index", "product.productBatch.Index", function(req, res) {
4 this.$extend = { 4 this.$extend = {
5 moduleName: "营销管理", 5 moduleName: "营销管理",
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <%include '../../common/__partail/ListHeader'%> 2 <%include '../../common/__partail/ListHeader'%>
3 3
4 <div class="data.contentDatapanel"> 4 <div class="data.contentDatapanel">
5 - 5 + <!-- 量贩 -->
6 <form id="add-form" class="form-horizontal form-bordered" type="<%type%>" action="<%action%>"> 6 <form id="add-form" class="form-horizontal form-bordered" type="<%type%>" action="<%action%>">
7 <div class="panel-group"> 7 <div class="panel-group">
8 <div class="panel-group" id="editor-group"> 8 <div class="panel-group" id="editor-group">
1 <%include '../../common/__ui/header'%> 1 <%include '../../common/__ui/header'%>
2 <%include '../../common/__partail/ListHeader'%> 2 <%include '../../common/__partail/ListHeader'%>
3 - 3 +<!-- 量贩 -->
4 <div class="contentpanel"> 4 <div class="contentpanel">
5 <div class="panel panel-default" style="margin-bottom:10px;"> 5 <div class="panel panel-default" style="margin-bottom:10px;">
6 <div class="panel-body"> 6 <div class="panel-body">
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <td>说明：</td> 17 <td>说明：</td>
18 <td colspan="2"> 18 <td colspan="2">
19 1、上传文件必须是 .xlsx 文件<br> 19 1、上传文件必须是 .xlsx 文件<br>
20 - 2、第一行标题栏：SKN、起购件数、折扣、促销短语<br> 20 + 2、第一行标题栏：SKN、起购件数、折扣、促销名称、状态（1：开启，2：关闭）<br>
21 <span style="color: red;">3、折扣只支持 0.01-1 之间的数字，到小数点后 2 位，例如 0.85；</span><br> 21 <span style="color: red;">3、折扣只支持 0.01-1 之间的数字，到小数点后 2 位，例如 0.85；</span><br>
22 4、量贩商品不可参加秒杀、限定、预售、定金预售，设定后无法生效<br/> 22 4、量贩商品不可参加秒杀、限定、预售、定金预售，设定后无法生效<br/>
23 5、<a href="/ajax/link/productBatchImport">下载样例</a> 23 5、<a href="/ajax/link/productBatchImport">下载样例</a>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <%include '../../common/__partail/ListHeader'%> 2 <%include '../../common/__partail/ListHeader'%>
3 3
4 <div class="contentpanel"> 4 <div class="contentpanel">
5 - 5 + <!-- 量贩 -->
6 <div class="panel panel-default" style="margin-bottom: 10px;"> 6 <div class="panel panel-default" style="margin-bottom: 10px;">
7 7
8 <div class="panel-body" style="padding-bottom: 0px; padding-left: 10px;"> 8 <div class="panel-body" style="padding-bottom: 0px; padding-left: 10px;">