Merge branch 'master' of repo.ufutx.net:ufutx.love.mp.v2

src/pages/tabBar/user.wpy

@@ -182,7 +182,7 @@
     <!--    访客弹框-->
   </visitorModel>
   <canvas canvas-id="shareCanvas" class="canvas" style="width: {{width}}px; height: {{height}}px; position: fixed; top: -999999px;"></canvas>
-  <loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips>
+<!--  <loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips>-->
 
   <chooseImageTips :chooseShow.sync="chooseShow" :jumpString.sync="jumpString" :photo.sync="user.photo" @hideCut.user="hideCut"></chooseImageTips>
     <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
@@ -389,16 +389,16 @@
       vm.is_base_info = getApp().$wepy.$options.globalData.is_base_info
       // vm.getorderDetail()
       console.log('33333JJJJ')
-      if (!vm.token) {
+      // if (!vm.token) {
-      vm.loginShow = true
+      // vm.loginShow = true
-        wepy.$instance.pageLogin().then((data) => {
+      //   wepy.$instance.pageLogin().then((data) => {
-          vm.token = data.token
+      //     vm.token = data.token
-          vm.loginShow = false
+      //     vm.loginShow = false
-          vm.page = 1
+      //     vm.page = 1
-          vm.onShow()
+      //     vm.onShow()
-        })
+      //   })
-        return
+      //   return
-      }
+      // }
 
       async function timi(res) {
         // await vm.getNewCount()
@@ -717,7 +717,9 @@
         let titles = ['好友', '关注', '粉丝', '访客'], {is_base_info} = app.globalData,
           vm = this, {id} = wx.getStorageSync('userInfo')
           // 校验是否完成注册资料
+          console.log(vm.$signInVerify(), 'vm.$signInVerify()===')
           if (!vm.$signInVerify()) {
+              console.log('000')
               vm.loginShow = true
               return
           }
@@ -752,10 +754,10 @@
       loginCut(e) {
         this.loginShow = e.loginShow
       },
-      loginDialogCut(e) {
+      // loginDialogCut(e) {
-        // this.$parent.getEvent(this.config.navigationBarTitleText, `点击暂不登录`)
+      //   // this.$parent.getEvent(this.config.navigationBarTitleText, `点击暂不登录`)
-        this.loginShow = e.loginShow
+      //   this.loginShow = e.loginShow
-      },
+      // },
       hideCut(e) {
         wx.showTabBar({
           animation: true

src/pages/users/friendlist.wpy

@@ -186,6 +186,8 @@ wepy.page({
         getLibraries(keyword) {
             let _this = this
             _this.loading = true
+            _this.noMore = false
+            _this.default = false
             let url = service.libraries
             if (_this.type == 'fans') {
                 url = service.followers
@@ -306,7 +308,7 @@ wepy.page({
         },
       gotoNew(e) {
         let item = e
-        this.$goto(`/pages/news/chitchat?id=${item.id}&name=${item.nickname}&type=${item.type}&icon=${item.photo}`)
+        this.$goto(`/pages/news/chitchat?id=${item.id}&name=${item.nickname}&type=${item.type}&pic=${item.photo}`)
       },
       touchstart (e) {
         let vm = this

src/pages/users/upgradeVIP.wpy

@@ -17,7 +17,7 @@
       </block>
     </view>
     <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
-      {{user.deadline?user.deadline+'到期':'未激活'}}
+      {{user.deadline_str?user.deadline_str+'到期':'未激活'}}
     </view>
     <swiper class="card-swiper" circular="true"  bindchange="cardSwiper">
       <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}"  @tap="showFn(index)">
@@ -240,22 +240,22 @@
             vm.$get({url: `${service.host}/rank/list`}).then(({code, data}) => {
                 vm.user = data.rank_info
                 let {type, is_subscribe} = wx.getStorageSync('userInfo')
-                let userInfo = {
+                // let userInfo = {
-                    nickName: vm.user.nickname,
+                //     nickName: vm.user.nickname,
-                    avatarUrl: vm.user.avatar,
+                //     avatarUrl: vm.user.avatar,
-                    type,
+                //     type,
-                    id: vm.user.id,
+                //     id: vm.user.id,
-                    is_subscribe,
+                //     is_subscribe,
-                    rank_id: vm.user.rank_id
+                //     rank_id: vm.user.rank_id
-                }
+                // }
-                wx.setStorageSync('userInfo', userInfo)
+                // wx.setStorageSync('userInfo', userInfo)
                 vm.specialVIP = data.ranks
                 console.log(data, 'aaaaaaaa')
                 vm.rankList = []
                 data.ranks.sub_ranks.forEach((item, index) => {
-                    if (index <= 2) {
+                    // if (index <= 2) {
                         vm.rankList.push(item)
-                    }
+                    // }
                 })
                 if (vm.system == 'iOS') {
                     vm.rankList = [

src/pages/users/upgradeVIP2.wpy

@@ -17,7 +17,7 @@
       </block>
     </view>
     <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
-      {{user.deadline?user.deadline+'到期':'未开通'}}
+      {{user.deadline_str?user.deadline_str+'到期':'未开通'}}
     </view>
     <swiper class="card-swiper" circular="true" previous-margin="1px" bindchange="cardSwiper" current="{{cardCur}}">
       <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)">
@@ -258,15 +258,15 @@
                 // vm.payData.remain_amount = data.remain_amount
                 // vm.payData.coin = data.coin
                 let {type, is_subscribe} = wx.getStorageSync('userInfo')
-                let userInfo = {
+                // let userInfo = {
-                    nickName: data.nickname,
+                //     nickName: data.nickname,
-                    avatarUrl: data.avatar,
+                //     avatarUrl: data.avatar,
-                    type,
+                //     type,
-                    id: data.id,
+                //     id: data.id,
-                    is_subscribe,
+                //     is_subscribe,
-                    rank_id: data.rank_id
+                //     rank_id: data.rank_id
-                }
+                // }
-                wx.setStorageSync('userInfo', userInfo)
+                // wx.setStorageSync('userInfo', userInfo)
                 console.log(data)
         })
         },