Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !101

src/subPackage/page/pages/myInvite/myInvite.wxml

@@ -18,6 +18,7 @@
   </navigator>
   <view class="order-benefit-wrap">
     <view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}">
+    <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit" hover-class="none">
       <view class="top-info">
         <image class="invite-avatar" src="{{item.headimgurl}}"></image>
         <view class="invite-phone">
@@ -28,6 +29,7 @@
           <button class="btn btn-primary btn-outline">查看收益</button>
         </view>
       </view>
+    </navigator>
       <!-- <view class="bottom-info">
         <view>
           <image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>

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

@@ -5,8 +5,6 @@ const utils = require('../../../../utils/util')
 
 // src/pages/xml2can/xml2can.js
 wxService.page({
-  // imagePath: '',
-
   data: {
     //轮播图
     swiperCurrent: 0,
@@ -47,7 +45,6 @@ wxService.page({
 
   // 点击更换海报
   switchPoster(e){
-    console.log(e)
     this.setData({
       currentTab: e.currentTarget.dataset.current,
       swiperCurrent: e.currentTarget.dataset.current,
@@ -59,8 +56,6 @@ wxService.page({
 
   //生成海报
   generatePoster(){
-    console.log(this.data.currentPosterImg)
-    console.log(this.data.codeImg)
     this.setData({
       template: new Card().palette(this.data.currentPosterImg, this.data.codeImg),
     });
@@ -76,7 +71,6 @@ wxService.page({
           let initiatorPage = JSON.parse(data.initiatorPage)
           this.setData({
             posterImgData: initiatorPage
-          }, () => {
           })
         }
       }
@@ -99,6 +93,10 @@ wxService.page({
         this.setData({
           // codeImg: app.globalData.imageUrl + data
           codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
+        },()=>{
+          this.setData({
+            template: new Card().palette(this.data.posterImgData[0], this.data.codeImg),
+          });
         })
       }
     })
@@ -120,26 +118,19 @@ wxService.page({
       if (res && res.tentacleId) {
         wx.saveImageToPhotosAlbum({
           filePath: this.imagePath,
+          success(res) { 
+            setTimeout(()=>{
+              wx.showToast({
+                title: '保存成功,请前往相册查看~',
+                icon: 'none'
+              },2000)
+            })
+          }
         });
       }
     })
   },
   onImgOK(e) {
     this.imagePath = e.detail.path;
-  },
-
-  // saveImage() {
-  //   wx.saveImageToPhotosAlbum({
-  //     filePath: this.imagePath,
-  //   });
-  // },
-
-  // /**
-  //  * 生命周期函数--监听页面初次渲染完成
-  //  */
-  onReady: function () {
-    // this.setData({
-    //   template: new Card().palette('http://testimg3.bigaka.com/group3/M00/00/1B/Cv6CBF1kypiAHc11AAAJmPBsWAo215.png', 'https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg'),
-    // });
-  },
+  }
 });
\ No newline at end of file

src/subPackage/page/pages/share/share.wxss

@@ -112,6 +112,7 @@ swiper-item{
 /* 测试 */
 .test{
   position: absolute;
+  top: 0;
   transform: translateX(100%);
   width: 100vw;
   height: 100vh;