diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html index 28f7515b9..11e739d65 100755 --- a/application/admin/view/default/goods/index.html +++ b/application/admin/view/default/goods/index.html @@ -128,6 +128,9 @@
标题名称
{{$v.title}}
+
商品简述
+
{{$v.simple_desc}}
+
销售价格(元)
{{$v.price}} diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html index e9558ed72..7f1a8949a 100755 --- a/application/admin/view/default/goods/save_info.html +++ b/application/admin/view/default/goods/save_info.html @@ -57,6 +57,10 @@ +
+ + +
diff --git a/application/admin/view/default/order/index.html b/application/admin/view/default/order/index.html index 75aecaafa..b94131078 100755 --- a/application/admin/view/default/order/index.html +++ b/application/admin/view/default/order/index.html @@ -234,6 +234,12 @@ {{$vs.title}}
+ + 型号： + {{if !empty($vs.model)}} + {{$vs.model}} + {{/if}} + 规格： {{if !empty($vs.spec_text)}} diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html index c7f646d8f..82a6c0a6a 100755 --- a/application/index/view/default/goods/index.html +++ b/application/index/view/default/goods/index.html @@ -107,7 +107,7 @@
-

+

{{$goods.title}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} @@ -123,6 +123,9 @@ {{/foreach}} {{/if}}

+ {{if !empty($goods['simple_desc'])}} +

{{$goods.simple_desc}}

+ {{/if}}
diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html index 2558ac0ce..cb4b44abf 100755 --- a/application/index/view/default/order/detail.html +++ b/application/index/view/default/order/detail.html @@ -273,11 +273,16 @@
{{$goods.title}} - {{if !empty($goods.spec)}} + {{if !empty($goods.spec) or !empty($goods['model'])}}
    - {{foreach $goods.spec as $spec}} -
  • {{$spec.type}}：{{$spec.value}}
    • - {{/foreach}} + {{if !empty($goods['model'])}} +
  • 型号：{{$goods.model}}
    • + {{/if}} + {{if !empty($goods.spec)}} + {{foreach $goods.spec as $spec}} +
  • {{$spec.type}}：{{$spec.value}}
    • + {{/foreach}} + {{/if}}
{{/if}}
diff --git a/application/plugins/membershiplevel/Hook.php b/application/plugins/membershiplevel/Hook.php index f6e158a31..6e6fd51ea 100755 --- a/application/plugins/membershiplevel/Hook.php +++ b/application/plugins/membershiplevel/Hook.php @@ -153,15 +153,19 @@ class Hook extends Controller $level = Service::UserLevelMatching(); if(!empty($level) && $level['discount_rate'] > 0) { - if(empty($goods['original_price'])) + // 无价格字段则不处理 + if(isset($goods['price'])) { - $goods['original_price'] = $goods['price']; - } + if(empty($goods['original_price'])) + { + $goods['original_price'] = $goods['price']; + } - // 价格处理 - $goods['price'] = Service::PriceCalculate($goods['price'], $level['discount_rate'], 0); - $price_title = empty($level['name']) ? '会员价' : $level['name']; - $goods['show_field_price_text'] = ''.$price_title.''; + // 价格处理 + $goods['price'] = Service::PriceCalculate($goods['price'], $level['discount_rate'], 0); + $price_title = empty($level['name']) ? '会员价' : $level['name']; + $goods['show_field_price_text'] = ''.$price_title.''; + } // 最低价最高价 if(isset($goods['min_price'])) diff --git a/application/service/AppMiniService.php b/application/service/AppMiniService.php index 350abb4a2..288ff2325 100755 --- a/application/service/AppMiniService.php +++ b/application/service/AppMiniService.php @@ -101,7 +101,7 @@ class AppMiniService public static function Created($params = []) { // 是否https - if(config('shopxo.is_develop') == false) + if(config('shopxo.is_develop') !== true) { if(__MY_HTTP__ != 'https') { diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 4327b7803..dfef8577a 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -181,7 +181,7 @@ class BuyService $where = (!empty($params['where']) && is_array($params['where'])) ? $params['where'] : []; $where['c.user_id'] = $params['user']['id']; - $field = 'c.*, g.title, g.images, g.inventory_unit, g.is_shelves, g.is_delete_time, g.buy_min_number, g.buy_max_number'; + $field = 'c.*, g.title, g.images, g.inventory_unit, g.is_shelves, g.is_delete_time, g.buy_min_number, g.buy_max_number, g.model'; $data = Db::name('Cart')->alias('c')->join(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->select(); @@ -391,7 +391,7 @@ class BuyService 'is_delete_time' => 0, 'is_shelves' => 1, ], - 'field' => 'id, id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number', + 'field' => 'id, id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number, model', ]; $ret = GoodsService::GoodsList($p); if(empty($ret['data'][0])) @@ -784,6 +784,7 @@ class BuyService 'spec_coding' => empty($v['spec_coding']) ? '' : $v['spec_coding'], 'spec_barcode' => empty($v['spec_barcode']) ? '' : $v['spec_barcode'], 'buy_number' => intval($v['stock']), + 'model' => $v['model'], 'add_time' => time(), ]; if(Db::name('OrderDetail')->insertGetId($detail) <= 0) diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index d1ef9baec..ac0b40cf8 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -975,6 +975,13 @@ class GoodsService 'checked_data' => '2,60', 'error_msg' => '标题名称格式 2~60 个字符', ], + [ + 'checked_type' => 'length', + 'key_name' => 'simple_desc', + 'checked_data' => '60', + 'is_checked' => 1, + 'error_msg' => '商品简述格式 最多60个字符', + ], [ 'checked_type' => 'length', 'key_name' => 'model', @@ -1062,6 +1069,7 @@ class GoodsService $data = [ 'title' => $params['title'], 'title_color' => empty($params['title_color']) ? '' : $params['title_color'], + 'simple_desc' => $params['simple_desc'], 'model' => $params['model'], 'place_origin' => isset($params['place_origin']) ? intval($params['place_origin']) : 0, 'inventory_unit' => $params['inventory_unit'], diff --git a/application/service/OrderService.php b/application/service/OrderService.php index 64d809b52..56b109f0a 100755 --- a/application/service/OrderService.php +++ b/application/service/OrderService.php @@ -763,6 +763,7 @@ class OrderService $excel_export_items .= '原价：'.$vs['original_price']."\n"; $excel_export_items .= '销售价：'.$vs['price']."\n"; $excel_export_items .= '总价：'.$vs['total_price']."\n"; + $excel_export_items .= '型号：'.$vs['model']."\n"; $excel_export_items .= '规格：'.$vs['spec_text']."\n"; $excel_export_items .= '重量：'.$vs['spec_weight']."\n"; $excel_export_items .= '编码：'.$vs['spec_coding']."\n"; diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index 5c7ff2440..330f6346d 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -1085,6 +1085,12 @@ php; { return DataReturn($ret, -1); } + + // 是否开启开发者模式 + if(config('shopxo.is_develop') !== true) + { + return DataReturn('请先开启开发者模式', -1); + } // 获取应用标记 $where = ['id'=>intval($params['id'])]; diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index 3ff3af34e..f6df47cd8 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -177,9 +177,7 @@ fieldset legend{margin-left:15px;padding-left:3px;padding-right:3px;color:#333;} .tab a.cur{ font-weight:bold;} /*商品详细页*/ -/*iteminfo*/ -.clearfix-right{font-size:12px;} -.tb-detail-hd h1 {padding-bottom:0.4em; line-height: 1;font-size: 14px;font-weight: 600;color: #333; line-height: 24px;} +.simple-desc { color: #999; } /*价格*/ .tb-detail-price{text-align: left; position: relative;} @@ -421,7 +419,7 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig /* 手机模式下 */ @media only screen and (max-width:640px) { .goods-detail { padding: 0px; } - .detail-title, .detail-attr { padding: 0px 5px; } + .detail-title, .detail-attr, .simple-desc { padding: 0px 5px; } .tb-detail-price { padding: 10px 5px; } .buy-nav .buy-nav-opt { width: 40%; } ul.tm-ind-panel li { border-left: 0px; } diff --git a/public/static/upload/images/plugins_distribution/.gitignore b/public/static/upload/images/plugins_distribution/.gitignore new file mode 100644 index 000000000..c96a04f00 --- /dev/null +++ b/public/static/upload/images/plugins_distribution/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file