fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit a9561202ff9c167e516d107c1643f438d1aaae9a 2 parents 5e58e55f e00d605e

Merge branch 'dev5.2' into test5.2

Inline Side-by-side
Showing 2 changed files with 18 additions and 5 deletions
@@ -677,6 +677,7 @@ @@ -677,6 +677,7 @@
677 </div> 677 </div>
678 </div> 678 </div>
679 </td> 679 </td>
  680 + <td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="sale1T1L4R.big_image" type="button" data-index="[[index]]">删除</button></td>
680 </tr> 681 </tr>
681 </tbody> 682 </tbody>
682 </table> 683 </table>
@@ -711,6 +712,7 @@ @@ -711,6 +712,7 @@
711 </div> 712 </div>
712 </div> 713 </div>
713 </td> 714 </td>
  715 + <td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="sale1T1L4R.list" type="button" data-index="[[index]]">删除</button></td>
714 </tr> 716 </tr>
715 </tbody> 717 </tbody>
716 </table> 718 </table>
@@ -1139,7 +1141,7 @@ @@ -1139,7 +1141,7 @@
1139 <input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/> 1141 <input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
1140 </div> 1142 </div>
1141 </div> 1143 </div>
1142 - <div class="col-sm-3"> 1144 + <div class="col-sm-3" style="display: none">
1143 <label>背景色</label>&emsp; 1145 <label>背景色</label>&emsp;
1144 <input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color"> 1146 <input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
1145 </div> 1147 </div>
@@ -1188,6 +1190,7 @@ @@ -1188,6 +1190,7 @@
1188 </div> 1190 </div>
1189 </div> 1191 </div>
1190 </td> 1192 </td>
  1193 + <td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="newUserFloor.banner_image" type="button" data-index="[[index]]">删除</button></td>
1191 </tr> 1194 </tr>
1192 </tbody> 1195 </tbody>
1193 </table> 1196 </table>
@@ -1213,7 +1216,7 @@ @@ -1213,7 +1216,7 @@
1213 <input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/> 1216 <input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
1214 </div> 1217 </div>
1215 </div> 1218 </div>
1216 - <div class="col-sm-3"> 1219 + <div class="col-sm-3" style="display: none">
1217 <label>背景色</label>&emsp; 1220 <label>背景色</label>&emsp;
1218 <input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color"> 1221 <input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
1219 </div> 1222 </div>
@@ -1262,6 +1265,7 @@ @@ -1262,6 +1265,7 @@
1262 </div> 1265 </div>
1263 </div> 1266 </div>
1264 </td> 1267 </td>
  1268 + <td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="popularSingleProduct.banner_image" type="button" data-index="[[index]]">删除</button></td>
1265 </tr> 1269 </tr>
1266 </tbody> 1270 </tbody>
1267 </table> 1271 </table>
@@ -1993,7 +1997,7 @@ @@ -1993,7 +1997,7 @@
1993 <input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/> 1997 <input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
1994 </div> 1998 </div>
1995 </div> 1999 </div>
1996 - <div class="col-sm-3"> 2000 + <div class="col-sm-3" style="display: none">
1997 <label>背景色</label>&emsp; 2001 <label>背景色</label>&emsp;
1998 <input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color"> 2002 <input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
1999 </div> 2003 </div>
@@ -2042,6 +2046,7 @@ @@ -2042,6 +2046,7 @@
2042 </div> 2046 </div>
2043 </div> 2047 </div>
2044 </td> 2048 </td>
  2049 + <td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="vipUse.banner_image" type="button" data-index="[[index]]">删除</button></td>
2045 </tr> 2050 </tr>
2046 </tbody> 2051 </tbody>
2047 </table> 2052 </table>
@@ -2103,6 +2108,7 @@ @@ -2103,6 +2108,7 @@
2103 </div> 2108 </div>
2104 </div> 2109 </div>
2105 </td> 2110 </td>
  2111 + <td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="newProductFloor.list" type="button" data-index="[[index]]">删除</button></td>
2106 </tr> 2112 </tr>
2107 </tbody> 2113 </tbody>
2108 </table> 2114 </table>
@@ -128,12 +128,12 @@ function timeToSeconds(time) { @@ -128,12 +128,12 @@ function timeToSeconds(time) {
128 128
129 var e = new common.edit("#baseform"); 129 var e = new common.edit("#baseform");
130 130
131 - console.log(e);  
132 -  
133 var dialog = common.dialog.confirm(hint, artTemplate("template", item), function() { 131 var dialog = common.dialog.confirm(hint, artTemplate("template", item), function() {
134 132
135 e.submit(url, function (option) { 133 e.submit(url, function (option) {
136 134
  135 + console.log(option.data);
  136 +
137 option.data.startTime = new Date(option.data.startTime).getTime() / 1000; 137 option.data.startTime = new Date(option.data.startTime).getTime() / 1000;
138 option.data.endTime = new Date(option.data.endTime).getTime() / 1000; 138 option.data.endTime = new Date(option.data.endTime).getTime() / 1000;
139 139
@@ -147,6 +147,13 @@ function timeToSeconds(time) { @@ -147,6 +147,13 @@ function timeToSeconds(time) {
147 return false; 147 return false;
148 }); 148 });
149 149
  150 + e.on("validate", function() {
  151 + var matchWordName = $("#baseform").find("#matchWordName").val();
  152 + if (matchWordName.indexOf("，") >= 0) {
  153 + return "请使用英文 , 分割";
  154 + }
  155 + });
  156 +
150 e.init(); 157 e.init();
151 158
152 159