切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
anyv
6 years ago
提交
fca472792301177a50cd7022a1ce2e483f8a3bc8
1 个父辈
65c226b3
master
...
liuzhen
wangxiaogang
1 个管道 的构建
通过
耗费 0 秒
4
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
7 行增加
和
7 行删除
app/portal/controller/OrderpageController.php
public/themes/simpleboot3/portal/goodsdetails/goods_details.html
public/themes/simpleboot3/portal/orderpage/go_add_address.html
app/portal/controller/OrderpageController.php
查看文件 @
fca4727
...
...
@@ -154,13 +154,15 @@ class OrderpageController extends WeChatBaseController{
$this
->
assign
(
'courier'
,
$courier
[
'courier'
]);
$money
[
'money'
]
=
$money
[
'money'
]
+
$courier
[
'courier'
];
$this
->
assign
(
'money'
,
$money
[
'money'
]);
if
(
empty
(
$indent_id
[
'address_id'
])){
$address
=
Db
::
name
(
'address'
)
->
where
(
"uid="
.
$uid
.
" and default_address=1 and delete_time = 0"
)
->
find
();
}
else
{
$address
=
Db
::
name
(
'address'
)
->
where
(
'id'
,
$indent_id
[
'address_id'
])
->
find
();
}
$address
=
Db
::
name
(
'address'
)
->
where
(
"uid="
.
$uid
.
" and default_address=1 and delete_time = 0"
)
->
find
();
if
(
empty
(
$address
)){
$this
->
assign
(
'address'
,
4
);
}
else
{
$address_arr
=
explode
(
','
,
$address
[
'detailed'
]);
$address
[
'detailed'
]
=
$address_arr
[
0
]
.
$address_arr
[
1
];
$indet_data
=
Db
::
name
(
'indent'
)
->
where
(
"id"
,
$indent_id
[
'indet_id'
])
->
find
();
if
(
$indet_data
[
'state'
]
==
4
){
$indet_data_update
[
'id'
]
=
$indent_id
[
'indet_id'
];
...
...
public/themes/simpleboot3/portal/goodsdetails/goods_details.html
查看文件 @
fca4727
...
...
@@ -234,8 +234,6 @@
}
});
}
...
...
public/themes/simpleboot3/portal/orderpage/go_add_address.html
查看文件 @
fca4727
...
...
@@ -74,9 +74,9 @@
id
=
$
(
'.haha'
).
attr
(
'data-id'
);
if
(
typeof
(
id
)
==
'undefined'
){
window
.
location
.
href
=
"{:url('Orderpage/order_
page
',array('indet_id'=>$indent_id))}"
;
window
.
location
.
href
=
"{:url('Orderpage/order_
salesman_kd
',array('indet_id'=>$indent_id))}"
;
}
else
{
window
.
location
.
href
=
"{:url('Orderpage/order_
page
',array('indet_id'=>$indent_id))}?address_id="
+
id
;
window
.
location
.
href
=
"{:url('Orderpage/order_
salesman_kd
',array('indet_id'=>$indent_id))}?address_id="
+
id
;
}
}
...
...
请
注册
或
登录
后发表评论