切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
anyv
6 years ago
提交
7a917fa3838b0fdd7b65e66b41e4bf8dada32b75
2 个父辈
e2296abb
ed8389a0
1 个管道 的构建
通过
耗费 3 秒
Merge branch 'master' of
http://114.215.101.231:8099/anyv/xkeasy
变更
3
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
92 行增加
和
40 行删除
app/portal/controller/OrderSalesmanController.php
public/themes/simpleboot3/portal/order_salesman/get_all.html
public/themes/simpleboot3/portal/order_salesman/get_one.html
app/portal/controller/OrderSalesmanController.php
查看文件 @
7a917fa
...
...
@@ -129,9 +129,9 @@ class OrderSalesmanController extends WeChatBaseController
if
(
empty
(
$param
[
'start_time'
])){
$this
->
error
(
'缺少必要参数2'
);
}
if
(
empty
(
$param
[
'end_time'
])){
$this
->
error
(
'缺少必要参数3'
);
}
// if(empty($param['end_time'])){
// $this->error('缺少必要参数3');
// }
}
else
if
(
$param
[
'is_courier'
]
==
2
){
if
(
empty
(
$param
[
'logistic_name'
])){
$this
->
error
(
'缺少必要参数4'
);
...
...
@@ -155,7 +155,7 @@ class OrderSalesmanController extends WeChatBaseController
$arr
=
[];
if
(
$param
[
'is_courier'
]
==
1
){
$arr
[
'start_time'
]
=
$param
[
'start_time'
];
$arr
[
'end_time'
]
=
$param
[
'end_time'
];
//
$arr['end_time'] = $param['end_time'];
}
else
if
(
$param
[
'is_courier'
]
==
2
){
$arr
[
'logistic_name'
]
=
$param
[
'logistic_name'
];
$arr
[
'logistic_code'
]
=
$param
[
'logistic_code'
];
...
...
public/themes/simpleboot3/portal/order_salesman/get_all.html
查看文件 @
7a917fa
...
...
@@ -278,16 +278,17 @@
<div
class=
"log_three_model"
>
<div
class=
"log_three_model_one time"
>
<div
class=
"log_three_model_left"
>
配送时间
</div>
<div
class=
"log_psong"
>
<input
type=
"text"
id=
"start_time"
value=
""
placeholder=
"请输入开始配送时间"
/>
<div
class=
"log_psong tongyi_start_time"
style=
"color: #CCCCCC;"
>
请选择配送到达时间
</div>
<input
type=
"hidden"
id=
"start_time"
value=
""
placeholder=
"请输入开配送时间"
/>
</div>
<div
class=
"log_three_model_one time"
>
<
!--<
div class="log_three_model_one time">
<div class="log_three_model_left">配送时间</div>
<div class="log_psong">
<input type="text" id="end_time" value="" placeholder="请输入结束配送时间"/>
</div>
</div>
</div>
-->
<div
class=
"log_three_model_one logistic"
>
<div
class=
"log_three_model_left"
>
选择快递
</div>
<div
class=
"log_psong log_psong_select"
>
...
...
@@ -1081,10 +1082,10 @@
$
(
'.confirm'
).
attr
(
'data-is_courier'
,
is_courier
);
});
//点击确认
$
(
"body"
).
on
(
'click'
,
'.confirm'
,
function
()
{
$
(
'.confirm'
).
click
(
function
()
{
var
is_courier
=
$
(
this
).
attr
(
'data-is_courier'
);
var
start_time
=
$
(
'#start_time'
).
val
();
var
end_time
=
$
(
'#end_time'
).
val
();
//
var end_time = $('#end_time').val();
var
logistic_name
=
$
(
'#logistic_name'
).
val
();
var
logistic_code
=
$
(
'#logistic_code'
).
val
();
var
indent_id
=
$
(
this
).
attr
(
'data-indent-id'
);
...
...
@@ -1092,10 +1093,11 @@
if
(
start_time
==
''
)
{
alert
(
'请填写配送时间'
);
return
false
;
}
else
if
(
end_time
==
''
)
{
alert
(
'请填写配送时间'
);
return
false
;
}
// else if (end_time == '') {
// alert('请填写配送时间');
// return false;
// }
}
else
if
(
is_courier
==
2
)
{
if
(
logistic_name
==
''
)
{
alert
(
'请填写快递公司'
);
...
...
@@ -1113,7 +1115,7 @@
type
:
"GET"
,
data
:
{
'start_time'
:
start_time
,
'end_time'
:
end_time
,
//
'end_time': end_time,
'logistic_name'
:
logistic_name
,
'logistic_code'
:
logistic_code
,
'is_courier'
:
is_courier
,
...
...
@@ -1231,6 +1233,25 @@
}
}
</script>
<script
type=
"text/javascript"
>
var
dtpicker
=
new
mui
.
DtPicker
({
type
:
"datetime"
,
//设置日历初始视图模式
beginDate
:
new
Date
(),
//设置开始日期
labels
:
[
'年'
,
'月'
,
'日'
,
'时'
,
'分'
,
'秒'
],
//设置默认标签区域提示语
})
//统一配送选择时间
$
(
".tongyi_start_time"
).
click
(
function
()
{
dtpicker
.
show
(
function
(
e
)
{
console
.
log
(
e
);
$
(
'.tongyi_start_time'
).
text
(
e
.
text
);
$
(
'#start_time'
).
val
(
e
.
text
);
$
(
'.tongyi_start_time'
).
css
(
'color'
,
'#333333'
);
});
});
function
zZFun
(
e
)
{
window
.
event
?
(
window
.
event
.
cancelBubble
=
true
)
:
e
.
stopPropagation
();
}
</script>
</body>
</html>
\ No newline at end of file
...
...
public/themes/simpleboot3/portal/order_salesman/get_one.html
查看文件 @
7a917fa
...
...
@@ -60,16 +60,17 @@
<div
class=
"log_three_model"
>
<div
class=
"log_three_model_one time"
>
<div
class=
"log_three_model_left"
>
配送时间
</div>
<div
class=
"log_psong"
>
<input
type=
"text"
id=
"start_time"
value=
""
placeholder=
"请输入开始配送时间"
/>
<div
class=
"log_psong tongyi_start_time"
style=
"color: #CCCCCC;"
>
请选择配送到达时间
</div>
<input
type=
"hidden"
id=
"start_time"
value=
""
placeholder=
"请输入开配送时间"
/>
</div>
<div
class=
"log_three_model_one time"
>
<
!--<
div class="log_three_model_one time">
<div class="log_three_model_left">配送时间</div>
<div class="log_psong">
<input type="text" id="end_time" value="" placeholder="请输入结束配送时间"/>
</div>
</div>
</div>
-->
<div
class=
"log_three_model_one logistic"
>
<div
class=
"log_three_model_left"
>
选择快递
</div>
<div
class=
"log_psong log_psong_select"
>
...
...
@@ -168,7 +169,7 @@
<img
src=
"__TMPL__/public/assets/images/29.png"
alt=
""
/>
</div>
</div>
<else
/>
<else/>
<div
class=
"log_four_input_one"
>
<div
class=
"log_four_input_one_left"
>
地区
...
...
@@ -268,7 +269,7 @@
<!-- 底部按钮 -->
<div
class=
"log_seven_btn log_seven_btn9"
style=
"margin-top: 0.36rem;"
>
<if
condition=
"$data.state eq 2"
>
<div
class=
"log_seven_btn_contant send"
data-is_courier=
"{$data.is_courier}"
data-indent-id=
"{$data.id}"
>
<div
class=
"log_seven_btn_contant send"
data-is_courier=
"{$data.is_courier}"
data-indent-id=
"{$data.id}"
>
立即发货
</div>
<elseif
condition=
"$data.state eq 5"
/>
...
...
@@ -288,21 +289,22 @@
function
zZFun
(
e
)
{
window
.
event
?
(
window
.
event
.
cancelBubble
=
true
)
:
e
.
stopPropagation
();
}
//选择快递方式
$
(
".log_psong_select"
).
click
(
function
()
{
//选择快递方式
$
(
".log_psong_select"
).
click
(
function
()
{
$
(
".tx_mask_kuaidi"
).
css
({
display
:
"block"
});
});
$
(
".tx_mask_kuaidi .three_model_school_name"
).
click
(
function
()
{
});
$
(
".tx_mask_kuaidi .three_model_school_name"
).
click
(
function
()
{
var
index
=
$
(
this
).
index
();
$
(
this
).
addClass
(
'there_unActive'
).
siblings
().
removeClass
(
'there_unActive'
);
$
(
'.log_ps_title'
).
text
(
$
(
this
).
text
()).
css
(
"color"
,
"#333"
);
$
(
".tx_mask_kuaidi"
).
hide
();
$
(
'#logistic_name'
).
val
(
$
(
this
).
attr
(
'data-name'
))
});
$
(
function
(){
$
(
'body'
).
on
(
'click'
,
'.send'
,
function
(){
});
$
(
function
()
{
$
(
'body'
).
on
(
'click'
,
'.send'
,
function
()
{
var
indent_id
=
$
(
this
).
attr
(
'data-indent-id'
);
var
is_courier
=
$
(
this
).
attr
(
'data-is_courier'
);
console
.
log
(
indent_id
);
...
...
@@ -317,24 +319,25 @@ $(function(){
$
(
'.logistic'
).
show
();
}
$
(
'.tx_maskone'
).
show
();
$
(
'.confirm'
).
attr
(
'data-indent-id'
,
indent_id
);
$
(
'.confirm'
).
attr
(
'data-is_courier'
,
is_courier
);
$
(
'.confirm'
).
attr
(
'data-indent-id'
,
indent_id
);
$
(
'.confirm'
).
attr
(
'data-is_courier'
,
is_courier
);
});
$
(
'body'
).
on
(
'click'
,
'.confirm'
,
function
()
{
$
(
'.confirm'
).
click
(
function
()
{
var
is_courier
=
$
(
this
).
attr
(
'data-is_courier'
);
var
indent_id
=
$
(
this
).
attr
(
'data-indent-id'
);
var
logistic_name
=
$
(
'#logistic_name'
).
val
();
var
logistic_code
=
$
(
'#logistic_code'
).
val
();
var
start_time
=
$
(
'#start_time'
).
val
();
var
end_time
=
$
(
'#end_time'
).
val
();
//
var end_time = $('#end_time').val();
if
(
is_courier
==
1
)
{
if
(
start_time
==
''
)
{
alert
(
'请填写配送时间'
);
return
false
;
}
else
if
(
end_time
==
''
)
{
alert
(
'请填写配送时间'
);
return
false
;
}
// else if (end_time == '') {
// alert('请填写配送时间');
// return false;
// }
}
else
if
(
is_courier
==
2
)
{
if
(
logistic_name
==
''
)
{
alert
(
'请填写快递公司'
);
...
...
@@ -348,10 +351,17 @@ $(function(){
return
false
;
}
$
.
ajax
({
url
:
"{:url('send')}"
,
type
:
"GET"
,
data
:{
'indent_id'
:
indent_id
,
'is_courier'
:
is_courier
,
'logistic_name'
:
logistic_name
,
'logistic_code'
:
logistic_code
,
'start_time'
:
start_time
,
'end_time'
:
end_time
},
success
:
function
(
res
){
url
:
"{:url('send')}"
,
type
:
"GET"
,
data
:
{
'indent_id'
:
indent_id
,
'is_courier'
:
is_courier
,
'logistic_name'
:
logistic_name
,
'logistic_code'
:
logistic_code
,
'start_time'
:
start_time
,
// 'end_time': end_time
},
success
:
function
(
res
)
{
console
.
log
(
res
);
if
(
res
.
code
==
1
)
{
$
(
'.order_'
+
indent_id
).
remove
();
...
...
@@ -362,18 +372,39 @@ $(function(){
display
:
"none"
});
$
(
'.send'
).
remove
();
var
html
=
"<a href=\"{:url('logistics/index','',false,true)}/indent_id/"
+
indent_id
+
"\">\n"
+
var
html
=
"<a href=\"{:url('logistics/index','',false,true)}/indent_id/"
+
indent_id
+
"\">\n"
+
" <div class=\"log_seven_btn_contant\">\n"
+
" 查看物流\n"
+
" </div>\n"
+
" </a>"
;
$
(
'.log_seven_btn9'
).
html
(
html
)
window
.
location
.
href
=
"{:url('get_all')}"
;
}
alert
(
res
.
msg
)
}
})
})
})
})
</script>
<script>
var
dtpicker
=
new
mui
.
DtPicker
({
type
:
"datetime"
,
//设置日历初始视图模式
beginDate
:
new
Date
(),
//设置开始日期
labels
:
[
'年'
,
'月'
,
'日'
,
'时'
,
'分'
,
'秒'
],
//设置默认标签区域提示语
})
//统一配送选择时间
$
(
".tongyi_start_time"
).
click
(
function
()
{
dtpicker
.
show
(
function
(
e
)
{
console
.
log
(
e
);
$
(
'.tongyi_start_time'
).
text
(
e
.
text
);
$
(
'#start_time'
).
val
(
e
.
text
);
$
(
'.tongyi_start_time'
).
css
(
'color'
,
'#333333'
);
});
})
function
zZFun
(
e
)
{
window
.
event
?
(
window
.
event
.
cancelBubble
=
true
)
:
e
.
stopPropagation
();
}
</script>
</body>
...
...
请
注册
或
登录
后发表评论