From 460e346a32751f9431f6ba5cdd9f75f745ec7b43 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 16 Nov 2018 16:47:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/GoodsController.class.php | 2 +- .../Application/Api/Lang/zh-cn/agreement.php | 13 ----- .../Application/Api/Lang/zh-cn/merchant.php | 46 ------------------ .../Home/View/Default/Index/Index.html | 8 +-- service/Public/Home/Default/Css/Index.css | 1 + .../Images/home-mini-nav-order-icon.png | Bin 0 -> 1430 bytes 6 files changed, 6 insertions(+), 64 deletions(-) delete mode 100755 service/Application/Api/Lang/zh-cn/agreement.php delete mode 100755 service/Application/Api/Lang/zh-cn/merchant.php create mode 100644 service/Public/Home/Default/Images/home-mini-nav-order-icon.png diff --git a/service/Application/Admin/Controller/GoodsController.class.php b/service/Application/Admin/Controller/GoodsController.class.php index 500b03fe4..ec5bf22a1 100755 --- a/service/Application/Admin/Controller/GoodsController.class.php +++ b/service/Application/Admin/Controller/GoodsController.class.php @@ -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']); } diff --git a/service/Application/Api/Lang/zh-cn/agreement.php b/service/Application/Api/Lang/zh-cn/agreement.php deleted file mode 100755 index d272c5e85..000000000 --- a/service/Application/Api/Lang/zh-cn/agreement.php +++ /dev/null @@ -1,13 +0,0 @@ - '服务协议', -); -?> \ No newline at end of file diff --git a/service/Application/Api/Lang/zh-cn/merchant.php b/service/Application/Api/Lang/zh-cn/merchant.php deleted file mode 100755 index 5d3e104ae..000000000 --- a/service/Application/Api/Lang/zh-cn/merchant.php +++ /dev/null @@ -1,46 +0,0 @@ - '站点名称', - '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 diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html index 26061326b..d09af5141 100755 --- a/service/Application/Home/View/Default/Index/Index.html +++ b/service/Application/Home/View/Default/Index/Index.html @@ -39,11 +39,11 @@
- -
- + href="javascript:;" class="login-event" href="{{:U('Home/Order/Index')}}"> +
+
-
秒杀
+
订单
diff --git a/service/Public/Home/Default/Css/Index.css b/service/Public/Home/Default/Css/Index.css index 58e0318f2..f5afad00a 100755 --- a/service/Public/Home/Default/Css/Index.css +++ b/service/Public/Home/Default/Css/Index.css @@ -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; } diff --git a/service/Public/Home/Default/Images/home-mini-nav-order-icon.png b/service/Public/Home/Default/Images/home-mini-nav-order-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a3172aaf7c4f7c07ebdfd70db39c8827ea847cac GIT binary patch literal 1430 zcmV;H1!?+;P)WV?{&S|7*(Turgb@S2 z0lox20$vARlJs4UbG;+l%#H%?0d4_~$T8Ar+XwWslYyMm#6Gp>Bwf1{5E3gfC zSkiBO9PI_#%+3OK0;lxpw4+TQ&~E37fp%Q|HAxq(5a^|D-v%y`^h3(uBxo~R2kZh4 zPj%MgcpuOng`PTw%0@|BR~WQ+{~2(BBu_6hr4zK79RutJPMXrgKfouz`@pAw|DBTU zDTllRGxICwO2F;UBRf<1d1A*SzBB3@#?PGibm$a^Ja;?nUuHR*0=)yczNNeucof*u z2iiQ8YSl5b0A}_iaC75dze_r@H)u0E7HB^kCLfm;Z4hRp zk5$v2tEc8@Gg||E)dIIc()LAz*>%2Vb|cVcvPRO^ZM^_JAaVlq0C+j70Xm1)fVKg8 z0K6R40G&f?K-&O40A7x2fX<;cplyI2053;1KY*0U%e4?Db-pWce4C_OQytd=`U~LX zl(Ur{PcFW3ziR;<5#5NQ6`S~PEQ0ZcFk=zV%f2Md7vPK|M~{W<5I?I(9YaoFEV==@ z&`1U709}YcAu|!t0lE-@LS`bO19Tw*h0H`mFA``o^LImhnsiJb!F`DQBe+kKcD|!n z)1=aJy~b83KKC<|d`Gb+&@oL~X!g$E@9@+yM(MTazM7k%nR$L5+gDk=-chV3b&N5L zbA7HRqH`S|Tl)ZAXv6|^fG$L!keP_+09}YcAu|!t0lE-@LT0Lp=*g~MM;AKxp=N&W zGi$eGqzcfJkKbFCVZ*DT@N)HiGR)^XeD<+ZY61Q32I$dkVOzVQ#Oa=2p=A4t0Tk6F9%oiO*=AD#;7LEWDVR z2chpsyt)Bnk0dX;@IUDS?L`CHsbc2V>WfC+%(MZj0yY^<8^>^eN%wDda7`5gy1i2b`Nf zot>MiYL^5(Ng-ZZ@0AfR9~i)~Q`PHaT_wrOTy;t>&=c5R_QLO|o}=b1vzPK`EXTdf z-V>8Dd;WV;dV^l-X>voj9Jp|jx4go|39V93Ny8&;@DA`i;O`->OyS6pf~m&s?1-+$ k^N~3cpbHIHfG!03Uktdeh(5h|wg3PC07*qoM6N<$g0G>Vr~m)} literal 0 HcmV?d00001