Merge branch 'bonus_manager' of 121.43.114.153:/home/git/repositories/shopnc into bonus_manager

admin/templates/default/css/skin_0.css

@@ -1653,7 +1653,7 @@ td.trigger i:hover { color: #27A9E3;}
 .mb-item-edit-content .home3 .item { font-size: 12px; vertical-align: top; letter-spacing: normal; display: inline-block; *display: inline/*IE7*/; width: 240px; *zoom:1/*IE7*/;}
 .mb-item-edit-content .home3 img { max-width: 200px;max-height: 200px;}
 /*块模型布局G-编辑*/
-.mb-item-edit-content .home6 .item {font-size: 12px; vertical-align: top; letter-spacing: normal; *display: inline/*IE7*/; *zoom:1/*IE7*/;display: inline-block;width: 96px;}
+.mb-item-edit-content .home6 .item {font-size: 12px; vertical-align: top; letter-spacing: normal; *display: inline/*IE7*/; *zoom:1/*IE7*/;display: inline-block;width: 150px;}
 .mb-item-edit-content .home6 img { width:100%;max-width: 200px;}
 /* 商品块模型-编辑*/
 .mb-item-edit-content .goods-list { font-size: 12px; *word-spacing: -1px/*IE6、7*/; display: inline-block; width: 500px;}
@@ -1681,7 +1681,7 @@ td.trigger i:hover { color: #27A9E3;}
 }
 /* 商品块模型-单行-编辑*/
 .mb-item-edit-content .home7 { font-size:12px; *word-spacing: -1px/*IE6、7*/; display: inline-block; width: 500px;}
-.mb-item-edit-content .home7 .item { font-size: 12px; vertical-align: top; letter-spacing: normal; display: inline-block; *display: inline/*IE7*/; width: 220px; margin: 0 0 14px 14px; *zoom:1/*IE7*/;}
+.mb-item-edit-content .home7 .item { font-size: 12px; vertical-align: top; letter-spacing: normal; display: inline-block; *display: inline/*IE7*/; width: 150px; *zoom:1/*IE7*/;}
 .mb-item-edit-content .home7 .item img {width: 100%;}
 .mb-item-edit-content .home7 .goods-pic { line-height: 0; background-color: #FFF; text-align: center; vertical-align: middle; display: table-cell; *display: block; width: 220px; height: 220px; overflow: hidden;}
 .mb-item-edit-content .home7 .goods-pic img { max-width: 220px; max-height: 220px; margin-top:expression(220-this.height/2);}

admin/templates/default/mb_special_item.list.php

@@ -47,7 +47,13 @@
                     <?php foreach ($output['list'] as $key => $value) { ?>
                         <div nctype="special_item"
                              class="special-item <?php echo $value['item_type']; ?> <?php echo $value['usable_class']; ?>"
-                             data-item-id="<?php echo $value['item_id']; ?>">
+                             data-item-id="<?php echo $value['item_id']; ?>"
+                             style="background:<?php
+                                $bg_data = "";
+                                if(empty($value['bg_image'])){$bg_data = $value['bg_data'];}
+                                else{$bg_data ="url('".UPLOAD_SITE_URL.'/mobile/special/s'.$value['special_id'].'/'.$value['bg_image']."');background-size:100%;";}
+                                echo $bg_data;
+                             ?>">
                             <div class="item_type">
                                 <?php
                                     echo $output['module_list'][$value['item_type']]['desc'];