Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/pages/extendProduct/extendProduct.js

@@ -27,6 +27,7 @@ wxService.page({
     noMoreFlag: false,
     myShareCount:'',
     extendProBanner: '',
+    explain:[],//文案
     scene: '', //触点参数
     proData : []
   },
@@ -199,7 +200,7 @@ wxService.page({
 
               }else{
                 this.setData({
-                  cardTitle: this.data.proData[0].productName,
+                  cardTitle: this.data.explain ? this.data.explain : this.data.proData[0].productName,
                   cardUrl: this.data.proData[0].productImgUrl,
                   pagePath: path,
                   scene: scene
@@ -318,7 +319,8 @@ wxService.page({
         const { result, data } = res.data
         if (result == 0 && data) {
           this.setData({
-            extendProBanner: data.backgroundImgUrl
+            extendProBanner: data.backgroundImgUrl,
+            explain: data.explain
           }, () => {
 
           })

src/palette/inviteFriends.js

 
 
 export default class InviteFriends {
-  palette(posterImg, qrcodeImg, userName, avatarUrl,options) {
+  palette(posterImg, qrcodeImg, userName, avatarUrl, options, explain) {
     //获取图片的长宽
     let posterImgWidth = 0, posterImgHeight = 280;
     let windowWidth = options.windowWidth;
@@ -49,7 +49,31 @@ export default class InviteFriends {
         },
          {
           type: 'text',
-          text: userName + '邀请您一起成为会员,共享优惠,赶快扫码加入吧~。',
+           text: userName + explain[0],
+          css: {
+            width: '180rpx',
+            left: '82rpx',
+            bottom: '83rpx',
+            fontSize: '18rpx',
+            color: '#333333'
+          },
+          
+        },
+        {
+          type: 'text',
+          text: explain[1],
+          css: {
+            width: '180rpx',
+            left: '82rpx',
+            bottom: '63rpx',
+            fontSize: '18rpx',
+            color: '#333333'
+          },
+
+        },
+        {
+          type: 'text',
+          text: explain[2],
           css: {
             width: '180rpx',
             left: '82rpx',
@@ -57,6 +81,7 @@ export default class InviteFriends {
             fontSize: '18rpx',
             color: '#333333'
           },
+
         },
       ],
     });

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

@@ -24,6 +24,7 @@ wxService.page({
     nextmargin: '142rpx',//后边距
     posterImgData:[],
     currentPosterImg: '',
+    explain: [],
     codeImg:'', //二维码
     template :{}
   },
@@ -85,7 +86,7 @@ wxService.page({
                   posterImgHeight: posterImgHeight ,
                   windowWidth: system.windowWidth,
                   windowHeight: system.windowHeight
-                }),
+                }, _this.data.explain),
             });
           }
         })
@@ -99,10 +100,11 @@ wxService.page({
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
-          
           let initiatorPage = JSON.parse(data.initiatorPage)
+          let explain = JSON.parse(data.explain)
           this.setData({
-            posterImgData: initiatorPage
+            posterImgData: initiatorPage,
+            explain: explain
           })
         }
       }
@@ -146,7 +148,7 @@ wxService.page({
                         posterImgHeight: posterImgHeight,
                         windowWidth: system.windowWidth,
                         windowHeight: system.windowHeight
-                      }),
+                      }, _this.data.explain),
                   });
                 }
               })

src/subPackage/page/pages/share/share.wxml

@@ -15,7 +15,10 @@
 					</view>
           <view class="poster-title">
             <open-data type="userNickName"></open-data>
-            <text>邀请您一起成为会员,共享优惠,赶快扫码加入吧~。</text>
+            <text>{{explain[0]}}</text>
+            <view>{{explain[1]}}</view>
+            <view>{{explain[2]}}</view>
+            <!-- <view>邀请您一起成为会员,共享优惠,赶快扫码加入吧~。</view> -->
           </view>
           <image class="code-img" src="{{codeImg}}"></image>
         </view>

src/utils/Http.js

@@ -99,8 +99,8 @@ class Http {
         url,
         method: 'GET',
         header: {
-          // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
-          'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
+          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
+          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tunnel-token' : 'brand1001', // 开发
           'tentacle-content': this.getTentacle(),
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
@@ -135,8 +135,8 @@ class Http {
         url,
         method: 'POST',
         header: {
-          // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
-          'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
+          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
+          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tunnel-token' : 'brand1001', // 开发
           'tentacle-content': this.getTentacle()
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'