Merge branch 'master' into v1.2.0

application/admin/view/default/order/index.html

@@ -86,10 +86,8 @@
 										</div>
 										<div class="other">
 											<span class="fl fs-12">
-												{{if !empty($vs.spec)}}
-													{{foreach $vs.spec as $kss=>$vss}}
-														{{$vss.type}}:{{$vss.value}}{{if $kss neq count($vs.spec)-1}}，{{/if}}
-													{{/foreach}}
+												{{if !empty($vs.spec_text)}}
+													{{$vs.spec_text}}
 												{{/if}}
 											</span>
 											<span class="fr">{{$vs.price}}x{{$vs.buy_number}}</span>
@@ -158,12 +156,17 @@
 															</div>
 															<div class="other">
 																<span class="fl fs-12">
-																	{{if !empty($vs.spec)}}
-																		{{foreach $vs.spec as $kss=>$vss}}
-																			{{$vss.type}}:{{$vss.value}}{{if $kss neq count($vs.spec)-1}}，{{/if}}
-																		{{/foreach}}
+																	规格：
+																	{{if !empty($vs.spec_text)}}
+																		{{$vs.spec_text}}
 																	{{/if}}
 																</span>
+																<span class="fl fs-12">
+																	重量：{{$vs.spec_weight}}
+																</span>
+																<span class="fl fs-12">
+																	编码：{{$vs.spec_coding}}
+																</span>
 																<span class="fr">{{$vs.price}}x{{$vs.buy_number}}</span>
 															</div>
 														</div>

application/service/GoodsService.php

@@ -1041,12 +1041,6 @@ class GoodsService
                 return $ret;
             }
 
-            // 删除原来的视频
-            if(!empty($goods['video']) && (!empty($video['data']['file_video']['url']) || empty($data['video'])))
-            {
-                \base\FileUtil::UnlinkFile(ROOT_PATH.$goods['video']);
-            }
-
             // 提交事务
             Db::commit();
             return DataReturn('操作成功', 0);

application/service/OrderService.php

@@ -652,7 +652,7 @@ class OrderService
                             if(!empty($vs['spec']))
                             {
                                 $vs['spec'] = json_decode($vs['spec'], true);
-                                $vs['spec_text'] = implode(',', array_map(function($spec)
+                                $vs['spec_text'] = implode('，', array_map(function($spec)
                                 {
                                     return $spec['type'].':'.$spec['value'];
                                 }, $vs['spec']));

public/static/index/default/css/common.css

@@ -203,9 +203,9 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; position: a
     .category-content .category-list a:hover{ text-decoration: none; color: #D2364C; }
     .category-content .category-name{ overflow:hidden; position: relative;}
     .category-content .category-name img{ position: absolute; top: 6px; width: 25px; height: 25px; left: 6px; display:block;}
-    .category-content .category-name .ml-22{font-size:14px ;margin-left: 35px;}
+    .category-content .category-name .ml-22{font-size:14px ;padding-left: 35px;}
     .category-content .category-list .bd-b{ height: 1px;  margin: -1px 10px 0 10px;  background: #eee; line-height: 1; font-size: 0; }
-    .category-content .b-category-name {line-height:32px;padding-top:3px ;padding-left:5px ;}
+    .category-content .b-category-name {line-height:32px;padding-top:3px ;padding-left:5px; padding-right: 35px;}
     .category-content .b-category-name b{ margin-left: 4px; font:400 12px/28px "宋体"; }
     .category-content .b-category-name a{ color: #fff; }
     .category-content .c-category-list a{ margin-right:8px; color:#626262; }
@@ -213,7 +213,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; position: a
     .category-content .s-category-name{ height:22px;}
     .category-content .s-category-name a{ margin:0 16px 0 0; font:12px/22px "宋体";}
     .category-content .category-info{ position:relative;height:100%;  padding-left: 12px;width: 152px;overflow: hidden;}
-    .category-content .category-info em{ position:absolute; top:8px; right:15px; width: 13px; height: 13px; font: 12px/18px "宋体"; color: #9b9b9b;}
+    .category-content .category-info em{ position:absolute; top:8px; right:20px; width: 13px; height: 13px; font: 12px/18px "宋体"; color: #9b9b9b;}
     .category-content .category .hover{ margin-left: -1px; padding-left: 1px;z-index:999;} 
     .category-content .hover .category-info{ border:none; text-decoration:none; background: #fff;  }
     .category-content .menu-item { position: absolute;left: 149px;height:100%; z-index: 11;padding:0 0 0 2px;width:770px;background: #fff; border:none; border-top: 1px solid #bbb9;overflow-y: scroll;overflow-x: hidden;}
@@ -271,11 +271,11 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; position: a
     /* 分类 */
     #goods-category .category-content{ position:relative; width: 180px; float: left; z-index: 113; top: 45px; }
     #goods-category .category-content .all-goods {width:180px;}
-    .category-content .category{  width:180px;}
+    .category-content .category{  width:180px; max-height: 432px; overflow-y: auto; overflow-x: hidden;}
     .category-content .category-info {padding-left: 12px;width: 182px;overflow: hidden;}
     .category-content .menu-item {left: 179px;}
     .category-content .category-list li {height:43px;}
-    .category-content .b-category-name {padding-left:10px ;}
+    .category-content .b-category-name {padding-left:10px; padding-right: 35px;}
     .category-content .category-name i {top:6px}
     .category-content .category-info em{top:9px}
 }

public/static/index/default/css/goods.css

@@ -65,12 +65,12 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;}
 
 @media only screen and (min-width:640px) {
     .theme-span{height:0px;background:#fff ;}
-    .theme-popover{box-shadow:0 0 10px #666;position:fixed;top:20%;left:calc(50% - 130px);width:260px;bottom:auto;border:solid 6px #d3d3d3;border-radius:3px;}
+    .theme-popover{box-shadow:0 0 10px #666;position:fixed;top:20%;left:calc(50% - 250px);width:500px;bottom:auto;border:solid 6px #d3d3d3;border-radius:3px;}
     .theme-poptit{display: none;}
 
 
     /*商品规格*/
-    .theme-signin-left{padding-top:10px ;float: left;max-width:300px;max-height: none;overflow: visible;}
+    .theme-signin-left{padding-top:10px ;float: left;max-height: none;overflow: visible;}
     .theme-options .cart-title{margin-top:5px ;}
     .theme-options ul{float: left;}
 
@@ -90,7 +90,7 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;}
     .text-info span.stock-tips {float:left;font-size: 12px;}
 
     /*操作*/
-    .btn-op{overflow: hidden;padding:10px 20%; position: static;}
+    .btn-op{overflow: hidden;padding:10px 30%; position: static;}
     .theme-signin .btn {width:auto; font-size:12px ;padding:5px 15px ;border-radius:0;}
     .btn.close {display:block;float: left;position: static;}
     i.buy-event{display: inline-block;}
@@ -386,7 +386,7 @@ li.am-comment{ width:100%}
         
             
     /*规格*/
-    .theme-popover {display: block;position: static;border:none ;box-shadow: none;}
+    .theme-popover {display: block;position: static;border:none ;box-shadow: none;width: 100%;}
     .theme-poptit,.theme-signin-right,.iteminfo_parameter dt.buy-event,.btn-op{display: none;}
 
     .theme-options{overflow: visible;padding:0px 0px; margin-bottom: 5px;}
@@ -400,7 +400,6 @@ li.am-comment{ width:100%}
     .clearfix-left{display:block;float: left;width:360px;}
     .clearfix-right{width:calc(100% - 370px);margin-left:10px;}
     .freight{width:400px;float: left;}
-    .theme-signin-left {max-width:500px ;}
     .iteminfo_parameter.freight dt{padding-top:6px ;padding-bottom:0px ;}