add goods_top and resvered to block item

admin/templates/default/mb_special_item.edit.php

@@ -67,7 +67,6 @@
             <span>
       <input id="btn_upload_image" type="file" name="special_image">
       </span> <span id="dialog_image_desc" class="dialog-image-desc"></span>
-
             <h4 class="dialog-handle-title">标题：</h4>
             <input id="dialog_item_image_title" type="text" class="txt w200 marginright marginbot vatop"><br/>
 
@@ -78,6 +77,7 @@
                     <option value="image">图片</option>
                     <option value="goods">商品(红包价 + 专柜价)</option>
                     <option value="goods_simple">商品(红包价)</option>
+                    <option value="goods_top">商品榜单</option>
                     <option value="webview">网络页面</option>
                     <option value="video">外部视频链接</option>
                 </select>
@@ -103,6 +103,8 @@
                 <span id="dialog_item_image_desc" class="dialog-image-desc"></span>
             </div>
         </div>
+        <h4 class="dialog-handle-title">保留数据：</h4>
+        <input id="dialog_item_image_reserved" type="text" class="txt w200 marginright marginbot vatop"><br/>
         <a id="btn_save_item" class="btn" href="javascript:;"><span>保存</span></a>
     </form>
 </div>
@@ -116,6 +118,7 @@
         <input nctype="image_type" name="item_data[item][<%=image_name%>][type]" type="hidden" value="<%=image_type%>">
         <input nctype="image_data" name="item_data[item][<%=image_name%>][data]" type="hidden" value="<%=image_data%>">
         <input nctype="image_title" name="item_data[item][<%=image_name%>][title]" type="hidden" value="<%=image_title%>">
+        <input nctype="image_reserved" name="item_data[item][<%=image_name%>][reserved]" type="hidden" value="<%=image_reserved%>">
         <a nctype="btn_del_item_image" href="javascript:;" class="a1"><i class="icon-trash"></i>删除</a>
         <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>
     </div>
@@ -135,6 +138,8 @@
         var $current_image = null;
         var $current_image_name = null;
         var $current_image_title = null;
+        var $current_image_reserved = null;
+
         var $current_image_show_type = null;
         var $current_image_show_data = null;
         var $current_image_type = null;
@@ -210,6 +215,7 @@
             $current_image_type = $item_image.find('[nctype="image_type"]');
             $current_image_data = $item_image.find('[nctype="image_data"]');
             $current_image_title = $item_image.find('[nctype="image_title"]');
+            $current_image_reserved = $item_image.find('[nctype="image_reserved"]');
 
             $('#dialog_item_image').attr('src', $current_image.attr('src'));
             $('#dialog_item_image_name').val($current_image_name.val());
@@ -220,6 +226,7 @@
             $('#dialog_item_image_type').val($current_image_type.val());
             $('#dialog_item_image_data').val($current_image_data.val());
             $('#dialog_item_image_title').val($current_image_title.val());
+            $('#dialog_item_image_reserved').val($current_image_reserved.val());
 
             $('#dialog_image_desc').text('推荐图片尺寸' + $(this).attr('data-desc'));
             $('#dialog_type').val('edit');
@@ -259,7 +266,6 @@
             $('#dialog_item_show_data').val(goods_id);
             $('#dialog_item_image_type').val('goods');
             $('#dialog_item_image_data').val(goods_id);
-
             $('#dialog_item_image_title').val(goods_name);
 
             change_image_type_desc($('#dialog_item_image_type').val());
@@ -332,16 +338,24 @@
             }
         });
 
-        $('#btn_save_item').on('click', function () {
+        $('#btn_save_item').on('click', function ()
+        {
+            var item_type=$('input[name="item_type"]').val();
             var type = $('#dialog_type').val();
             if (type == 'edit') {
                 edit_item_image_save();
-            } else {
+            }
+            else
+            {
                 if ($dialog_item_image_name.val() == '') {
                     showError('请上传图片');
                     return false;
                 }
-                add_item_image_save();
+                if(item_type == 'home1') {
+                    edit_item_image_save();
+                } else {
+                    add_item_image_save();
+                }
             }
             $('#dialog_item_edit_image').hide();
         });
@@ -370,6 +384,7 @@
             $current_image_type.val($('#dialog_item_image_type').val());
             $current_image_data.val($('#dialog_item_image_data').val());
             $current_image_title.val($('#dialog_item_image_title').val());
+            $current_image_reserved.val($('#dialog_item_image_reserved').val());
         }
 
         function edit_bg_image_save() {
@@ -395,6 +410,7 @@
             item.image_type = $('#dialog_item_image_type').val();
             item.image_data = $('#dialog_item_image_data').val();
             item.image_title = $('#dialog_item_image_title').val();
+            item.image_reserved = $('#dialog_item_image_reserved').val();
             var $templateObj = template.render('item_image_template', item);
             $current_content.append($templateObj);
         }

admin/templates/default/mb_special_item.module_adv_list.php

@@ -64,6 +64,7 @@
                         <input nctype="image_type" name="item_data[item][<?php echo $item_key; ?>][type]" type="hidden" value="<?php echo $item_value['type']; ?>">
                         <input nctype="image_data" name="item_data[item][<?php echo $item_key; ?>][data]" type="hidden" value="<?php echo $item_value['data']; ?>">
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
+                        <input nctype="image_reserved" name="item_data[item][<?php echo $item_key; ?>][reserved]" type="hidden" value="<?php echo $item_value['reserved']; ?>">
                         <div style="color: red;float: left;">
                             <?php
                                 $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);

admin/templates/default/mb_special_item.module_goods.php

@@ -74,6 +74,8 @@
                         <input nctype="image_type" name="item_data[item][<?php echo $item_key; ?>][type]" type="hidden" value="<?php echo $item_value['type']; ?>">
                         <input nctype="image_data" name="item_data[item][<?php echo $item_key; ?>][data]" type="hidden" value="<?php echo $item_value['data']; ?>">
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
+                        <input nctype="image_reserved" name="item_data[item][<?php echo $item_key; ?>][reserved]" type="hidden" value="<?php echo $item_value['reserved']; ?>">
+
                         <div style="color: red;float: left;">
                             <?php
                                 $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);

admin/templates/default/mb_special_item.module_home1.php

@@ -70,6 +70,8 @@
                 <input nctype="image_type" name="item_data[type]" type="hidden" value="<?php echo $item_data['type']; ?>">
                 <input nctype="image_data" name="item_data[data]" type="hidden" value="<?php echo $item_data['data']; ?>">
                 <input nctype="image_title" name="item_data[title]" type="hidden" value="<?php echo $item_data['title']; ?>">
+                <input nctype="image_reserved" name="item_data[reserved]" type="hidden" value="<?php echo $item_data['reserved']; ?>">
+
                 <div style="color: red;float: left;">
                     <?php
                     $ret = @getimagesize(getMbSpecialImageUrl($item_data['image']),$info);
@@ -83,7 +85,27 @@
                     ?>
                 </div>
                 <a nctype="btn_edit_item_image" data-desc="640*260" href="javascript:;"><i class="icon-edit"></i>编辑</a>
+                <a nctype="btn_del_item_image" href="javascript:;" class="a1"><i class="icon-trash"></i>删除</a>
             <?php } ?>
         </div>
     </div>
+    <?php if ($item_edit_flag) { ?>
+        <a nctype="btn_add_item_image" class="btn-add" data-desc="640*240" href="javascript:;">添加新的图片</a>
+    <?php } ?>
 </div>
+
+<?php if ($item_edit_flag) { ?>
+    <div class="search-goods" style="position: absolute;left: 500px;top: 220px;">
+        <h3>选择商品添加</h3>
+        <h5>商品关键字：</h5>
+        <label>
+            类型：
+            <select name="search_type" id="search_type">
+                <option value="keyword">关键字</option>
+            </select>
+        </label>
+        <input id="txt_goods_name" type="text" class="txt w200" name="">
+        <a id="btn_mb_special_goods_search" class="btn-search" href="javascript:;" style="vertical-align: top; margin-left: 5px;" title="搜索"></a>
+        <div id="mb_special_goods_list"></div>
+    </div>
+<?php } ?>

admin/templates/default/mb_special_item.module_home3.php

@@ -74,6 +74,8 @@
                         <input nctype="image_type" name="item_data[item][<?php echo $item_key; ?>][type]" type="hidden" value="<?php echo $item_value['type']; ?>">
                         <input nctype="image_data" name="item_data[item][<?php echo $item_key; ?>][data]" type="hidden" value="<?php echo $item_value['data']; ?>">
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
+                        <input nctype="image_reserved" name="item_data[item][<?php echo $item_key; ?>][reserved]" type="hidden" value="<?php echo $item_value['reserved']; ?>">
+
                         <div style="color: red;float: left;">
                             <?php
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);

admin/templates/default/mb_special_item.module_home5.php

@@ -71,6 +71,8 @@
                         <input nctype="image_type" name="item_data[item][<?php echo $item_key; ?>][type]" type="hidden" value="<?php echo $item_value['type']; ?>">
                         <input nctype="image_data" name="item_data[item][<?php echo $item_key; ?>][data]" type="hidden" value="<?php echo $item_value['data']; ?>">
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
+                        <input nctype="image_reserved" name="item_data[item][<?php echo $item_key; ?>][reserved]" type="hidden" value="<?php echo $item_value['reserved']; ?>">
+
                         <div style="color: red;float: left;">
                             <?php
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);

admin/templates/default/mb_special_item.module_home6.php

@@ -74,6 +74,8 @@
                         <input nctype="image_type" name="item_data[item][<?php echo $item_key; ?>][type]" type="hidden" value="<?php echo $item_value['type']; ?>">
                         <input nctype="image_data" name="item_data[item][<?php echo $item_key; ?>][data]" type="hidden" value="<?php echo $item_value['data']; ?>">
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
+                        <input nctype="image_reserved" name="item_data[item][<?php echo $item_key; ?>][reserved]" type="hidden" value="<?php echo $item_value['reserved']; ?>">
+
                         <div style="color: red;float: left;">
                             <?php
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);

admin/templates/default/mb_special_item.module_home7.php

@@ -75,6 +75,8 @@
                         <input nctype="image_type" name="item_data[item][<?php echo $item_key; ?>][type]" type="hidden" value="<?php echo $item_value['type']; ?>">
                         <input nctype="image_data" name="item_data[item][<?php echo $item_key; ?>][data]" type="hidden" value="<?php echo $item_value['data']; ?>">
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
+                        <input nctype="image_reserved" name="item_data[item][<?php echo $item_key; ?>][reserved]" type="hidden" value="<?php echo $item_value['reserved']; ?>">
+
                         <div style="color: red;float: left;">
                             <?php
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);

helper/special/block_filter.php

@@ -46,6 +46,7 @@ class block_filter
         }
 
         $show_type = $this->mItems['show_type'];
+        $show_data = $this->mItems['show_data'];
         $this->calc_show($this->mItems['type'],$this->mItems['data'],$this->mItems['image'],$show_type,$show_data);
         $this->mItems['show_type'] = $show_type;
         $this->mItems['show_data'] = $show_data;
@@ -57,6 +58,7 @@ class block_filter
         if(true)
         {
             $show_type = $this->mItems['rectangle1_show_type'];
+            $show_data = $this->mItems['rectangle1_show_data'];
             $this->calc_show($this->mItems['rectangle1_type'],$this->mItems['rectangle1_data'],$this->mItems['rectangle1_image'],$show_type,$show_data);
             $this->mItems['rectangle1_show_type'] = $show_type;
             $this->mItems['rectangle1_show_data'] = $show_data;
@@ -65,6 +67,7 @@ class block_filter
         if(true)
         {
             $show_type = $this->mItems['rectangle2_show_type'];
+            $show_data = $this->mItems['rectangle2_show_data'];
             $this->calc_show($this->mItems['rectangle2_type'],$this->mItems['rectangle2_data'],$this->mItems['rectangle2_image'],$show_type,$show_data);
             $this->mItems['rectangle2_show_type'] = $show_type;
             $this->mItems['rectangle2_show_data'] = $show_data;
@@ -72,6 +75,7 @@ class block_filter
         if(true)
         {
             $show_type = $this->mItems['square_show_type'];
+            $show_data = $this->mItems['square_show_data'];
             $this->calc_show($this->mItems['square_type'],$this->mItems['square_data'],$this->mItems['square_image'],$show_type,$show_data);
             $this->mItems['square_show_type'] = $show_type;
             $this->mItems['square_show_data'] = $show_data;
@@ -120,6 +124,7 @@ class block_filter
             }
 
             $show_type = $item['show_type'];
+            $show_data = $item['show_data'];
             $this->calc_show($item['type'],$item['data'],$item['image'],$show_type,$show_data);
             $item['show_type'] = $show_type;
             $item['show_data'] = $show_data;

helper/special/upgrade_helper.php

@@ -69,9 +69,13 @@ class upgrade_helper extends block_filter
             $val['data'] = $item['goods_id'];
             if($this->mType == 'goods') {
                 $val['show_type'] = 'goods';
-            } else {
+            }
+            elseif($this->mType == 'goods_simple') {
                 $val['show_type'] = 'goods_simple';
             }
+            else {
+                $val['show_type'] = 'goods_top';
+            }
             $val['show_data'] = $val['data'];
             $result[$image] = $val;
         }

helper/special_helper.php

@@ -170,7 +170,6 @@ class special_formater
             $items[] = $item;
 
             $block['items'] = $items;
-
             $blocks[] = $block;
         }
 
@@ -298,7 +297,6 @@ class special_formater
             $item['type'] = "goods";
             $item['data'] = strval($goods_id);
             $item['title'] = $summary['goods_mobile_name'];
-
             $result['items'][] = $item;
         }
 
@@ -513,7 +511,7 @@ class special_formater
         $item['data']  = $val['data'];
         $item['show_type']  = $val['show_type'];
         $item['show_data']  = $val['show_data'];
-
+        $item['reserved']   = $this->safe_string($val['reserved']);
         $item['title']  = $this->safe_string($val['title']);
         $scale = self::scale($item['image']);
 
@@ -541,6 +539,7 @@ class special_formater
             $item['show_type']  = $val['square_show_type'];
             $item['show_data']  = $val['square_show_data'];
             $item['title'] =  $this->safe_string($val['square_title']);
+            $item['reserved']  = $this->safe_string($val['square_reserved']);
             $items[] = $item;
         }
 
@@ -551,6 +550,8 @@ class special_formater
             $item['show_type']  = $val['rectangle1_show_type'];
             $item['show_data']  = $val['rectangle1_show_data'];
             $item['title'] = $this->safe_string($val['rectangle1_title']);
+            $item['reserved']  = $this->safe_string($val['rectangle1_reserved']);
+
             $items[] = $item;
             $scale = self::scale($item['image']);
         }
@@ -561,6 +562,8 @@ class special_formater
             $item['show_type']  = $val['rectangle2_show_type'];
             $item['show_data']  = $val['rectangle2_show_data'];
             $item['title'] = $this->safe_string($val['rectangle2_title']);
+            $item['reserved']  = $this->safe_string($val['rectangle2_reserved']);
+
             $items[] = $item;
         }
 
@@ -591,6 +594,8 @@ class special_formater
             $item['show_type']  = $val['rectangle1_show_type'];
             $item['show_data']  = $val['rectangle1_show_data'];
             $item['title'] = $this->safe_string($val['rectangle1_title']);
+            $item['reserved']  = $this->safe_string($val['rectangle1_reserved']);
+
             $items[] = $item;
         }
         {
@@ -600,6 +605,7 @@ class special_formater
             $item['show_type']  = $val['rectangle2_show_type'];
             $item['show_data']  = $val['rectangle2_show_data'];
             $item['title'] = $this->safe_string($val['rectangle2_title']);
+            $item['reserved']  = $this->safe_string($val['rectangle2_reserved']);
 
             $scale = self::scale($item['image']);
             $items[] = $item;
@@ -611,6 +617,8 @@ class special_formater
             $item['show_type']  = $val['square_show_type'];
             $item['show_data']  = $val['square_show_data'];
             $item['title'] = $this->safe_string($val['square_title']);
+            $item['reserved']  = $this->safe_string($val['square_reserved']);
+
             $items[] = $item;
         }