切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
anyv
6 years ago
提交
9f7f8bed0e4c44189676fed038ba785cbade55e2
1 个父辈
6be50acb
master
...
liuzhen
wangxiaogang
1 个管道 的构建
通过
耗费 0 秒
4
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
22 行增加
和
5 行删除
app/portal/controller/OrderpageController.php
public/themes/simpleboot3/portal/orderpage/go_add_address.html
public/themes/simpleboot3/portal/orderpage/order_page.html
app/portal/controller/OrderpageController.php
查看文件 @
9f7f8be
...
...
@@ -52,6 +52,7 @@ class OrderpageController extends WeChatBaseController{
$this
->
assign
(
'money'
,
$money
[
'money'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'indent_id'
,
$indet_id
[
'indet_id'
]);
$this
->
assign
(
'type'
,
5
);
return
$this
->
fetch
();
}
...
...
@@ -274,6 +275,11 @@ class OrderpageController extends WeChatBaseController{
$data
=
Db
::
name
(
'address'
)
->
where
(
"delete_time = 0 and uid ="
.
$uid
)
->
select
()
->
toArray
();
$this
->
assign
(
'indent_id'
,
$indent_id
[
'indet_id'
]);
$this
->
assign
(
'data'
,
$data
);
if
(
!
empty
(
$indent_id
[
'type'
])){
$this
->
assign
(
'type'
,
5
);
}
else
{
$this
->
assign
(
'type'
,
6
);
}
return
$this
->
fetch
();
}
...
...
public/themes/simpleboot3/portal/orderpage/go_add_address.html
查看文件 @
9f7f8be
...
...
@@ -71,12 +71,23 @@
*点击确认
*/
function
deter_sub
(){
type
=
"{$type}"
;
id
=
$
(
'.haha'
).
attr
(
'data-id'
);
if
(
typeof
(
id
)
==
'undefined'
){
window
.
location
.
href
=
"{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}"
;
if
(
type
==
5
){
window
.
location
.
href
=
"{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}"
;
}
else
{
window
.
location
.
href
=
"{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}"
;
}
}
else
{
window
.
location
.
href
=
"{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}?address_id="
+
id
;
if
(
type
==
5
){
window
.
location
.
href
=
"{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}?address_id="
+
id
;
}
else
{
window
.
location
.
href
=
"{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}?address_id="
+
id
;
}
}
}
...
...
public/themes/simpleboot3/portal/orderpage/order_page.html
查看文件 @
9f7f8be
...
...
@@ -37,7 +37,7 @@
<div
class=
"order_adImg"
>
<img
src=
"__TMPL__/public/assets/images/31.png"
alt=
""
>
</div>
<p
class=
"order_addressGo"
>
暂无默认收货地址,
<a
href=
"{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}"
>
去添加
</a></p>
<p
class=
"order_addressGo"
>
暂无默认收货地址,
<a
href=
"{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id
,'type'=>$type
))}"
>
去添加
</a></p>
</div>
<else/>
<div
class=
"order_addressYes"
>
...
...
@@ -52,7 +52,7 @@
<p
class=
"or_address_detailed"
id=
"detailed"
>
{$address.region}{$address.detailed}
</p>
</div>
<div
class=
"or_addressYesImg2"
>
<a
href=
"{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}"
>
<a
href=
"{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id
,'type'=>$type
))}"
>
<img
src=
"__TMPL__/public/assets/images/29.png"
alt=
""
>
</a>
</div>
...
...
请
注册
或
登录
后发表评论