Merge branch 'dev_2.5_基础网销' into gray

xuhongyun
Commit 8c87399e15b14cf02d96e93b71b70e8f89793080 2 parents ca67f74b 8130c889
Showing 5 changed files with 71 additions and 14 deletions
code/apps/goods/views/netsale/Batch.html
code/apps/goods/views/netsale/Edit.html
code/apps/goods/views/netsale/partials/search-key.html
code/static/js.jquery/common/index.js
code/static/js.jquery/module/goods/partials/editor_recommend.js
--- a/code/apps/goods/views/netsale/Batch.html
View file @8c87399
+++ b/code/apps/goods/views/netsale/Batch.html
View file @8c87399
@@ -14,7 +14,7 @@
                     <td>说明：</td>
                     <td colspan="2">
                         1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
-                        2、Excel表头为：<span style="color: #67D267;">SKN、模块ID（品牌设置：1）、排序值</span><br>
+                        2、Excel表头为：<span style="color: #67D267;">SKN、模块ID（品牌排序：1、店铺排序：5）、排序值</span><br>
                         3、第一行为表头内容，第二行开始为正式内容<br>
                         4、每个文件控制在2500行以内<br>
                         5、<a href="/ajax/link/searchSort">下载样例</a>
--- a/code/apps/goods/views/netsale/Edit.html
View file @8c87399
+++ b/code/apps/goods/views/netsale/Edit.html
View file @8c87399
@@ -18,8 +18,8 @@
                 <%include 'partials/fenmian'%>
                 <%include 'partials/goods-description'%>
                 <%include 'partials/goods-params'%>
-                <%include 'partials/size-info'%>
-                <%include 'partials/goods-sort'%>
+                <!-- <include 'partials/size-info'>
+                <include 'partials/goods-sort'> -->
             </div>
         </div>
@@ -31,12 +31,12 @@
                 <a class="netsale-position" href="javascript:;" name="position9"></a>
                 <a id="editProductName" class="btn btn-default" href="javascript:;" style="position: absolute;left: 40%;top: 20%;">去编辑商品名称</a>
                 <div class="panel-btns" style="display: none;">
-                    <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
+                    <a href="" class="panel-minimize tooltips maximize" data-toggle="tooltip" title=""><i class="fa fa-plus"></i></a>
                 </div>
                 <h2 class="panel-title">上架后补全信息</h2>
             </div>
-            <div class="panel-body">
+            <div class="panel-body" style="display: none;" >
                 <%include 'partials/add-info'%>
                 <%include 'partials/editor-recommend'%>
                 <%include 'partials/model'%>
@@ -61,8 +61,8 @@
                 <li name="position3"><a href="javascript:;"><i class="required-icon"></i>封面设置</a></li>
                 <li name="position4"><a href="javascript:;"><i class="required-icon"></i>商品描述</a></li>
                 <li name="position6"><a href="javascript:;"><i class="required-icon"></i>商品参数</a></li>
-                <li name="position5" data-pos="尺码信息"><a href="javascript:;"><i class="required-icon"></i>尺码信息</a></li>
-                <li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li>
+                <!-- <li name="position5" data-pos="尺码信息"><a href="javascript:;"><i class="required-icon"></i>尺码信息</a></li>
+                <li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li> -->
             </ul>
         </li>
         <li name="position8" data-pos="搜索/标签">
--- a/code/apps/goods/views/netsale/partials/search-key.html
View file @8c87399
+++ b/code/apps/goods/views/netsale/partials/search-key.html
View file @8c87399
@@ -2,12 +2,12 @@
     <div class="panel-heading">
        <a class="netsale-position" href="javascript:;" name="position8"></a>
         <div class="panel-btns" style="display: none;">
-            <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
+            <a href="" class="panel-minimize tooltips maximize" data-toggle="tooltip" title=""><i class="fa fa-plus"></i></a>
         </div>
         <h2 class="panel-title">搜索关键词</h2>
     </div>
-    <div class="panel-body">
+    <div class="panel-body" style="display: none;">
         <div class="form-group">
             <label class="col-sm-1 control-label height40" for="searchKeys">商品关键词</label>
             <div class="col-sm-6">
@@ -23,7 +23,7 @@
             </div>
         </div>
     </div>
-    <div class="panel-footer">
+    <div class="panel-footer" style="display: none;">
         <button class="btn btn-primary" id="save-searchKey">保存</button>
     </div>
 </div>
--- a/code/static/js.jquery/common/index.js
View file @8c87399
+++ b/code/static/js.jquery/common/index.js
View file @8c87399
@@ -69,3 +69,32 @@ $('.shops_id').click(function (){
         }
     })
 });
+
+
+// LocalStorage.setItem("router",);
+$('.panel-heading').hover(function() {
+  $(this).find('.panel-btns').fadeIn('fast');
+}, function() {
+  $(this).find('.panel-btns').fadeOut('fast');
+});
+
+$('.panel .panel-close').click(function() {
+  $(this).closest('.panel').fadeOut(200);
+  return false;
+});
+
+// Minimize Panel
+$('.panel .panel-minimize').click(function() {
+  var t = $(this);
+  var p = t.closest('.panel');
+  if (!$(this).hasClass('maximize')) {
+    p.find('.panel-body, .panel-footer').slideUp(200);
+    t.addClass('maximize');
+    t.find('i').removeClass('fa-minus').addClass('fa-plus');
+  } else {
+    p.find('.panel-body, .panel-footer').slideDown(200);
+    t.removeClass('maximize');
+    t.find('i').removeClass('fa-plus').addClass('fa-minus');
+  }
+  return false;
+});
--- a/code/static/js.jquery/module/goods/partials/editor_recommend.js
View file @8c87399
+++ b/code/static/js.jquery/module/goods/partials/editor_recommend.js
View file @8c87399
@@ -61,7 +61,9 @@ $(document).on("click", "#btn-descriptioner", function () {
 /*小编推荐*/
 var recommendEdit = new common.edit('#recommenderWrap');
-window.UMrecommender = UM.getEditor('edit-recommender');
+window.UMrecommender = UM.getEditor('edit-recommender',{
+        initialFrameWidth: null
+    });
 var recommender = [];
 common.util.__ajax({
     url: '/guang/article/queryArticlesBySKN',
@@ -322,6 +324,7 @@ renderGoodList();
 function changeImgQuality(flag){
     $.each(goodsList,function (index,item){
+        if(!item.goodsImagesList){return true;}
         $.each(item.goodsImagesList, function (_index, _item) {
            if(flag && _item.imageUrl.indexOf('?') == -1){
                 _item.imageUrl = _item.imageUrl + '?imageView2/0/q/75';
@@ -421,10 +424,35 @@ $(document).on('click', '.btn-use-img', function() {
         var data = res.data;
         var imgHtml = '';
         if (res.code == 200 && data.list instanceof Array && data.list[0].pictureBoList instanceof Array) {
-            $.each(data.list[0].pictureBoList, function(i, value) {
+            
+            var picArray = data.list[0].pictureBoList;
+            var skuArray = [];
+
+            $.each(picArray, function(i, value) {
+                if(skuArray.indexOf(value.productSku) == -1 ){
+                    skuArray.push(value.productSku);
+                }
+            });
+
+            var indexTag = 0;
+            $.each(skuArray, function(i, skuItem) {
+                var skuHtml = "<div class = 'skuList' style='border-top:solid black 1px;border-bottom:solid black 1px;padding:8px;'><table><tr>";
+                skuHtml += "<td><div style='display:inline;height:100%'>"+skuItem+"&nbsp;&nbsp;&nbsp;&nbsp;</div></td><td>";
+                $.each(picArray, function(j, picItem) {
+                    if(skuItem == picItem.productSku){
+                        skuHtml += '<div style="display:inline; height:123px; width:125px;margin:5px;text-align: center;line-height:128px" ><a style="display:inline-block"><img class="use-img" src="' + picItem.fileName +'?imageView2/0/w/120/q/75'+ '" alt="" data-i="'+indexTag+'" data-index="' + index + '" style="cursor:pointer;" /></a></div>';
+                        indexTag = indexTag + 1;
+                    }
+                });
+                skuHtml += "</td></tr></table></div>";
+                imgHtml += skuHtml;
+            })
+
+
+            /*$.each(data.list[0].pictureBoList, function(i, value) {
                 imgHtml += '<div style="float:left; border:1px solid gray; height:123px; width:125px;margin:5px;text-align: center;line-height:120px" ><a style="display:inline-block"><img class="use-img" src="' + value.fileName +'?imageView2/0/w/120/q/75'+ '" alt="" data-i="'+i+'" data-index="' + index + '" style="cursor:pointer;" /></a></div>';
-                /*imgHtml += '<a style="margin:0 0 10px 10px"><img class="use-img" src="' + value.fileName + '" alt="" width="100" height="140" data-i="'+i+'" data-index="' + index + '" style="cursor:pointer;" /></a>';*/
-            });        
+                imgHtml += '<a style="margin:0 0 10px 10px"><img class="use-img" src="' + value.fileName + '" alt="" width="100" height="140" data-i="'+i+'" data-index="' + index + '" style="cursor:pointer;" /></a>';
+            }); */      
             uesImgDialog = common.dialog.confirm("调用图片",imgHtml,function(){
                 for(var i in uesImgMap){
                     addFengmian(uesImgIndex, uesImgMap[i]);