Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/Cart/CartService.php

@@ -603,7 +603,7 @@ class CartServiceModel extends \Business\AbstractModel{
         foreach($storeIds as $storeId){
             $store = $storeDao->get($storeId,false);
             $storeCarts = $storeCartData['cartList'][$storeId];
-            $deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付
+            $deliverySetting['onelinePay'] = $store['wx_pay']&&$store['onlinepay_flag']?\Our\ApiConst::one:\Our\ApiConst::zero;//是否支持线上支付
             $deliverySetting['offlinePay'] = $store['offline_pay'];
 
             if($deliverySetting['offlinePay']){