Merge branch 'dev' into 'test'

1. 礼包购买的时候 2. 导航不显示图标的显示 See merge request !368

Merge branch 'dev' into 'test'
1. 礼包购买的时候 2. 导航不显示图标的显示 See merge request !368
后端研发-苏明海
2 parents acf175cd 060b2bc6
Showing 2 changed files with 3 additions and 1 deletions
components/diy_nav/diy_nav.wxss
pages/giftpack/buygiftpack/giftpackbuy.js
@@ -113,6 +113,7 @@
   margin-top: 40rpx;
   font-size: 30rpx;
   font-family: "宋体";
+  width: 100%;text-align: center; margin: 20rpx 0;
 }
  
 /* 隐藏图片 */
@@ -123,7 +123,8 @@ Page({
           "buyType": '1', //1=积分兑换 2=余额购买
           "giftBagId": id, //礼包Id
           "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID //用户ID
+          "userId": that.getUserID, //用户ID
+          "buyFrom": 2
         };
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";