增加品牌国家名称显示

admin/control/brand.php

@@ -74,6 +74,7 @@ class brandControl extends SystemControl{
 			}else {
 				$insert_array = array();
 				$insert_array['brand_name'] = trim($_POST['brand_name']);
+				$insert_array['brand_country'] = trim($_POST['brand_country']);
 				$insert_array['brand_initial'] = strtoupper($_POST['brand_initial']);
 				$insert_array['class_id']	= $_POST['class_id'];
 				$insert_array['brand_class'] = trim($_POST['brand_class']);
@@ -131,7 +132,8 @@ class brandControl extends SystemControl{
 				$where['brand_id'] = intval($_POST['brand_id']);
 				$update_array = array();
 				$update_array['brand_name'] = trim($_POST['brand_name']);
-				$update_array['brand_initial'] = strtoupper($_POST['brand_initial']);
+                $update_array['brand_country'] = trim($_POST['brand_country']);
+                $update_array['brand_initial'] = strtoupper($_POST['brand_initial']);
 				$update_array['class_id']	= $_POST['class_id'];
 				$update_array['brand_class'] = trim($_POST['brand_class']);
 				if (!empty($_POST['brand_pic'])){

admin/language/zh/brand.php

@@ -9,6 +9,10 @@ $lang['brand_index_name']		= '品牌名稱';
 $lang['brand_index_class']		= '所屬分類';
 $lang['brand_index_class_tips']	= '選擇分類，可關聯大分類或更具體的下級分類。';
 $lang['brand_index_pic_sign']	= '品牌圖片標識';
+$lang['brand_index_mobile_pic_sign'] = '品牌圖片手机端標識';
+$lang['brand_index_mobile_pic_sign'] = '手机端標識';
+$lang['brand_index_country'] = '国家';
+
 $lang['brand_index_help1']		= '當店主添加商品時可選擇商品品牌，用戶可根據品牌查詢商品列表';
 $lang['brand_index_help2']		= '被推薦品牌，將在前台品牌推薦模組處顯示';
 $lang['brand_index_help3']		= '在品牌列表頁面，品牌將按類別分組，即具有相同類別的品牌為一組，品牌類別與品牌分類無聯繫';

admin/language/zh_cn/brand.php

@@ -11,6 +11,8 @@ $lang['brand_index_class_tips']	= '选择分类，可关联大分类或更具体
 $lang['brand_index_upload_tips']= '品牌LOGO尺寸要求宽度为150像素，高度为50像素、比例为3:1的图片；';
 $lang['brand_index_recommend_tips']	= '选择被推荐的图片将在所有品牌列表页“推荐品牌”位置展现。';
 $lang['brand_index_pic_sign']	= '品牌图片标识';
+$lang['brand_index_mobile_pic_sign']	= '手机端标识';
+$lang['brand_index_country']    = '国家';
 $lang['brand_index_help1']		= '当店主添加商品时可选择商品品牌，用户可根据品牌查询商品列表';
 $lang['brand_index_help2']		= '被推荐品牌，将在前台品牌推荐模块处显示';
 $lang['brand_index_help3']		= '在品牌列表页面，品牌将按类别分组，即具有相同类别的品牌为一组，品牌类别与品牌分类无联系';

admin/templates/default/brand.edit.php

@@ -26,6 +26,13 @@
           <td class="vatop tips"></td>
         </tr>
         <tr class="noborder">
+            <td colspan="2" class="required"><label class="validation"><?php echo $lang['brand_index_country'];?>:</label></td>
+        </tr>
+        <tr class="noborder">
+            <td class="vatop rowform"><input type="text" value="<?php echo $output['brand_array']['brand_country']?>" name="brand_country" id="brand_country" class="txt"></td>
+            <td class="vatop tips"></td>
+        </tr>
+        <tr class="noborder">
           <td colspan="2" class="required"><label class="validation">名称首字母:</label></td>
         </tr>
         <tr class="noborder">
@@ -55,17 +62,17 @@
           <td class="vatop tips"><?php echo $lang['brand_index_class_tips'];?></td>
         </tr>
         <tr>
-          <td colspan="2" class="required"><?php echo $lang['brand_index_pic_sign'];?>: </td>
+            <td colspan="2" class="required"><?php echo $lang['brand_index_pic_sign'];?>: </td>
         </tr>
         <tr class="noborder">
-          <td class="vatop rowform"><span class="type-file-show"> <img class="show_image" src="<?php echo ADMIN_TEMPLATES_URL;?>/images/preview.png">
+            <td class="vatop rowform"><span class="type-file-show"> <img class="show_image" src="<?php echo ADMIN_TEMPLATES_URL;?>/images/preview.png">
             <div class="type-file-preview" style="display: none;"><img id="view_img" src="<?php echo UPLOAD_SITE_URL.'/'.ATTACH_BRAND.'/'.$output['brand_array']['brand_pic']; ?>"></div>
             </span> <span class="type-file-box">
             <input type='text' name='brand_pic' id='brand_pic' class='type-file-text' />
             <input type='button' name='button' id='button' value='' class='type-file-button' />
             <input name="_pic" type="file" class="type-file-file" id="_pic" size="30" hidefocus="true" />
             </span></td>
-          <td class="vatop tips"><?php echo $lang['brand_index_upload_tips'].$lang['brand_add_support_type'];?>gif,jpg,png</td>
+            <td class="vatop tips"><?php echo $lang['brand_index_upload_tips'].$lang['brand_add_support_type'];?>gif,jpg,png</td>
         </tr>
         <tr>
           <td colspan="2" class="required">展示方式: </td>

admin/templates/default/brand.index.php

@@ -58,7 +58,9 @@
           <th class="w270"><?php echo $lang['brand_index_name'];?></th>
           <th class="w150"><?php echo $lang['brand_index_class'];?></th>
           <th><?php echo $lang['brand_index_pic_sign'];?></th>
-          <th class="align-center">展示方式</th>
+          <th><?php echo $lang['brand_index_mobile_pic_sign'];?></th>
+          <th><?php echo $lang['brand_index_country'];?></th>
+            <th class="align-center">展示方式</th>
           <th class="align-center"><?php echo $lang['nc_recommend'];?></th>
           <th class="w72 align-center"><?php echo $lang['nc_handle'];?></th>
         </tr>
@@ -72,7 +74,9 @@
           <td class="name"><span class=" editable" nc_type="inline_edit" fieldname="brand_name" ajax_branch='brand_name' fieldid="<?php echo $v['brand_id']?>" required="1"  title="<?php echo $lang['nc_editable'];?>"><?php echo $v['brand_name']?></span></td>
           <td class="class"><?php echo $v['brand_class']?></td>
           <td class="picture"><div class="brand-picture"><img src="<?php echo brandImage($v['brand_pic']);?>"/></div></td>
-          <td class="align-center"><?php echo $v['show_type']==1?'文字':'图片'; ?></td>
+          <td class="picture"><div class="brand-picture"><img src="<?php echo brandLogo($v['brand_logo']);?>"/></div></td>
+            <td class="class"><?php echo $v['brand_country']?></td>
+            <td class="align-center"><?php echo $v['show_type']==1?'文字':'图片'; ?></td>
           <td class="align-center yes-onoff"><?php if($v['brand_recommend'] == '0'){ ?>
             <a href="JavaScript:void(0);" class=" disabled" ajax_branch='brand_recommend' nc_type="inline_edit" fieldname="brand_recommend" fieldid="<?php echo $v['brand_id']?>" fieldvalue="0" title="<?php echo $lang['nc_editable'];?>"><img src="<?php echo ADMIN_TEMPLATES_URL;?>/images/transparent.gif"></a>
             <?php }else{ ?>

core/framework/function/goods.php

@@ -191,6 +191,14 @@ function brandImage($image_name = '') {
     return UPLOAD_SITE_URL.'/'.ATTACH_COMMON.'/default_brand_image.gif';
 }
 
+function brandLogo($image_name = '') {
+    if ($image_name != '') {
+        return UPLOAD_SITE_URL . $image_name;
+    }
+    //todo 需要配一个默认的图标
+    return UPLOAD_SITE_URL.'/'.ATTACH_COMMON.'/default_brand_image.gif';
+}
+
 /**
 * 取得订单状态文字输出形式
 *