diff --git a/public/themes/simpleboot3/portal/order_salesman/get_all.html b/public/themes/simpleboot3/portal/order_salesman/get_all.html
index 9485c72..ccbb682 100755
--- a/public/themes/simpleboot3/portal/order_salesman/get_all.html
+++ b/public/themes/simpleboot3/portal/order_salesman/get_all.html
@@ -19,7 +19,8 @@
position: fixed;
background-color: rgba(0, 0, 0, 0.5);
}
- .take_one{
+
+ .take_one {
margin-top: 0.3rem;
width: 1.6rem;
height: 0.48rem;
@@ -64,7 +65,8 @@
border-left: none;
border-right: none
}
- .get_Go{
+
+ .get_Go {
height: 0.36rem;
margin: 0.08rem;
font-size: 0.24rem;
@@ -77,6 +79,7 @@
border-left: none;
border-right: none;
}
+
.mui-poppicker-header,
.mui-picker {
background-color: white;
@@ -92,10 +95,12 @@
.mui-pciker-list li.highlight {
color: #FF7700;
}
- .mui-dtpicker-header,.mui-dtpicker-title h5{
+
+ .mui-dtpicker-header, .mui-dtpicker-title h5 {
background-color: white;
}
- .dingdan_lianxi_ren{
+
+ .dingdan_lianxi_ren {
font-size: 0.28rem;
cursor: pointer;
font-family: PingFang SC;
@@ -103,22 +108,27 @@
color: rgba(102, 102, 102, 1);
opacity: 1;
}
- .dingdan_detail{
- padding-top: 0.22rem;
- }
- .dingdan_detail_hao{
+
+ /*.dingdan_detail {*/
+ /*padding-top: 0.22rem;*/
+ /*}*/
+
+ .dingdan_detail_hao {
font-size: 0.28rem;
cursor: pointer;
font-family: PingFang SC;
font-weight: 400;
color: rgba(102, 102, 102, 1);
opacity: 1;
+ margin-top:0.2rem;
}
- .right_dingdan{
+
+ .right_dingdan {
width: 5.6rem;
margin-left: 0.2rem;
}
- .right_dingdan_top{
+
+ .right_dingdan_top {
display: flex;
justify-content: space-between;
display: -webkit-box; /* Chrome 4+, Safari 3.1, iOS Safari 3.2+ */
@@ -135,17 +145,20 @@
-moz-box-align-items: center;
-ms-flexbox-align-items: center;
}
- .right_dingdan_center{
+
+ .right_dingdan_center {
text-align: right;
}
- .right_dingdan_one{
+
+ .right_dingdan_one {
font-size: 0.26rem;
cursor: pointer;
font-weight: 400;
color: rgba(51, 51, 51, 1);
opacity: 1;
}
- .right_dingdan_two{
+
+ .right_dingdan_two {
font-size: 0.34rem;
font-weight: 400;
cursor: pointer;
@@ -153,7 +166,8 @@
color: rgba(51, 51, 51, 1);
opacity: 1;
}
- .shuju_zongshu{
+
+ .shuju_zongshu {
padding-left: 0.4rem;
font-size: 0.28rem;
font-weight: 600;
@@ -313,14 +327,14 @@
</div>
<!-- 下拉框 -->
<div class="log_three_select">
- <!-- <div class="log_three_select_one log_three_select_school" style="cursor: pointer">
- <div class="log_three_select_title log_three_select_school2">
- 请选择学校/班级
- </div>
- <div class="log_three_select_img">
- <img src="__TMPL__/public/assets/images/75.png" alt=""/>
- </div>
- </div>-->
+ <!-- <div class="log_three_select_one log_three_select_school" style="cursor: pointer">
+ <div class="log_three_select_title log_three_select_school2">
+ 请选择学校/班级
+ </div>
+ <div class="log_three_select_img">
+ <img src="__TMPL__/public/assets/images/75.png" alt=""/>
+ </div>
+ </div>-->
<div class="log_three_select_one log_three_select_school">
@@ -328,7 +342,7 @@
请选择学校
</div>
<!--<div class="log_three_select_img">-->
- <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
+ <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
<!--</div>-->
</div>
<div class="log_three_select_one log_three_select_school">
@@ -336,7 +350,7 @@
请选择班级
</div>
<!--<div class="log_three_select_img">-->
- <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
+ <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
<!--</div>-->
</div>
@@ -346,7 +360,7 @@
统一配送
</div>
<!--<div class="log_three_select_img">-->
- <!--<img src="__TMPL__/public/assets/images/75.png" alt=""/>-->
+ <!--<img src="__TMPL__/public/assets/images/75.png" alt=""/>-->
<!--</div>-->
</div>
<div class="log_three_select_one log_three_select_btn search">
@@ -356,7 +370,7 @@
<input type="hidden" id="grade" value=""/>
<input type="hidden" id="is_courier" value="1"/>
</div>
-<div class="shuju_zongshu">搜索结果为20条</div>
+<div class="shuju_zongshu">搜索结果为<span class="count">{:count($data)}</span>条</div>
<!-- 列表内容 -->
<div>
<!--未发货-->
@@ -393,39 +407,43 @@
</div>
</div>
<a href="{:url('get_one',array('id'=>$vo['id']))}">
+ <div class="dingdan_detail_top">
+ <div class="dingdan_detail_hao">订单号：{$vo.order_number}</div>
+ </div>
<foreach name="$vo.indent_goods" item="i_g">
<div class="dingdan_detail">
- <div class="dingdan_detail_top">
- <div class="dingdan_detail_hao">订单号：{$vo.order_number}</div>
- <div class="dingdan_lianxi_ren">联系人：{$vo.name}</div>
- </div>
<div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
<div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
- <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
+ <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""
+ style="width: 100%;height: 100%;"/>
</div>
<!--<div class="log_three_list_center_right" style="margin-left: 0.16rem;width: 5.6rem">-->
- <!--<div class="log_three_center_one">-->
- <!--{$i_g.book_name}-->
- <!--</div>-->
- <!--<div class="right_dingdan_money">-->
- <!--<div class="log_three_center_three"><span>￥</span>{$i_g.price}</div>-->
- <!--<div class="log_three_center_two">×{$i_g.number}</div>-->
- <!--</div>-->
+ <!--<div class="log_three_center_one">-->
+ <!--{$i_g.book_name}-->
+ <!--</div>-->
+ <!--<div class="right_dingdan_money">-->
+ <!--<div class="log_three_center_three"><span>￥</span>{$i_g.price}</div>-->
+ <!--<div class="log_three_center_two">×{$i_g.number}</div>-->
+ <!--</div>-->
<!--</div>-->
<div class="right_dingdan">
<div class="right_dingdan_top">
<div class="right_dingdan_one">{$i_g.book_name}</div>
<div class="right_dingdan_two">￥{$i_g.price}</div>
</div>
- <div class="right_dingdan_center">
- <div class="right_dindan_three right_dingdan_one">x{$i_g.number}</div>
- </div>
+ <div class="right_dingdan_center">
+ <div class="right_dindan_three right_dingdan_one">x{$i_g.number}</div>
+ </div>
- <div class="right_dingdan_four right_dingdan_one">地址：{$vo.school} {$vo.grade} {$vo.class}</div>
- <div class="right_dingdan_four right_dingdan_one" style="margin-top: -0.05rem;">联系电话：{$vo.phone}</div>
+ <div class="right_dingdan_four right_dingdan_one">地址：{$vo.school} {$vo.grade}
+ {$vo.class}
+ </div>
+ <div class="right_dingdan_four right_dingdan_one" style="margin-top: -0.05rem;">
+ {$vo.name}电话：{$vo.phone}
+ </div>
+ </div>
</div>
</div>
-
</foreach>
</a>
<!-- 立即发货 -->
@@ -448,7 +466,7 @@
</if>
<elseif condition="$vo.state eq 3"/>
<!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
- <!--已完成啦-->
+ <!--已完成啦-->
<!--</div>-->
</if>
</div>
@@ -496,8 +514,9 @@
<a href="{:url('get_one',array('id'=>$vo['id']))}">
<foreach name="$vo.indent_goods" item="i_g">
<div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
- <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
- <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
+ <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
+ <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""
+ style="width: 100%;height: 100%;"/>
</div>
<div class="log_three_list_center_right" style="margin-left: 0.16rem;">
<div class="log_three_center_one">
@@ -522,14 +541,14 @@
查看物流
</div>
</a>
- <else />
+ <else/>
<div class="take_one" data-indent-id="{$vo.id}">
完成
</div>
</if>
<elseif condition="$vo.state eq 3"/>
<!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
- <!--已完成啦-->
+ <!--已完成啦-->
<!--</div>-->
</if>
</div>
@@ -577,7 +596,8 @@
<foreach name="$vo.indent_goods" item="i_g">
<div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
<div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
- <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
+ <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""
+ style="width: 100%;height: 100%;"/>
</div>
<div class="log_three_list_center_right" style="margin-left: 0.16rem;">
<div class="log_three_center_one">
@@ -608,7 +628,7 @@
</if>
<elseif condition="$vo.state eq 3"/>
<!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
- <!--已完成啦-->
+ <!--已完成啦-->
<!--</div>-->
</if>
</div>
@@ -646,27 +666,29 @@
var classpicker = new mui.PopPicker();
var class_arr = '';
zujian();
- function zujian(data_class_arr){
- (function($, doc) {
+
+ function zujian(data_class_arr) {
+ (function ($, doc) {
$.init();
school_arr = {$school};
- console.log(data_class_arr,'dfdfds');
- $.ready(function() {
+ console.log(data_class_arr, 'dfdfds');
+ $.ready(function () {
schoolpicker.setData(school_arr);
classpicker.setData(data_class_arr);
});
})(mui, document);
}
+
var school_name;
- $(".log_three_select_school2").click(function() {
- schoolpicker.show(function(e) {
+ $(".log_three_select_school2").click(function () {
+ schoolpicker.show(function (e) {
school_name = e[0].value;
school_names = e[0].text;
$('#school').val(school_names);
$(".log_three_select_school2").text(e[0].text);
$('.log_three_select_school2').css('color', '#333333');
- $.post("{:url('Personalcenter/get_grade_class')}",{id:school_name},function(data){
- if(data){
+ $.post("{:url('Personalcenter/get_grade_class')}", {id: school_name}, function (data) {
+ if (data) {
data = JSON.parse(data);
zujian(data);
}
@@ -675,10 +697,10 @@
});
})
- $(".log_three_select_class2").click(function() {
- if(school_name != undefined) {
- classpicker.show(function(e) {
- class_name=e[0].text;
+ $(".log_three_select_class2").click(function () {
+ if (school_name != undefined) {
+ classpicker.show(function (e) {
+ class_name = e[0].text;
$('#grade').val(class_name);
$(".log_three_select_class2").text(e[0].text);
$('.log_three_select_class2').css('color', '#333333');
@@ -692,18 +714,19 @@
function zZFun(e) {
window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
}
+
// 选择学校
-// $(".three_model_school_left").click(function () {
-// var indexs = $(this).index();
-// $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");
-// });
+ // $(".three_model_school_left").click(function () {
+ // var indexs = $(this).index();
+ // $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");
+ // });
$(".log_three_tab_one").click(function () {
var tabIndex = $(this).index();
$(this).addClass("log_three_tab_two").addClass("word_color").addClass('aaa').siblings().removeClass("log_three_tab_two").removeClass("word_color").removeClass("aaa");
$('.log_three_list_contant').eq(tabIndex).css('display', 'block').siblings().css('display', 'none');
search();
- $('.log_three_fixed_left_one img').attr('src',"__TMPL__/public/assets/images/fangkuang.png")
+ $('.log_three_fixed_left_one img').attr('src', "__TMPL__/public/assets/images/fangkuang.png")
});
$(".three_model_school_tab>div").click(function () {
$(this).addClass("three_model_school_hover").addClass("word_color").addClass('aaa').siblings().removeClass("three_model_school_hover").removeClass("word_color").removeClass("aaa");
@@ -718,23 +741,25 @@
//判断订单是否全选了
check();
});
- function check(){
+
+ function check() {
var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa'));
var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length;
var l = 0;
- for(var n=0;n<length;n++){
+ for (var n = 0; n < length; n++) {
console.log($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src'));
- if($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png"){
+ if ($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") {
l++
}
}
- console.log('@@@@@'+l+'@@@@@'+length);
- if(l == length){
- $('.log_three_fixed_left_one img').attr('src',"__TMPL__/public/assets/images/xuanzhong (1).png")
- }else{
- $('.log_three_fixed_left_one img').attr('src',"__TMPL__/public/assets/images/fangkuang.png")
+ console.log('@@@@@' + l + '@@@@@' + length);
+ if (l == length) {
+ $('.log_three_fixed_left_one img').attr('src', "__TMPL__/public/assets/images/xuanzhong (1).png")
+ } else {
+ $('.log_three_fixed_left_one img').attr('src', "__TMPL__/public/assets/images/fangkuang.png")
}
}
+
$(".log_three_fixed_left_one").click(function () {
if (
$(this)
@@ -834,9 +859,10 @@
console.log(data);
if (data.code == 1) {
var result = data.data;
- if(result == 0){
+ console.log(result);
+ if (result == 0) {
var html = "<div style=\"text-align: center;width: 100%;height:100%;margin:0 auto;\">暂无数据</div>";
- }else{
+ } else {
var html = '';
}
for (var i = 0; i < result.length; i++) {
@@ -860,7 +886,7 @@
"\t\t\t\t\t\t\t\t\t\t\t</div></div>\n" +
"\t\t\t\t\t\t\t\t\t\t</a>";
} else {
- var html_bottom = "<div class=\"take_one\" data-indent-id=\""+result[i].id+"\">\n" +
+ var html_bottom = "<div class=\"take_one\" data-indent-id=\"" + result[i].id + "\">\n" +
" 完成\n" +
" </div>";
}
@@ -871,25 +897,49 @@
var indent_goods_data = result[i].indent_goods;
var indent_goods_html = '';
for (var i3 = 0; i3 < indent_goods_data.length; i3++) {
- indent_goods_html += "<div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
- " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
- " <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\" style=\"width: 100%;height: 100%;\"/>\n" +
- " </div>\n" +
- " <div class=\"log_three_list_center_right\" style=\"margin-left: 0.16rem;\">\n" +
- " <div class=\"log_three_center_one\">\n" +
- " " + indent_goods_data[i3].book_name + "\n" +
+ // indent_goods_html += "<div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
+ // " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
+ // " <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\" style=\"width: 100%;height: 100%;\"/>\n" +
+ // " </div>\n" +
+ // " <div class=\"log_three_list_center_right\" style=\"margin-left: 0.16rem;\">\n" +
+ // " <div class=\"log_three_center_one\">\n" +
+ // " " + indent_goods_data[i3].book_name + "\n" +
+ // " </div>\n" +
+ // " <div class=\"log_three_center_two\">×" + indent_goods_data[i3].number + "</div>\n" +
+ // " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" +
+ // " </div>\n" +
+ // " </div>";
+ indent_goods_html += "<div class=\"dingdan_detail\">\n" +
+ " <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
+ " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
+ " <img src=\""+indent_goods_data[i3].thumbnail+"\" alt=\"\"\n" +
+ " style=\"width: 100%;height: 100%;\"/>\n" +
+ " </div>\n" +
+ " <div class=\"right_dingdan\">\n" +
+ " <div class=\"right_dingdan_top\">\n" +
+ " <div class=\"right_dingdan_one\">"+indent_goods_data[i3].book_name+"</div>\n" +
+ " <div class=\"right_dingdan_two\">￥"+indent_goods_data[i3].price+"</div>\n" +
+ " </div>\n" +
+ " <div class=\"right_dingdan_center\">\n" +
+ " <div class=\"right_dindan_three right_dingdan_one\">x"+indent_goods_data[i3].number+"</div>\n" +
+ " </div>\n" +
+ "\n" +
+ " <div class=\"right_dingdan_four right_dingdan_one\">地址："+result[i].school+" "+result[i].grade+"\n" +
+ " "+result[i].class+"\n" +
+ " </div>\n" +
+ " <div class=\"right_dingdan_four right_dingdan_one\" style=\"margin-top: -0.05rem;\">\n" +
+ " "+result[i].name+"电话："+result[i].phone+"\n" +
+ " </div>\n" +
+ " </div>\n" +
" </div>\n" +
- " <div class=\"log_three_center_two\">×" + indent_goods_data[i3].number + "</div>\n" +
- " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" +
- " </div>\n" +
- " </div>";
+ " </div>";
}
if (is_courier == 1) {
html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +
"\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" +
"\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_left\">\n" +
"\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lo\">\n" +
- "\t\t\t\t\t\t\t\t\t\t<img src=\"__TMPL__/public/assets/images/fangkuang.png\" data-indent-id=\""+result[i].id+"\" alt=\"\" />\n" +
+ "\t\t\t\t\t\t\t\t\t\t<img src=\"__TMPL__/public/assets/images/fangkuang.png\" data-indent-id=\"" + result[i].id + "\" alt=\"\" />\n" +
"\t\t\t\t\t\t\t\t\t</div>\n" +
"\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lt\">\n" +
"\t\t\t\t\t\t\t\t\t\t<div class=\"log_three_zhongbiao\">\n" +
@@ -903,7 +953,9 @@
"\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_right\">\n" +
"\t\t\t\t\t\t\t\t\t\t" + state + "\n" +
"\t\t\t\t\t\t\t\t</div>\n" +
- "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+
+ "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/" + result[i].id + "\"><div class=\"dingdan_detail_top\">\n" +
+ " <div class=\"dingdan_detail_hao\">订单号："+result[i].order_number+"</div>\n" +
+ " </div>\n" + indent_goods_html + "</a>" +
"\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
} else if (is_courier == 2) {
html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +
@@ -924,11 +976,13 @@
"\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_right\">\n" +
"\t\t\t\t\t\t\t\t\t\t" + state + "\n" +
"\t\t\t\t\t\t\t\t</div>\n" +
- "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+
+ "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/" + result[i].id + "\"><div class=\"dingdan_detail_top\">\n" +
+ " <div class=\"dingdan_detail_hao\">订单号："+result[i].order_number+"</div>\n" +
+ " </div>\n" + indent_goods_html + "</a>" +
"\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
}
}
-
+ $('.count').html(i);
$('.log_three_list_contant').eq(index).html(html);
update();
} else {
@@ -1048,7 +1102,7 @@
});
$('body').on('click', '.unify_all', function () {
var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa'));
- var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length-1;
+ var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length - 1;
var arr = [];
for (var i = 0; i <= length; i++) {
if ($('.log_three_list_top_lo img').eq(i).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") {
@@ -1058,15 +1112,15 @@
$('.confirm2').attr('data-indent-id', arr.join(","));
var type = $('.unify_all').attr('data-type');
if (arr.length != 0) {
- if(type == 1){
+ if (type == 1) {
$.ajax({
- url:"{:url('take_all')}",
- type:"GET",
- data:{'indent_ids':arr.join(",")},
- success: function(res){
+ url: "{:url('take_all')}",
+ type: "GET",
+ data: {'indent_ids': arr.join(",")},
+ success: function (res) {
if (res.code == 1) {
- $(arr).each(function(i,vo){
- $('.order_'+vo).remove();
+ $(arr).each(function (i, vo) {
+ $('.order_' + vo).remove();
})
alert('操作成功')
} else {
@@ -1074,7 +1128,7 @@
}
}
})
- }else{
+ } else {
$('.tx_masktwo').show();
}
} else {
@@ -1108,17 +1162,17 @@
});
update();
- $('body').on('click','.take_one',function(){
+ $('body').on('click', '.take_one', function () {
var indent_id = $(this).attr('data-indent-id');
$.ajax({
- url:"{:url('take_one')}",
- type:"GET",
- data:{'indent_id':indent_id},
- success:function(res){
- if(res.code == 1){
- $('.order_'+indent_id).remove();
+ url: "{:url('take_one')}",
+ type: "GET",
+ data: {'indent_id': indent_id},
+ success: function (res) {
+ if (res.code == 1) {
+ $('.order_' + indent_id).remove();
alert('操作成功')
- }else{
+ } else {
alert(res.msg)
}
}
@@ -1132,12 +1186,12 @@
if (is_courier == 1 && index == 0) {
$('.log_three_list_fixed').show();
$('.unify_all').text('统一发货');
- $('.unify_all').attr('data-type','')
+ $('.unify_all').attr('data-type', '')
} else if (is_courier == 2 || (index != 0 && index != 1)) {
$('.log_three_list_fixed').hide();
- } else if(index == 1){
+ } else if (index == 1) {
$('.unify_all').text('统一完成');
- $('.unify_all').attr('data-type',1)
+ $('.unify_all').attr('data-type', 1)
}
}
</script>
diff --git a/public/themes/simpleboot3/public/assets/css/log.css b/public/themes/simpleboot3/public/assets/css/log.css
index a97d6f2..eaa9f74 100755
--- a/public/themes/simpleboot3/public/assets/css/log.css
+++ b/public/themes/simpleboot3/public/assets/css/log.css
@@ -932,7 +932,7 @@ cursor: pointer;
}
.log_three_list_center {
- margin-top: 0.32rem;
+ margin-top: 0.2rem;
display: flex;
justify-content: space-between;
cursor: pointer;