切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
刘朕
6 years ago
提交
05b6c5183dac0603980dbacc07a25a09fe49b502
1 个父辈
7eb52eef
1 个管道 的构建
通过
耗费 1 秒
统一配送订单新增备用地址
变更
6
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
31 行增加
和
3 行删除
app/portal/controller/OrderSalesmanController.php
app/portal/controller/OrderpageController.php
public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_show.html
public/themes/simpleboot3/portal/order_salesman/get_one.html
public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html
app/portal/controller/OrderSalesmanController.php
查看文件 @
05b6c51
...
...
@@ -353,7 +353,7 @@ class OrderSalesmanController extends WeChatBaseController
$indentModel
= new IndentModel();
$data
=
$indentModel->findData
(['id'=>
$indent_id
]);
if(
$data['is_courier']
== 1){
if(empty(
$param['name']
) || empty(
$param['region']
) || empty(
$param['school']
) || empty(
$param['grade_class']
) || empty(
$param['phone']
)
){
if(empty(
$param['name']
) || empty(
$param['region']
) || empty(
$param['school']
) || empty(
$param['grade_class']
) || empty(
$param['phone']
)
|| empty(
$param['beiyong_address']
)){
$this->error
('缺少必要参数');
}
$grade_class
= explode('-',
$param['grade_class']
);
...
...
@@ -363,6 +363,7 @@ class OrderSalesmanController extends WeChatBaseController
$arr['school']
= preg_replace('# #','',
$param['school']
);
$arr['grade']
=
$grade_class[0]
;
$arr['class']
=
$grade_class[1]
;
$arr['beiyong_address']
=
$param['beiyong_address']
;
$result
=
$indentModel
->updateData(['id'=>
$indent_id
],
$arr
);
}else if(
$data['is_courier']
== 2){
if(empty(
$param['name']
) || empty(
$param['phone']
) || empty(
$param['region']
) || empty(
$param['region_detail']
)){
...
...
app/portal/controller/OrderpageController.php
查看文件 @
05b6c51
...
...
@@ -289,6 +289,7 @@ class OrderpageController extends WeChatBaseController{
$indent_data
[
'grade'
]
=
$_POST
[
'grade'
];
$indent_data
[
'class'
]
=
$_POST
[
'class'
];
$indent_data
[
'leave_word'
]
=
$_POST
[
'leave_word'
];
$indent_data
[
'beiyong_address'
]
=
$_POST
[
'beiyong_address'
];
$data
=
Db
::
name
(
'indent'
)
->
update
(
$indent_data
);
if
(
$data
){
return
true
;
...
...
public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
查看文件 @
05b6c51
...
...
@@ -62,6 +62,7 @@
<th>
数量
</th>
<th>
价钱
</th>
<th>
学校-班级
</th>
<th>
备用地址
</th>
<th>
订单状态
</th>
<th>
创建时间
</th>
<th>
操作
</th>
...
...
@@ -79,6 +80,7 @@
<td>
{$vo.book_num}
</td>
<td>
{$vo.money}
</td>
<td>
{$vo.grade_class}
</td>
<td>
{$vo.beiyong_address}
</td>
<if
condition=
"$vo.state eq 4"
>
<td>
待付款
</td>
<elseif
condition=
"$vo.state eq 1"
/>
...
...
public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_show.html
查看文件 @
05b6c51
...
...
@@ -47,6 +47,7 @@
</h4>
<h4>
买家留言:{$data.leave_word}
</h4>
<h4>
收货地址:{$address_region}
</h4>
<h4>
备用地址:{$data.beiyong_address}
</h4>
</div>
</div>
</body>
...
...
public/themes/simpleboot3/portal/order_salesman/get_one.html
查看文件 @
05b6c51
...
...
@@ -231,6 +231,14 @@
<input
style=
"width: 200px;text-align: left"
class=
"phone"
type=
"text"
value=
"{$data.phone}"
/>
</div>
</div>
<div
class=
"log_four_input_one"
>
<div
class=
"log_four_input_one_left"
>
备用地址
</div>
<div
class=
"log_four_input_one_center"
>
<input
style=
"width: 200px;text-align: left"
class=
"beiyong_address"
type=
"text"
value=
"{$data.beiyong_address}"
/>
</div>
</div>
</if>
...
...
@@ -579,6 +587,7 @@
var
phone
=
$
(
'.phone'
).
val
();
var
region
=
$
(
'.region'
).
text
();
var
region_detail
=
$
(
'.region_detail'
).
val
();
var
beiyong_address
=
$
(
'.beiyong_address'
).
val
();
var
school
=
$
(
'.school'
).
text
();
var
grade_class
=
$
(
'.grade_class_text'
).
text
();
...
...
@@ -587,7 +596,7 @@
$
.
ajax
({
url
:
"{:url('updatePost')}"
,
type
:
"GET"
,
data
:{
'indent_id'
:
indent_id
,
'name'
:
name
,
'phone'
:
phone
,
'region'
:
region
,
'region_detail'
:
region_detail
,
'school'
:
school
,
'grade_class'
:
grade_class
},
data
:{
'indent_id'
:
indent_id
,
'name'
:
name
,
'phone'
:
phone
,
'region'
:
region
,
'region_detail'
:
region_detail
,
'school'
:
school
,
'grade_class'
:
grade_class
,
beiyong_address
:
beiyong_address
},
success
:
function
(
res
){
if
(
res
.
code
==
1
){
alert
(
'修改成功'
)
...
...
public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html
查看文件 @
05b6c51
...
...
@@ -154,6 +154,17 @@
<img
src=
"__TMPL__/public/assets/images/29.png"
alt=
""
/>
</div>
</div>
<div
class=
"log_four_input_one"
>
<div
class=
"log_four_input_one_left"
>
备用地址
</div>
<div
class=
"log_four_input_one_center"
>
<input
type=
"text"
placeholder=
"输入备用地址"
maxlength=
"11"
id=
"beiyong_address"
/>
</div>
<div
class=
"log_four_input_one_right"
style=
"opacity: 0;"
>
<img
src=
"__TMPL__/public/assets/images/29.png"
alt=
""
/>
</div>
</div>
</div>
<!-- 订单信息 -->
<div
class=
"log_four_order"
>
...
...
@@ -320,6 +331,7 @@
grade
=
$
(
'.banji_name'
).
text
();
name
=
$
(
'#name'
).
val
();
phone
=
$
(
'#phone'
).
val
();
var
beiyong_address
=
$
(
'#beiyong_address'
).
val
();
if
(
region
==
'请选择省市区'
){
alert
(
'地区不能为空'
);
}
else
if
(
school
==
'请选择学校'
){
...
...
@@ -330,11 +342,13 @@
alert
(
'姓名不能为空'
);
}
else
if
(
phone
==
''
){
alert
(
'手机号不能为空'
);
}
else
if
(
beiyong_address
==
''
){
alert
(
'备用地址不能为空'
);
}
else
{
liuyan
=
$
(
'#liuyan'
).
val
();
indet_id
=
{
$indent_id
};
money
=
{
$money
.
0
};
$
.
post
(
"{:url('Orderpage/salesman_ty_go_pay')}"
,{
leave_word
:
liuyan
,
id
:
indet_id
,
money
:
money
,
region
:
region
,
school
:
school
,
name
:
name
,
phone
:
phone
,
grade
:
grade
},
function
(
data
){
$
.
post
(
"{:url('Orderpage/salesman_ty_go_pay')}"
,{
leave_word
:
liuyan
,
id
:
indet_id
,
money
:
money
,
region
:
region
,
school
:
school
,
name
:
name
,
phone
:
phone
,
grade
:
grade
,
beiyong_address
:
beiyong_address
},
function
(
data
){
if
(
data
){
window
.
location
.
href
=
"{:url('Pay/index',array('id'=>$indent_id))}"
;
}
else
{
...
...
请
注册
或
登录
后发表评论