郭盛 / community · 提交

转到一个项目

作者 何书鹏
提交 b23cbd00b5e50f609877287d55c9a4f804e888ef 2 个父辈 f5919444 33f24373
1 个管道 的构建 通过 耗费 0 秒

合并分支 'heshupeng' 到 'master' 

Heshupeng



查看合并请求 !38
内嵌 并排对比
正在显示 7 个修改的文件 包含 89 行增加 和 12 行删除
... ... @@ -146,11 +146,9 @@ class HouseActivity extends Backend
$this->model->validate($validate);
}
$result = $this->model->allowField(true)->save($params);
//\think\Log::write('hawk-1 result'.json_encode($result), \think\Log::NOTICE);
if ($result !== false) {
//成功之后 存储商品规格
$spec_many_params = $this->request->post("spec_many/a");
//\think\Log::write('hawk0 spec_many_params'.json_encode($spec_many_params), \think\Log::NOTICE);
$this->model->addGoodsSpec($params,$spec_many_params,$this->request->post("spec/a"));
$this->success();
} else {
... ... @@ -238,7 +236,7 @@ class HouseActivity extends Backend
}
// 多规格信息
$specData = 'null';
if ($row['spec_type'] === '20'){
if ($row['spec_type'] === '2'){
$specData = json_encode($this->model->getManySpecData($row['spec_rel'], $row['spec']));
}
$row['specData'] = $specData;
... ...
... ... @@ -95,22 +95,22 @@ class HouseActivity extends Model
{
// 更新模式: 先删除所有规格
$model = new Houseactivityspec;
$isUpdate && $model->removeAll($this['house_activity_id']);
$isUpdate && $model->removeAll($this['id']);
// 添加规格数据
if ($data['spec_type'] === '1') {
// 单规格
$this->spec()->save($specparams);
} else if ($data['spec_type'] === '2') {
// 添加商品与规格关系记录
$model->addGoodsSpecRel($this['house_activity_id'],$params['spec_attr']);
$model->addGoodsSpecRel($this['id'],$params['spec_attr']);
// 添加商品sku
$model->addSkuList($this['house_activity_id'],$params['spec_list']);
$model->addSkuList($this['id'],$params['spec_list']);
}
}
public function removesku(){
// 删除活动sku
(new Houseactivityspec)->removeAll($this['house_activity_id']);
(new Houseactivityspec)->removeAll($this['id']);
}
/**
* 获取规格信息
... ...
... ... @@ -17,7 +17,7 @@ class Houseactivityspec extends Model
protected $updateTime = 'update_time';
/**
* 批量添加商品sku记录
* 批量添加活动sku记录
* @param $house_activity_id
* @param $spec_list
* @return array|false
... ... @@ -36,7 +36,7 @@ class Houseactivityspec extends Model
}
/**
* 添加商品规格关系记录
* 添加商品活动关系记录
* @param $house_activity_id
* @param $spec_attr
* @return array|false
... ... @@ -59,7 +59,7 @@ class Houseactivityspec extends Model
}
/**
* 移除指定商品的所有sku
* 移除指定活动的所有sku
* @param $house_activity_id
* @return int
*/
... ...
... ... @@ -21,6 +21,6 @@ class Houseactivityspecrel extends Model
*/
public function spec()
{
return $this->belongsTo('Houseactivityspec');
return $this->belongsTo('Housespec');
}
}
\ No newline at end of file
... ...
... ... @@ -79,7 +79,7 @@
</div>
</div>
<div class="goods-spec-single" style="display: none;">
<div class="goods-spec-single">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">报名费用:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -24,6 +24,72 @@
</div>
</div>
<!-- 商品规格属性 start -->
<div class="goods-spec-many form-group">
<!-- <label class="control-label col-xs-12 col-sm-2"></label>-->
<div class="goods-spec-box col-xs-12 col-sm-11" style="background-color: white;">
<!-- 规格属性 -->
<div class="spec-attr"></div>
<!-- 添加规格：按钮 -->
<div class="spec-group-button">
<button type="button" class="btn-addSpecGroup btn btn-xs btn-success">添加规格</button>
</div>
<!-- 添加规格：表单 -->
<div class="spec-group-add">
<div class="spec-group-add-item form-group">
<label class="control-label form-require">规格名 </label>
<input type="text" class="input-specName tpl-form-input"
placeholder="请输入规格名称">
</div>
<div class="spec-group-add-item form-group">
<label class="control-label form-require">规格值 </label>
<input type="text" class="input-specValue tpl-form-input"
placeholder="请输入规格值">
</div>
<div class="spec-group-add-item margin-top">
<button type="button" class="btn-addSpecName btn btn-xs btn-success"> 确定
</button>
<button type="button" class="btn-cancleAddSpecName btn btn-xs btn-default"> 取消
</button>
</div>
</div>
<!-- 商品多规格sku信息 -->
<div class="goods-sku scrollable-horizontal">
<!-- 分割线 -->
<div class="goods-spec-line"></div>
<!-- sku 批量设置 -->
<div class="spec-batch form-inline">
<div class="form-group">
<label class="control-label">批量设置</label>
</div>
<div class="form-group">
<input type="number" data-type="price" placeholder="报名费用">
</div>
<div class="form-group">
<button type="button" class="btn-specBatchBtn btn btn-sm btn-secondary
radius">确定
</button>
</div>
</div>
<!-- sku table -->
<table class="spec-sku-tabel table table-bordered table-centered margin-bottom-xs text-nowrap"></table>
</div>
</div>
</div>
<div class="goods-spec-single">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">报名费用:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" data-rule="required" class="form-control form-control" name="spec[price]" type="number" value="{$row.spec.0.price|default=0}">
</div>
</div>
</div>
<!-- 商品规格属性 end -->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('House_ids')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -50,3 +116,10 @@
</div>
</div>
</form>
{include file="house_activity/spec_many_template" /}
<link rel="stylesheet" href="__CDN__/assets/addons/litestore/css/litestoregoods.css">
<script type="text/javascript">
var from_specData = <?= $row['specData'] ?>;
</script>
... ...
... ... @@ -39,6 +39,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/house_activi
Table.api.bindevent(table);
},
add: function () {
setTimeout(function () {
$('select[name="row[spec_type]"]').trigger("change");
}, 100);
Form.api.bindevent($("form[role=form]"), function(data, ret){
Fast.api.close(data);
Toastr.success("活动提交成功");
... ... @@ -127,6 +130,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/house_activi
});
},
edit: function () {
setTimeout(function () {
$('select[name="row[spec_type]"]').trigger("change");
}, 100);
Form.api.bindevent($("form[role=form]"), function(data, ret){
//Fast.api.close(data);
Toastr.success("商品提交成功");
... ...