From ee0db490add18d997aae31c0d4147501c23f4f66 Mon Sep 17 00:00:00 2001
From: SHW\戥岁。。 <2873657140@qq.com>
Date: Mon, 25 Apr 2022 10:38:46 +0800
Subject: [PATCH] 同步
---
application/admin/view/litestore/litestoregoods/add.html | 2 +-
application/admin/view/litestore/litestoregoods/edit.html | 2 +-
application/api/controller/Cart.php | 15 +++++++--------
public/assets/js/backend/litestore/litestoregoods.js | 6 +++---
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/application/admin/view/litestore/litestoregoods/add.html b/application/admin/view/litestore/litestoregoods/add.html
index ba49e2f..9e3f750 100644
--- a/application/admin/view/litestore/litestoregoods/add.html
+++ b/application/admin/view/litestore/litestoregoods/add.html
@@ -284,7 +284,7 @@
<label class="control-label col-xs-12 col-sm-2">{:__('Detail_images')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
- <input id="c-detail_images" data-rule="required" class="form-control form-control" size="50" name="row[detail_images]" placeholder="图片最多添加十张" type="text">
+ <input id="c-detail_images" class="form-control form-control" size="50" name="row[detail_images]" placeholder="图片最多添加十张" type="text">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-detail_images" data-maxcount="10" class="btn btn-danger plupload" data-input-id="c-detail_images" data-mimetype="image/jpeg,image/png,image/jpg" data-multiple="true" data-preview-id="p-detail_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-detail_images" data-maxcount="10" class="btn btn-primary fachoose" data-input-id="c-detail_images" data-mimetype="image/jpeg,image/png,image/jpg" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
diff --git a/application/admin/view/litestore/litestoregoods/edit.html b/application/admin/view/litestore/litestoregoods/edit.html
index 7f322ec..20c50df 100644
--- a/application/admin/view/litestore/litestoregoods/edit.html
+++ b/application/admin/view/litestore/litestoregoods/edit.html
@@ -284,7 +284,7 @@
<label class="control-label col-xs-12 col-sm-2">{:__('Detail_images')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
- <input id="c-detail_images" data-rule="required" placeholder="图片最多添加十张" class="form-control form-control" size="50" name="row[detail_images]" type="text" value="{$row.detail_images}">
+ <input id="c-detail_images" placeholder="图片最多添加十张" class="form-control form-control" size="50" name="row[detail_images]" type="text" value="{$row.detail_images}">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-detail_images" class="btn btn-danger plupload" data-input-id="c-detail_images" data-mimetype="image/jpeg,image/png,image/jpg" data-maxcount="10" data-multiple="true" data-preview-id="p-detail_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-detail_images" class="btn btn-primary fachoose" data-input-id="c-detail_images" data-mimetype="image/jpeg,image/png,image/jpg" data-maxcount="10" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
diff --git a/application/api/controller/Cart.php b/application/api/controller/Cart.php
index 1f3aae1..8b02a44 100644
--- a/application/api/controller/Cart.php
+++ b/application/api/controller/Cart.php
@@ -32,11 +32,11 @@ class Cart extends Api
*/
public function addCart()
{
- $sku_id = $this->request->post('sku_id');
- $goods_id = $this->request->post('goods_id');
- $number = $this->request->post('number');
+ $sku_id = $this->request->param('sku_id');
+ $goods_id = $this->request->param('goods_id');
+ $number = $this->request->param('number');
- if (!is_numeric($sku_id) || !is_numeric($goods_id) || !is_numeric($number)) $this->error('参数不合法');
+// if (!is_numeric($sku_id) || !is_numeric($goods_id) || !is_numeric($number)) $this->error('参数不合法');
$category_id = (new \app\api\model\Goods())->where('goods_id', $goods_id)->value('category_id');
$where = [
'goods_id' => $goods_id,
@@ -61,13 +61,12 @@ class Cart extends Api
} else {
$model->where($where)->update(['number'=>$number]);
}
-
} else {
- if ($spec_info['stock_num'] > $number) {
+ if ($number > $spec_info['stock_num']) {
$this->error('库存不足');
} else {
- $data['number'] = $number;
- $model->isUpdate(false)->save($data);
+ $where['number'] = $number;
+ $model->isUpdate(false)->save($where);
}
}
diff --git a/public/assets/js/backend/litestore/litestoregoods.js b/public/assets/js/backend/litestore/litestoregoods.js
index 8b89f8d..07f0bf6 100644
--- a/public/assets/js/backend/litestore/litestoregoods.js
+++ b/public/assets/js/backend/litestore/litestoregoods.js
@@ -20,13 +20,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'litestor
var table = $("#table");
table.on('post-common-search.bs.table', function (event, table) {
var form = $("form", table.$commonsearch);
- $("input[name='category_id']", form).addClass("selectpage").data("source", "litestore/litestorecategory/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id desc").data("pageSize",1);
+ $("input[name='category_id']", form).addClass("selectpage").data("source", "litestore/litestorecategory/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id asc").data("pageSize",20);
Form.events.cxselect(form);
Form.events.selectpage(form);
});
table.on('post-common-search.bs.table', function (event, table) {
var form = $("form", table.$commonsearch);
- $("input[name='activity_id']", form).addClass("selectpage").data("source", "activity/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id desc").data("pageSize",1);
+ $("input[name='activity_id']", form).addClass("selectpage").data("source", "activity/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id asc").data("pageSize",20);
Form.events.cxselect(form);
Form.events.selectpage(form);
});
@@ -45,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'litestor
{field: 'goods_name', title: __('Goods_name'), operate: 'LIKE'},
{field: 'keywords', title: __('Keywords'), operate: 'LIKE'},
{field: 'category.name', title: __('Category.name'), operate: false},
- {field: 'activity.name', title: __('Activity.name'), operate: 'LIKE'},
+ {field: 'activity.name', title: __('Activity.name'), operate: false},
{field: 'category_id', visible: false, title: __('Category_id'),operate: 'LIKE %...%'},
{field: 'activity_id', visible: false, title: __('Activity_id'),operate: 'LIKE %...%'},
{field: 'image', title: __('Image'), formatter: Table.api.formatter.image},
--
libgit2 0.24.0