Merge branch 'redesign‌-260706' into dev

app-hd/controllers/CustomController.php

@@ -668,8 +668,9 @@ class CustomController extends BaseController
     }
 
     /**
-     * 客户余额页小程序码（隔天/无原单返余额海报用）
+     * 客户充值页小程序码（隔天/无原单返余额海报用）
      * GET: id=customId
+     * 落地页：mallApp pages/member/recharge，scene 带店铺 id（s=shopId → account）
      */
     public function actionGetGatheringMiniCode()
     {
@@ -683,7 +684,8 @@ class CustomController extends BaseController
             util::fail('不是你的客户');
         }
         $merchant = \bizHd\wx\classes\WxOpenClass::getMallWxInfo();
-        $page = 'pages/home/user';
+        // 与扫码充值码一致，扫码进入商城充值页
+        $page = 'pages/member/recharge';
         $ptStyle = \common\components\dict::getDict('ptStyle', 'mall');
         $scene = 's=' . $this->shopId;
         $envVersion = \common\components\miniUtil::normalizeMiniEnvVersion($get['env_version'] ?? 'release');

app-hd/controllers/RefundController.php

@@ -61,7 +61,7 @@ class RefundController extends BaseController
         if ($customId > 0) {
             $where['customId'] = $customId;
         }
-        // sameDay：-1全部 1当天 0隔天/无原单
+        // sameDay：-1全部 1当天售后 0隔天售后
         $sameDay = isset($get['sameDay']) ? intval($get['sameDay']) : -1;
         if ($sameDay === 0 || $sameDay === 1) {
             $where['sameDay'] = $sameDay;