build

@@ -38,6 +38,7 @@ webpackJsonp([41],[
 	                if (loadModal) {
 	                if (loadModal) {
 	                    loadModal.close();
 	                    loadModal.close();
 	                }
 	                }
+	                common.util.__tip('处理失败！具体报错见页面下方！', 'warning');
 	                return false;
 	                return false;
 	            }
 	            }
 	            if (loadModal) {
 	            if (loadModal) {
@@ -59,6 +60,7 @@ webpackJsonp([41],[
 	common.edit.ajaxfileupload('#brand-file', batchExport('#brand-file', 'brandProperty'));
 	common.edit.ajaxfileupload('#brand-file', batchExport('#brand-file', 'brandProperty'));
 	common.edit.ajaxfileupload('#offShelve-file', batchExport('#offShelve-file', 'offShelveSkn'));
 	common.edit.ajaxfileupload('#offShelve-file', batchExport('#offShelve-file', 'offShelveSkn'));
 	common.edit.ajaxfileupload('#onShelve-file', batchExport('#onShelve-file', 'onShelveSkn'));
 	common.edit.ajaxfileupload('#onShelve-file', batchExport('#onShelve-file', 'onShelveSkn'));
+	common.edit.ajaxfileupload('#phrase-file', batchExport('#phrase-file', 'productPhrase'));
 
 
 
 
 	function __ajaxCheckTask(unquid){
 	function __ajaxCheckTask(unquid){

@@ -67,6 +67,23 @@
                         6、<a href="/ajax/link/onShelveSkn">下载样例</a>
                         6、<a href="/ajax/link/onShelveSkn">下载样例</a>
                     </td>
                     </td>
                 </tr>
                 </tr>
+                <tr>
+                    <td rowspan="2">批量修改商品促销短语</td>
+                    <td>上传EXCEL:</td>
+                    <td style="position: relative;">
+                    <input id="phrase-file" name="file" data-type="productPhrase" type="file" style="cursor: pointer; height: 37px; top: 8px;">
+                    </td>
+                </tr>
+                <tr>
+                    <td>说明：</td>
+                    <td colspan="2">
+                        1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
+                        2、Excel表头为：<span style="color: #67D267;">SKN|促销短语(如果为空则清空促销短语)</span><br>
+                        3、第一行为表头内容，第二行开始为正式内容<br>
+                        4、每个文件控制在1000行以内<br>
+                        5、<a href="/ajax/link/productPhrase">下载样例</a>
+                    </td>
+                </tr>
             </table>
             </table>
         </div>
         </div>
     </div>
     </div>

@@ -49,7 +49,7 @@
 
 
     <div class="form-group">
     <div class="form-group">
         <label>促销短语：</label>
         <label>促销短语：</label>
-        <input id="salesPhrase" class="form-control" type="text" value="[[salesPhrase]]" style="display: inline-block;width: 280px;">
+        <input id="salesPhrase" class="form-control" type="text" value="[[salesPhrase]]" style="display: inline-block;width: 280px;" maxlength="12">
     </div>
     </div>
     <!--
     <!--
     <div class="form-group">
     <div class="form-group">

@@ -93,8 +93,8 @@
                         <div class="col-sm-1 control-label">
                         <div class="col-sm-1 control-label">
                             <label>店铺简介:</label>
                             <label>店铺简介:</label>
                         </div>
                         </div>
-                        <div class="col-sm-7">
-                            <script id="edit-shop-intro" type="text/plain" style="width:100%;height:500px;"></script>
+                        <div class="col-sm-8">
+                            <script id="edit-shop-intro" type="text/plain" style="width:89%;height:500px;"></script>
                             <input id="shopIntro" type="hidden" placeholder="店铺简介" value="<%data.shopIntro%>">
                             <input id="shopIntro" type="hidden" placeholder="店铺简介" value="<%data.shopIntro%>">
                         </div>
                         </div>
                     </div>
                     </div>