Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
亲子游项目
backend
Commits
6840fa43
Commit
6840fa43
authored
Nov 21, 2018
by
LiuJunYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
美行者BUG
parent
0f7eca77
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
16 deletions
+19
-16
application/admin/controller/Project.php
+1
-2
application/admin/view/guide/index.html
+1
-1
application/admin/view/project/index.html
+7
-7
application/admin/view/project/pricepage.html
+3
-0
application/admin/view/project/save.html
+2
-2
application/api/controller/Guide.php
+1
-1
application/api/controller/Project.php
+3
-2
public/static/qiniu_ueditor143/php/config.json
+1
-1
No files found.
application/admin/controller/Project.php
View file @
6840fa43
...
...
@@ -619,13 +619,12 @@ class Project extends AuthBase
}
//修改价格
public
function
priceSave
()
{
if
(
request
()
->
isPost
())
{
$res
=
ProjectModel
::
update
(
input
(
'post.'
));
if
(
$res
)
{
return
json
([
'code'
=>
0
,
'msg'
=>
'修改成功'
]);
return
json
([
'code'
=>
0
,
'msg'
=>
'修改成功'
,
'data'
=>
$res
]);
}
else
{
return
json
([
'code'
=>
1
,
'msg'
=>
'修改失败'
]);
}
...
...
application/admin/view/guide/index.html
View file @
6840fa43
...
...
@@ -41,7 +41,7 @@
<th>
简介
</th>
<th>
标签
</th>
<th>
封面
</th>
<th>
最热
</th>
<th>
排序
</th>
<th>
发布时间
</th>
<th>
操作
</th>
</tr>
...
...
application/admin/view/project/index.html
View file @
6840fa43
...
...
@@ -125,11 +125,11 @@
<div
class=
"clearfix"
style=
"width: 500px"
>
<div
class=
"table-detail-left"
>
<p
class=
"table-detail-row"
><span>
类
型:
</span>
活动
</p>
<p
class=
"table-detail-row"
><span>
晚
数:
</span>
{$vo.night_num}
<p
class=
"table-detail-row"
><span>
晚
数:
</span>
<i
id=
"night_num_{$vo.id}"
>
{$vo.night_num}
</i>
</p>
<p
class=
"table-detail-row"
><span>
价
格:
</span>
¥{$vo.price}
<p
class=
"table-detail-row"
><span>
价
格:
</span>
<i
id=
"price_{$vo.id}"
>
¥{$vo.price}
</i>
</p>
<p
class=
"table-detail-row"
><span>
会
员价:
</span>
¥{$vo.vip_price}
</p>
<p
class=
"table-detail-row"
><span>
会
员
价:
</span><i
id=
"vip_price_{$vo.id}"
>
¥{$vo.vip_price}
</i>
</p>
</div>
<div
class=
"table-detail-right"
>
<p
class=
"table-detail-row"
><span>
总
组
数:
</span>
{$vo.sign_limits}
...
...
@@ -140,7 +140,7 @@
<p
class=
"table-detail-row"
><span>
报名截至:
</span>
{$vo.sign_endtime}
</p>
</div>
<div
class=
"table-detail-full"
>
<p
class=
"table-detail-row"
><span>
所
在
地:
</span>
{$vo.location}
</p>
<p
class=
"table-detail-row"
><span>
所
在
地:
</span>
{$vo.location}
</p>
<p
class=
"table-detail-row"
><span>
标
签:
</span>
{$vo.tags}
</p>
</div>
...
...
@@ -148,10 +148,10 @@
{else/}
<div
class=
"clearfix"
style=
"width: 500px"
>
<p
class=
"table-detail-row"
><span>
类
型:
</span>
商家
</p>
<p
class=
"table-detail-row"
><span>
价
格:
</span>
¥{$vo.price}
<p
class=
"table-detail-row"
><span>
价
格:
</span>
<i
id=
"price_{$vo.id}"
>
¥{$vo.price}
</i>
</p>
<p
class=
"table-detail-row"
><span>
晚
数:
</span>
{$vo.night_num}
<p
class=
"table-detail-row"
><span>
所
在
地:
</span>
{$vo.location}
</p>
<p
class=
"table-detail-row"
><span>
晚
数:
</span>
<i
id=
"night_num_{$vo.id}"
>
{$vo.night_num}
</i>
<p
class=
"table-detail-row"
><span>
所
在
地:
</span>
{$vo.location}
</p>
<p
class=
"table-detail-row"
><span>
标
签:
</span>
{$vo.tags}
</p>
</div>
{/if}
...
...
application/admin/view/project/pricepage.html
View file @
6840fa43
...
...
@@ -48,6 +48,9 @@
$
.
post
(
"{:url('priceSave')}"
,
data
.
field
,
function
(
res
){
layer
.
msg
(
res
.
msg
);
setTimeout
(
function
(){
$
(
'#price_'
+
res
.
data
.
id
).
html
(
res
.
data
.
price
);
$
(
'#night_num_'
+
res
.
data
.
id
).
html
(
res
.
data
.
night_num
);
$
(
'#vip_price_'
+
res
.
data
.
id
).
html
(
res
.
data
.
vip_price
);
layer
.
closeAll
();
},
1500
);
});
...
...
application/admin/view/project/save.html
View file @
6840fa43
...
...
@@ -220,8 +220,8 @@
<div
class=
"layui-upload"
>
<button
type=
"button"
class=
"layui-btn"
id=
"test2"
>
上传图片
</button>
<div
class=
"layui-upload-list"
>
<img
class=
"layui-upload-img"
id=
"dome2"
{
:isset
($
info
['
kf_qrcode
'])?"
src=
'".$info
['
kf_qrcode
']
."'"
:
''}
>
<input
type=
"hidden"
name=
"kf_qrcode"
value=
"{
$info['kf_qrcode']??'';
}"
id=
"qrcode-input"
>
<img
class=
"layui-upload-img"
id=
"dome2"
{
:isset
($
info
['
kf_qrcode
'])?"
src=
'".$info
->getData('
kf_qrcode
')
."'"
:
''}
>
<input
type=
"hidden"
name=
"kf_qrcode"
value=
"{
:isset($info['kf_qrcode'])?"
src=
'".$info->getData('
kf_qrcode
')."'"
:
''
}"
id=
"qrcode-input"
>
</div>
</div>
</div>
...
...
application/api/controller/Guide.php
View file @
6840fa43
...
...
@@ -20,7 +20,7 @@ class Guide extends Base
public
function
detail
(
$id
=
0
)
{
if
(
empty
(
$id
))
return
[
'code'
=>
1
,
'msg'
=>
'缺少参数ID'
];
$data
=
GuideModel
::
order
(
'
sort'
,
'desc'
)
->
order
(
'
id'
,
'desc'
)
->
find
(
$id
);
$data
=
GuideModel
::
order
(
'id'
,
'desc'
)
->
find
(
$id
);
if
(
!
$data
)
return
[
'code'
=>
1
,
'msg'
=>
'攻略不存在'
];
return
[
'code'
=>
1
,
'msg'
=>
'success'
,
'data'
=>
$data
];
}
...
...
application/api/controller/Project.php
View file @
6840fa43
...
...
@@ -121,7 +121,8 @@ class Project extends Base
//美行攻略
$guides
=
GuideModel
::
all
(
function
(
$query
)
{
$query
->
order
(
'id'
,
'desc'
)
$query
->
order
(
'sort'
,
'desc'
)
->
order
(
'id'
,
'desc'
)
->
limit
(
6
);
});
$guides
=
$guides
?
collection
(
$guides
)
->
toArray
()
:
[];
...
...
@@ -217,7 +218,7 @@ class Project extends Base
public
function
guides
(
$p
=
1
,
$page
=
8
)
{
$guides
=
GuideModel
::
all
(
function
(
$query
)
use
(
$p
,
$page
)
{
$query
->
order
(
'id'
,
'desc'
)
$query
->
order
(
'
sort'
,
'desc'
)
->
order
(
'
id'
,
'desc'
)
->
page
(
$p
,
$page
);
});
$guides
=
$guides
?
collection
(
$guides
)
->
toArray
()
:
[];
...
...
public/static/qiniu_ueditor143/php/config.json
View file @
6840fa43
...
...
@@ -3,7 +3,7 @@
/*
七牛云存储配置start
*/
"uploadType"
:
"qiniu"
,
/*
qiniu|local
【qiniu】七牛云存储
【local】本地上传*/
"qiniuUploadType"
:
"url"
,
/*
url|php
【url】
通过URL直传,根据token来判断返回地址
,
【php】
通过php文件方式传输
*/
"uploadQiniuUrl"
:
"http
s
://upload.qiniu.com/"
,
/*
七牛上传地址
*/
"uploadQiniuUrl"
:
"http://upload.qiniu.com/"
,
/*
七牛上传地址
*/
"qiniuUploadPath"
:
"uploads/"
,
/*
七牛上传的前缀
*/
"qiniuDatePath"
:
"mmdd"
,
/*
文件夹后的时间例如
uploads/
0712
留空uploads/
,
格式
yyyy
==
2017
yy
==
17
mm
月份
07
dd
日期
12
*/
"uploadSaveType"
:
"date"
,
/*
保存文件的名称类型
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment