Merge branch 'zjl_create_order_20180813' into development

public/js/add_order.js

@@ -335,7 +335,7 @@
                                 }
                                 }
                             }                         
                             }                         
                         } else {
                         } else {
-                            if (type == 2) {
+                            if (type == 1 && type == 2) { // 1.联营 2.专卖
                                 layer.msg('仅支持自营商品下单，请在联营订单中下单');
                                 layer.msg('仅支持自营商品下单，请在联营订单中下单');
                                 return false;
                                 return false;
                             }
                             }