Merge branch 'release/1.1.2发布'

zhaojs

2023-06-10 69ea24e8fdfb41fc48c3fdb8c444645c13b1bbc4

 uniapp/pages/mine/mine.vue

@@ -81,8 +81,8 @@
               </view>
            </view>
         </view>

         <view class="account-assets-container rowCenCen borderBox" v-if="!showtar || platform!='iOS'">
			
            <view class="cardBac-container rowStaBet borderBox">
               <view class="left-content">
                  <view class="balance">
@@ -124,7 +124,27 @@
               </view>
            </view>
         </view>

			
         <view class="vip-info-container rowCenBet" v-if="!showtar || platform!='iOS'">
         <view class="left-info" v-if="user.level != 3">
           升级等级可拿更高收益
         </view>
         <view class="left-info" v-else>
           您已经是最高等级,快去邀请好友赚佣金吧!
         </view>
         <view class="rt-btn rowCenCen" @tap="golevelRules()" v-if="user.level != 3">
           <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
           <view class="level-txt">
             立即升级
           </view>
         </view>
         <view class="rt-btn rowCenCen" @tap="golevelRules()" v-else>
           <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
           <view class="level-txt">
             立即查看
           </view>
         </view>
         </view>
         <view class="swiper-container borderBox" v-if="bannerList.length>0">
            <swiper class="banerContent" :autoplay="true" :interval="3000" :duration="1000" circular>
               <swiper-item v-for="(items,index) in bannerList" :key="index" @tap="goUrl(items)">
@@ -277,6 +297,7 @@
         this.getuserInfo();
         this.centerInfo();
         this.getmoneyInfo();
         this.getInit();
         uni.stopPullDownRefresh();
      },      
      onLoad() {
@@ -285,26 +306,35 @@
               url:"/pages/login/wxlogin"
            })
         }else{
            getApp().watch(this.getInit,'appinfo')
            //getApp().watch(this.ifwtChange,'ifwt')
            this.centerInfo()
            this.getbanner()
         }
      },
      onShow() {
         if(this.hasLogin){
            this.getInit();
            this.getmoneyInfo()
            this.getuserInfo()
				
         }
      },
      methods: {
         getInit()
         {
               // #ifdef APP-PLUS
               this.appInfo = uni.getStorageSync('appInfo');
               this.showtar = getApp().globalData.ifwt == 1 ? false : true;
               this.platform = plus.os.name
               // #endif
            if(!getApp().globalData.hasinit)
            {
               getApp().getAppInfo();
               setTimeout(()=>{
                  this.getInit();
               },2000)
            }
				
             // #ifdef APP-PLUS
            console.log(getApp().globalData.ifwt)
            this.appInfo = uni.getStorageSync('appInfo');
            this.showtar = getApp().globalData.ifwt == 1 ? false : true;
            this.platform = plus.os.name
            // #endif
         },
         getmoneyInfo() {
            var that = this;
@@ -314,7 +344,11 @@
            }).catch(function (err) {
            })
         },
			
         golevelRules() {
          uni.navigateTo({
            url: '../goods/privilege'
          })
         },
         getuserInfo() {
            var that = this;
            this.$u.api.getUserInfo({}).then(e => {
@@ -336,6 +370,7 @@
         },

         centerInfo() {
              this.user = uni.getStorageSync('userInfo');
            var that = this;
            this.$u.api.userHomemenu({}).then(e => {
               var res = e.data.list;
@@ -701,10 +736,42 @@
            }
         }
      }

      .vip-info-container {
        width: 100%;
        height: 60rpx;
        background: #FFF2CF;
       border-radius: 16rpx;
        padding: 0 20rpx;
        margin-bottom: 20rpx;
		
        .left-info {
          font-size: 24rpx;
          font-weight: 500;
          color: #593A0F;
        }
		
        .rt-btn {
          width: 152rpx;
          height: 44rpx;
          background-color: rgba(0, 0, 0, 0.6);
          border-radius: 22rpx;
		
          .vipimg {
            width: 27rpx;
            height: 24rpx;
          }
		
          .level-txt {
            font-size: 24rpx;
            font-weight: 500;
            color: #FFFFFF;
            margin-left: 10rpx;
          }
        }
      }
      .mine-under-container {
         width: 100%;
         margin-top: 85rpx;
         margin-top: 95rpx;
         padding: 0 30rpx;

         .nav-container {