anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 82354b5c04a70e587732a8d0b801291e56f7ecaa 1 个父辈 2055307a
1 个管道 的构建 通过 耗费 1 秒

1

内嵌 并排对比
正在显示 4 个修改的文件 包含 279 行增加 和 104 行删除
... ... @@ -224,42 +224,42 @@
<!--统一配送-->
<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>
<!--<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>-->
<!--选择快递-->
<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>
<!--<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>-->
<div class="tx_masktwo" style="display: none;" onclick="$(this).hide()">
<div class="tx_maskCon" onclick="zZFun(this)">
<div class="tx_maskConImg">
... ... @@ -306,13 +306,22 @@
<input type="text" id="end_time" value="" placeholder="请输入结束配送时间"/>
</div>
</div>-->
<div class="log_three_model_one logistic">
<!--<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>-->
<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_title2 get_Gofo">请选择快递公司</div>
<div class="log_ps_title excompany_word">请选择</div>
<div class="log_ps_img">
<img src="__TMPL__/public/assets/images/29.png"/>
<input type="hidden" id="logistic_name" placeholder="请选择快递公司"/>
<img src="__TMPL__/public/assets/images/29.png" />
</div>
</div>
</div>
... ... @@ -355,16 +364,16 @@
</div>-->
<div class="log_three_select_one log_three_select_school">
<div class="log_three_select_title log_three_select_school2">
<div class="log_three_select_one log_three_select_school2">
<div class="log_three_select_title schools_word">
请选择学校
</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">
<div class="log_three_select_title log_three_select_class2">
<div class="log_three_select_one log_three_select_class2">
<div class="log_three_select_title class_word">
请选择班级
</div>
<!--<div class="log_three_select_img">-->
... ... @@ -374,7 +383,10 @@
<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 class="log_three_select_title log_three_select_contant">-->
<!--统一配送-->
<!--</div>-->
<div class="log_three_select_title express_word" >
统一配送
</div>
<!--<div class="log_three_select_img">-->
... ... @@ -698,6 +710,9 @@
<script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
<script src="__TMPL__/public/assets/js/city.data-3.js"></script>
<script>
var expresspicker = new mui.PopPicker();
$(".clear").click(function () {
window.location.reload();
})
... ... @@ -714,10 +729,28 @@
$.ready(function () {
schoolpicker.setData(school_arr);
classpicker.setData(data_class_arr);
expresspicker.setData([{
value: '1',
text: '快递配送'
}, {
value: '2',
text: '统一配送'
}]);
});
})(mui, document);
}
var express_word
$(".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")
$(".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)");
... ... @@ -726,8 +759,8 @@
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');
$(".schools_word").text(e[0].text);
$('.schools_word').css('color', '#333333');
$.post("{:url('Personalcenter/get_grade_class')}", {id: school_name}, function (data) {
if (data) {
data = JSON.parse(data);
... ... @@ -750,6 +783,56 @@
alert("请先选择学校")
}
})
var excompanypicker = new mui.PopPicker();
excompanypicker.setData([{
value: 'SF',
text: '顺丰快递'
}, {
value: 'YTO',
text: '圆通快递'
}, {
value: 'ZTO',
text: '中通快递'
}, {
value: 'STO',
text: '申通快递'
}, {
value: 'YD',
text: '韵达快递'
}, {
value: 'HHTT',
text: '天天快递'
}, {
value: 'HTKY',
text: '百世快递'
}, {
value: 'YZPY',
text: '邮政快递包裹'
}, {
value: 'EMS',
text: 'EMS'
}, {
value: 'DBL',
text: '德邦快递'
}, {
value: 'ZJS',
text: '宅急送'
}, {
value: 'TNT',
text: 'TNT快递'
}]);
var excompany_word
$(".excompany").click(function() {
excompanypicker.show(function(e) {
console.log(e, '3333')
console.log(e[0].value);
console.log(e[0].text);
school_name = e[0].value
$(".excompany_word").text(e[0].text);
$("#logistic_name").val(e[0].value);
$('.excompany_word').css('color', '#333333');
});
})
</script>
<script>
function zZFun(e) {
... ... @@ -830,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({
... ... @@ -888,7 +971,7 @@
var school = $('#school').val();
var grade = $('#grade').val();
var state = $('.log_three_tab_top .aaa').attr('data-state');
var is_courier = $('#is_courier').val();
var is_courier = express_word
$.ajax({
'url': "{:url('order_salesman/getOrderSalesman')}",
... ... @@ -1121,6 +1204,7 @@
var start_time = $('#start_time').val();
// var end_time = $('#end_time').val();
var logistic_name = $('#logistic_name').val();
console.log(logistic_name);
var logistic_code = $('#logistic_code').val();
var indent_id = $(this).attr('data-indent-id');
if (is_courier == 1) {
... ... @@ -1165,6 +1249,11 @@
display: "none"
});
}
var count = Number($('.count').text());
if(count>0){
count--;
}
$(".count").text(count);
alert(res.msg)
},
error: function (res) {
... ... @@ -1191,9 +1280,14 @@
data: {'indent_ids': arr.join(",")},
success: function (res) {
if (res.code == 1) {
var count = Number($('.count').text());
$(arr).each(function (i, vo) {
if(count>0){
count--;
}
$('.order_' + vo).remove();
})
});
$(".count").text(count);
alert('操作成功')
} else {
alert(res.msg);
... ... @@ -1283,9 +1377,9 @@
</script>
<script type="text/javascript">
var dtpicker = new mui.DtPicker({
type: "datetime", //设置日历初始视图模式
beginDate: new Date(), //设置开始日期
labels: ['年', '月', '日', '时', '分', '秒'], //设置默认标签区域提示语
type: "date", //设置日历初始视图模式
beginDate: new Date(2015, 04, 25), //设置开始日期
labels: ['年', '月', '日'], //设置默认标签区域提示语
})
//统一配送选择时间
$(".tongyi_start_time").click(function () {
... ...
... ... @@ -30,35 +30,35 @@
</head>
<body style="background-color: #F7F7F7;">
<div class="tx_mask_school">
<div class="tx_maskCon_school">
<div class="three_model_school">
<div class="three_model_school_title">
选择学校-班级
</div>
<div class="three_model_school_tab">
<div class="three_model_school_left three_model_school_hover word_color" style="cursor: pointer;">
学校
</div>
<div class="three_model_school_left" style="cursor: pointer;">
班级
</div>
</div>
<div>
<div class="three_model_school_data there_university" style="display: block;cursor: pointer;">
<!--<volist name="school" id="vo">
<div class="three_model_school_name <eq name='key' value='0'>there_unActive</eq>" onclick="click_school({$vo.id})" style="cursor: pointer;">{$vo.school}</div>
</volist>-->
</div>
<div class="three_model_school_data there_class banjiadd" style="cursor: pointer;">
<!--<volist name="grade_class_show" id="vo">-->
<!--<div class="three_model_school_name banji">{$vo}</div>-->
<!--</volist>-->
</div>
</div>
</div>
</div>
</div>
<!--<div class="tx_mask_school">-->
<!--<div class="tx_maskCon_school">-->
<!--<div class="three_model_school">-->
<!--<div class="three_model_school_title">-->
<!--选择学校-班级-->
<!--</div>-->
<!--<div class="three_model_school_tab">-->
<!--<div class="three_model_school_left three_model_school_hover word_color" style="cursor: pointer;">-->
<!--学校-->
<!--</div>-->
<!--<div class="three_model_school_left" style="cursor: pointer;">-->
<!--班级-->
<!--</div>-->
<!--</div>-->
<!--<div>-->
<!--<div class="three_model_school_data there_university" style="display: block;cursor: pointer;">-->
<!--&lt;!&ndash;<volist name="school" id="vo">-->
<!--<div class="three_model_school_name <eq name='key' value='0'>there_unActive</eq>" onclick="click_school({$vo.id})" style="cursor: pointer;">{$vo.school}</div>-->
<!--</volist>&ndash;&gt;-->
<!--</div>-->
<!--<div class="three_model_school_data there_class banjiadd" style="cursor: pointer;">-->
<!--&lt;!&ndash;<volist name="grade_class_show" id="vo">&ndash;&gt;-->
<!--&lt;!&ndash;<div class="three_model_school_name banji">{$vo}</div>&ndash;&gt;-->
<!--&lt;!&ndash;</volist>&ndash;&gt;-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="log_top_co" style="background-color: white;">
<!-- 顶部 -->
<div class=" order_top log_top_co">
... ... @@ -96,18 +96,41 @@
<img src="__TMPL__/public/assets/images/29.png" alt="" />
</div>
</div>
<div class="log_four_input_one log_banjis">
<!--<div class="log_four_input_one log_banjis">-->
<!--<div class="log_four_input_one_left">-->
<!--学校-->
<!--</div>-->
<!--<div class="log_four_input_one_center">-->
<!--<div class="city_text school_grade_class" id="school_class">请选择学校和班级</div>-->
<!--</div>-->
<!--<div class="log_four_input_one_right">-->
<!--<img src="__TMPL__/public/assets/images/29.png" alt="" />-->
<!--</div>-->
<!--</div>-->
<div class="log_four_input_one log_banjis log_three_select_school2">
<div class="log_four_input_one_left">
学校
</div>
<div class="log_four_input_one_center">
<div class="city_text school_grade_class" id="school_class">请选择学校和班级</div>
<div class="log_four_input_one_center ">
<div class="city_text xuexiao_name">请选择学校</div>
</div>
<div class="log_four_input_one_right">
<img src="__TMPL__/public/assets/images/29.png" alt="" />
</div>
</div>
<div class="log_four_input_one log_banjis log_three_select_class2">
<div class="log_four_input_one_left">
班级
</div>
<div class="log_four_input_one_center">
<div class="city_text banji_name">请选择班级</div>
</div>
<div class="log_four_input_one_right">
<img src="__TMPL__/public/assets/images/29.png" alt="" />
</div>
</div>
<div class="log_four_input_one">
<div class="log_four_input_one_left">
... ... @@ -196,6 +219,64 @@
<script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
<script src="__TMPL__/public/assets/js/city.data-3.js"></script>
<script>
var schoolpicker = new mui.PopPicker();
var classpicker = new mui.PopPicker();
(function($, doc) {
$.init();
$.ready(function() {
schoolpicker.setData([{
value: 'school1',
text: '天津科技大学1'
}, {
value: 'school2',
text: '天津科技大学2'
}, {
value: 'school3',
text: '天津科技大学3'
}, {
value: 'school4',
text: '天津科技大学4'
}]);
classpicker.setData([{
value: 'class1',
text: '1'
}, {
value: 'class2',
text: '2'
}, {
value: 'class3',
text: '3'
}, {
value: 'class4',
text: '4'
}]);
});
})(mui, document);
var school_name
$(".log_three_select_school2").click(function() {
schoolpicker.show(function(e) {
console.log(e, '3333')
console.log(e[0].value);
console.log(e[0].text);
school_name = e[0].value
$(".xuexiao_name").text(e[0].text);
$('.xuexiao_name').css('color', '#333333');
});
})
console.log(school_name)
$(".log_three_select_class2").click(function() {
if(school_name != undefined) {
classpicker.show(function(e) {
console.log(e)
console.log(e[0].value);
console.log(e[0].text);
$(".banji_name").text(e[0].text);
$('.banji_name').css('color', '#333333');
});
} else {
alert("请先选择学校")
}
})
/**
*快递配送
*/
... ...
... ... @@ -152,11 +152,11 @@
<!-- 操作 -->
<div class="log_five_shanxian">
<div class="log_five_handle">
<div class="log_five_handle_one">
<div class="log_five_handle_one" onclick="goods_edit({$vo.id})">
<div class="log_five_handle_img">
<img src="__TMPL__/public/assets/images/87.png" alt="" />
</div>
<div class="log_five_handle_word log_five_handle_add" onclick="goods_edit({$vo.id})" style="cursor: pointer;">
<div class="log_five_handle_word log_five_handle_add" style="cursor: pointer;">
编辑
</div>
</div>
... ... @@ -168,19 +168,19 @@
删除
</div>
</div>
<div class="log_five_handle_one" >
<div class="log_five_handle_one" onclick="move_up({$vo.id})">
<div class="log_five_handle_img">
<img src="__TMPL__/public/assets/images/85.png" alt="" />
</div>
<div class="log_five_handle_word log_five_handle_up" onclick="move_up({$vo.id})" style="cursor: pointer;">
<div class="log_five_handle_word log_five_handle_up" style="cursor: pointer;">
上移
</div>
</div>
<div class="log_five_handle_one">
<div class="log_five_handle_one" onclick="cost({$vo.id})">
<div class="log_five_handle_img">
<img src="__TMPL__/public/assets/images/84.png" alt="" />
</div>
<div class="log_five_handle_word log_five_handle_pay" onclick="cost({$vo.id})" style="cursor: pointer;">
<div class="log_five_handle_word log_five_handle_pay" style="cursor: pointer;">
费用
</div>
</div>
... ...
... ... @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
*/
public function checkWeChatUserLogin()
{
/*$user = Db::name('user')->where('id',6)->find();
cmf_update_current_user($user);*/
$user = Db::name('user')->where('id',27)->find();
cmf_update_current_user($user);
$userId = cmf_get_current_user_id();
if (empty($userId)) {
$config = [
... ...