sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品分类新增背景色

feat/task1-c-wallet
gongfuxiang 2018-08-06 23:49:29 +08:00
parent 6473f7da31
commit 74e93a92c3
14 changed files with 100 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
service/Application/Admin/Controller/GoodsController.class.php
View File

@ -64,6 +64,9 @@ class GoodsController extends CommonController
// 是否上下架
$this->assign('common_goods_is_shelves_list', L('common_goods_is_shelves_list'));
// 是否首页推荐
$this->assign('common_is_text_list', L('common_is_text_list'));
// 参数
$this->assign('param', $param);
@ -139,6 +142,10 @@ class GoodsController extends CommonController
{
$where['is_shelves'] = intval(I('is_shelves', 0));
}
if(I('is_home_recommended', -1) > -1)
{
$where['is_home_recommended'] = intval(I('is_home_recommended', 0));
}
// 表达式
if(!empty($_REQUEST['time_start']))
@ -281,8 +288,8 @@ class GoodsController extends CommonController
'content_web' => $_POST['content_web'],
'images' => isset($photo['data'][0]) ? $photo['data'][0] : '',
'photo_count' => count($photo['data']),
'is_home_recommended' => intval(I('is_home_recommended')),
];
print_r($_POST);die;
// 添加/编辑
$m = D('Goods');
@ -574,13 +581,13 @@ class GoodsController extends CommonController
}
/**
* [StatusUpdate 状态更新]
* [StatusShelves 上下架状态更新]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2017-01-12T22:23:06+0800
*/
public function StatusUpdate()
public function StatusShelves()
{
// 参数
if(empty($_POST['id']) || !isset($_POST['state']))
@ -596,5 +603,29 @@ class GoodsController extends CommonController
$this->ajaxReturn(L('common_operation_edit_error'), -100);
}
}
/**
* [StatusHomeRecommended 是否首页推荐状态更新]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2017-01-12T22:23:06+0800
*/
public function StatusHomeRecommended()
{
// 参数
if(empty($_POST['id']) || !isset($_POST['state']))
{
$this->ajaxReturn(L('common_param_error'), -1);
}
// 数据更新
if(M('Goods')->where(array('id'=>I('id')))->save(array('is_home_recommended'=>I('state'))))
{
$this->ajaxReturn(L('common_operation_edit_success'));
} else {
$this->ajaxReturn(L('common_operation_edit_error'), -100);
}
}
}
?>

6
service/Application/Admin/Lang/zh-cn/goods.php
View File

@ -47,12 +47,12 @@ return array(
'goods_buy_max_number_tips' => '单次最大数值 100000000, 小于等于0或空则不限',
'goods_buy_max_number_format' => '单次最大购买数量 1~100000000',
'goods_is_deduction_inventory_text' => '是否扣减库存',
'goods_is_deduction_inventory_text' => '扣减库存',
'goods_is_deduction_inventory_tips' => '扣除规则根据后台配置->扣除库存规则而定',
'goods_is_shelves_text' => '是否上下架',
'goods_is_shelves_text' => '上下架',
'goods_is_shelves_tips' => '下架后用户不可见',
'goods_is_home_recommended_text' => '是否首页推荐',
'goods_is_home_recommended_text' => '首页推荐',
'goods_is_home_recommended_tips' => '推荐后在首页展示',
'goods_images_text' => '相册',

2
service/Application/Admin/Lang/zh-cn/goodscategory.php
View File

@ -11,5 +11,7 @@ return array(
// 添加/编辑
'goods_category_add_name' => '分类添加',
'goods_category_edit_name' => '分类编辑',
'goods_category_bg_color' => '背景色',
);
?>

2
service/Application/Admin/View/Default/Answer/Index.html
View File

@ -69,7 +69,7 @@
</td>
<td>{{$v.content}}</td>
<td>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_show'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Answer/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_show']}}"></a>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_show'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Answer/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_show']}}" data-is-update-status="1"></a>
</td>
<td class="am-hide-sm-only">{{$v.reply}}</td>
<td class="am-hide-sm-only">{{$v.add_time}}</td>

2
service/Application/Admin/View/Default/Article/Index.html
View File

@ -66,7 +66,7 @@
<td class="am-hide-sm-only">{{$v.article_category_name}}</td>
<td class="am-hide-sm-only">{{$v.access_count}}</td>
<td>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}"></a>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
</td>
<td class="am-hide-sm-only">{{$v.add_time}}</td>
<td>

2
service/Application/Admin/View/Default/Coupon/Index.html
View File

@ -83,7 +83,7 @@
</if>
</td>
<td class="am-hide-sm-only">
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Coupon/StateUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}"></a>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Coupon/StateUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
</td>
<td>
<span class="am-icon-caret-down c-p" data-am-modal="{target: '#my-popup{{$v.id}}'}"> {{:L('common_see_more_name')}}</span>

12
service/Application/Admin/View/Default/Goods/Index.html
View File

@ -21,6 +21,12 @@
<option value="{{$v.id}}" <if condition="isset($param['is_shelves']) and $param['is_shelves'] eq $v['id']">selected</if>>{{$v.name}}</option>
</foreach>
</select>
<select name="is_home_recommended" class="am-radius c-p m-t-10 m-l-5 param-where">
<option value="-1">{{:L('goods_is_home_recommended_text')}}</option>
<foreach name="common_is_text_list" item="v">
<option value="{{$v.id}}" <if condition="isset($param['is_home_recommended']) and $param['is_home_recommended'] eq $v['id']">selected</if>>{{$v.name}}</option>
</foreach>
</select>
<div class="param-date param-where m-l-5">
<input type="text" name="time_start" class="Wdate am-radius m-t-10" placeholder="{{:L('common_time_start_name')}}" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" <if condition="isset($param['time_start'])">value="{{$param.time_start}}"</if>/>
<span>~</span>
@ -47,7 +53,6 @@
<th>{{:L('goods_is_home_recommended_text')}}</th>
<th class="am-hide-sm-only">{{:L('goods_inventory_text')}}</th>
<th class="am-hide-sm-only">{{:L('goods_model_text')}}</th>
<th class="am-hide-sm-only">{{:L('common_create_time_name')}}</th>
<th>{{:L('common_more_name')}}</th>
<th>{{:L('common_operation_name')}}</th>
</tr>
@ -69,14 +74,13 @@
</if>
</td>
<td>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_shelves'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Goods/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_shelves']}}"></a>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_shelves'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Goods/StatusShelves')}}" data-id="{{$v.id}}" data-state="{{$v['is_shelves']}}" data-is-update-status="1"></a>
</td>
<td>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_home_recommended'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Goods/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_home_recommended']}}"></a>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_home_recommended'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Goods/StatusHomeRecommended')}}" data-id="{{$v.id}}" data-state="{{$v['is_home_recommended']}}" data-is-update-status="0"></a>
</td>
<td class="am-hide-sm-only">{{$v.inventory}} {{$v.inventory_unit}}</td>
<td class="am-hide-sm-only">{{$v.model}}</td>
<td class="am-hide-sm-only">{{$v.add_time}}</td>
<td>
<span class="am-icon-caret-down c-p" data-am-modal="{target: '#my-popup{{$v.id}}'}"> {{:L('common_see_more_name')}}</span>
<div class="am-popup am-radius" id="my-popup{{$v.id}}">

7
service/Application/Admin/View/Default/GoodsCategory/Index.html
View File

@ -29,6 +29,13 @@
<div id="form-images_url-tips" class="m-t-5"></div>
<img src="<if condition="!empty($data['images_url'])">{{$image_host}}{{$data.images_url}}<else />{{$image_host}}/Public/Admin/Default/Images/default-images.png</if>" id="form-img-images_url" class="block m-t-5 am-img-thumbnail am-radius" width="50" height="50" data-default="<if condition="!empty($data['images_url'])">{{$image_host}}{{$data.images_url}}<else />{{$image_host}}/Public/Admin/Default/Images/default-images.png</if>" />
</div>
<div class="am-form-group">
<label>{{:L('goods_category_bg_color')}}</label>
<input type="hidden" name="bg_color" value="" />
<button class="am-btn am-btn-default colorpicker-submit bg-color-tag am-btn-block bk-cr-white t-r" type="button" data-input-tag="button.bg-color-tag" data-color-tag="input[name='bg_color']" data-color-style="background-color">
<img src="__PUBLIC__/Common/Images/colorpicker.png" />
</button>
</div>
<div class="am-form-group">
<label>{{:L('common_name_text')}}</label>
<input type="text" placeholder="{{:L('common_name_text')}}" name="name" minlength="2" maxlength="16" data-validation-message="{{:L('common_name_format')}}" class="am-radius" required />

2
service/Application/Admin/View/Default/Slide/Index.html
View File

@ -84,7 +84,7 @@
</if>
</td>
<td class="am-hide-sm-only">
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Slide/StateUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}"></a>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Slide/StateUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
</td>
<td>{{$v.add_time_text}}</td>
<td class="view-operation">

2
service/Application/Runtime/Temp/8cde93cbd070139d84f31d26f8ea8f4d.php
View File

@ -1,3 +1,3 @@
<?php
//000000000000a:93:{i:41;s:12:"config_index";i:42;s:11:"config_save";i:81;s:10:"site_index";i:103;s:10:"site_index";i:105;s:9:"site_save";i:104;s:9:"sms_index";i:107;s:8:"sms_save";i:199;s:9:"seo_index";i:200;s:8:"seo_save";i:1;s:11:"power_index";i:22;s:11:"admin_index";i:19;s:14:"admin_saveinfo";i:20;s:10:"admin_save";i:21;s:12:"admin_delete";i:4;s:10:"power_role";i:17;s:18:"power_rolesaveinfo";i:18;s:14:"power_rolesave";i:23;s:16:"power_roledelete";i:13;s:11:"power_index";i:15;s:15:"power_powersave";i:16;s:17:"power_powerdelete";i:126;s:10:"user_index";i:127;s:10:"user_index";i:128;s:13:"user_saveinfo";i:129;s:9:"user_save";i:130;s:11:"user_delete";i:146;s:16:"user_excelexport";i:38;s:11:"goods_index";i:39;s:11:"goods_index";i:57;s:14:"goods_saveinfo";i:58;s:10:"goods_save";i:59;s:12:"goods_delete";i:181;s:18:"goods_statusupdate";i:201;s:19:"goodscategory_index";i:202;s:18:"goodscategory_save";i:203;s:20:"goodscategory_delete";i:177;s:11:"order_index";i:178;s:11:"order_index";i:179;s:12:"order_delete";i:180;s:12:"order_cancel";i:218;s:14:"order_delivery";i:219;s:13:"order_collect";i:213;s:12:"answer_index";i:214;s:12:"answer_index";i:215;s:11:"answer_save";i:216;s:13:"answer_delete";i:217;s:19:"answer_statusupdate";i:204;s:13:"article_index";i:205;s:13:"article_index";i:206;s:16:"article_saveinfo";i:207;s:12:"article_save";i:208;s:14:"article_delete";i:209;s:20:"article_statusupdate";i:210;s:21:"articlecategory_index";i:211;s:20:"articlecategory_save";i:212;s:22:"articlecategory_delete";i:162;s:15:"marketing_index";i:163;s:12:"coupon_index";i:164;s:18:"coupon_stateupdate";i:165;s:15:"coupon_saveinfo";i:166;s:11:"coupon_save";i:167;s:11:"coupon_user";i:168;s:13:"coupon_delete";i:169;s:15:"coupon_sendinfo";i:170;s:11:"coupon_send";i:171;s:16:"coupon_userquery";i:182;s:10:"data_index";i:183;s:13:"message_index";i:184;s:14:"message_delete";i:185;s:12:"paylog_index";i:186;s:21:"userintegrallog_index";i:187;s:15:"complaint_index";i:188;s:14:"complaint_save";i:189;s:16:"complaint_delete";i:152;s:15:"resources_index";i:153;s:12:"region_index";i:154;s:11:"region_save";i:155;s:13:"region_delete";i:156;s:13:"express_index";i:157;s:12:"express_save";i:158;s:14:"express_delete";i:172;s:11:"slide_index";i:173;s:14:"slide_saveinfo";i:174;s:10:"slide_save";i:175;s:17:"slide_stateupdate";i:176;s:12:"slide_delete";i:193;s:15:"agreement_index";i:194;s:14:"agreement_save";i:118;s:10:"tool_index";i:119;s:11:"cache_index";i:120;s:16:"cache_siteupdate";i:121;s:20:"cache_templateupdate";i:122;s:18:"cache_moduleupdate";}
//000000000000a:92:{i:41;s:12:"config_index";i:42;s:11:"config_save";i:81;s:10:"site_index";i:103;s:10:"site_index";i:105;s:9:"site_save";i:104;s:9:"sms_index";i:107;s:8:"sms_save";i:199;s:9:"seo_index";i:200;s:8:"seo_save";i:1;s:11:"power_index";i:22;s:11:"admin_index";i:19;s:14:"admin_saveinfo";i:20;s:10:"admin_save";i:21;s:12:"admin_delete";i:4;s:10:"power_role";i:17;s:18:"power_rolesaveinfo";i:18;s:14:"power_rolesave";i:23;s:16:"power_roledelete";i:13;s:11:"power_index";i:15;s:15:"power_powersave";i:16;s:17:"power_powerdelete";i:126;s:10:"user_index";i:127;s:10:"user_index";i:128;s:13:"user_saveinfo";i:129;s:9:"user_save";i:130;s:11:"user_delete";i:146;s:16:"user_excelexport";i:38;s:11:"goods_index";i:39;s:11:"goods_index";i:57;s:14:"goods_saveinfo";i:58;s:10:"goods_save";i:59;s:12:"goods_delete";i:181;s:19:"goods_statusshelves";i:218;s:27:"goods_statushomerecommended";i:201;s:19:"goodscategory_index";i:202;s:18:"goodscategory_save";i:203;s:20:"goodscategory_delete";i:177;s:11:"order_index";i:178;s:11:"order_index";i:179;s:12:"order_delete";i:180;s:12:"order_cancel";i:213;s:12:"answer_index";i:214;s:12:"answer_index";i:215;s:11:"answer_save";i:216;s:13:"answer_delete";i:217;s:19:"answer_statusupdate";i:204;s:13:"article_index";i:205;s:13:"article_index";i:206;s:16:"article_saveinfo";i:207;s:12:"article_save";i:208;s:14:"article_delete";i:209;s:20:"article_statusupdate";i:210;s:21:"articlecategory_index";i:211;s:20:"articlecategory_save";i:212;s:22:"articlecategory_delete";i:162;s:15:"marketing_index";i:163;s:12:"coupon_index";i:164;s:18:"coupon_stateupdate";i:165;s:15:"coupon_saveinfo";i:166;s:11:"coupon_save";i:167;s:11:"coupon_user";i:168;s:13:"coupon_delete";i:169;s:15:"coupon_sendinfo";i:170;s:11:"coupon_send";i:171;s:16:"coupon_userquery";i:182;s:10:"data_index";i:183;s:13:"message_index";i:184;s:14:"message_delete";i:185;s:12:"paylog_index";i:186;s:21:"userintegrallog_index";i:187;s:15:"complaint_index";i:188;s:14:"complaint_save";i:189;s:16:"complaint_delete";i:152;s:15:"resources_index";i:153;s:12:"region_index";i:154;s:11:"region_save";i:155;s:13:"region_delete";i:156;s:13:"express_index";i:157;s:12:"express_save";i:158;s:14:"express_delete";i:172;s:11:"slide_index";i:173;s:14:"slide_saveinfo";i:174;s:10:"slide_save";i:175;s:17:"slide_stateupdate";i:176;s:12:"slide_delete";i:193;s:15:"agreement_index";i:194;s:14:"agreement_save";i:118;s:10:"tool_index";i:119;s:11:"cache_index";i:120;s:16:"cache_siteupdate";i:121;s:20:"cache_templateupdate";i:122;s:18:"cache_moduleupdate";}
?>

2
service/Application/Runtime/Temp/a58f8070835be94249ea77f3601c6647.php
View File

File diff suppressed because one or more lines are too long

11
service/Public/Admin/Default/Css/GoodsCategory.css Normal file
View File

@ -0,0 +1,11 @@
.colorpicker-submit:hover, .colorpicker-submit:active, .colorpicker-submit:focus {
background-color: #fff;
}
.colorpicker-submit:active {
background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15);
box-shadow: inset 0 3px 5px rgba(255, 255, 255, 0.15);
}
.colorpicker-submit img {
margin-right: 10px;
}

8
service/Public/Common/Css/Common.css
View File

@ -38,6 +38,7 @@ legend {padding-bottom:0.2rem !important; margin-bottom: 1rem; }
select {height:32px !important;}
.bk-cr-gray {background:#f3f3f3 !important;}
.bk-cr-ffd {background:#ffd !important;}
.bk-cr-white {background-color: #fff;}
.t-c {text-align:center;}
.t-l {text-align:left;}
.t-r {text-align:right;}
@ -163,4 +164,11 @@ input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single
background-color: #ffeee1;
border-color: #f9e4d3;
color: #f37b1d;
}
/**
* 颜色选择插件
*/
#colorpanel {
z-index: 10000;
}

29
service/Public/Common/Js/Common.js
View File

@ -103,11 +103,17 @@ function GetFormVal(element)
// input 复选框checkboox
tmp_all = [];
temp_field = '';
i = 0;
$(element).find('input[type="checkbox"]').each(function(key, tmp)
{
if(tmp.name != undefined && tmp.name != '')
{
// name不一样的时候初始化索引值
if(temp_field != tmp.name)
{
i = 0;
}
if($(this).is(':checked'))
{
if(tmp_all[tmp.name] == undefined) tmp_all[tmp.name] = [];
@ -643,6 +649,7 @@ $(function()
var id = $tag.data('id');
var state = ($tag.data('state') == 1) ? 0 : 1;
var url = $tag.data('url');
var is_update_status = $tag.data('is-update-status') || 0;
if(id == undefined || url == undefined)
{
Prompt('参数配置有误');
@ -667,16 +674,22 @@ $(function()
{
$tag.removeClass('am-success');
$tag.addClass('am-default');
if($('#data-list-'+id).length > 0)
if(is_update_status == 1)
{
$('#data-list-'+id).addClass('am-active');
if($('#data-list-'+id).length > 0)
{
$('#data-list-'+id).addClass('am-active');
}
}
} else {
$tag.removeClass('am-default');
$tag.addClass('am-success');
if($('#data-list-'+id).length > 0)
if(is_update_status == 1)
{
$('#data-list-'+id).removeClass('am-active');
if($('#data-list-'+id).length > 0)
{
$('#data-list-'+id).removeClass('am-active');
}
}
}
$tag.data('state', state);
@ -972,8 +985,6 @@ $(function()
}
address += $('#form-address').val();
console.log(address);
var map = new BMap.Map("map", {enableMapClick:false});
var point = new BMap.Point(116.331398,39.897445);
map.centerAndZoom(point,12);
@ -1056,12 +1067,14 @@ $(function()
fillcolor:true,
success:function(o, color)
{
$($('.colorpicker-submit').data('input-tag')).css('color', color);
var style = $('.colorpicker-submit').data('color-style') || 'color';
$($('.colorpicker-submit').data('input-tag')).css(style, color);
$($('.colorpicker-submit').data('color-tag')).val(color);
},
reset:function(o)
{
$($('.colorpicker-submit').data('input-tag')).css('color', '');
var style = $('.colorpicker-submit').data('color-style') || 'color';
$($('.colorpicker-submit').data('input-tag')).css(style, '');
$($('.colorpicker-submit').data('color-tag')).val('');
}
});