提交 460e346a 编写于 作者: D devil_gong

有啊

上级 8147969d
......@@ -415,7 +415,7 @@ class GoodsController extends CommonController
$m->commit();
// 删除原来的视频
if(!empty($goods['video']) && !empty($video['data']['file_video']['url']))
if(!empty($goods['video']) && (!empty($video['data']['file_video']['url']) || empty($data['video'])))
{
$this->FileDelete($goods['video']);
}
......
<?php
/**
* 模块语言包-协议
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
return array(
'agreement_site_title' => '服务协议',
);
?>
\ No newline at end of file
<?php
/**
* 模块语言包-站点
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
return array(
// 添加/编辑
'merchant_name_text' => '站点名称',
'merchant_name_format' => '站点名称格式 2~60 个字符',
'merchant_license_text' => '执照信息',
'merchant_license_name_text' => '执照名称',
'merchant_license_name_format' => '执照名称格式 2~80 个字符',
'merchant_license_number_text' => '执照编号',
'merchant_license_number_format' => '执照编号格式 2~60 个字符',
'merchant_address_ssqx_text' => '省/市/区县',
'merchant_address_save_text' => '详细地址',
'merchant_address_text' => '地址',
'merchant_province_format' => '请选择所在省',
'merchant_city_format' => '请选择所在市',
'merchant_county_format' => '请选择所在区',
'merchant_address_format' => '详细地址格式 2~80 个字符',
'merchant_coordinate_format' => '请定位站点坐标位置',
'merchant_contacts_text' => '负责人',
'merchant_contacts_name_text' => '负责人姓名',
'merchant_contacts_name_format' => '负责人姓名格式 2~60 个字符',
'merchant_contacts_tel_text' => '负责人电话',
'merchant_contacts_tel_format' => '负责人电话格式 2~15 个字符',
'merchant_courier_number_text' => '配送人员数量',
'merchant_courier_number_format' => '请填写配送人员数量',
'merchant_license_images_text' => '执照',
'merchant_license_images_format' => '请上传执照',
'merchant_courier_health_images_text' => '配送人员健康证',
'merchant_courier_health_images_format' => '请上传配送人员健康证',
);
?>
\ No newline at end of file
......@@ -39,11 +39,11 @@
</a>
</div>
<div class="am-u-sm-3">
<a href="#">
<div class="nav-icon mini-nav-seconds">
<img src="__PUBLIC__/Home/{{$default_theme}}/Images/home-mini-nav-seconds-icon.png" />
<a <if condition="empty($user)">href="javascript:;" class="login-event"<else /> href="{{:U('Home/Order/Index')}}"</if>>
<div class="nav-icon mini-nav-order">
<img src="__PUBLIC__/Home/{{$default_theme}}/Images/home-mini-nav-order-icon.png" />
</div>
<div class="mini-nav-title">秒杀</div>
<div class="mini-nav-title">订单</div>
</a>
</div>
<div class="am-u-sm-3">
......
......@@ -22,6 +22,7 @@ dt + dd {margin-top: 0;}
.small-nav .mini-nav-goods-category { background-color: #FB6E52; }
.small-nav .mini-nav-cart { background-color: #48CFAE; }
.small-nav .mini-nav-user { background-color: #49acfa; }
.small-nav .mini-nav-order { background-color: #fa506c; }
.small-nav .mini-nav-seconds { background-color: #fa506c; }
.small-nav a { text-decoration: none !important; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册