xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.js

@@ -1,182 +1,182 @@
-// import room from '@/api/room';
-import base64 from '../../libs/base64'
-import {
-    getInviteDetail
-} from "../../../../common/api/eLiveInvite";
-Component({
-    properties: {
-        switchToControlDialogVisible:{
-            type: Boolean,
-            value:false
-        },
-        aliveId:{
-            type: String,
-            value: ''
-        },
-        appId: {
-            type: String,
-            value: ''
-        },
-        userId: {
-            type: String,
-            value: ''
-        },
-        isPackUp:{
-            type:Boolean,
-            value:false,
-        }
-    },
-    data: {
-        isShowFriends: false,
-        count: 0, // 邀请的好友数
-        inviteParm:'',
-        total: 0,
-        refreshing: false,
-        finishedTxt: '加载中',
-        finished: false,
-        componentsState: 1,
-        page_size: 25,
-        page_index: 0,
-        friendList:[],
-        friendListMockData: [
-            // {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'wendy'
-            // }, {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira1'
-            // }
-
-        ] //邀请的好友列表
-    },
-    observers: {
-        switchToControlDialogVisible(val) {
-            if(val){
-                this.showFriends()
-            }else{
-                this.closeFriends()
-            }
-        },
-      },
-    ready() {
-    },
-    methods: {
-        onLoad(){
-            if (this._freshing) return
-            this._freshing = true
-            this.setData({
-              finished: false,
-              page_index: 0
-            })
-            this.getFriendsList()
-        },
-        onScrolltolower(){
-            console.log(this.data.finished, this._freshing )
-            if(this.scrolling){return}
-            this.scrolling = true
-            this.setData({
-              finishedTxt: this.data.finished ? "没有更多了" : "加载中"
-            })
-            if(this.data.finished || this._freshing){
-                return
-            }
-            let onScrolltolower  = true
-            this.getFriendsList(onScrolltolower)
-        },
-        closeFriends() {
-            this.setData({
-                isShowFriends: false
-            })
-            this.setData({
-                componentsState: this.data.componentsState + 1
-            })
-        },
-        showFriends() {
-            this.setData({
-                isShowFriends: true
-            })
-            this.getFriendsList()
-        },
-        generateBase64(paymentType, resourceType, resourceId, productId) {
-            const params = {
-              payment_type: paymentType,
-              resource_type: resourceType,
-              resource_id: resourceId,
-              product_id: productId,
-            }
-            return base64.encode(JSON.stringify(params))
-        },
-        getFriendsList(onScrolltolower = false) {
-            let state = this.data.componentsState 
-            let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
-            let params = {
-                "bizData": {
-                    "inviteParm": inviteParams,
-                    "page": this.data.page_index,
-                    "count": this.data.page_size,
-                },
-                "user_id": this.properties.userId,
-                "app_id": this.properties.appId
-            };
-            getInviteDetail(params).then(res => {
-                let DATA = res.data;
-                if (DATA.code === 0) {
-                    // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
-                if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
-                    return
-                  }
-                  var total = DATA.inviteNum
-                  var finishedTxt = "加载中"
-                  var finished = false
-                  this.formatData(DATA.data,onScrolltolower)
-                  // 下拉加载，且数据返回空
-                  if(this._freshing && DATA.data.length === 0){
-                    finishedTxt = "no-data"
-                  }
-                  else if (this.data.friendList.length >= total || DATA.data.length === 0) {
-                      // 获取到所有数据
-                      finished = true// 没有更多了
-                      finishedTxt = "没有更多了"
-                      this.setData({finishedTxt})
-                  }
-                  else {
-                    finishedTxt = "加载中"
-                  }
-                  this.setData({
-                    refreshing: false,
-                    page_index: this.data.page_index + 1,
-                    finishedTxt,
-                    finished,
-                    total
-                  })
-                  this._freshing = false
-                  this.scrolling = false
-                } else {
-                    wx.showToast({
-                        title: DATA.msg,
-                        icon: 'error'
-                    })
-                }
-            }).catch(err => {
-                wx.showToast({
-                    title: err.msg,
-                    icon: 'error'
-                })
-            });
-        },
-        formatData(data,onScrolltolower){
-            //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
-              let friendList = this.data.friendList
-              data.forEach((item,index) => {
-                  if (!this._freshing) {
-                    friendList.push(item)
-                  }
-                })
-                if (this._freshing && !onScrolltolower) {
-                  //下拉刷新的时候直接赋值
-                  friendList = JSON.parse(JSON.stringify(data))
-                }
-                this.setData({friendList})
-          },
-    }
+// import room from '@/api/room';
+import base64 from '../../libs/base64'
+import {
+    getInviteDetail
+} from "../../../../common/api/eLiveInvite";
+Component({
+    properties: {
+        switchToControlDialogVisible:{
+            type: Boolean,
+            value:false
+        },
+        aliveId:{
+            type: String,
+            value: ''
+        },
+        appId: {
+            type: String,
+            value: ''
+        },
+        userId: {
+            type: String,
+            value: ''
+        },
+        isPackUp:{
+            type:Boolean,
+            value:false,
+        }
+    },
+    data: {
+        isShowFriends: false,
+        count: 0, // 邀请的好友数
+        inviteParm:'',
+        total: 0,
+        refreshing: false,
+        finishedTxt: '加载中',
+        finished: false,
+        componentsState: 1,
+        page_size: 25,
+        page_index: 0,
+        friendList:[],
+        friendListMockData: [
+            // {
+            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
+            //     wx_nickname: 'wendy'
+            // }, {
+            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
+            //     wx_nickname: 'moira1'
+            // }
+
+        ] //邀请的好友列表
+    },
+    observers: {
+        switchToControlDialogVisible(val) {
+            if(val){
+                this.showFriends()
+            }else{
+                this.closeFriends()
+            }
+        },
+      },
+    ready() {
+    },
+    methods: {
+        onLoad(){
+            if (this._freshing) return
+            this._freshing = true
+            this.setData({
+              finished: false,
+              page_index: 0
+            })
+            this.getFriendsList()
+        },
+        onScrolltolower(){
+            console.log(this.data.finished, this._freshing )
+            if(this.scrolling){return}
+            this.scrolling = true
+            this.setData({
+              finishedTxt: this.data.finished ? "没有更多了" : "加载中"
+            })
+            if(this.data.finished || this._freshing){
+                return
+            }
+            let onScrolltolower  = true
+            this.getFriendsList(onScrolltolower)
+        },
+        closeFriends() {
+            this.setData({
+                isShowFriends: false
+            })
+            this.setData({
+                componentsState: this.data.componentsState + 1
+            })
+        },
+        showFriends() {
+            this.setData({
+                isShowFriends: true
+            })
+            this.getFriendsList()
+        },
+        generateBase64(paymentType, resourceType, resourceId, productId) {
+            const params = {
+              payment_type: paymentType,
+              resource_type: resourceType,
+              resource_id: resourceId,
+              product_id: productId,
+            }
+            return base64.encode(JSON.stringify(params))
+        },
+        getFriendsList(onScrolltolower = false) {
+            let state = this.data.componentsState 
+            let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
+            let params = {
+                "bizData": {
+                    "inviteParm": inviteParams,
+                    "page": this.data.page_index,
+                    "count": this.data.page_size,
+                },
+                "user_id": this.properties.userId,
+                "app_id": this.properties.appId
+            };
+            getInviteDetail(params).then(res => {
+                let DATA = res.data;
+                if (DATA.code === 0) {
+                    // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
+                if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
+                    return
+                  }
+                  var total = DATA.inviteNum
+                  var finishedTxt = "加载中"
+                  var finished = false
+                  this.formatData(DATA.data,onScrolltolower)
+                  // 下拉加载，且数据返回空
+                  if(this._freshing && DATA.data.length === 0){
+                    finishedTxt = "no-data"
+                  }
+                  else if (this.data.friendList.length >= total || DATA.data.length === 0) {
+                      // 获取到所有数据
+                      finished = true// 没有更多了
+                      finishedTxt = "没有更多了"
+                      this.setData({finishedTxt})
+                  }
+                  else {
+                    finishedTxt = "加载中"
+                  }
+                  this.setData({
+                    refreshing: false,
+                    page_index: this.data.page_index + 1,
+                    finishedTxt,
+                    finished,
+                    total
+                  })
+                  this._freshing = false
+                  this.scrolling = false
+                } else {
+                    wx.showToast({
+                        title: DATA.msg,
+                        icon: 'error'
+                    })
+                }
+            }).catch(err => {
+                wx.showToast({
+                    title: err.msg,
+                    icon: 'error'
+                })
+            });
+        },
+        formatData(data,onScrolltolower){
+            //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
+              let friendList = this.data.friendList
+              data.forEach((item,index) => {
+                  if (!this._freshing) {
+                    friendList.push(item)
+                  }
+                })
+                if (this._freshing && !onScrolltolower) {
+                  //下拉刷新的时候直接赋值
+                  friendList = JSON.parse(JSON.stringify(data))
+                }
+                this.setData({friendList})
+          },
+    }
 })

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxml

@@ -1,26 +1,26 @@
-<view class="{{isPackUp?'viewAreaPackUp':'viewUnPackUp'}} container-friends" wx:if="{{isShowFriends}}">
-  <van-popup show="{{ isShowFriends }}" bind:close="onClose" position="bottom" custom-class="container-friends">
-    <view bindtap="closeFriends" class="header">
-      <image
-        class="icon-left-back"
-        src="../../../images/icon_arrow_up.png"
-      />
-      <view class="count-style">邀请的好友{{'('+total+')'}}</view>
-    </view>
-    <scroll-view scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}" style="height:calc(100vh - 700rpx)">
-    <view class="friend-list">
-      <view
-        class="friend-item"
-        wx:for="{{friendList}}"
-      >
-        <image wx:if="{{item.wx_avatar}}" class="img-avatar" src="{{item.wx_avatar}}" />
-        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cdn.xiaoeknow.com/aaa/default.svg" />
-        <view class="name">
-          {{ item.wx_nickname }}
-        </view>
-      </view>
-    </view>
-    <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
-  </scroll-view>
-  </van-popup>
+<view class="{{isPackUp?'viewAreaPackUp':'viewUnPackUp'}} container-friends" wx:if="{{isShowFriends}}">
+  <van-popup show="{{ isShowFriends }}" bind:close="onClose" position="bottom" custom-class="container-friends">
+    <view bindtap="closeFriends" class="header">
+      <image
+        class="icon-left-back"
+        src="../../../images/icon_arrow_up.png"
+      />
+      <view class="count-style">邀请的好友{{'('+total+')'}}</view>
+    </view>
+    <scroll-view scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}" style="height:calc(100vh - 700rpx)">
+    <view class="friend-list">
+      <view
+        class="friend-item"
+        wx:for="{{friendList}}"
+      >
+        <image wx:if="{{item.wx_avatar}}" class="img-avatar" src="{{item.wx_avatar}}" />
+        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cdn.xiaoeknow.com/aaa/default.svg" />
+        <view class="name">
+          {{ item.wx_nickname }}
+        </view>
+      </view>
+    </view>
+    <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
+  </scroll-view>
+  </van-popup>
 </view>