shish 3 лет назад
Родитель
Сommit
fbfc635d0b
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      app-ghs/controllers/OrderController.php
  2. 1 1
      biz-ghs/product/classes/ProductClass.php

+ 1 - 1
app-ghs/controllers/OrderController.php

@@ -787,7 +787,7 @@ class OrderController extends BaseController
         //判断花材有效性
         //判断花材有效性
         foreach ($itemInfo as $itemData) {
         foreach ($itemInfo as $itemData) {
             if (isset($itemData['mainId']) == false || $itemData['mainId'] != $this->mainId) {
             if (isset($itemData['mainId']) == false || $itemData['mainId'] != $this->mainId) {
-                util::fail('只能选择同一家的商品下单...');
+                util::fail('只能选择同一家的商品');
             }
             }
         }
         }
         //开单提交订单时,别人修改价格,暂成提交价格不是真实卖价问题解决!!
         //开单提交订单时,别人修改价格,暂成提交价格不是真实卖价问题解决!!

+ 1 - 1
biz-ghs/product/classes/ProductClass.php

@@ -553,7 +553,7 @@ class ProductClass extends BaseClass
         if (!empty($productList)) {
         if (!empty($productList)) {
             foreach ($productList as $product) {
             foreach ($productList as $product) {
                 if (isset($product['mainId']) == false || $product['mainId'] != $mainId) {
                 if (isset($product['mainId']) == false || $product['mainId'] != $mainId) {
-                    util::fail('只能选择同一家的商品下单哦');
+                    util::fail('只能选择同一家的商品哦');
                 }
                 }
             }
             }
             if (count($productList) != count($ids)) {
             if (count($productList) != count($ids)) {