...

pages/life/capacity.vue

@@ -11,7 +11,8 @@
         </view>
         <view class="capacity-block">
             <view class="capacity-block-title">
-				<view class="title">成员产率({{group.effect}}/{{group.count}})<text</text></view>
+                <view class="title">成员产率({{group.effect}}/{{group.count}})<text< /text>
+                </view>
                 <view class="capacity-block-glf">{{group.capacity}}GLF/h</view>
                 <!-- <view class="more" @click="onInvitation">邀请更多好友</view> -->
             </view>
@@ -68,7 +69,10 @@
 </template>
 
 <script>
-	import { glz } from '@/apis/interfaces/life.js'
+    import {
+        glz,sign
+    } from '@/apis/interfaces/life.js'
+    import AD from '@/utils/ad.js'
     export default {
         data() {
             return {
@@ -99,12 +103,14 @@
                 },
                 build: {},
                 together: {},
-                other:{}
+                other: {},
+                can_repeat_sign: false
             };
         },
         created() {
             uni.showLoading({})
             glz().then(res => {
+                console.log(res);
                 this.nickname = res.nickname
                 this.identityText = res.identity_text
                 this.baseHour = res.base_hour
@@ -115,6 +121,7 @@
                 this.build = res.build
                 this.together = res.together
                 this.other = res.other
+                this.can_repeat_sign = res.can_repeat_sign
                 uni.setNavigationBarTitle({
                     title: res.glz + 'GLF'
                 })
@@ -127,6 +134,15 @@
             })
         },
         onNavigationBarButtonTap() {
+            if (!this.can_repeat_sign) {
+                uni.showModal({
+                    title: '温馨提示',
+                    content: '今日重置签到机会已使用过了，明日再来试试吧~',
+                    confirmColor: '#34CE98',
+                    confirmText: '知道了',
+                    showCancel: false,
+                })
+            } else {
                 uni.showModal({
                     title: '温馨提示',
                     content: '重置签到只重新计算24小时时间，所迭代加成的比例不变',
@@ -134,10 +150,11 @@
                     confirmText: '立即重置',
                     cancelColor: '#999',
                     cancelText: '再想想',
-                success: (res) => {
+                    success: (res1) => {
-                    if(res.confirm){
+                        if (res1.confirm) {
                             console.log('再次签到。。。')
                             this.checkIMEI().then(res => {
+                                console.log(res);
                                 switch (res) {
                                     case 'Permanent':
                                         uni.showModal({
@@ -155,7 +172,8 @@
                                             success: e => {
                                                 if (e.cancel) {
                                                     this.checkIMEI().then(IMEI => {
-                        							if (IMEI === 'Success') {
+                                                        if (IMEI ===
+                                                            'Success') {
                                                             this.showAd()
                                                         }
                                                     })
@@ -167,14 +185,48 @@
                                         this.showAd()
                                         break;
                                 }
+                            }).catch(err => {
+                                console.log(err)
                             })
                         }
                     }
                 })
+            }
         },
         methods: {
+            showAd() {
+                AD.show({
+                    adpid: 1428308887,
+                    adType: 'RewardedVideo'
+                }, detail => {
+                    if (detail && detail.isEnded) {
+                        uni.showLoading({
+                            title: '签到中..'
+                        })
+                        sign().then(res => {
+                            uni.showToast({
+                                title: '签到成功',
+                                icon: 'none'
+                            })
+                            this.getLife()
+                        }).catch(err => {
+                            uni.showToast({
+                                title: err.message,
+                                icon: 'none'
+                            })
+                        })
+                    }
+                }, err => {
+                    uni.showToast({
+                        title: err.errMsg,
+                        icon: 'none'
+                    })
+                })
+            },
             onInvitation() {
-				this.$Router.push({name: 'Invitation'})
+                this.$Router.push({
+                    name: 'Invitation'
+                })
             },
             // imei权限
             checkIMEI() {
@@ -212,41 +264,49 @@
         min-height: 100vh;
         padding: $padding;
         box-sizing: border-box;
+
         &-hint {
             font-size: 26rpx;
             color: gray;
             line-height: 40rpx;
             padding: $padding 0;
         }
+
         &-title {
             font-size: 38rpx;
             font-weight: bold;
             line-height: 60rpx;
+
             text {
                 margin-left: 10rpx;
                 color: $main-color;
             }
         }
+
         &-sbutitle {
             font-size: 26rpx;
             line-height: 40rpx;
         }
+
         &-block {
             background: white;
             margin-top: $margin;
             border-radius: $radius;
             padding: $padding;
+
             &-glf {
                 color: $main-color;
                 font-size: 30rpx;
                 // padding-top: 30rpx;
             }
+
             &-title {
                 font-weight: bold;
                 font-size: 34rpx;
                 line-height: 60rpx;
                 display: flex;
                 justify-content: space-between;
+
                 .title {
                     text {
                         color: $main-color;
@@ -254,6 +314,7 @@
                         padding-left: 10rpx;
                     }
                 }
+
                 .more {
                     background: $main-color;
                     color: white;
@@ -264,29 +325,35 @@
                     width: 230rpx;
                     text-align: center;
                 }
+
                 .subtitle {
                     font-weight: normal;
                     font-size: 24rpx;
                     color: $main-color;
                 }
+
                 .nickname {
                     color: gray;
                     font-size: 30rpx;
                 }
             }
+
             &-text {
                 font-size: 28rpx;
                 color: gray;
                 line-height: 40rpx;
                 padding-top: 30rpx;
             }
+
             &-table {
                 border: solid 1px $border-color;
                 margin-bottom: 20rpx;
                 padding-top: 30rpx;
+
                 &:last-child {
                     margin-top: 0;
                 }
+
                 .header {
                     background: $border-color;
                     line-height: 50rpx;
@@ -294,16 +361,19 @@
                     font-size: 26rpx;
                     color: gray;
                 }
+
                 .flex {
                     display: flex;
                     border-top: solid 1rpx $border-color;
                     color: gray;
+
                     .flex-item {
                         width: 50%;
                         box-sizing: border-box;
                         line-height: 50rpx;
                         padding: 0 15rpx;
                         font-size: 24rpx;
+
                         &:first-child {
                             border-right: solid 1rpx $border-color;
                         }
@@ -312,6 +382,7 @@
 
             }
         }
+
         .pt30 {
             padding-top: 30rpx;
         }

unpackage/dist/dev/app-plus/app-view.js

@@ -24148,7 +24148,8 @@ var render = function() {
                       "/" +
                       _vm._$g(11, "t0-1") +
                       ")"
-                  )
+                  ),
+                  _vm._v("< /text>")
                 ]
               ),
               _c(