Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !166

src/component/attention/attention.wxss

@@ -4,9 +4,9 @@
 	width: 710rpx;
 	height: 133rpx;
 	border-radius: 16rpx;
-	background-color: rgba(192, 154, 116, 1);
+	/* background-color: rgba(192, 154, 116, 1); */
 	margin-top: 50rpx;
-	margin-bottom: 100rpx;
+	margin-bottom: 50rpx;
 	display: flex;
 	align-items: center;
 	justify-content: space-between;

src/component/bottomTabs/bottomTabs.wxss

@@ -5,6 +5,7 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
+  border-top: solid 1rpx #eee;
 }
 .tab-img {
 	/* width: 70rpx;

src/component/cardModal/cardModal.wxml

@@ -4,7 +4,7 @@
   <view class="card-modal" hidden="{{!showCardModal}}" catchtouchmove='true'>
     <view class="card-modal-content">
       <view class="modal-header">
-        <image class="brand-img" src="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg"></image>
+        <image class="brand-img" src="https://xiedemo.oss-cn-shanghai.aliyuncs.com/logo_head.jpg"></image>
         <view class="brand-title">{{cardTitle}}</view>
       </view>
       <view class="card-img-wrap">
@@ -21,6 +21,6 @@
     <text class="share-text">生成朋友圈海报</text>
   </view>
 </view>
-<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
+<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="https://xiedemo.oss-cn-shanghai.aliyuncs.com/logo_head.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
 
 

src/component/plus/plus.js

@@ -44,8 +44,8 @@ Component({
       wxService.request({
         url: app.globalData.ctx + '/sale/premium/query',
         header: {
-          'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试
-          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
+          // 'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试
+          'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
         },
         success: (res) => {
           const { result, data } = res.data

src/component/plus/plus.wxss

@@ -11,7 +11,8 @@
   position: fixed;
   bottom: 88rpx;
   padding: 36rpx 0 36rpx 30rpx;
-  background-color: rgba(192, 154, 116, 0.2);
+  /* background-color: rgba(192, 154, 116, 0.2); */
+  background-color: rgb(230,215,199);
 }
 
 .scroll-view_H {

src/component/sharePoster/sharePoster.js

@@ -81,6 +81,13 @@ Component({
                 }
               })
             }
+          },
+          fail : function(res){
+            wx.hideLoading();
+            wx.showToast({
+              title: '产品图片下载失败！',
+              icon: 'none',
+            })
           }
         })
       } else {
@@ -118,6 +125,14 @@ Component({
                 }
               })
             }
+          },
+          fail: function(res){
+            wx.hideLoading();
+            wx.showToast({
+              title: '二维码下载失败！',
+              icon: 'none',
+              duration: 2000,
+            })
           }
         })
       } else {
@@ -161,13 +176,7 @@ Component({
 
         // 品牌头像
         if (that.data.userAvatar) {
-          console.log(imgheght)
-          // ctx.drawImage(that.data.userAvatar, 12, 306, 25, 25);
           ctx.drawImage(that.data.userAvatar, 12, 290, 40, 40);
-          ctx.setFontSize(14);
-          ctx.setFillStyle('#d8d8d8');
-          ctx.setTextAlign('left');
-          // ctx.fillText(that.data.userAvatar, left - 15, imgheght + 110); //电话
         }
         // title
         console.log('productDesc', that.data.productDesc)

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -16,7 +16,7 @@
   <view class="item" bindtap="gotoDetail" data-id="{{id}}" data-current-type="{{currentType}}">
   
     <view class="no-audited" wx:if="{{currentType != 2}}">
-      待审核
+      {{currentType == 1 ? '待审核' : (currentType == 3 ? '已驳回' : '已通过')}}
     </view>
     <image class="item-img" src="{{url}}" mode="widthFix" bindload="imageLoad"></image>
     <view class="item-title-box">

src/pages/confirmOrder/confirmOrder.js

@@ -496,6 +496,9 @@ wxService.page({
           wx.hideLoading()
         })
 
+        this.data.addressInfo.fullArea = this.data.addressInfo.provinceName + ' ' + 
+          this.data.addressInfo.cityName + ' ' + this.data.addressInfo.countyName
+        wx.setStorageSync('_defalutAddress', this.data.addressInfo)
         console.log('WX---------------------', this.data.addressInfo)
       },
       fail: function (err) {

src/pages/extendProduct/extendProduct.js

@@ -224,16 +224,18 @@ wxService.page({
       "scene": this.data.scene,
       "width": 100
     }
+    
     wxService.post(`/marketing/quickMark/getAppQrCodePicture`, data).then(res => {
       const { result, data } = res.data
       if (result == 0) {
         this.setData({
           codeImg: app.globalData.imageUrl + data
           // codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
-        })
+        },() => {
           if (this.data.codeImg) {
             this.selectComponent('#getPoster').getAvaterInfo()
           }
+        })
       }
     })
   },

src/pages/extendProduct/extendProduct.wxml

@@ -162,7 +162,7 @@
  page-path="{{pagePath}}"
  scene="{{scene}}"
 />
-<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
+<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="https://xiedemo.oss-cn-shanghai.aliyuncs.com/logo_head.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
 <!--goHome-->
 <go-home/>
 

src/pages/my/my.js

@@ -16,6 +16,7 @@ wxService.page({
    */
   data: {
     pages: [],
+    paddingBottom: '0',
     render: null, // 渲染页面数据对象(安全渲染)
     renderPageOver: false, // 渲染页面结束
     integralNum: 0,
@@ -206,6 +207,26 @@ wxService.page({
         const renderData = render.next()
         this.data.renderPageOver = renderData.done
         this.renderPageFunc({ products: renderData.value })
+
+        //是否有tabbar 或 plus
+        let tabbar = products.filter(item => item.type == 5);
+        let plus = products.filter(item => item.type == 9);
+
+        if (plus.length != 0) {
+          this.setData({
+            paddingBottom: '320rpx'
+          })
+        }
+        else if (tabbar.length != 0) {
+          this.setData({
+            paddingBottom: '140rpx'
+          })
+        }
+        else {
+          this.setData({
+            paddingBottom: '40rpx'
+          })
+        }
       }
 
     }).finally(() => {

src/pages/my/my.wxml

@@ -31,4 +31,7 @@
 	</block>
 </view>
 <guide-page-modal show="{{guidePageModalShow}}" />
+<!--<authorization-modal isAuthorization='{{isAuthorization}}'/>-->
+<!-- 底部补充高度 防止被遮盖 -->
+<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
 <share-benefit-modal show="{{shareBenefitModalShow}}" benefit-data="{{benefitData}}"/>

src/pages/my/my.wxss

 /* pages/my/my.wxss */
 @import './../../base/base.wxss';
+
+.bottom-fixed{
+  padding-bottom: 40rpx;
+}
+
 .user-center{
   box-sizing: border-box;
-  padding-bottom: 200rpx;
   height: 100%;
 }
 

src/pages/myAddress/myAddress.js

@@ -43,7 +43,6 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    
     this.getAddressList()
   },
 

src/pages/userCenter/userCenter.js

@@ -17,6 +17,7 @@ wxService.page({
    */
   data: {
     pages: [],
+    paddingBottom :'0',
     render: null, // 渲染页面数据对象(安全渲染)
     renderPageOver: false, // 渲染页面结束
     integralNum: 0,
@@ -248,6 +249,27 @@ wxService.page({
         const renderData = render.next()
         this.data.renderPageOver = renderData.done
         this.renderPageFunc({ products: renderData.value })
+        //是否有tabbar 或 plus
+        let tabbar = products.filter(item => item.type == 5);
+        let plus = products.filter(item => item.type == 9);
+
+        if(plus.length != 0){
+            this.setData({
+              paddingBottom : '320rpx'
+            })
+        }
+        else if (tabbar.length != 0){
+          this.setData({
+            paddingBottom: '140rpx'
+          })
+        }
+        else{
+          this.setData({
+            paddingBottom: '40rpx'
+          })
+        }
+
+
       }
 
     }).finally(() => {

src/pages/userCenter/userCenter.wxml

@@ -3,7 +3,7 @@
 	<!-- 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}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
+			<image-swiper image-data="{{pItem.rotationchart.images}}" bind:updatePage="updatePage" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 2}}">
 			 <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}}"/>
@@ -34,3 +34,5 @@
 <guide-page-modal show="{{guidePageModalShow}}" />
 <share-benefit-modal show="{{shareBenefitModalShow}}" benefit-data="{{benefitData}}"/>
 <!--<authorization-modal isAuthorization='{{isAuthorization}}'/>-->
+<!-- 底部补充高度 防止被遮盖 -->
+<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>

src/pages/userCenter/userCenter.wxss

 /* pages/userCenter.wxss */
 @import './../../base/base.wxss';
 page{
-  padding-bottom: 320rpx;
+  /* padding-bottom: 320rpx; */
 }
+.bottom-fixed{
+  padding-bottom: 40rpx;
+}
+
 .user-center{
   box-sizing: border-box;
-  padding-bottom: 200rpx;
   height: 100%;
 }
 

src/pages/wantToBuyDetail/wantToBuyDetail.wxss

@@ -2,7 +2,7 @@
 @import './../../base/base.wxss';
 page{
   background: #ffffff;
-  padding-bottom: 80rpx;
+  padding-bottom: 90rpx;
 }
 scroll-view{
   height: 100%;
@@ -50,18 +50,19 @@ swiper {
 .share-oprate{
   display: flex;
   align-items: center;
+  margin-right: 30rpx;
 }
 
 .share-wrap{
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: center;
   /* margin-top: 31rpx; */
 }
 
 .share-img{
-  width: 28rpx;
-  height: 28rpx;
+  width: 30rpx;
+  height: 30rpx;
 }
 .share-number{
   font-size: 24rpx;
@@ -143,7 +144,8 @@ swiper {
   height: auto;
   bottom: 0;
   left: 0;
-  padding: 20rpx;
+  padding: 24rpx 40rpx;
+  padding-right: 20rpx;
   box-sizing: border-box;
   background: #ffffff;
   border-top: solid 1px #eee;

src/palette/inviteFriends.js

+
+
 export default class InviteFriends {
-  palette(posterImg, qrcodeImg, userName, avatarUrl) {
+  palette(posterImg, qrcodeImg, userName, avatarUrl,options) {
+    //获取图片的长宽
+    console.log(options)
+    let posterImgWidth = 0, posterImgHeight = 280;
+    if(options){
+      posterImgWidth = options.posterImgWidth ? options.posterImgWidth : 0;
+      posterImgHeight = options.posterImgHeight ? options.posterImgHeight : 0;
+      if (posterImgHeight > 280){
+        posterImgHeight = 280;
+      }
+    }
+
     return ({
-      width: '410rpx',
+      width: '750rpx',
       height: '705rpx',
       background: '#fff',
       views: [
@@ -9,8 +22,8 @@ export default class InviteFriends {
           type: 'image',
           url: posterImg,
           css: {
-            width: '410rpx',
-            height: '540rpx'
+            width: '375px',
+            height: posterImgHeight + 'px'
           }
         },
         {

src/subPackage/page/pages/myRelease/myRelease.wxml

@@ -19,12 +19,14 @@
  open-type='getUserInfo'
  hover-class="btn-hover"
 >
-	<view class="add">+</view>
+	<view class="add">
+    <text>+</text>
+  </view>
 </button>
 <view wx:if="{{currentHasUserInfo}}">
 	<block wx:if="{{contentPermission}}">
 		<navigator open-type="navigate" url="/subPackage/page/pages/grassCommunity/grassCommunity">
-			<view class="add">+</view>
+			<view class="add"><text>+</text></view>
 		</navigator>
 	</block>
 </view>

src/subPackage/page/pages/myRelease/myRelease.wxss

@@ -42,8 +42,6 @@
   height: 82rpx;
   background-color: rgba(203, 60, 60, 1);
   border-radius: 50%;
-  line-height:82rpx;
-  text-align: center;
   font-size: 60rpx;
   color: #ffffff;
   position: fixed;
@@ -51,6 +49,9 @@
   bottom: 357rpx;
   /* bottom: 35rpx; */
   z-index: 99;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 

src/subPackage/page/pages/share/share.js

@@ -66,9 +66,23 @@ wxService.page({
 
   //生成海报
   generatePoster(){
-    this.setData({
-      template: new Card().palette(this.data.currentPosterImg, this.data.codeImg, member.memberWeixin.nickname, avatarUrl),
+    console.log(this.data.currentPosterImg)
+    let _this = this;
+    wx.getImageInfo({
+      src: this.data.currentPosterImg,
+      success: function (res) {
+        let posterImgWidth = res.width,
+          posterImgHeight = res.height;
+        _this.setData({
+          template: new Card().palette(_this.data.currentPosterImg, 
+            _this.data.codeImg, 
+            member.memberWeixin.nickname, 
+            avatarUrl, { posterImgWidth: posterImgWidth, posterImgHeight: posterImgHeight}),
           });
+      }
+    })
+
+    
   },
   
   // 获取海报图片
@@ -106,7 +120,7 @@ wxService.page({
           // codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
         },()=>{
           this.setData({
-            template: new Card().palette(this.data.posterImgData[0], this.data.codeImg, member.memberWeixin.nickname, avatarUrl),
+            template: new Card().palette(this.data.posterImgData[0], this.data.codeImg, member.memberWeixin.nickname, avatarUrl,wx),
           });
         })
       }

src/subPackage/page/pages/subPage/subPage.js

@@ -16,6 +16,7 @@ wxService.page({
    */
   data: {
     pages: [],
+    paddingBottom :'0',
     render: null, // 渲染页面数据对象(安全渲染)
     renderPageOver: false, // 渲染页面结束
     integralNum: 0,
@@ -223,6 +224,27 @@ wxService.page({
         const renderData = render.next()
         this.data.renderPageOver = renderData.done
         this.renderPageFunc({ products: renderData.value })
+
+        //是否有tabbar 或 plus
+        let tabbar = products.filter(item => item.type == 5);
+        let plus = products.filter(item => item.type == 9);
+
+        if (plus.length != 0) {
+          this.setData({
+            paddingBottom: '320rpx'
+          })
+        }
+        else if (tabbar.length != 0) {
+          this.setData({
+            paddingBottom: '140rpx'
+          })
+        }
+        else {
+          this.setData({
+            paddingBottom: '40rpx'
+          })
+        }
+
       }
 
     }).finally(() => {

src/subPackage/page/pages/subPage/subPage.wxml

@@ -3,7 +3,7 @@
 	<!-- 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}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
+			<image-swiper image-data="{{pItem.rotationchart.images}}" bind:updatePage="updatePage" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 2}}">
 			 <person-center bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
@@ -32,3 +32,5 @@
 	</block>
 </view>
 <guide-page-modal show="{{guidePageModalShow}}" />
+<!-- 底部补充高度 防止被遮盖 -->
+<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>

src/subPackage/page/pages/subPage/subPage.wxss

 /* subPackage/page/pages/subPage/subPage.wxss */
 @import './../../../../base/base.wxss';
 page{
-  padding-bottom: 320rpx;
+  /* padding-bottom: 320rpx; */
+}
+.bottom-fixed{
+  padding-bottom: 40rpx;
 }
 .user-center{
   box-sizing: border-box;
-  padding-bottom: 200rpx;
   height: 100%;
 }
 

src/utils/currentLinkRouter.js

@@ -15,6 +15,7 @@ function currentLinkRouter(event, _this) {
     } else if (curItemType.link.type == 2) {
       // 触发父组件更新页面
       wxService.nextTick(() => {
+        
         _this.triggerEvent('updatePage', { pageId: currentClickType.url })
       })
     } else if (curItemType.link.type == 3) {