Merge branch 'dev_7.0.1' into feature-zyw

src/pages/couponCodeDetail/couponCodeDetail.js

@@ -24,7 +24,9 @@ wxService.page({
     })
     // 条形码
     if(cardno){
-      wxbarcode.barcode('barcode', cardno, 600, 180);
+      setTimeout(()=> {
+        wxbarcode.barcode('barcode', cardno, 600, 180);
+      }, 200)
       this.getCouponDetail(cardno)
     }
   },

src/pages/memberOfOwn/memberOfOwn.js

@@ -57,7 +57,9 @@ wxService.page({
         // 获取会员信息
         this.getMemberFind()
         // 条形码
-        wxbarcode.barcode('barcode', memberCardNo, 500, 120);
+        setTimeout(()=> {
+          wxbarcode.barcode('barcode', memberCardNo, 500, 120);
+        }, 200)
       })
     }
   },

src/pages/userCenter/userCenter.js

@@ -72,7 +72,6 @@ wxService.page({
     const baseUserInfo = wx.getStorageSync('_baseUserInfo')
     const cardMember = wx.getStorageSync('_cardMember')
     // _cardMemebr
-    console.log('user-----cardMember',cardMember)
     if (baseUserInfo){
       this.setData({
         token: wx.getStorageSync('token'),