Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_te_20200402

public/js/add_order.js

@@ -839,7 +839,7 @@
                                 },
                                 },
                             })
                             })
 
 
-                            // layer.msg('订单生成中...', {icon: 16, time: 0, shade: 0.3});
+                            layer.msg('订单生成中...', {icon: 16, time: 0, shade: 0.3});
                         }                         
                         }                         
                     } else {
                     } else {
                         layer.msg('请先添加商品');
                         layer.msg('请先添加商品');