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

轮播新增背景色

feat/task1-c-wallet
devil_gong 2018-08-07 17:17:01 +08:00
parent 927964eab1
commit 593bb74b7c
10 changed files with 843 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/Application/Admin/Controller/SlideController.class.php
View File

@ -269,6 +269,7 @@ class SlideController extends CommonController
$m->images_url = I('images_url');
$m->platform = I('platform');
$m->is_enable = intval(I('is_enable'));
$m->bg_color = I('bg_color');
$m->add_time = time();
// 数据添加
@ -305,6 +306,7 @@ class SlideController extends CommonController
$m->images_url = I('images_url');
$m->platform = I('platform');
$m->is_enable = intval(I('is_enable'));
$m->bg_color = I('bg_color');
$m->upd_time = time();
// 更新数据库

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

@ -13,6 +13,5 @@ return array(
'goods_category_edit_name' => '分类编辑',
'goods_category_big_images_text' => '大图片',
'goods_category_bg_color' => '背景色',
);
?>

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

@ -40,7 +40,7 @@
<img src="{{$image_host}}/Public/Admin/Default/Images/default-images.png" id="form-img-big_images" class="block m-t-5 am-img-thumbnail am-radius" width="50" height="50" data-default="{{$image_host}}/Public/Admin/Default/Images/default-images.png" />
</div>
<div class="am-form-group">
<label>{{:L('goods_category_bg_color')}}</label>
<label>{{:L('common_background_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" />

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

@ -68,7 +68,7 @@
<tr id="data-list-{{$v.id}}" <if condition="$v['is_enable'] eq 0">class="am-active"</if>>
<td>{{$v.name}}</td>
<td>{{$v.platform_text}}</td>
<td>
<td <if condition="!empty($v['bg_color'])">style="background-color:{{$v.bg_color}};"</if>>
<if condition="!empty($v['images_url'])">
<a href="{{$v['images_url']}}" target="_blank">
<img src="{{$v['images_url']}}" class="am-img-thumbnail am-radius" width="100" height="60" />

11
service/Application/Admin/View/Default/Slide/SaveInfo.html
View File

@ -46,14 +46,21 @@
<label class="block">{{:L('slide_images_url_text')}}</label>
<button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
<i class="am-icon-cloud-upload"></i> {{:L('common_select_images_text')}}</button>
<input type="text" name="images_url" class="am-radius js-choice-one original-images-url" data-choice-one-to=".images-file-event" <notempty name="data"> value="{{$data.images_url}}"</notempty>" data-validation-message="{{:L('common_select_images_tips')}}" readonly="readonly" <notempty name="data"> value="{{$data.images_url}}"</notempty>" required />
<input type="text" name="images_url" class="am-radius js-choice-one original-images-url" data-choice-one-to=".images-file-event" <notempty name="data"> value="{{$data.images_url}}"</notempty>" data-validation-message="{{:L('common_select_images_tips')}}" readonly="readonly" <notempty name="data"> value="{{$data.images_url}}"</notempty> required />
<input type="file" name="file_images_url" multiple data-validation-message="{{:L('common_select_images_tips')}}" accept="image/gif,image/jpeg,image/jpg,image/png" class="js-choice-one images-file-event" data-choice-one-to=".original-images-url" data-tips-tag="#form-images_url-tips" data-image-tag="#form-img-images_url" required />
<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="300" height="150" 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('common_background_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" <notempty name="data"> style="background-color:{{$data.bg_color}};"</notempty>>
<img src="__PUBLIC__/Common/Images/colorpicker.png" />
</button>
</div>
<include file="Lib/Enable" />
<div class="am-form-group">
<input type="hidden" name="id" <notempty name="data"> value="{{$data.id}}"</notempty>" />
<input type="hidden" name="id" <notempty name="data"> value="{{$data.id}}"</notempty> />
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100" data-am-loading="{loadingText:'{{:L('common_form_loading_tips')}}'}">{{:L('common_operation_save')}}</button>
</div>
</form>

1
service/Application/Common/Lang/zh-cn.php
View File

@ -278,6 +278,7 @@ return array(
'common_order_status_name' => '订单状态',
'common_pay_status_name' => '支付状态',
'common_express_name' => '快递公司',
'common_background_color' => '背景色',
// 性别
'common_gender_list' => array(

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

@ -1,11 +0,0 @@
.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;
}

4
service/Public/Admin/Default/Css/Slide.css
View File

@ -15,6 +15,4 @@
}
@media only screen and (max-width: 321px) {
.view-operation button { margin: 2px 0px; }
}
input[type="file"] { width: 105px !important; height: 32px; margin-top: 27px; overflow:hidden; }
#original-images-url { display: -webkit-inline-box; width: calc(100% - 110px) !important; }
}

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

@ -171,4 +171,15 @@ input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single
*/
#colorpanel {
z-index: 10000;
}
button.colorpicker-submit:hover, button.colorpicker-submit:active, button.colorpicker-submit:focus {
background-color: #fff;
}
button.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);
}
button.colorpicker-submit img {
margin-right: 10px;
}

817
service/shopxo.sql Normal file
View File

File diff suppressed because one or more lines are too long