Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
4d643d38
Commit
4d643d38
authored
Dec 04, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
share
parent
45213edc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
Index.php
application/controllers/Index.php
+8
-0
ShareService.php
application/models/Business/User/ShareService.php
+3
-0
saleShare.php
application/views/index/saleShare.php
+1
-1
store.phtml
application/views/index/store.phtml
+1
-1
No files found.
application/controllers/Index.php
View file @
4d643d38
...
...
@@ -58,7 +58,14 @@ class IndexController extends \Our\Controller_Abstract {
//"freeShippingPrice": 0
//}';
$paramsStr
=
json_decode
(
$paramsStr
,
true
);
if
(
$paramsStr
[
'type'
]
==
\Our\ApiConst
::
shareGoods
||
$paramsStr
[
'type'
]
==
\Our\ApiConst
::
shareGroup
){
$begin
=
strtotime
(
$paramsStr
[
'storeStartTime'
]);
$end
=
strtotime
(
$paramsStr
[
'storeCloseTime'
]);
if
(
$begin
>=
$end
){
$paramsStr
[
'storeCloseTime'
]
=
date
(
'H:i'
,
$end
+
\Our\ApiConst
::
oneDaySecond
);
}
}
$this
->
_view
->
assign
(
"params"
,
$paramsStr
);
if
(
$paramsStr
[
'type'
]
==
\Our\ApiConst
::
sharePlat
){
$this
->
_view
->
display
(
'index/plat.phtml'
);
...
...
@@ -67,6 +74,7 @@ class IndexController extends \Our\Controller_Abstract {
$this
->
_view
->
display
(
'index/store.phtml'
);
}
if
(
$paramsStr
[
'type'
]
==
\Our\ApiConst
::
shareGoods
||
$paramsStr
[
'type'
]
==
\Our\ApiConst
::
shareGroup
){
$this
->
_view
->
display
(
'index/goods.phtml'
);
}
if
(
$paramsStr
[
'type'
]
==
\Our\ApiConst
::
shareSaler
){
...
...
application/models/Business/User/ShareService.php
View file @
4d643d38
...
...
@@ -67,6 +67,9 @@ class ShareServiceModel extends \Business\AbstractModel
$data
[
'sellerDistribution'
]
=
$store
[
'seller_distribution'
];
$data
[
'startShippingPrice'
]
=
$store
[
'start_shipping_price'
];
$data
[
'freeShippingPrice'
]
=
$store
[
'free_shipping_price'
];
$data
[
'storeStartTime'
]
=
$store
[
'store_start_time'
];
$data
[
'storeCloseTime'
]
=
$store
[
'store_close_time'
];
}
}
...
...
application/views/index/saleShare.php
View file @
4d643d38
...
...
@@ -121,7 +121,7 @@
<p
class=
"follow"
>
关注
</p>
<div
class=
"shop-name"
>
<?php
echo
$params
[
'storeName'
];
?>
</div>
</div>
<p
class=
"time"
>
营业时间:
<?php
echo
$params
[
'store
Workingt
ime'
];
?>
</p>
<p
class=
"time"
>
营业时间:
<?php
echo
$params
[
'store
StartTime'
]
.
'-'
.
$params
[
'storeCloseT
ime'
];
?>
</p>
<div
class=
"tag"
>
<?php
echo
$params
[
'buyerDistribution'
]
?
'<p>支持自提</p>'
:
''
;
?>
<?php
echo
$params
[
'sellerDistribution'
]
?
'<p>商家配送</p>'
:
''
;
?>
...
...
application/views/index/store.phtml
View file @
4d643d38
...
...
@@ -121,7 +121,7 @@
<p
class=
"follow"
>
关注
</p>
<div
class=
"shop-name"
>
<?php
echo
$params
[
'storeName'
];
?>
</div>
</div>
<p
class=
"time"
>
营业时间:
<?php
echo
$params
[
'store
Workingt
ime'
];
?>
</p>
<p
class=
"time"
>
营业时间:
<?php
echo
$params
[
'store
StartTime'
]
.
'-'
.
$params
[
'storeCloseT
ime'
];
?>
</p>
<div
class=
"tag"
>
<?php
echo
$params
[
'buyerDistribution'
]
?
'<p>支持自提</p>'
:
''
;
?>
<?php
echo
$params
[
'sellerDistribution'
]
?
'<p>商家配送</p>'
:
''
;
?>
...
...
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