合并分支 'wangxiaogang' 到 'master'

Wangxiaogang



查看合并请求 !104

@@ -619,6 +619,8 @@
             'data': {'school': school, 'grade': grade, 'state': state, 'is_courier': is_courier},
             'data': {'school': school, 'grade': grade, 'state': state, 'is_courier': is_courier},
             'success': (function (data) {
             'success': (function (data) {
                 var index = $('.log_three_tab_top div').index($('.aaa'));
                 var index = $('.log_three_tab_top div').index($('.aaa'));
+                console.log(3333);
+                console.log(data);
                 if (data.code == 1) {
                 if (data.code == 1) {
                     var result = data.data;
                     var result = data.data;
                     if(result == 0){
                     if(result == 0){
@@ -667,7 +669,7 @@
                                 "                                    " + indent_goods_data[i3].book_name + "\n" +
                                 "                                    " + indent_goods_data[i3].book_name + "\n" +
                                 "                                </div>\n" +
                                 "                                </div>\n" +
                                 "                                <div class=\"log_three_center_two\">×" + indent_goods_data[i3].number + "</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 * 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>\n" +
                                 "                        </div>";
                                 "                        </div>";
                         }
                         }
@@ -758,7 +760,7 @@
             })
             })
         })
         })
         $('.search').click(function () {
         $('.search').click(function () {
-            search()
+            search();
         });
         });
         //发货
         //发货
         $("body").on('click', '.send', function () {
         $("body").on('click', '.send', function () {
@@ -880,7 +882,7 @@
 
 
     function update() {
     function update() {
         var is_courier = $('#is_courier').val();
         var is_courier = $('#is_courier').val();
-        var index = $('.log_three_tab_top div').index($('.aaa'));
+        var index = $('.log_three_tab_top').children('.aaa').index();
         if (is_courier == 1 && index == 0) {
         if (is_courier == 1 && index == 0) {
             $('.log_three_list_fixed').show();
             $('.log_three_list_fixed').show();
         } else if (is_courier == 2 || index != 0) {
         } else if (is_courier == 2 || index != 0) {