合并分支 'liuzhen' 到 'master'

订单管理调试



查看合并请求 !163

@@ -727,7 +727,6 @@
                                 "                        </div>\n" + indent_goods_html + "</a></div>";
                                 "                        </div>\n" + indent_goods_html + "</a></div>";
                         }
                         }
                     }
                     }
-                    alert(22);
                     $('.count').html(i);
                     $('.count').html(i);
                     $('.log_three_list_contant').eq(index).html(html);
                     $('.log_three_list_contant').eq(index).html(html);
                     update();
                     update();
@@ -740,9 +739,7 @@
                     })
                     })
                     $('.goods').html(goods_count_html);
                     $('.goods').html(goods_count_html);
                     count = result.length;
                     count = result.length;
-                    alert(11);
                     order2canvas();
                     order2canvas();
-                    alert(33);
                 } else {
                 } else {
                     alert('未知错误');
                     alert('未知错误');
                 }
                 }
@@ -843,7 +840,9 @@
                     },
                     },
                     success: function (res) {
                     success: function (res) {
                         img_url = res.data;
                         img_url = res.data;
+                        alert(123);
                         $('.view_img').css('display','block');
                         $('.view_img').css('display','block');
+                        alert(45);
                         $('#view_canvas').text(text);
                         $('#view_canvas').text(text);
                         $('#view_canvas').removeClass('disabled');
                         $('#view_canvas').removeClass('disabled');
                         allow = true;
                         allow = true;