Merge branch 'dev' of git.huaml.com:zhh/huahuibao into dev

app-ghs/controllers/TestController.php

@@ -341,6 +341,7 @@ class TestController extends BaseController
             //['name' => '徐州贴心鲜花批发', 'merchantNo' => '82230305992005L', 'wx' => [770844003, 770842534], 'zfb' => '2088370485434992'],
             //['name' => '海沧好多花换店', 'merchantNo' => '8223930599200CN', 'wx' => [772684174, 772684211], 'zfb' => '2088370864383343'],
             //['name' => '九江伊朵鲜花批发', 'merchantNo' => '82242405992002A', 'wx' => [774681090, 774681246], 'zfb' => '2088470298005142'],
+            ['name' => '徐州邂逅花坊鲜花', 'merchantNo' => '8223030539903EM', 'wx' => [787183981, 787183276], 'zfb' => '2088670583372931'],
             ['name' => '徐州云之南鲜花', 'merchantNo' => '82230305992005R', 'wx' => [774780650, 774780913], 'zfb' => '2088470313464547'],
             //['name' => '日照温暖小筑', 'merchantNo' => '82247705992002F', 'wx' => [781363841, 781362087], 'zfb' => '2088570557754874'],
             //['name' => '昆明建芳基地鲜花直发', 'merchantNo' => '8223970599200AH', 'wx' => [775915046, 775915051], 'zfb' => '2088470558755358'],

app-hd/controllers/OrderController.php

@@ -320,14 +320,14 @@ class OrderController extends BaseController
         $order = OrderClass::getById($id, true);
         OrderClass::valid($order, $this->mainId);
 
-        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
-            $msg = '订单已取消';
-            util::success(['returnStatus' => 'FAILURE'], $msg);
-        }
-        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            $msg = '订单不是待付款状态';
-            util::success(['returnStatus' => 'FAILURE'], $msg);
-        }
+//        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
+//            $msg = '订单已取消';
+//            util::success(['returnStatus' => 'FAILURE'], $msg);
+//        }
+//        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
+//            $msg = '订单不是待付款状态';
+//            util::success(['returnStatus' => 'FAILURE'], $msg);
+//        }
 
         $shop = $this->shop;
         $sj = $shop->merchantName;

common/components/book.php

@@ -91,7 +91,7 @@ class book
         'chargeStandard' => [
             ['style' => 'info', 'value' => '软件年费1580元/每年（注意是每年），客户通过小程序下单，会扣千分之3.3手续费（即1千元扣3.3元）。',],
             ['style' => 'info', 'value' => '根据你自身门店情况，选择以下套餐。下面列出的套餐，已经过全国100多家鲜花批发店磨合使用，非常成熟好用，请放心购买使用，以下套餐已含第一年年费。',],
-            ['style' => 'smallTitle', 'value' => '注意，不管是年费、费率和套餐，都已经给到大家最低价，没有谈的空间。如果还要再谈，不需要再找我们浪费时间，请理解。',],
+            ['style' => 'smallTitle', 'value' => '注意，软件的研发成本巨大，不管是年费、费率和套餐，都已经给到大家最低价，没有谈的空间。如果还要再谈，不需要再找我们浪费时间，请理解。',],
             ['style' => 'info', 'value' => '首次开通系统，另外赠送30天有效期，保证有足够时间试运营。',],
             ['style' => 'info', 'value' => '-------------------------------------------',],
             ['style' => 'smallTitle', 'value' => '仓库版',],

composer.json

@@ -14,7 +14,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.0",
+        "php": ">=5.4.0",
         "yiisoft/yii2": "2.0.29",
         "yiisoft/yii2-bootstrap": "~2.0.6",
         "yiisoft/yii2-swiftmailer": "~2.0.6",