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

QYF-GitLab1

2024-12-18 2115fa126543700a7a15235bf3e5fceeb7e39e00

 pages/scanResult/index.js

@@ -30,17 +30,18 @@
          result,
          textValue: result.type == "PromoteCode" ? '领取' : '激活'
        })
        wx.setNavigationBarTitle({
          title: result.type == "PromoteCode" ? '领取优惠卷' : '激活商品',
        })
        // this.getRules();
        this.getProductByCode();
      } else {
        debugger
        this.setData({
          isOther: true
        })
      }
    } catch (error) {
      console.log(error);
      debugger
      this.setData({
        isOther: true
      })
@@ -165,7 +166,6 @@
            const list = JSON.parse(res.config);
            console.log('code', res, list);
            if (this.data.result) {

              const type = res.saleMethodList[0].type
              this.setData({
                goodsData: res,