Merge branch 'bug修复/产品详情补丁合并收藏夹分支和定制项分支修复未选中全部选项可以加入购物车的问题' into 德莱宝测试除了手机登录不合并

packageA/favorites/index.js

@@ -165,12 +165,13 @@ Page({
         istool: 0,
         type: "标准订单",
         "tradefield": data.type, //必选
+        sa_brandid: this.data.sa_brandid,
         "items": data.list.map(v => {
           return {
             "sa_orderitemsid": 0,
             "itemid": v.itemid,
             "qty": v.favoritesqty,
-            sa_brandid: this.data.sa_brandid,
+            "sa_brandid": v.brand.length ? v.brand[0].sa_brandid : this.data.sa_brandid || 0,
             width: v.favoriteswidth || 0,
             length: v.favoriteslength || 0,
           }