diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index b7d1b7d7..d6805744 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -67,7 +67,7 @@ class GoodsLogic extends Logic } $goodsDetail = Goods::with(['goods_image', 'goods_item', 'shop']) - ->field('id,type,name,image,video,remark,goods_remark,content,purchase_price,issuing_price,wholesale_price,market_price,min_price,max_price,is_show_stock,stock,sales_actual,sales_virtual,clicks,clicks_virtual,shop_id,poster,subsidy_id,is_new_goods') + ->field('id,type,name,image,video,remark,goods_remark,content,purchase_price,issuing_price,wholesale_price,market_price,min_price,max_price,is_show_stock,stock,sales_actual,sales_virtual,clicks,clicks_virtual,shop_id,poster,subsidy_id,presale,presale_mask') ->where($onSaleWhere) ->where('id', $goodsId) ->findOrEmpty(); diff --git a/app/shop/logic/goods/GoodsLogic.php b/app/shop/logic/goods/GoodsLogic.php index af6f1aa0..6aac6ef4 100755 --- a/app/shop/logic/goods/GoodsLogic.php +++ b/app/shop/logic/goods/GoodsLogic.php @@ -417,7 +417,8 @@ class GoodsLogic extends Logic //更新主表 $data = [ 'name' => $post['name'], - 'is_new_goods' => isset($post['is_new_goods']) && $post['is_new_goods'] == 'on' ? 1 : 0, + 'presale' => isset($post['presale']) && $post['presale'] == 'on' ? 1 : 0, + 'presale_mask' => $post['presale_mask'], 'code' => $post['code'], 'shop_cate_id' => $post['shop_cate_id'], 'first_cate_id' => $post['first_cate_id'], @@ -956,7 +957,8 @@ class GoodsLogic extends Logic $data = [ 'type' => $post['type'], 'name' => trim($post['name']), - 'is_new_goods' => isset($post['is_new_goods']) && $post['is_new_goods'] == 'on' ? 1 : 0, + 'presale' => isset($post['presale']) && $post['presale'] == 'on' ? 1 : 0, + 'presale_mask' => $post['presale_mask'], 'code' => trim($post['code']) ? trim($post['code']) : create_goods_code($shop_id), 'shop_id' => $shop_id, 'shop_cate_id' => $post['shop_cate_id'], diff --git a/app/shop/view/goods/goods/add.html b/app/shop/view/goods/goods/add.html index 3092463f..f7b2e92c 100755 --- a/app/shop/view/goods/goods/add.html +++ b/app/shop/view/goods/goods/add.html @@ -843,7 +843,8 @@ var goods_info= {$info|raw|default=''}; // 商品类型 - $("input[name=is_new_goods]").prop("checked", goods_info['base']['is_new_goods'] == 1); + $("input[name=presale]").prop("checked", goods_info['base']['presale'] == 1); + $("input[name=presale_mask]").val(goods_info['base']['presale_mask']); $("input[name=type]").prop("disabled",true); $("input[name=type][value="+goods_info['base']['type']+"]").prop("checked",true); switchGoodsType(goods_info['base']['type']); @@ -853,8 +854,8 @@ $('textarea[name="delivery_content"]').val(goods_info['base']['delivery_content']); // 配送方式 renderDeliveryType(goods_info['base']['delivery_type'], goods_info['base']['type']); -$('textarea[name="goods_remark"]').val(goods_info['base']['goods_remark']); -$('input[name="work_remark"]').val(goods_info['base']['work_remark']); + $('textarea[name="goods_remark"]').val(goods_info['base']['goods_remark']); + $('input[name="work_remark"]').val(goods_info['base']['work_remark']); $('input[name="goods_id"]').val(goods_info['base']['id']); $('input[name="name"]').val(goods_info['base']['name']); $('input[name="code"]').val(goods_info['base']['code']); diff --git a/app/shop/view/goods/goods/goods_base.html b/app/shop/view/goods/goods/goods_base.html index 871c379f..d91c2651 100755 --- a/app/shop/view/goods/goods/goods_base.html +++ b/app/shop/view/goods/goods/goods_base.html @@ -25,11 +25,19 @@ - +