Merge refs/remotes/origin/master into refs/heads/master

QYF-GitLab1

2024-12-18 2115fa126543700a7a15235bf3e5fceeb7e39e00

 pages/scanResult/index.js

@@ -30,6 +30,9 @@
          result,
          textValue: result.type == "PromoteCode" ? '领取' : '激活'
        })
        wx.setNavigationBarTitle({
          title: result.type == "PromoteCode" ? '领取优惠卷' : '激活商品',
        })
        // this.getRules();
        this.getProductByCode();
      } else {