Merge branch 'jiaoneiqunuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into jiaoneiqunuan

taobao_jn/client/app.js

@@ -21,7 +21,7 @@ App({
     //     backgroundColor: '#000000',
     //   });
   },
-  onShow(options) {
+  onShow(options) { 
     // 从后台被 scheme 重新打开
     console.log('执行了app onshow')
   },

taobao_jn/client/components/cominvitemodal/cominvitemodal.js

@@ -13,10 +13,10 @@ const {
     getSystemInfo
 } = tbcc.tb
 Component({
-    canDoHelp:true,
     props: {},
     data: {
-        resList: resList
+        resList: resList,
+        canDoHelp:true
     },
     methods: {
         openInviteFailedModal() {
@@ -34,8 +34,9 @@ Component({
         },
         /**助力 */
         async doHelp() {
-            if(!this.canDoHelp) return;
-            this.canDoHelp = false;
+            console.log("助力",this.data.canDoHelp);
+            if(!this.data.canDoHelp) return;
+            this.data.canDoHelp = false;
             my.showLoading();
             const {
                 success,
@@ -48,16 +49,16 @@ Component({
                 if (r.data && !r.data.isVip) {
                     my.hideLoading();
                     commonToast("3s入会，即可为好友助力", 1500, () => {
-                        this.canDoHelp = true;
+                        this.data.canDoHelp = true;
                         app.isGoVip = true;
                         navigateToOutside(r.data.url);
                     })
                 } else if (r.data && r.data.isVip) {
-                    this.canDoHelp = true;
+                    this.data.canDoHelp = true;
                     my.hideLoading();
                     this.openInviteFailedModal();
                 } else {
-                    this.canDoHelp = true;
+                    this.data.canDoHelp = true;
                     my.hideLoading();
                     const {
                         onCloseModal
@@ -68,7 +69,7 @@ Component({
             }) || {};
             console.log("hhahahha")
             if (success) {
-                this.canDoHelp = true;
+                this.data.canDoHelp = true;
                 this.openInviteSuccessModal();
             }
             my.hideLoading();

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

@@ -250,8 +250,8 @@
   color: #000000;
 }
 .pageindex .rule {
-  width: 38rpx;
-  height: 131rpx;
+  width: 42rpx;
+  height: 135rpx;
   opacity: 1;
   top: 130rpx;
   position: absolute;

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

@@ -6,7 +6,7 @@
         </canvas>
         </view>
         <view class="sai_duan ">
-          <label class="battle7Label " a:if="{{unLock7Times>0&&curGameStep<3}}">累计{{unLock7Times}}局胜场开启</label>
+          <label class="battle7Label " a:if="{{unLock7Times>0&&curGameStep<3}}">5系获胜{{unLock7Times}}局开启</label>
           <label class="battle5Label " a:if="{{unLock5Times>0&&curGameStep<2}}">累计{{unLock5Times}}局胜场开启</label>
           <image class="battle7 " a:if="{{curGameStep<3}}" src={{resList['edc11c83-81db-4bb6-9ebd-0a276ff36fa0'].url}} />
           <image class="battle5 " a:if="{{curGameStep<2}}" src={{resList['204c7b21-29a1-4b39-92a7-fdb8605f922f'].url}} />

taobao_jn/client/tbcc-sdk/lib/constants.js

 // 分享配置
 export const SHARE_CONFIG = {
   title: '抱团取暖 冲刺2999元蕉内购物金',
-  desc: '降温了！来玩抱团游戏赢取双11大奖',
+  desc: '抱团取暖 冲刺2999元蕉内购物金',
   imageUrl: 'https://isv.alibabausercontent.com/00000000/imgextra/i1/3035493001/O1CN01TEmmQP1Y2VDuoPLYn_!!3035493001-0-isvtu-00000000.jpg', // 分享图片URL
   path: '/pages/pagepageindex/pagepageindex'
 };