anyv / xkeasy · 提交

转到一个项目

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

1

内嵌 并排对比
正在显示 4 个修改的文件 包含 279 行增加 和 104 行删除
@@ -224,42 +224,42 @@ @@ -224,42 +224,42 @@
224 224
225 225
226 <!--统一配送--> 226 <!--统一配送-->
227 -<div class="tx_mask_tongyi" onclick="$(this).hide()">  
228 - <div class="tx_maskCon_tongyi" onclick="zZFun(this)">  
229 - <div class="three_model_school">  
230 - <div class="three_model_school_data" style="display: block;">  
231 - <div class="three_modal_kuaidi_name there_unActive" data-id="1">统一配送</div>  
232 - <div class="three_modal_kuaidi_name" data-id="2">快递配送</div>  
233 - </div>  
234 - </div>  
235 - </div>  
236 -</div> 227 +<!--<div class="tx_mask_tongyi" onclick="$(this).hide()">-->
  228 + <!--<div class="tx_maskCon_tongyi" onclick="zZFun(this)">-->
  229 + <!--<div class="three_model_school">-->
  230 + <!--<div class="three_model_school_data" style="display: block;">-->
  231 + <!--<div class="three_modal_kuaidi_name there_unActive" data-id="1">统一配送</div>-->
  232 + <!--<div class="three_modal_kuaidi_name" data-id="2">快递配送</div>-->
  233 + <!--</div>-->
  234 + <!--</div>-->
  235 + <!--</div>-->
  236 +<!--</div>-->
237 <!--选择快递--> 237 <!--选择快递-->
238 -<div class="tx_mask_kuaidi" onclick="$(this).hide()">  
239 - <div class="tx_maskCon_school" onclick="zZFun(this)">  
240 - <div class="three_model_school">  
241 - <div class="three_model_school_title">  
242 - 选择快递  
243 - </div>  
244 - <div>  
245 - <div class="three_model_school_data" style="display: block;">  
246 - <div class="get_Go" data-name="SF">顺丰快递</div>  
247 - <div class="get_Go" data-name="YTO">圆通快递</div>  
248 - <div class="get_Go" data-name="ZTO">中通快递</div>  
249 - <div class="get_Go there_unActive" data-name="STO">申通快递</div>  
250 - <div class="get_Go" data-name="YD">韵达快递</div>  
251 - <div class="get_Go" data-name="HHTT">天天快递</div>  
252 - <div class="get_Go" data-name="HTKY">百世快递</div>  
253 - <div class="get_Go" data-name="YZPY">邮政快递包裹</div>  
254 - <div class="get_Go" data-name="EMS">EMS</div>  
255 - <div class="get_Go" data-name="DBL">德邦快递</div>  
256 - <div class="get_Go" data-name="ZJS">宅急送</div>  
257 - <div class="get_Go" data-name="TNT">TNT快递</div>  
258 - </div>  
259 - </div>  
260 - </div>  
261 - </div>  
262 -</div> 238 +<!--<div class="tx_mask_kuaidi" onclick="$(this).hide()">-->
  239 + <!--<div class="tx_maskCon_school" onclick="zZFun(this)">-->
  240 + <!--<div class="three_model_school">-->
  241 + <!--<div class="three_model_school_title">-->
  242 + <!--选择快递-->
  243 + <!--</div>-->
  244 + <!--<div>-->
  245 + <!--<div class="three_model_school_data" style="display: block;">-->
  246 + <!--<div class="get_Go" data-name="SF">顺丰快递</div>-->
  247 + <!--<div class="get_Go" data-name="YTO">圆通快递</div>-->
  248 + <!--<div class="get_Go" data-name="ZTO">中通快递</div>-->
  249 + <!--<div class="get_Go there_unActive" data-name="STO">申通快递</div>-->
  250 + <!--<div class="get_Go" data-name="YD">韵达快递</div>-->
  251 + <!--<div class="get_Go" data-name="HHTT">天天快递</div>-->
  252 + <!--<div class="get_Go" data-name="HTKY">百世快递</div>-->
  253 + <!--<div class="get_Go" data-name="YZPY">邮政快递包裹</div>-->
  254 + <!--<div class="get_Go" data-name="EMS">EMS</div>-->
  255 + <!--<div class="get_Go" data-name="DBL">德邦快递</div>-->
  256 + <!--<div class="get_Go" data-name="ZJS">宅急送</div>-->
  257 + <!--<div class="get_Go" data-name="TNT">TNT快递</div>-->
  258 + <!--</div>-->
  259 + <!--</div>-->
  260 + <!--</div>-->
  261 + <!--</div>-->
  262 +<!--</div>-->
263 <div class="tx_masktwo" style="display: none;" onclick="$(this).hide()"> 263 <div class="tx_masktwo" style="display: none;" onclick="$(this).hide()">
264 <div class="tx_maskCon" onclick="zZFun(this)"> 264 <div class="tx_maskCon" onclick="zZFun(this)">
265 <div class="tx_maskConImg"> 265 <div class="tx_maskConImg">
@@ -306,13 +306,22 @@ @@ -306,13 +306,22 @@
306 <input type="text" id="end_time" value="" placeholder="请输入结束配送时间"/> 306 <input type="text" id="end_time" value="" placeholder="请输入结束配送时间"/>
307 </div> 307 </div>
308 </div>--> 308 </div>-->
309 - <div class="log_three_model_one logistic"> 309 + <!--<div class="log_three_model_one logistic">-->
  310 + <!--<div class="log_three_model_left">选择快递</div>-->
  311 + <!--<div class="log_psong log_psong_select">-->
  312 + <!--<div class="log_ps_title2 get_Gofo">请选择快递公司</div>-->
  313 + <!--<div class="log_ps_img">-->
  314 + <!--<img src="__TMPL__/public/assets/images/29.png"/>-->
  315 + <input type="hidden" id="logistic_name" value="" placeholder="请选择快递公司"/>
  316 + <!--</div>-->
  317 + <!--</div>-->
  318 + <!--</div>-->
  319 + <div class="log_three_model_one excompany logistic">
310 <div class="log_three_model_left">选择快递</div> 320 <div class="log_three_model_left">选择快递</div>
311 <div class="log_psong log_psong_select"> 321 <div class="log_psong log_psong_select">
312 - <div class="log_ps_title2 get_Gofo">请选择快递公司</div> 322 + <div class="log_ps_title excompany_word">请选择</div>
313 <div class="log_ps_img"> 323 <div class="log_ps_img">
314 - <img src="__TMPL__/public/assets/images/29.png"/>  
315 - <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/> 324 + <img src="__TMPL__/public/assets/images/29.png" />
316 </div> 325 </div>
317 </div> 326 </div>
318 </div> 327 </div>
@@ -355,16 +364,16 @@ @@ -355,16 +364,16 @@
355 </div>--> 364 </div>-->
356 365
357 366
358 - <div class="log_three_select_one log_three_select_school">  
359 - <div class="log_three_select_title log_three_select_school2"> 367 + <div class="log_three_select_one log_three_select_school2">
  368 + <div class="log_three_select_title schools_word">
360 请选择学校 369 请选择学校
361 </div> 370 </div>
362 <!--<div class="log_three_select_img">--> 371 <!--<div class="log_three_select_img">-->
363 <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />--> 372 <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
364 <!--</div>--> 373 <!--</div>-->
365 </div> 374 </div>
366 - <div class="log_three_select_one log_three_select_school">  
367 - <div class="log_three_select_title log_three_select_class2"> 375 + <div class="log_three_select_one log_three_select_class2">
  376 + <div class="log_three_select_title class_word">
368 请选择班级 377 请选择班级
369 </div> 378 </div>
370 <!--<div class="log_three_select_img">--> 379 <!--<div class="log_three_select_img">-->
@@ -374,7 +383,10 @@ @@ -374,7 +383,10 @@
374 383
375 384
376 <div class="log_three_select_one log_three_select_peisong log_three_select_tongyi" style="cursor: pointer"> 385 <div class="log_three_select_one log_three_select_peisong log_three_select_tongyi" style="cursor: pointer">
377 - <div class="log_three_select_title log_three_select_contant"> 386 + <!--<div class="log_three_select_title log_three_select_contant">-->
  387 + <!--统一配送-->
  388 + <!--</div>-->
  389 + <div class="log_three_select_title express_word" >
378 统一配送 390 统一配送
379 </div> 391 </div>
380 <!--<div class="log_three_select_img">--> 392 <!--<div class="log_three_select_img">-->
@@ -698,6 +710,9 @@ @@ -698,6 +710,9 @@
698 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script> 710 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
699 <script src="__TMPL__/public/assets/js/city.data-3.js"></script> 711 <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
700 <script> 712 <script>
  713 + var expresspicker = new mui.PopPicker();
  714 +
  715 +
701 $(".clear").click(function () { 716 $(".clear").click(function () {
702 window.location.reload(); 717 window.location.reload();
703 }) 718 })
@@ -714,10 +729,28 @@ @@ -714,10 +729,28 @@
714 $.ready(function () { 729 $.ready(function () {
715 schoolpicker.setData(school_arr); 730 schoolpicker.setData(school_arr);
716 classpicker.setData(data_class_arr); 731 classpicker.setData(data_class_arr);
  732 + expresspicker.setData([{
  733 + value: '1',
  734 + text: '快递配送'
  735 + }, {
  736 + value: '2',
  737 + text: '统一配送'
  738 + }]);
717 }); 739 });
718 })(mui, document); 740 })(mui, document);
719 } 741 }
720 - 742 + var express_word
  743 + $(".log_three_select_tongyi").click(function() {
  744 + expresspicker.show(function(e) {
  745 + console.log(e, '3333')
  746 + console.log(e[0].value);
  747 + console.log(e[0].text);
  748 + express_word = e[0].value;
  749 + console.log(express_word,"experss_word")
  750 + $(".express_word").text(e[0].text);
  751 + $('.express_word').css('color', '#333333');
  752 + });
  753 + })
721 var school_name; 754 var school_name;
722 $(".log_three_select_school2").click(function () { 755 $(".log_three_select_school2").click(function () {
723 $(".log_three_select_class2").text("请选择班级").css("color","rgba(153, 153, 153, 1)"); 756 $(".log_three_select_class2").text("请选择班级").css("color","rgba(153, 153, 153, 1)");
@@ -726,8 +759,8 @@ @@ -726,8 +759,8 @@
726 school_name = e[0].value; 759 school_name = e[0].value;
727 school_names = e[0].text; 760 school_names = e[0].text;
728 $('#school').val(school_names); 761 $('#school').val(school_names);
729 - $(".log_three_select_school2").text(e[0].text);  
730 - $('.log_three_select_school2').css('color', '#333333'); 762 + $(".schools_word").text(e[0].text);
  763 + $('.schools_word').css('color', '#333333');
731 $.post("{:url('Personalcenter/get_grade_class')}", {id: school_name}, function (data) { 764 $.post("{:url('Personalcenter/get_grade_class')}", {id: school_name}, function (data) {
732 if (data) { 765 if (data) {
733 data = JSON.parse(data); 766 data = JSON.parse(data);
@@ -750,6 +783,56 @@ @@ -750,6 +783,56 @@
750 alert("请先选择学校") 783 alert("请先选择学校")
751 } 784 }
752 }) 785 })
  786 + var excompanypicker = new mui.PopPicker();
  787 + excompanypicker.setData([{
  788 + value: 'SF',
  789 + text: '顺丰快递'
  790 + }, {
  791 + value: 'YTO',
  792 + text: '圆通快递'
  793 + }, {
  794 + value: 'ZTO',
  795 + text: '中通快递'
  796 + }, {
  797 + value: 'STO',
  798 + text: '申通快递'
  799 + }, {
  800 + value: 'YD',
  801 + text: '韵达快递'
  802 + }, {
  803 + value: 'HHTT',
  804 + text: '天天快递'
  805 + }, {
  806 + value: 'HTKY',
  807 + text: '百世快递'
  808 + }, {
  809 + value: 'YZPY',
  810 + text: '邮政快递包裹'
  811 + }, {
  812 + value: 'EMS',
  813 + text: 'EMS'
  814 + }, {
  815 + value: 'DBL',
  816 + text: '德邦快递'
  817 + }, {
  818 + value: 'ZJS',
  819 + text: '宅急送'
  820 + }, {
  821 + value: 'TNT',
  822 + text: 'TNT快递'
  823 + }]);
  824 + var excompany_word
  825 + $(".excompany").click(function() {
  826 + excompanypicker.show(function(e) {
  827 + console.log(e, '3333')
  828 + console.log(e[0].value);
  829 + console.log(e[0].text);
  830 + school_name = e[0].value
  831 + $(".excompany_word").text(e[0].text);
  832 + $("#logistic_name").val(e[0].value);
  833 + $('.excompany_word').css('color', '#333333');
  834 + });
  835 + })
753 </script> 836 </script>
754 <script> 837 <script>
755 function zZFun(e) { 838 function zZFun(e) {
@@ -830,18 +913,18 @@ @@ -830,18 +913,18 @@
830 }); 913 });
831 914
832 //统一配送 915 //统一配送
833 - $(".log_three_select_tongyi").click(function () {  
834 - $(".tx_mask_tongyi").css({  
835 - display: "block"  
836 - });  
837 - })  
838 - $(".tx_mask_tongyi .three_modal_kuaidi_name").click(function () {  
839 - var index = $(this).index();  
840 - $(this).addClass('there_unActive').siblings().removeClass('there_unActive');  
841 - $('.log_three_select_contant').text($(this).text()).css("color", "#333");  
842 - $(".tx_mask_tongyi").hide();  
843 - $("#is_courier").val($(this).attr('data-id'))  
844 - }) 916 +// $(".log_three_select_tongyi").click(function () {
  917 +// $(".tx_mask_tongyi").css({
  918 +// display: "block"
  919 +// });
  920 +// })
  921 +// $(".tx_mask_tongyi .three_modal_kuaidi_name").click(function () {
  922 +// var index = $(this).index();
  923 +// $(this).addClass('there_unActive').siblings().removeClass('there_unActive');
  924 +// $('.log_three_select_contant').text($(this).text()).css("color", "#333");
  925 +// $(".tx_mask_tongyi").hide();
  926 +// $("#is_courier").val($(this).attr('data-id'))
  927 +// })
845 //选择快递方式 928 //选择快递方式
846 $(".log_psong_select").click(function () { 929 $(".log_psong_select").click(function () {
847 $(".tx_mask_kuaidi").css({ 930 $(".tx_mask_kuaidi").css({
@@ -888,7 +971,7 @@ @@ -888,7 +971,7 @@
888 var school = $('#school').val(); 971 var school = $('#school').val();
889 var grade = $('#grade').val(); 972 var grade = $('#grade').val();
890 var state = $('.log_three_tab_top .aaa').attr('data-state'); 973 var state = $('.log_three_tab_top .aaa').attr('data-state');
891 - var is_courier = $('#is_courier').val(); 974 + var is_courier = express_word
892 975
893 $.ajax({ 976 $.ajax({
894 'url': "{:url('order_salesman/getOrderSalesman')}", 977 'url': "{:url('order_salesman/getOrderSalesman')}",
@@ -1121,6 +1204,7 @@ @@ -1121,6 +1204,7 @@
1121 var start_time = $('#start_time').val(); 1204 var start_time = $('#start_time').val();
1122 // var end_time = $('#end_time').val(); 1205 // var end_time = $('#end_time').val();
1123 var logistic_name = $('#logistic_name').val(); 1206 var logistic_name = $('#logistic_name').val();
  1207 + console.log(logistic_name);
1124 var logistic_code = $('#logistic_code').val(); 1208 var logistic_code = $('#logistic_code').val();
1125 var indent_id = $(this).attr('data-indent-id'); 1209 var indent_id = $(this).attr('data-indent-id');
1126 if (is_courier == 1) { 1210 if (is_courier == 1) {
@@ -1165,6 +1249,11 @@ @@ -1165,6 +1249,11 @@
1165 display: "none" 1249 display: "none"
1166 }); 1250 });
1167 } 1251 }
  1252 + var count = Number($('.count').text());
  1253 + if(count>0){
  1254 + count--;
  1255 + }
  1256 + $(".count").text(count);
1168 alert(res.msg) 1257 alert(res.msg)
1169 }, 1258 },
1170 error: function (res) { 1259 error: function (res) {
@@ -1191,9 +1280,14 @@ @@ -1191,9 +1280,14 @@
1191 data: {'indent_ids': arr.join(",")}, 1280 data: {'indent_ids': arr.join(",")},
1192 success: function (res) { 1281 success: function (res) {
1193 if (res.code == 1) { 1282 if (res.code == 1) {
  1283 + var count = Number($('.count').text());
1194 $(arr).each(function (i, vo) { 1284 $(arr).each(function (i, vo) {
  1285 + if(count>0){
  1286 + count--;
  1287 + }
1195 $('.order_' + vo).remove(); 1288 $('.order_' + vo).remove();
1196 - }) 1289 + });
  1290 + $(".count").text(count);
1197 alert('操作成功') 1291 alert('操作成功')
1198 } else { 1292 } else {
1199 alert(res.msg); 1293 alert(res.msg);
@@ -1283,9 +1377,9 @@ @@ -1283,9 +1377,9 @@
1283 </script> 1377 </script>
1284 <script type="text/javascript"> 1378 <script type="text/javascript">
1285 var dtpicker = new mui.DtPicker({ 1379 var dtpicker = new mui.DtPicker({
1286 - type: "datetime", //设置日历初始视图模式  
1287 - beginDate: new Date(), //设置开始日期  
1288 - labels: ['年', '月', '日', '时', '分', '秒'], //设置默认标签区域提示语 1380 + type: "date", //设置日历初始视图模式
  1381 + beginDate: new Date(2015, 04, 25), //设置开始日期
  1382 + labels: ['年', '月', '日'], //设置默认标签区域提示语
1289 }) 1383 })
1290 //统一配送选择时间 1384 //统一配送选择时间
1291 $(".tongyi_start_time").click(function () { 1385 $(".tongyi_start_time").click(function () {
@@ -30,35 +30,35 @@ @@ -30,35 +30,35 @@
30 </head> 30 </head>
31 31
32 <body style="background-color: #F7F7F7;"> 32 <body style="background-color: #F7F7F7;">
33 -<div class="tx_mask_school">  
34 - <div class="tx_maskCon_school">  
35 - <div class="three_model_school">  
36 - <div class="three_model_school_title">  
37 - 选择学校-班级  
38 - </div>  
39 - <div class="three_model_school_tab">  
40 - <div class="three_model_school_left three_model_school_hover word_color" style="cursor: pointer;">  
41 - 学校  
42 - </div>  
43 - <div class="three_model_school_left" style="cursor: pointer;">  
44 - 班级  
45 - </div>  
46 - </div>  
47 - <div>  
48 - <div class="three_model_school_data there_university" style="display: block;cursor: pointer;">  
49 - <!--<volist name="school" id="vo">  
50 - <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>  
51 - </volist>-->  
52 - </div>  
53 - <div class="three_model_school_data there_class banjiadd" style="cursor: pointer;">  
54 - <!--<volist name="grade_class_show" id="vo">-->  
55 - <!--<div class="three_model_school_name banji">{$vo}</div>-->  
56 - <!--</volist>-->  
57 - </div>  
58 - </div>  
59 - </div>  
60 - </div>  
61 -</div> 33 +<!--<div class="tx_mask_school">-->
  34 + <!--<div class="tx_maskCon_school">-->
  35 + <!--<div class="three_model_school">-->
  36 + <!--<div class="three_model_school_title">-->
  37 + <!--选择学校-班级-->
  38 + <!--</div>-->
  39 + <!--<div class="three_model_school_tab">-->
  40 + <!--<div class="three_model_school_left three_model_school_hover word_color" style="cursor: pointer;">-->
  41 + <!--学校-->
  42 + <!--</div>-->
  43 + <!--<div class="three_model_school_left" style="cursor: pointer;">-->
  44 + <!--班级-->
  45 + <!--</div>-->
  46 + <!--</div>-->
  47 + <!--<div>-->
  48 + <!--<div class="three_model_school_data there_university" style="display: block;cursor: pointer;">-->
  49 + <!--&lt;!&ndash;<volist name="school" id="vo">-->
  50 + <!--<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>-->
  51 + <!--</volist>&ndash;&gt;-->
  52 + <!--</div>-->
  53 + <!--<div class="three_model_school_data there_class banjiadd" style="cursor: pointer;">-->
  54 + <!--&lt;!&ndash;<volist name="grade_class_show" id="vo">&ndash;&gt;-->
  55 + <!--&lt;!&ndash;<div class="three_model_school_name banji">{$vo}</div>&ndash;&gt;-->
  56 + <!--&lt;!&ndash;</volist>&ndash;&gt;-->
  57 + <!--</div>-->
  58 + <!--</div>-->
  59 + <!--</div>-->
  60 + <!--</div>-->
  61 +<!--</div>-->
62 <div class="log_top_co" style="background-color: white;"> 62 <div class="log_top_co" style="background-color: white;">
63 <!-- 顶部 --> 63 <!-- 顶部 -->
64 <div class=" order_top log_top_co"> 64 <div class=" order_top log_top_co">
@@ -96,18 +96,41 @@ @@ -96,18 +96,41 @@
96 <img src="__TMPL__/public/assets/images/29.png" alt="" /> 96 <img src="__TMPL__/public/assets/images/29.png" alt="" />
97 </div> 97 </div>
98 </div> 98 </div>
99 - <div class="log_four_input_one log_banjis"> 99 + <!--<div class="log_four_input_one log_banjis">-->
  100 + <!--<div class="log_four_input_one_left">-->
  101 + <!--学校-->
  102 + <!--</div>-->
  103 + <!--<div class="log_four_input_one_center">-->
  104 + <!--<div class="city_text school_grade_class" id="school_class">请选择学校和班级</div>-->
  105 + <!--</div>-->
  106 + <!--<div class="log_four_input_one_right">-->
  107 + <!--<img src="__TMPL__/public/assets/images/29.png" alt="" />-->
  108 + <!--</div>-->
  109 +
  110 + <!--</div>-->
  111 + <div class="log_four_input_one log_banjis log_three_select_school2">
100 <div class="log_four_input_one_left"> 112 <div class="log_four_input_one_left">
101 学校 113 学校
102 </div> 114 </div>
103 - <div class="log_four_input_one_center">  
104 - <div class="city_text school_grade_class" id="school_class">请选择学校和班级</div> 115 + <div class="log_four_input_one_center ">
  116 + <div class="city_text xuexiao_name">请选择学校</div>
105 </div> 117 </div>
106 <div class="log_four_input_one_right"> 118 <div class="log_four_input_one_right">
107 <img src="__TMPL__/public/assets/images/29.png" alt="" /> 119 <img src="__TMPL__/public/assets/images/29.png" alt="" />
108 </div> 120 </div>
109 121
110 </div> 122 </div>
  123 + <div class="log_four_input_one log_banjis log_three_select_class2">
  124 + <div class="log_four_input_one_left">
  125 + 班级
  126 + </div>
  127 + <div class="log_four_input_one_center">
  128 + <div class="city_text banji_name">请选择班级</div>
  129 + </div>
  130 + <div class="log_four_input_one_right">
  131 + <img src="__TMPL__/public/assets/images/29.png" alt="" />
  132 + </div>
  133 + </div>
111 134
112 <div class="log_four_input_one"> 135 <div class="log_four_input_one">
113 <div class="log_four_input_one_left"> 136 <div class="log_four_input_one_left">
@@ -196,6 +219,64 @@ @@ -196,6 +219,64 @@
196 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script> 219 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
197 <script src="__TMPL__/public/assets/js/city.data-3.js"></script> 220 <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
198 <script> 221 <script>
  222 + var schoolpicker = new mui.PopPicker();
  223 + var classpicker = new mui.PopPicker();
  224 + (function($, doc) {
  225 + $.init();
  226 + $.ready(function() {
  227 + schoolpicker.setData([{
  228 + value: 'school1',
  229 + text: '天津科技大学1'
  230 + }, {
  231 + value: 'school2',
  232 + text: '天津科技大学2'
  233 + }, {
  234 + value: 'school3',
  235 + text: '天津科技大学3'
  236 + }, {
  237 + value: 'school4',
  238 + text: '天津科技大学4'
  239 + }]);
  240 + classpicker.setData([{
  241 + value: 'class1',
  242 + text: '1'
  243 + }, {
  244 + value: 'class2',
  245 + text: '2'
  246 + }, {
  247 + value: 'class3',
  248 + text: '3'
  249 + }, {
  250 + value: 'class4',
  251 + text: '4'
  252 + }]);
  253 + });
  254 + })(mui, document);
  255 + var school_name
  256 + $(".log_three_select_school2").click(function() {
  257 + schoolpicker.show(function(e) {
  258 + console.log(e, '3333')
  259 + console.log(e[0].value);
  260 + console.log(e[0].text);
  261 + school_name = e[0].value
  262 + $(".xuexiao_name").text(e[0].text);
  263 + $('.xuexiao_name').css('color', '#333333');
  264 + });
  265 + })
  266 + console.log(school_name)
  267 + $(".log_three_select_class2").click(function() {
  268 + if(school_name != undefined) {
  269 + classpicker.show(function(e) {
  270 + console.log(e)
  271 + console.log(e[0].value);
  272 + console.log(e[0].text);
  273 + $(".banji_name").text(e[0].text);
  274 + $('.banji_name').css('color', '#333333');
  275 + });
  276 + } else {
  277 + alert("请先选择学校")
  278 + }
  279 + })
199 /** 280 /**
200 *快递配送 281 *快递配送
201 */ 282 */
@@ -152,11 +152,11 @@ @@ -152,11 +152,11 @@
152 <!-- 操作 --> 152 <!-- 操作 -->
153 <div class="log_five_shanxian"> 153 <div class="log_five_shanxian">
154 <div class="log_five_handle"> 154 <div class="log_five_handle">
155 - <div class="log_five_handle_one"> 155 + <div class="log_five_handle_one" onclick="goods_edit({$vo.id})">
156 <div class="log_five_handle_img"> 156 <div class="log_five_handle_img">
157 <img src="__TMPL__/public/assets/images/87.png" alt="" /> 157 <img src="__TMPL__/public/assets/images/87.png" alt="" />
158 </div> 158 </div>
159 - <div class="log_five_handle_word log_five_handle_add" onclick="goods_edit({$vo.id})" style="cursor: pointer;"> 159 + <div class="log_five_handle_word log_five_handle_add" style="cursor: pointer;">
160 编辑 160 编辑
161 </div> 161 </div>
162 </div> 162 </div>
@@ -168,19 +168,19 @@ @@ -168,19 +168,19 @@
168 删除 168 删除
169 </div> 169 </div>
170 </div> 170 </div>
171 - <div class="log_five_handle_one" > 171 + <div class="log_five_handle_one" onclick="move_up({$vo.id})">
172 <div class="log_five_handle_img"> 172 <div class="log_five_handle_img">
173 <img src="__TMPL__/public/assets/images/85.png" alt="" /> 173 <img src="__TMPL__/public/assets/images/85.png" alt="" />
174 </div> 174 </div>
175 - <div class="log_five_handle_word log_five_handle_up" onclick="move_up({$vo.id})" style="cursor: pointer;"> 175 + <div class="log_five_handle_word log_five_handle_up" style="cursor: pointer;">
176 上移 176 上移
177 </div> 177 </div>
178 </div> 178 </div>
179 - <div class="log_five_handle_one"> 179 + <div class="log_five_handle_one" onclick="cost({$vo.id})">
180 <div class="log_five_handle_img"> 180 <div class="log_five_handle_img">
181 <img src="__TMPL__/public/assets/images/84.png" alt="" /> 181 <img src="__TMPL__/public/assets/images/84.png" alt="" />
182 </div> 182 </div>
183 - <div class="log_five_handle_word log_five_handle_pay" onclick="cost({$vo.id})" style="cursor: pointer;"> 183 + <div class="log_five_handle_word log_five_handle_pay" style="cursor: pointer;">
184 费用 184 费用
185 </div> 185 </div>
186 </div> 186 </div>
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
204 */ 204 */
205 public function checkWeChatUserLogin() 205 public function checkWeChatUserLogin()
206 { 206 {
207 - /*$user = Db::name('user')->where('id',6)->find();  
208 - cmf_update_current_user($user);*/ 207 + $user = Db::name('user')->where('id',27)->find();
  208 + cmf_update_current_user($user);
209 $userId = cmf_get_current_user_id(); 209 $userId = cmf_get_current_user_id();
210 if (empty($userId)) { 210 if (empty($userId)) {
211 $config = [ 211 $config = [