From 9a771acc77fc012503caa38f7c9102ec0193dbc8 Mon Sep 17 00:00:00 2001
From: lisong <377344020@qq.com>
Date: Sun, 26 Dec 2021 16:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/Goods.php | 6 +-
application/admin/logic/CommonLogic.php | 2 +-
application/admin/logic/GoodsLogic.php | 47 +--
.../admin/logic/ScreenCapacityLogic.php | 5 +
application/admin/logic/ScreenMudLogic.php | 5 +
application/admin/logic/ScreenSizeLogic.php | 5 +
application/admin/view/goods/add.html | 337 +++++-------------
application/admin/view/goods/lists.html | 29 +-
.../admin/view/goods_category/add.html | 22 +-
.../admin/view/goods_category/edit.html | 18 +-
.../admin/view/goods_category/lists.html | 8 +-
.../temp/1deb98194e7db50017a25e2aaf1d6372.php | 31 +-
.../temp/a3127c1253dcbcb932add52187c2153f.php | 35 +-
.../temp/bf4d25a54283bb53ef3484d2ec13ac3e.php | 10 +-
.../temp/e5882a5bc0ff338b450366d1a0c08350.php | 20 +-
15 files changed, 176 insertions(+), 404 deletions(-)
diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php
index 0ebcb841..6e321825 100755
--- a/application/admin/controller/Goods.php
+++ b/application/admin/controller/Goods.php
@@ -8,7 +8,7 @@
namespace app\admin\controller;
-use app\admin\logic\{GoodsBrandLogic, GoodsCategoryLogic, GoodsLogic, SupplierLogic,FreightLogic,CommonLogic};
+use app\admin\logic\{GoodsBrandLogic, GoodsCategoryLogic, GoodsLogic, SupplierLogic,FreightLogic,CommonLogic,ScreenSizeLogic,ScreenMudLogic};
use think\Db;
class Goods extends AdminBase
@@ -137,6 +137,8 @@ class Goods extends AdminBase
$this->assign('brand_lists',json_encode(GoodsBrandLogic::getGoodsBrandList(),JSON_UNESCAPED_UNICODE));
$this->assign('supplier_lists',json_encode(SupplierLogic::getSupplierList(),JSON_UNESCAPED_UNICODE));
$this->assign('freight_lists',json_encode(FreightLogic::getFreightList(),JSON_UNESCAPED_UNICODE));
+ $this->assign('mud_lists',json_encode(ScreenMudLogic::getScreenMudList(),JSON_UNESCAPED_UNICODE));
+ $this->assign('size_lists',json_encode(ScreenSizeLogic::getScreenSizeList(),JSON_UNESCAPED_UNICODE));
return $this->fetch();
}
@@ -229,6 +231,8 @@ class Goods extends AdminBase
$this->assign('brand_lists',json_encode(GoodsBrandLogic::getGoodsBrandList(),JSON_UNESCAPED_UNICODE));
$this->assign('supplier_lists',json_encode(SupplierLogic::getSupplierList(),JSON_UNESCAPED_UNICODE));
$this->assign('freight_lists',json_encode(FreightLogic::getFreightList(),JSON_UNESCAPED_UNICODE));
+ $this->assign('mud_lists',json_encode(ScreenMudLogic::getScreenMudList(),JSON_UNESCAPED_UNICODE));
+ $this->assign('size_lists',json_encode(ScreenSizeLogic::getScreenSizeList(),JSON_UNESCAPED_UNICODE));
return $this->fetch('goods/add');
}
diff --git a/application/admin/logic/CommonLogic.php b/application/admin/logic/CommonLogic.php
index 5f216195..4aa6e6f6 100755
--- a/application/admin/logic/CommonLogic.php
+++ b/application/admin/logic/CommonLogic.php
@@ -23,7 +23,7 @@ class CommonLogic{
public static function changeTableValue($table,$pk_name,$pk_value,$field,$field_value){
//允许修改的字段
$allow_field = [
- 'is_show','sort','status','is_new','is_best','is_like','is_recommend'
+ 'is_show','sort','status','is_new','is_best','is_like','is_recommend','is_jiantreasure','is_zdtreasure'
];
if(!in_array($field,$allow_field)){
return false;
diff --git a/application/admin/logic/GoodsLogic.php b/application/admin/logic/GoodsLogic.php
index 3f8fe334..c15f26b3 100755
--- a/application/admin/logic/GoodsLogic.php
+++ b/application/admin/logic/GoodsLogic.php
@@ -247,14 +247,11 @@ class GoodsLogic
'name' => $post['name'],
'code' => $post['code'],
'first_category_id' => $post['first_category_id'],
- 'second_category_id' => $post['second_category_id'],
- 'third_category_id' => $post['third_category_id'],
'brand_id' => $post['brand_id'],
'supplier_id' => $post['supplier_id'],
'image' => $post['image'],
'video' => $video,
'poster' => $post['poster'] ?? '',
- 'remark' => $post['remark'],
'content' => $post['content'],
'max_price' => $max_price,
'min_price' => $min_price,
@@ -267,22 +264,18 @@ class GoodsLogic
'free_shipping_type' => $post['free_shipping_type'],
'free_shipping' => $free_shipping,
'free_shipping_template_id' => $free_shipping_template_id,
- 'is_commission' => $post['is_commission'],
- 'first_ratio' => $post['first_ratio'],
- 'second_ratio' => $post['second_ratio'],
- 'three_ratio' => $post['three_ratio'],
'is_new' => isset($post['is_new']) && $post['is_new'] == 'on' ? 1 : 0,
'is_best' => isset($post['is_best']) && $post['is_best'] == 'on' ? 1 : 0,
'is_like' => isset($post['is_like']) && $post['is_like'] == 'on' ? 1 : 0,
-// 'is_share_bouns' => $post['is_share_bouns'],
-// 'region_ratio' => $post['region_ratio'],
-// 'shareholder_ratio' => $post['shareholder_ratio'],
- 'is_integral' => $post['is_integral'],
- 'is_member' => $post['is_member'],
'give_integral_type' => $give_integral_type,
'give_integral' => $give_integral,
'spec_type' => $post['spec_type'],
- 'create_time' => $time
+ 'create_time' => $time,
+ 'size_id' => $post['size_id'],
+ 'mud_id' => $post['mud_id'],
+ 'rongliang_name' => $post['rongliang_name'],
+ 'is_jiantreasure' => isset($post['is_jiantreasure']) && $post['is_jiantreasure'] == 'on' ? 1 : 0,
+ 'is_zdtreasure' => isset($post['is_zdtreasure']) && $post['is_zdtreasure'] == 'on' ? 1 : 0
];
$goods_id = Db::name('goods')->insertGetId($data);
@@ -441,14 +434,11 @@ class GoodsLogic
'name' => $post['name'],
'code' => $post['code'],
'first_category_id' => $post['first_category_id'],
- 'second_category_id' => $post['second_category_id'],
- 'third_category_id' => $post['third_category_id'],
'brand_id' => $post['brand_id'],
'supplier_id' => $post['supplier_id'],
'image' => $post['image'],
'video' => $video,
'poster' => $post['poster'] ?? '',
- 'remark' => $post['remark'],
'content' => $post['content'],
'max_price' => $max_price,
'min_price' => $min_price,
@@ -461,22 +451,18 @@ class GoodsLogic
'free_shipping_type' => $post['free_shipping_type'],
'free_shipping' => $free_shipping,
'free_shipping_template_id' => $free_shipping_template_id,
- 'is_commission' => $post['is_commission'],
- 'first_ratio' => $post['first_ratio'],
- 'second_ratio' => $post['second_ratio'],
- 'three_ratio' => $post['three_ratio'],
'is_new' => isset($post['is_new']) && $post['is_new'] == 'on' ? 1 : 0,
'is_best' => isset($post['is_best']) && $post['is_best'] == 'on' ? 1 : 0,
'is_like' => isset($post['is_like']) && $post['is_like'] == 'on' ? 1 : 0,
-// 'is_share_bouns' => $post['is_share_bouns'],
-// 'region_ratio' => $post['region_ratio'],
-// 'shareholder_ratio' => $post['shareholder_ratio'],
- 'is_integral' => $post['is_integral'],
- 'is_member' => $post['is_member'],
'give_integral_type' => $give_integral_type,
'give_integral' => $give_integral,
'spec_type' => $post['spec_type'],
- 'update_time' => $time
+ 'update_time' => $time,
+ 'size_id' => $post['size_id'],
+ 'mud_id' => $post['mud_id'],
+ 'rongliang_name' => $post['rongliang_name'],
+ 'is_jiantreasure' => isset($post['is_jiantreasure']) && $post['is_jiantreasure'] == 'on' ? 1 : 0,
+ 'is_zdtreasure' => isset($post['is_zdtreasure']) && $post['is_zdtreasure'] == 'on' ? 1 : 0
];
Db::name('goods')
@@ -783,18 +769,9 @@ class GoodsLogic
*/
public static function getCateName($cates, $item)
{
- if(isset($cates[$item['third_category_id']])) {
- return $cates[$item['third_category_id']];
- }
-
- if(isset($cates[$item['second_category_id']])) {
- return $cates[$item['second_category_id']];
- }
-
if(isset($cates[$item['first_category_id']])) {
return $cates[$item['first_category_id']];
}
-
return '';
}
}
\ No newline at end of file
diff --git a/application/admin/logic/ScreenCapacityLogic.php b/application/admin/logic/ScreenCapacityLogic.php
index 94c479ff..5d2e29a8 100755
--- a/application/admin/logic/ScreenCapacityLogic.php
+++ b/application/admin/logic/ScreenCapacityLogic.php
@@ -107,4 +107,9 @@ class ScreenCapacityLogic
];
return Db::name('screen_capacity')->where(['del' => 0, 'id' => $post['id']])->update($data);
}
+
+ //获取容量列表
+ public static function getScreenCapacityList(){
+ return Db::name('screen_capacity')->where(['del'=>0])->field('id,name')->select();
+ }
}
diff --git a/application/admin/logic/ScreenMudLogic.php b/application/admin/logic/ScreenMudLogic.php
index a02d159b..9f1ca563 100755
--- a/application/admin/logic/ScreenMudLogic.php
+++ b/application/admin/logic/ScreenMudLogic.php
@@ -103,4 +103,9 @@ class ScreenMudLogic
];
return Db::name('screen_mud')->where(['del' => 0, 'id' => $post['id']])->update($data);
}
+
+ //获取泥料列表
+ public static function getScreenMudList(){
+ return Db::name('screen_mud')->where(['del'=>0])->field('id,name')->select();
+ }
}
diff --git a/application/admin/logic/ScreenSizeLogic.php b/application/admin/logic/ScreenSizeLogic.php
index 64e2ff3a..ee2de320 100755
--- a/application/admin/logic/ScreenSizeLogic.php
+++ b/application/admin/logic/ScreenSizeLogic.php
@@ -103,4 +103,9 @@ class ScreenSizeLogic
];
return Db::name('screen_size')->where(['del' => 0, 'id' => $post['id']])->update($data);
}
+
+ //获取尺寸列表
+ public static function getScreenSizeList(){
+ return Db::name('screen_size')->where(['del'=>0])->field('id,name')->select();
+ }
}
diff --git a/application/admin/view/goods/add.html b/application/admin/view/goods/add.html
index 82c0e279..b95a485a 100755
--- a/application/admin/view/goods/add.html
+++ b/application/admin/view/goods/add.html
@@ -6,7 +6,6 @@
价格库存
商品详情
销售设置
- 分销设置
@@ -22,12 +21,6 @@
class="layui-input">
-
@@ -275,64 +260,14 @@
-
-
-
-
- 默认不参与积分抵扣
-
-
-
-
-
-
-
- 按商品金额的比例赠送积分
-
-
-
-
-
-
- 根据会员等级设置的会员折扣自动打折,拼团和秒杀等营销活动不参与会员折扣
-
-
@@ -343,35 +278,6 @@
-
-
-
开启后商品可以参与分销佣金
-
-
-
-
@@ -505,23 +411,6 @@
format(that,value)
});
- //格式化分销比例
- function format(that,value){
- value = value.replace(/[^0-9.]/g,'');
-
- value = value.replace(/\.{2,}/g,".");
- value = value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
-
- value = value.replace(/^(\-)*(\d+)\.(\d)(\d).*$/,'$1$2.$3$4');
- if(value.indexOf(".")< 0 && value !=""){
- value= parseFloat(value);
- }
- if(value > 100){
- that.val(100);
- return false;
- }
- that.val(value);
- }
//------------------------基本信息----------------------------------
@@ -548,18 +437,6 @@
like.showImg(src,600);
});
- //分享海报删除按钮
- $(document).on('mouseenter','.poster-image',function () {
-
- $(this).children('.goods-image-del').show();
- })
- $(document).on('mouseleave', '.poster-image', function () {
- $(this).children('.goods-image-del').hide();
- });
- $(document).on('click', '.poster-image', function () {
- var src = $(this).children('img').attr('src');
- like.showImg(src,600);
- });
$(document).on('click', '.goods-img-del-x', function () {
@@ -614,20 +491,6 @@
}
}, true);
- // ========= 视频上传 开始
- $('#video').click(function(){
- layer.open({
- type: 2,
- title: '上传视频',
- content: '{:url("file_new/lists")}?type=video',
- area: ['90%', '90%']
- });
- });
-
- window.videoCallback = function(uris) {
- like.videoCallback(uris);
- };
- // ========== 视频上传 结束
//图片拉拽
$(document).on('dragstart', '.goods-li', function (e) {
@@ -654,12 +517,12 @@
swop($(this), $(this).parent().children().eq(swop_element));
});
- //渲染品牌
+ //渲染壶类型
var brands = {$brand_lists | raw};
setBrand();
function setBrand(default_id) {
- var brand_select_html = '';
+ var brand_select_html = '';
for (var i in brands) {
brand_select_html += '';
}
@@ -668,11 +531,11 @@
form.render('select');
}
- //渲染供应商
+ //渲染专家
var supplier = {$supplier_lists | raw};
setSupplier();
function setSupplier(default_id) {
- var supplier_select_html = '';
+ var supplier_select_html = '';
for (var i in supplier) {
supplier_select_html += '';
}
@@ -680,6 +543,35 @@
$('select[name="supplier_id"]').val(default_id);
form.render('select');
}
+
+ //渲染尺寸
+ var sizes = {$size_lists | raw};
+
+ setSizes();
+ function setSizes(default_id) {
+ var sizes_select_html = '';
+ for (var i in sizes) {
+ sizes_select_html += '';
+ }
+ $('select[name="size_id"]').html(sizes_select_html);
+ $('select[name="size_id"]').val(default_id);
+ form.render('select');
+ }
+
+ //渲染泥料
+ var muds = {$mud_lists | raw};
+
+ setMuds();
+ function setMuds(default_id) {
+ var muds_select_html = '';
+ for (var i in muds) {
+ muds_select_html += '';
+ }
+ $('select[name="mud_id"]').html(muds_select_html);
+ $('select[name="mud_id"]').val(default_id);
+ form.render('select');
+ }
+
//渲染运费模板
var freight_template = {$freight_lists | raw};
setFreightTemplate();
@@ -700,7 +592,6 @@
setSelectFirst();
-
function setSelectFirst(default_id) {
var category_select_html = '';
for (var i in categorys) {
@@ -712,41 +603,6 @@
$('select[name="first_category_id"]').val(default_id);
form.render('select');
}
- function setSelectSecond(default_id, pid) {
- pid = pid === undefined ? $('select[name="first_category_id"]').val() : pid;
- $('select[name="second_category_id"]').html('');
- $('select[name="third_category_id"]').html('');
- var category_select_html = '';
- for (var i in categorys) {
- if (categorys[i]['pid'] == pid) {
- category_select_html += '';
- }
- }
- $('select[name="second_category_id"]').html(category_select_html);
- $('select[name="second_category_id"]').val(default_id);
- form.render('select');
- }
- function setSelectThird(default_id, pid) {
- pid = pid === undefined ? $('select[name="second_category_id"]').val() : pid;
- $('select[name="third_category_id"]').html('');
- var first_category_id = $('select[name="first_category_id"]').val();
- var category_select_html = '';
- for (var i in categorys) {
- if (categorys[i]['pid'] == pid) {
- category_select_html += '';
- }
- }
- $('select[name="third_category_id"]').html(category_select_html);
- $('select[name="third_category_id"]').val(default_id);
- form.render('select');
- }
-
- form.on('select(first_category)', function (data) {
- setSelectSecond('', data.value);
- });
- form.on('select(second_category)', function (data) {
- setSelectThird('', data.value);
- });
//------------------------价格库存----------------------------------
@@ -1219,14 +1075,6 @@
}
}
},
- // one_market_price: function (value, item) {
- // if ($('input[name="spec_type"]:checked').val() == 1) {
- // if (value && value < 0.01) {
- // switchTab($(item).attr('switch-tab'));
- // return '市场价必须大于或等于0.01';
- // }
- // }
- // },
one_price: function (value, item) {
if ($('input[name="spec_type"]:checked').val() == 2) {
if (value && value < 0.01) {
@@ -1259,14 +1107,6 @@
}
}
},
- // more_market_price:function (value, item) {
- // if ($('input[name="spec_type"]:checked').val() == 2) {
- // if (value && value < 0.01) {
- // switchTab($(item).attr('switch-tab'));
- // return '市场价必须大于或等于0.01';
- // }
- // }
- // },
more_stock: function (value, item) {
if ($('input[name="spec_type"]:checked').val() == 2) {
if (value && value < 0) {
@@ -1314,15 +1154,6 @@
return '同一规格中,规格值不能重复';
}
}
- },
- distribution:function (value,item) {
- var first_ratio = parseFloat($('.first_ratio').val());
- var second_ratio = parseFloat($('.second_ratio').val());
- var three_ratio = parseFloat(value);
- if(first_ratio + second_ratio + three_ratio > 100){
- return '分销比例不可超过100';
- }
-
}
});
//------------------------数据验证----------------------------------
@@ -1335,12 +1166,13 @@
$('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']);
+ $('input[name="rongliang_name"]').val(goods_info['base']['rongliang_name']);
setSelectFirst(goods_info['base']['first_category_id']);
- setSelectSecond(goods_info['base']['second_category_id']);
- setSelectThird(goods_info['base']['third_category_id']);
- setBrand(goods_info['base']['brand_id']); //渲染品牌
- setSupplier(goods_info['base']['supplier_id']); //渲染品供应商
+ setBrand(goods_info['base']['brand_id']); //渲染壶类型
+ setSupplier(goods_info['base']['supplier_id']); //渲染专家
+ setSizes(goods_info['base']['size_id']); //渲染尺寸
+ setMuds(goods_info['base']['mud_id']); //渲染泥料
setFreightTemplate(goods_info['base']['free_shipping_template_id']); //渲染运费模板
$('input[name="remark"]').val(goods_info['base']['remark']);
@@ -1385,22 +1217,7 @@
$("input[name=free_shipping_type][value="+goods_info['base']['free_shipping_type']+"]").prop("checked",true); //快递运费类型
$('input[name="free_shipping"]').val(goods_info['base']['free_shipping']); //运费
- $("input[name=is_commission][value="+goods_info['base']['is_commission']+"]").prop("checked",true); //分销设置
- $("input[name=is_share_bouns][value="+goods_info['base']['is_share_bouns']+"]").prop("checked",true); //区域股东分红
- $('input[name="first_ratio"]').val(goods_info['base']['first_ratio']); //一级分销
- $('input[name="second_ratio"]').val(goods_info['base']['second_ratio']); //二级分销
- $('input[name="three_ratio"]').val(goods_info['base']['three_ratio']); //三级分销
- $('input[name="region_ratio"]').val(goods_info['base']['region_ratio']); //区域股东分红
- $('input[name="shareholder_ratio"]').val(goods_info['base']['shareholder_ratio']); //股东分红
-
- $("input[name=is_integral][value="+goods_info['base']['is_integral']+"]").prop("checked",true); //积分抵扣
- $("input[name=is_member][value="+goods_info['base']['is_member']+"]").prop("checked",true); //会员价是否开启
- $("input[name=give_integral_type][value="+goods_info['base']['give_integral_type']+"]").prop("checked",true); //赠送积分类型
- if(1 === goods_info['base']['give_integral_type']){
- $("input[name=give_integral_num]").val(goods_info['base']['give_integral']); //赠送积分
- }else if(2 === goods_info['base']['give_integral_type']){
- $("input[name=give_integral_ratio]").val(goods_info['base']['give_integral']);
- }
+
//渲染商品标签
@@ -1413,6 +1230,12 @@
if(1 == goods_info['base']['is_like']){
$("input[name=is_like]").prop("checked",true);
}
+ if(1 == goods_info['base']['is_jiantreasure']){
+ $("input[name=is_jiantreasure]").prop("checked",true);
+ }
+ if(1 == goods_info['base']['is_zdtreasure']){
+ $("input[name=is_zdtreasure]").prop("checked",true);
+ }
form.render();
switchSpecType(goods_info['base']['spec_type']);
diff --git a/application/admin/view/goods/lists.html b/application/admin/view/goods/lists.html
index d1909345..370d1fce 100755
--- a/application/admin/view/goods/lists.html
+++ b/application/admin/view/goods/lists.html
@@ -49,9 +49,9 @@
-
+
-
-
+
+
@@ -491,14 +492,14 @@
{type: 'checkbox'}
,{field: 'name', title: '商品名称',width:320,toolbar: '#goods-info'}
,{field: 'cat_name',width:160, title: '商品分类'}
- ,{field: 'commission_status',width:160, title: '三级分销'}
- ,{field: 'ratio',width:160, title: '分销比例',toolbar: '#ratio'}
,{field: 'price',width:180,title: '价格'}
,{field: 'stock',width: 100,title: '总库存'}
,{field: 'total_sales_sum',width: 100,title: '总销量'}
- ,{field: 'ratio',width:160, title: '新品推荐',toolbar: '#new'}
- ,{field: 'ratio',width:160, title: '好物优选',toolbar: '#best'}
- ,{field: 'ratio',width:160, title: '猜你喜欢',toolbar: '#like'}
+ ,{field: 'ratio',width:160, title: '新品上架',toolbar: '#new'}
+ ,{field: 'ratio',width:160, title: '精品推荐',toolbar: '#best'}
+ ,{field: 'ratio',width:160, title: '今日促销',toolbar: '#like'}
+ ,{field: 'ratio',width:160, title: '藏品捡宝',toolbar: '#jiantreasure'}
+ ,{field: 'ratio',width:160, title: '镇店藏品',toolbar: '#zdtreasure'}
,{field: 'sort',width: 80, title:'排序',event: 'tips',edit:'text',sort: true}
,{field: 'create_time_desc',width:160, title:'发布时间'}
,{fixed: 'right', title: '操作', align: 'center', width:300, toolbar: '#goods-operation'}
diff --git a/application/admin/view/goods_category/add.html b/application/admin/view/goods_category/add.html
index 3bb61101..7f35a552 100755
--- a/application/admin/view/goods_category/add.html
+++ b/application/admin/view/goods_category/add.html
@@ -45,17 +45,7 @@
-
+
-
-
- 当前分类推荐在PC商城首页显示,默认推荐
-