Merge remote-tracking branch 'origin/master'

doum

昨天 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

 mini-program/pagesA/pages/shop_points/shop_points.vue

@@ -57,7 +57,7 @@
            shop:{},
            active:0,
            backHeadImage:'',
            backImage: require('@/static/images/jifen_bg@2x.png')
            backImage: ''
         };
      },
      onReachBottom(){
@@ -72,7 +72,10 @@
          }
      },
      onLoad() {
          this.getBase64Img('/static/images/jifen_bg@2x.png')
         if (uni.getStorageSync('backgroundImage')) {
            this.backImage = uni.getStorageSync('backgroundImage').shopIntegralBg
         }
          // this.getBase64Img('/static/images/jifen_bg@2x.png')
      },
      onShow() {
          this.shop  ={}