海报优化

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/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/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()
+          }
         })
-        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/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,5 +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),
           });
         })
       }