切换导航条
此项目
正在载入...
登录
何书鹏
/
anttest
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
何书鹏
4 years ago
提交
c497bb4cbf6d6a7d372fca3f38ffbcc1c4033398
1 个父辈
4783ae4c
优惠券去掉有效时间和用券时间
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
10 行增加
和
6 行删除
application/admin/controller/shopro/Coupons.php
application/admin/view/shopro/coupons/add.html
application/admin/view/shopro/coupons/edit.html
public/assets/js/backend/shopro/coupons.js
application/admin/controller/shopro/Coupons.php
查看文件 @
c497bb4
...
...
@@ -88,6 +88,8 @@ class Coupons extends Backend
$params
=
$this
->
request
->
post
();
if
(
$params
)
{
$params
=
json_decode
(
$params
[
'data'
],
true
);
$params
[
'gettime'
]
=
date
(
'Y-m-d H:i:s'
)
.
' - '
.
date
(
'Y-m-d H:i:s'
,
strtotime
(
'+30year'
));
$params
[
'usetime'
]
=
date
(
'Y-m-d H:i:s'
)
.
' - '
.
date
(
'Y-m-d H:i:s'
,
strtotime
(
'+30year'
));
$result
=
false
;
Db
::
startTrans
();
try
{
...
...
@@ -137,6 +139,8 @@ class Coupons extends Backend
$params
=
$this
->
request
->
post
();
if
(
$params
)
{
$params
=
json_decode
(
$params
[
'data'
],
true
);
$params
[
'gettime'
]
=
date
(
'Y-m-d H:i:s'
)
.
' - '
.
date
(
'Y-m-d H:i:s'
,
strtotime
(
'+30year'
));
$params
[
'usetime'
]
=
date
(
'Y-m-d H:i:s'
)
.
' - '
.
date
(
'Y-m-d H:i:s'
,
strtotime
(
'+30year'
));
$result
=
false
;
Db
::
startTrans
();
try
{
...
...
application/admin/view/shopro/coupons/add.html
查看文件 @
c497bb4
...
...
@@ -78,7 +78,7 @@
<el-form-item
label=
"优惠券描述:"
>
<el-input
type=
"input"
v-model=
"detailData.description"
placeholder=
"仅商家端显示,用于区分相似优惠券(最多可输入十个字)"
></el-input>
</el-form-item>
<el-form-item
label=
"领取时间:"
prop=
"gettime"
>
<
!--<
el-form-item label="领取时间:" prop="gettime">
<el-date-picker v-model="detailData.gettime" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
...
...
@@ -87,7 +87,7 @@
<el-date-picker v-model="detailData.usetime" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"发券总量:"
>
<div
class=
"display-flex"
>
<el-input
type=
"number"
v-model=
"detailData.stock"
style=
"width:170px;"
placeholder=
"请输入发券总量"
>
...
...
application/admin/view/shopro/coupons/edit.html
查看文件 @
c497bb4
...
...
@@ -78,7 +78,7 @@
<el-form-item
label=
"优惠券描述:"
>
<el-input
type=
"input"
v-model=
"detailData.description"
placeholder=
"仅商家端显示,用于区分相似优惠券(最多可输入十个字)"
></el-input>
</el-form-item>
<el-form-item
label=
"有效时间:"
prop=
"gettime"
>
<
!--<
el-form-item label="有效时间:" prop="gettime">
<el-date-picker v-model="detailData.gettime" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
...
...
@@ -87,7 +87,7 @@
<el-date-picker v-model="detailData.usetime" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"发券总量:"
>
<div
class=
"display-flex"
>
<el-input
type=
"number"
v-model=
"detailData.stock"
style=
"width:170px;"
placeholder=
"请输入发券总量"
>
...
...
public/assets/js/backend/shopro/coupons.js
查看文件 @
c497bb4
...
...
@@ -525,8 +525,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
this
.
$refs
[
check
].
validate
((
valid
)
=>
{
if
(
valid
)
{
let
subData
=
JSON
.
parse
(
JSON
.
stringify
(
that
.
detailData
));
subData
.
gettime
=
subData
.
gettime
.
join
(
' - '
);
subData
.
usetime
=
subData
.
usetime
.
join
(
' - '
);
// subData.gettime=subData.gettime.join(' - ');
// subData.usetime=subData.usetime.join(' - ');
if
(
subData
.
goods_type
==
'all'
){
subData
.
goods_ids
=
0
}
else
{
...
...
请
注册
或
登录
后发表评论