fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by mali
Commit 4baedd1d57c5cae964d3a8a385da6cf7a7ca28d4 2 parents a6607906 fea2bc7b

Merge branch 'master' into gray

Inline Side-by-side
Showing 6 changed files with 8 additions and 6 deletions
... ... @@ -41,7 +41,8 @@ module.exports={
{name: 'registerCertUrl',type: 'string'},
{name: 'authorizeCerts',type: 'string'},
{name:'brandBanner',type:'string'},
{name:'certParty',type:'string'}
{name:'certParty',type:'string'},
{name:'countryId', type : 'Number'}
]
},
... ...
... ... @@ -20,7 +20,7 @@
2、第一行标题栏：SKN、起购件数、折扣、促销名称、状态（1：开启，2：关闭）<br>
<span style="color: red;">3、折扣只支持 0.01-1 之间的数字，到小数点后 2 位，例如 0.85；</span><br>
4、量贩商品不可参加秒杀、限定、预售、定金预售，设定后无法生效<br/>
5、<a href="/ajax/link/vipProduct">下载样例</a>
5、<a href="/ajax/link/productBatchImport">下载样例</a>
</td>
</tr>
</table>
... ...
... ... @@ -98,7 +98,7 @@ $(document).on('click', '.download-btn', function() {
$(document).on('click','#save_brand',function () {
e.submit($("#basicForm").attr("action"), function (option) {
//option.data.authorizeCerts = authorizeCertList;
//option.data.authorizeCerts = authorizeCertList.join(',');
option.data.countryId = option.data.brandHeadstream;
option.data.authorizeCerts = JSON.stringify(authorizeCertList);
option.success = function (res) {
... ...
... ... @@ -103,7 +103,7 @@ webpackJsonp([17],{
$(document).on('click','#save_brand',function () {
e.submit($("#basicForm").attr("action"), function (option) {
//option.data.authorizeCerts = authorizeCertList;
//option.data.authorizeCerts = authorizeCertList.join(',');
option.data.countryId = option.data.brandHeadstream;
option.data.authorizeCerts = JSON.stringify(authorizeCertList);
option.success = function (res) {
... ...
... ... @@ -41,7 +41,8 @@ module.exports={
{name: 'registerCertUrl',type: 'string'},
{name: 'authorizeCerts',type: 'string'},
{name:'brandBanner',type:'string'},
{name:'certParty',type:'string'}
{name:'certParty',type:'string'},
{name:'countryId', type : 'Number'}
]
},
... ...
... ... @@ -20,7 +20,7 @@
2、第一行标题栏：SKN、起购件数、折扣、促销名称、状态（1：开启，2：关闭）<br>
<span style="color: red;">3、折扣只支持 0.01-1 之间的数字，到小数点后 2 位，例如 0.85；</span><br>
4、量贩商品不可参加秒杀、限定、预售、定金预售，设定后无法生效<br/>
5、<a href="/ajax/link/vipProduct">下载样例</a>
5、<a href="/ajax/link/productBatchImport">下载样例</a>
</td>
</tr>
</table>
... ...