Merge branch 'dev_7.1.0' into fixbug-ZYW

# Conflicts:
#	src/pages/my/my.wxml

src/component/html2wxml/wxHtml.wxss

@@ -3,6 +3,9 @@
 .wxParser image {
   width:100%;
 }
+.wxParser {
+  margin:-20rpx 0;
+}
 
 /* .wxParser .wxParser-p{
   text-align: center;

src/component/skuPopup/skuPopup.js

@@ -166,6 +166,7 @@ Component({
           title: '请选择规格',
           icon: 'none'
         })
+        return false
       }else{
         for (var i = 0; i < this.data.curSpec.length; i++) {
           if (!this.data.curSpec[i]) {

src/component/waterFlowLayout/waterFlowLayout.wxml

 <!--component/waterFlowLayout/waterFlowLayout.wxml-->
 
- <view class="water-wrap">
+ <view class="water-wrap {{type == 2 ? 'release-water' : ''}}">
     <view class="left">
       <block wx:for="{{imageData}}" wx:key="">
         <template is="water-list" data="{{...item}}" wx:if="{{index%2==0}}"></template>

src/component/waterFlowLayout/waterFlowLayout.wxss

@@ -4,8 +4,11 @@
   margin: 50rpx 20rpx;
   text-align: justify; 
 }  
+.release-water{
+  margin-top: -2rpx;
+}
 .item {
-  margin-bottom: 10rpx;
+  margin-bottom: 14rpx;
   display: inline-block;
   width: 349.86rpx;
   border-radius: 10rpx;

src/pages/my/my.js

@@ -29,7 +29,7 @@ wxService.page({
     pageBackgroundColor: 0,
     guidePageModalShow: false,
     currHomePageId: '',
-    skuVOList:[]
+    skuVOList: []
   },
   /**
    * 生命周期函数--监听页面加载
@@ -87,9 +87,9 @@ wxService.page({
         isAuthorization: false
       }, () => {
         // 积分数量
-        // this.getMemberPointInfo()
+        this.getMemberPointInfo()
         // 优惠券数量
-        // this.getMemberCouponInfo()
+        this.getMemberCouponInfo()
       })
     }
     else if (!baseUserInfo && reLoginErrFlag) {
@@ -102,23 +102,6 @@ wxService.page({
         isAuthorization: true
       })
     }
-    // if (baseUserInfo){
-    //   this.setData({
-    //     token: wx.getStorageSync('token'),
-    //     baseUserInfo,
-    //     // cardMember,
-    //     isAuthorization: false
-    //   })
-
-    //   // 积分数量
-    //   this.getMemberPointInfo()
-    //   // 优惠券数量
-    //   this.getMemberCouponInfo()
-    // } else {
-    //   this.setData({
-    //     isAuthorization: true
-    //   })
-    // }
     // 获取plus购买信息
     this.getPlusPurchase()
     // 获取手机信息
@@ -135,12 +118,59 @@ wxService.page({
       })
     }
   },
-
+  // 查询积分信息
+  getMemberPointInfo() {
+    wx.showLoading({
+      title: '加载中'
+    })
+    wxService.get(`/member/memberPoint/getMyPointInfo`).then(res => {
+      if (res) {
+        const { result, data } = res.data
+        if (result == 0) {
+          wx.hideLoading()
+          this.setData({
+            integralNum: data && data.point || 0
+          })
+        }
+      }
+    })
+  },
+  // 查询优惠券数量
+  getMemberCouponInfo() {
+    wx.showLoading({
+      title: '加载中'
+    })
+    wxService.post(`/coupon/coupon/memberCouponCount`).then(res => {
+      if (res) {
+        const { result, data } = res && res.data
+        if (result == 0) {
+          wx.hideLoading()
+          this.setData({
+            couponNum: data && data[1] || 0
+          })
+        }
+      }
+    })
+  },
   // page 信息
-  initPage(pageId) {
+  initPage() {
     this.setData({
-      products: []
+      pages: [],
+      products: [],
+      groupLoadState: 'complete', // 活动分组加载标志
+      homeApiLoading: true,
+      render: null, // 渲染页面数据对象(安全渲染)
+      isLastPage: false, // 页面段落加载完成
+      renderPageOver: false, // 渲染页面结束
+      // isAuthorization: true,
+      outoHeigth: 500,
     })
+    handlerDataOnPage = new utils.HandlerDataOnPage()
+    renderPage = require('../../utils/renderPage').getRenderPage()
+    handlerDataOnPage.init(this, 'pages')
+    this.initHomePage()
+  },
+  initHomePage() {
     wx.showLoading({
       title: '加载中'
     })
@@ -230,7 +260,7 @@ wxService.page({
       wx.hideLoading()
     })
   },
- 
+
   // 获取plus购买信息
   getPlusPurchase() {
     wxService.get(`/sale/premium/query`).then(res => {

src/pages/my/my.wxml

@@ -2,31 +2,31 @@
 	<!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
 	<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
 		<view wx:if="{{pItem.type == 1}}">
-			<image-swiper image-data="{{pItem.rotationchart.images}}" />
+			<image-swiper image-data="{{pItem.rotationchart.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 2}}">
-			<person-center person-data="{{pItem.customer}}" />
+			 <person-center isVip="{{isVip}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 3}}">
-			<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
+			<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"  bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 4}}">
 			<bottom bottom="{{pItem.bottom}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 5}}">
-			<bottom-tabs currHomePageId="{{currHomePageId}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
+			<bottom-tabs currHomePageId="{{currHomePageId}}"  bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 6}}">
-			<announcement notice="{{pItem.notice}}" />
+			<announcement notice="{{pItem.notice}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 7}}">
-			<tab-sort category-type="{{pItem.categoryType}}" />
+			<tab-sort currHomePageId="{{currHomePageId}}" category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
 			<attention focus-wx="{{pItem.focusWx}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 9}}">
-			<plus sku-list="{{skuVOList}}" plus-bgi="{{pItem.plus}}" currentHasUserInfo="{{currentHasUserInfo}}"/>
+			<plus sku-list="{{skuVOList}}" plus-bgi="{{pItem.plus}}" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
 		</view>
 	</block>
 </view>
@@ -34,5 +34,4 @@
 <!--<authorization-modal isAuthorization='{{isAuthorization}}'/>-->
 <!-- 底部补充高度 防止被遮盖 -->
 <view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
-
-
+<share-benefit-modal show="{{shareBenefitModalShow}}" benefit-data="{{benefitData}}"/>

src/pages/productDetail/productDetail.wxml

@@ -84,7 +84,9 @@
 	<!--<view class="scroll-tips">
 		继续拖动，查看图文详情
 	</view>-->
-	<view class="scroll-tips" wx:if="{{htmlContent == null}}">{{scrollTips}}</view>
+	<view class="scroll-tips" wx:if="{{htmlContent == null}}">
+		<view class="scroll-tips-text">{{scrollTips}}</view>
+	</view>
 
 	<block wx:if="{{showHtml}}">
 		<x-html html="{{productInfo.descHtml}}" />

src/pages/productDetail/productDetail.wxss

@@ -162,8 +162,8 @@ page{
 .scroll-tips{
   width: 750rpx;
   text-align: center;
-  padding: 15rpx 0 30rpx;
-  margin-bottom: 100rpx;
+  /* padding: 15rpx 0 30rpx; */
+  /* margin-bottom: 100rpx; */
   color: #666666;
   font-size: 24rpx;
 }
@@ -254,3 +254,6 @@ page{
   float:right;
   margin-top: 26rpx;
 }
+.scroll-tips-text {
+  margin: 20rpx 0;
+}
\ No newline at end of file

src/pages/userCenter/userCenter.js

@@ -321,7 +321,6 @@ wxService.page({
   * 用户点击右上角分享
   */
   onShareAppMessage: function (res) {
-
     //修改为参数memberId
     const { memberId, member } = wx.getStorageSync('_baseUserInfo')
     var path = `pages/userCenter/userCenter`;

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 22,
+			"current": 16,
 			"list": [
 				{
 					"id": -1,
@@ -144,7 +144,7 @@
 					"id": 16,
 					"name": "商品详情页",
 					"pathName": "pages/productDetail/productDetail",
-					"query": "id=621372413208301568",
+					"query": "id=628181797502586880",
 					"scene": null
 				},
 				{