anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 bb4bbdc41107de9b9b669f25165e1c5c2b3bcdd8 1 个父辈 9b73a6bd
1 个管道 的构建 通过 耗费 1 秒

5

内嵌 并排对比
正在显示 1 个修改的文件 包含 82 行增加 和 78 行删除
... ... @@ -174,7 +174,8 @@
color: #333;
border-radius: 0.08rem;
}
.log_three_bottom2{
.log_three_bottom2 {
margin-top: 0.3rem;
cursor: pointer;
width: 1.6rem;
... ... @@ -225,40 +226,40 @@
<!--统一配送-->
<!--<div class="tx_mask_tongyi" onclick="$(this).hide()">-->
<!--<div class="tx_maskCon_tongyi" onclick="zZFun(this)">-->
<!--<div class="three_model_school">-->
<!--<div class="three_model_school_data" style="display: block;">-->
<!--<div class="three_modal_kuaidi_name there_unActive" data-id="1">统一配送</div>-->
<!--<div class="three_modal_kuaidi_name" data-id="2">快递配送</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="tx_maskCon_tongyi" onclick="zZFun(this)">-->
<!--<div class="three_model_school">-->
<!--<div class="three_model_school_data" style="display: block;">-->
<!--<div class="three_modal_kuaidi_name there_unActive" data-id="1">统一配送</div>-->
<!--<div class="three_modal_kuaidi_name" data-id="2">快递配送</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--选择快递-->
<!--<div class="tx_mask_kuaidi" onclick="$(this).hide()">-->
<!--<div class="tx_maskCon_school" onclick="zZFun(this)">-->
<!--<div class="three_model_school">-->
<!--<div class="three_model_school_title">-->
<!--选择快递-->
<!--</div>-->
<!--<div>-->
<!--<div class="three_model_school_data" style="display: block;">-->
<!--<div class="get_Go" data-name="SF">顺丰快递</div>-->
<!--<div class="get_Go" data-name="YTO">圆通快递</div>-->
<!--<div class="get_Go" data-name="ZTO">中通快递</div>-->
<!--<div class="get_Go there_unActive" data-name="STO">申通快递</div>-->
<!--<div class="get_Go" data-name="YD">韵达快递</div>-->
<!--<div class="get_Go" data-name="HHTT">天天快递</div>-->
<!--<div class="get_Go" data-name="HTKY">百世快递</div>-->
<!--<div class="get_Go" data-name="YZPY">邮政快递包裹</div>-->
<!--<div class="get_Go" data-name="EMS">EMS</div>-->
<!--<div class="get_Go" data-name="DBL">德邦快递</div>-->
<!--<div class="get_Go" data-name="ZJS">宅急送</div>-->
<!--<div class="get_Go" data-name="TNT">TNT快递</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="tx_maskCon_school" onclick="zZFun(this)">-->
<!--<div class="three_model_school">-->
<!--<div class="three_model_school_title">-->
<!--选择快递-->
<!--</div>-->
<!--<div>-->
<!--<div class="three_model_school_data" style="display: block;">-->
<!--<div class="get_Go" data-name="SF">顺丰快递</div>-->
<!--<div class="get_Go" data-name="YTO">圆通快递</div>-->
<!--<div class="get_Go" data-name="ZTO">中通快递</div>-->
<!--<div class="get_Go there_unActive" data-name="STO">申通快递</div>-->
<!--<div class="get_Go" data-name="YD">韵达快递</div>-->
<!--<div class="get_Go" data-name="HHTT">天天快递</div>-->
<!--<div class="get_Go" data-name="HTKY">百世快递</div>-->
<!--<div class="get_Go" data-name="YZPY">邮政快递包裹</div>-->
<!--<div class="get_Go" data-name="EMS">EMS</div>-->
<!--<div class="get_Go" data-name="DBL">德邦快递</div>-->
<!--<div class="get_Go" data-name="ZJS">宅急送</div>-->
<!--<div class="get_Go" data-name="TNT">TNT快递</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="tx_masktwo" style="display: none;" onclick="$(this).hide()">
<div class="tx_maskCon" onclick="zZFun(this)">
... ... @@ -275,10 +276,10 @@
<input type="hidden" id="start_time2" value="" placeholder="请输入开配送时间"/>
</div>
<!--<div class="log_three_model_one time">-->
<!--<div class="log_three_model_left">配送时间</div>-->
<!--<div class="log_psong">-->
<!--<input type="text" id="end_time2" value="" placeholder="请输入结束配送时间"/>-->
<!--</div>-->
<!--<div class="log_three_model_left">配送时间</div>-->
<!--<div class="log_psong">-->
<!--<input type="text" id="end_time2" value="" placeholder="请输入结束配送时间"/>-->
<!--</div>-->
<!--</div>-->
</div>
<!-- 确定 -->
... ... @@ -307,21 +308,21 @@
</div>
</div>-->
<!--<div class="log_three_model_one logistic">-->
<!--<div class="log_three_model_left">选择快递</div>-->
<!--<div class="log_psong log_psong_select">-->
<!--<div class="log_ps_title2 get_Gofo">请选择快递公司</div>-->
<!--<div class="log_ps_img">-->
<!--<img src="__TMPL__/public/assets/images/29.png"/>-->
<input type="hidden" id="logistic_name" value="" placeholder="请选择快递公司"/>
<!--</div>-->
<!--</div>-->
<!--<div class="log_three_model_left">选择快递</div>-->
<!--<div class="log_psong log_psong_select">-->
<!--<div class="log_ps_title2 get_Gofo">请选择快递公司</div>-->
<!--<div class="log_ps_img">-->
<!--<img src="__TMPL__/public/assets/images/29.png"/>-->
<input type="hidden" id="logistic_name" value="" placeholder="请选择快递公司"/>
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="log_three_model_one excompany logistic">
<div class="log_three_model_left">选择快递</div>
<div class="log_psong log_psong_select">
<div class="log_ps_title excompany_word">请选择</div>
<div class="log_ps_img">
<img src="__TMPL__/public/assets/images/29.png" />
<img src="__TMPL__/public/assets/images/29.png"/>
</div>
</div>
</div>
... ... @@ -384,9 +385,9 @@
<div class="log_three_select_one log_three_select_peisong log_three_select_tongyi" style="cursor: pointer">
<!--<div class="log_three_select_title log_three_select_contant">-->
<!--统一配送-->
<!--统一配送-->
<!--</div>-->
<div class="log_three_select_title express_word" >请选择配送方式</div>
<div class="log_three_select_title express_word">请选择配送方式</div>
<!--<div class="log_three_select_img">-->
<!--<img src="__TMPL__/public/assets/images/75.png" alt=""/>-->
<!--</div>-->
... ... @@ -737,21 +738,22 @@
});
})(mui, document);
}
var express_word
$(".log_three_select_tongyi").click(function() {
expresspicker.show(function(e) {
$(".log_three_select_tongyi").click(function () {
expresspicker.show(function (e) {
console.log(e, '3333')
console.log(e[0].value);
console.log(e[0].text);
express_word = e[0].value;
console.log(express_word,"experss_word")
console.log(express_word, "experss_word")
$(".express_word").text(e[0].text);
$('.express_word').css('color', '#333333');
});
})
var school_name;
$(".log_three_select_school2").click(function () {
$(".log_three_select_class2").text("请选择班级").css("color","rgba(153, 153, 153, 1)");
$(".log_three_select_class2").text("请选择班级").css("color", "rgba(153, 153, 153, 1)");
$("#grade").val("");
schoolpicker.show(function (e) {
school_name = e[0].value;
... ... @@ -820,8 +822,8 @@
text: 'TNT快递'
}]);
var excompany_word
$(".excompany").click(function() {
excompanypicker.show(function(e) {
$(".excompany").click(function () {
excompanypicker.show(function (e) {
console.log(e, '3333')
console.log(e[0].value);
console.log(e[0].text);
... ... @@ -911,18 +913,18 @@
});
//统一配送
// $(".log_three_select_tongyi").click(function () {
// $(".tx_mask_tongyi").css({
// display: "block"
// });
// })
// $(".tx_mask_tongyi .three_modal_kuaidi_name").click(function () {
// var index = $(this).index();
// $(this).addClass('there_unActive').siblings().removeClass('there_unActive');
// $('.log_three_select_contant').text($(this).text()).css("color", "#333");
// $(".tx_mask_tongyi").hide();
// $("#is_courier").val($(this).attr('data-id'))
// })
// $(".log_three_select_tongyi").click(function () {
// $(".tx_mask_tongyi").css({
// display: "block"
// });
// })
// $(".tx_mask_tongyi .three_modal_kuaidi_name").click(function () {
// var index = $(this).index();
// $(this).addClass('there_unActive').siblings().removeClass('there_unActive');
// $('.log_three_select_contant').text($(this).text()).css("color", "#333");
// $(".tx_mask_tongyi").hide();
// $("#is_courier").val($(this).attr('data-id'))
// })
//选择快递方式
$(".log_psong_select").click(function () {
$(".tx_mask_kuaidi").css({
... ... @@ -935,7 +937,7 @@
$(this).addClass('there_unActive').siblings().removeClass('there_unActive');
$('.get_Gofo').text($(this).text()).css("color", "#333");
$(".tx_mask_kuaidi").hide();
$('#logistic_name').val($(this).attr('data-name'))
$('#logistic_name').val($(this).attr('data-name'))
});
var index = $(".log_three_bottom").index();
$("body").on('click', '.log_three_bottom', function () {
... ... @@ -977,12 +979,10 @@
'data': {'school': school, 'grade': grade, 'state': state, 'is_courier': is_courier},
'success': (function (data) {
var index = $('.log_three_tab_top div').index($('.aaa'));
console.log(3333);
console.log(data);
if (data.code == 1) {
var result = data.data;
console.log(result);
if (result == 0) {
console.log("**********" + result.length);
if (result.length == 0) {
var html = "<div style=\"text-align: center;width: 100%;height:100%;margin:0 auto;\">暂无数据</div>";
} else {
var html = '';
... ... @@ -1008,7 +1008,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 = "<a href=\"{:url('logistics/index','',false,true)}/indent_id/"+ result[i].id +"\">\n" +
var html_bottom = "<a href=\"{:url('logistics/index','',false,true)}/indent_id/" + result[i].id + "\">\n" +
" <div class=\"log_three_bottom2\" data-indent-id=\"{$vo.id}\" style='margin-right: 15px;'>\n" +
" 查看物流\n" +
" </div>\n" +
... ... @@ -1086,7 +1086,7 @@
" </div>";
}
}
if (is_courier == 1) {
if (result[i].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" +
... ... @@ -1109,7 +1109,8 @@
" <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) {
} else if (result[i].is_courier == 2) {
console.log("++"+html);
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" +
... ... @@ -1134,7 +1135,9 @@
"\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
}
}
console.log(html);
$('.count').html(i);
console.log('@@@@@@@@@@' + index);
$('.log_three_list_contant').eq(index).html(html);
update();
} else {
... ... @@ -1248,7 +1251,7 @@
});
}
var count = Number($('.count').text());
if(count>0){
if (count > 0) {
count--;
}
$(".count").text(count);
... ... @@ -1280,7 +1283,7 @@
if (res.code == 1) {
var count = Number($('.count').text());
$(arr).each(function (i, vo) {
if(count>0){
if (count > 0) {
count--;
}
$('.order_' + vo).remove();
... ... @@ -1318,13 +1321,14 @@
data: {
'start_time2': start_time2,
// 'end_time2': end_time2,
'indent_ids': indent_ids},
'indent_ids': indent_ids
},
success: function (res) {
console.log(indent_ids);
indent_ids=indent_ids.split(",");
indent_ids = indent_ids.split(",");
console.log(indent_ids)
if (res.code == 1) {
$.each(indent_ids,function(key,indent_id){
$.each(indent_ids, function (key, indent_id) {
$('.order_' + indent_id).remove();
});
$(".tx_masktwo").css({
... ...