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

QYF-GitLab1

2024-12-18 2115fa126543700a7a15235bf3e5fceeb7e39e00

 pages/cart/paymentPage/index.js

@@ -177,6 +177,10 @@
            item.typeTxt = '云学习'
            item.productType = "图书服务-云学习"
          }
          if (item.orderSaleMethod.cmsItemList.length && item.orderSaleMethod.cmsItemList[0].type == "questionBankFolder") {
            item.typeTxt = '题库'
            item.productType = "图书服务-云测试"
          }
        }
      })
      this.setData({