xiaoe_mp_npm 0.3.5-t220418 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/.gitlab-ci.yml +1 -0
  2. package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.js +85 -48
  3. package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxml +4 -1
  4. package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxss +8 -1
  5. package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.less +8 -23
  6. package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxml +1 -1
  7. package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxss +8 -23
  8. package/miniprogram_dist/ConfirmOrder/components/AddressEdit/index.wxml +2 -2
  9. package/miniprogram_dist/ConfirmOrder/components/AddressManage/index.wxml +2 -2
  10. package/miniprogram_dist/ConfirmOrder/components/WechatAddress/index.js +1 -23
  11. package/package.json +1 -1
  12. package/src/AliveInvite/LiveRoomVertical/components/friends/friends.js +85 -48
  13. package/src/AliveInvite/LiveRoomVertical/components/friends/friends.wxml +4 -1
  14. package/src/AliveInvite/LiveRoomVertical/components/friends/friends.wxss +10 -3
  15. package/src/AliveInvite/LiveRoomVertical/index.less +8 -23
  16. package/src/AliveInvite/LiveRoomVertical/index.wxml +1 -1
  17. package/src/AliveInvite/LiveRoomVertical/index.wxss +8 -23
  18. package/src/ConfirmOrder/components/AddressEdit/index.wxml +2 -2
  19. package/src/ConfirmOrder/components/AddressManage/index.wxml +2 -2
  20. package/src/ConfirmOrder/components/WechatAddress/index.js +1 -23
package/.gitlab-ci.yml CHANGED
@@ -4,6 +4,7 @@ build_test:
4
4
  only:
5
5
  - dev
6
6
  - feature/live_marketing_iteration
7
+ - feature/remove-error-report
7
8
  - fix/record-lottery
8
9
  tags:
9
10
  - fe-group-prod-runner-2
package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.js CHANGED
@@ -5,14 +5,6 @@ import {
5
5
  } from "../../../../common/api/eLiveInvite";
6
6
  Component({
7
7
  properties: {
8
- // inviteParm: {
9
- // type: String,
10
- // value: ''
11
- // },
12
- // roomInfo: {
13
- // type: Object,
14
- // value: {}
15
- // },
16
8
  switchToControlDialogVisible:{
17
9
  type: Boolean,
18
10
  value:false
@@ -38,32 +30,21 @@ Component({
38
30
  isShowFriends: false,
39
31
  count: 0, // 邀请的好友数
40
32
  inviteParm:'',
41
- friendList: [
33
+ total: 0,
34
+ refreshing: false,
35
+ finishedTxt: '加载中',
36
+ finished: false,
37
+ componentsState: 1,
38
+ page_size: 25,
39
+ page_index: 0,
40
+ friendList:[],
41
+ friendListMockData: [
42
42
  // {
43
43
  // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
44
44
  // wx_nickname: 'wendy'
45
45
  // }, {
46
46
  // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
47
47
  // wx_nickname: 'moira1'
48
- // }, {
49
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
50
- // wx_nickname: 'moira2'
51
- // }
52
- // , {
53
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
54
- // wx_nickname: 'moira333333'
55
- // }
56
- // , {
57
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
58
- // wx_nickname: 'moira4'
59
- // }
60
- // , {
61
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
62
- // wx_nickname: 'moira5'
63
- // }
64
- // , {
65
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
66
- // wx_nickname: 'moira6'
67
48
  // }
68
49
 
69
50
  ] //邀请的好友列表
@@ -72,20 +53,43 @@ Component({
72
53
  switchToControlDialogVisible(val) {
73
54
  if(val){
74
55
  this.showFriends()
56
+ }else{
57
+ this.closeFriends()
75
58
  }
76
- // this.setData({
77
- // isShowFriends:val
78
- // })
79
- // this.getFriendsList()
80
59
  },
81
60
  },
82
61
  ready() {
83
62
  },
84
63
  methods: {
64
+ onLoad(){
65
+ if (this._freshing) return
66
+ this._freshing = true
67
+ this.setData({
68
+ finished: false,
69
+ page_index: 0
70
+ })
71
+ this.getFriendsList()
72
+ },
73
+ onScrolltolower(){
74
+ console.log(this.data.finished, this._freshing )
75
+ if(this.scrolling){return}
76
+ this.scrolling = true
77
+ this.setData({
78
+ finishedTxt: this.data.finished ? "没有更多了" : "加载中"
79
+ })
80
+ if(this.data.finished || this._freshing){
81
+ return
82
+ }
83
+ let onScrolltolower = true
84
+ this.getFriendsList(onScrolltolower)
85
+ },
85
86
  closeFriends() {
86
87
  this.setData({
87
88
  isShowFriends: false
88
89
  })
90
+ this.setData({
91
+ componentsState: this.data.componentsState + 1
92
+ })
89
93
  },
90
94
  showFriends() {
91
95
  this.setData({
@@ -102,22 +106,14 @@ Component({
102
106
  }
103
107
  return base64.encode(JSON.stringify(params))
104
108
  },
105
- getFriendsList() {
106
- // let params = {
107
- // "bizData": {
108
- // "inviteParm": this.data.inviteParm,
109
- // "page": 0,
110
- // "count": 10,
111
- // },
112
- // "user_id": this.properties.userId,
113
- // "app_id": this.properties.appId
114
- // };
109
+ getFriendsList(onScrolltolower = false) {
110
+ let state = this.data.componentsState
115
111
  let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
116
112
  let params = {
117
113
  "bizData": {
118
114
  "inviteParm": inviteParams,
119
- "page": 0,
120
- "count": 10,
115
+ "page": this.data.page_index,
116
+ "count": this.data.page_size,
121
117
  },
122
118
  "user_id": this.properties.userId,
123
119
  "app_id": this.properties.appId
@@ -125,9 +121,36 @@ Component({
125
121
  getInviteDetail(params).then(res => {
126
122
  let DATA = res.data;
127
123
  if (DATA.code === 0) {
128
- this.setData({
129
- friendList: DATA.data
130
- })
124
+ // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
125
+ if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
126
+ return
127
+ }
128
+ var total = DATA.inviteNum
129
+ var finishedTxt = "加载中"
130
+ var finished = false
131
+ this.formatData(DATA.data,onScrolltolower)
132
+ // 下拉加载，且数据返回空
133
+ if(this._freshing && DATA.data.length === 0){
134
+ finishedTxt = "no-data"
135
+ }
136
+ else if (this.data.friendList.length >= total || DATA.data.length === 0) {
137
+ // 获取到所有数据
138
+ finished = true// 没有更多了
139
+ finishedTxt = "没有更多了"
140
+ this.setData({finishedTxt})
141
+ }
142
+ else {
143
+ finishedTxt = "加载中"
144
+ }
145
+ this.setData({
146
+ refreshing: false,
147
+ page_index: this.data.page_index + 1,
148
+ finishedTxt,
149
+ finished,
150
+ total
151
+ })
152
+ this._freshing = false
153
+ this.scrolling = false
131
154
  } else {
132
155
  wx.showToast({
133
156
  title: DATA.msg,
@@ -136,10 +159,24 @@ Component({
136
159
  }
137
160
  }).catch(err => {
138
161
  wx.showToast({
139
- title: err.data.msg,
162
+ title: err.msg,
140
163
  icon: 'error'
141
164
  })
142
165
  });
143
166
  },
167
+ formatData(data,onScrolltolower){
168
+ //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
169
+ let friendList = this.data.friendList
170
+ data.forEach((item,index) => {
171
+ if (!this._freshing) {
172
+ friendList.push(item)
173
+ }
174
+ })
175
+ if (this._freshing && !onScrolltolower) {
176
+ //下拉刷新的时候直接赋值
177
+ friendList = JSON.parse(JSON.stringify(data))
178
+ }
179
+ this.setData({friendList})
180
+ },
144
181
  }
145
182
  })
package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxml CHANGED
@@ -5,8 +5,9 @@
5
5
  class="icon-left-back"
6
6
  src="../../../images/icon_arrow_up.png"
7
7
  />
8
- <view class="count-style">邀请的好友{{'('+friendList.length+')'}}</view>
8
+ <view class="count-style">邀请的好友{{'('+total+')'}}</view>
9
9
  </view>
10
+ <scroll-view scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}" style="height:calc(100vh - 700rpx)">
10
11
  <view class="friend-list">
11
12
  <view
12
13
  class="friend-item"
@@ -19,5 +20,7 @@
19
20
  </view>
20
21
  </view>
21
22
  </view>
23
+ <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
24
+ </scroll-view>
22
25
  </van-popup>
23
26
  </view>
package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxss CHANGED
@@ -8,6 +8,13 @@
8
8
  opacity: 1;
9
9
  }
10
10
  }
11
+ .finished-text {
12
+ display: flex;
13
+ justify-content: center;
14
+ color: #999;
15
+ font-size: 28rpx;
16
+ padding-bottom: 20rpx;
17
+ }
11
18
  .container-friends {
12
19
  animation: popping ease 300ms;
13
20
  position: fixed;
@@ -53,7 +60,7 @@
53
60
  padding: 32rpx;
54
61
  }
55
62
  .friend-list {
56
- height: calc(100vh - 700rpx);
63
+ height: calc(100vh - 748rpx);
57
64
  /* flex: 1; */
58
65
  overflow: scroll;
59
66
  /* display: flex; */
package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.less CHANGED
@@ -1,6 +1,12 @@
1
+ .invite-entrance-liveroom-page{
2
+ height:100%;
3
+ display:flex;
4
+ flex-direction: column;
5
+ }
1
6
  .invite-rank-page {
2
7
  animation: popping ease 300ms;
3
- height: 1250rpx;
8
+ height: 100%;
9
+ flex:1;
4
10
  background-color: #fff !important;
5
11
  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
6
12
  background-size: contain;
@@ -8,28 +14,7 @@
8
14
  border-radius: 16px 16px 0 0;
9
15
  }
10
16
  .scrollViewHeight{
11
- height:calc(100vh - 636rpx);
12
- }
13
- .scrollViewDefaultHeight{
14
- height:calc(100vh - 528rpx);
15
- }
16
- .smallModelViewDefaultHeight{
17
- height:calc(100vh - 508rpx);
18
- }
19
- .smallModelVeiwHeight{
20
- height:calc(100vh - 630rpx);
21
- }
22
- .scrollViewPackUpDefaultHeight{
23
- height:calc(100vh - 468rpx);
24
- }
25
- .scrollViewPackUpHeight{
26
- height:calc(100vh - 362rpx);
27
- }
28
- .smallModelViewPackUpDefaultHeight{
29
- height:calc(100vh - 342rpx);
30
- }
31
- .smallModelVeiwPackUpHeight{
32
- height:calc(100vh - 464rpx);
17
+ height:calc(100% - 120rpx);
33
18
  }
34
19
  .container-ranking {
35
20
  animation: popping ease 300ms;
package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxml CHANGED
@@ -3,7 +3,7 @@
3
3
  <view class="invite-rank-page" wx:if="{{isShowRank}}">
4
4
  <view class="mask-layer" bindtap="closeInvitingRank"></view>
5
5
  <scroll-view scroll-y="true"
6
- class="{{!isPackUp?hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewDefaultHeight':'scrollViewHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewDefaultHeight':'smallModelVeiwHeight':hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewPackUpDefaultHeight':'scrollViewPackUpHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewPackUpDefaultHeight':'smallModelVeiwPackUpHeight'}}">
6
+ class="scrollViewHeight">
7
7
  <view class="container-ranking">
8
8
  <view class="img-background">
9
9
  <image
package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxss CHANGED
@@ -1,6 +1,12 @@
1
+ .invite-entrance-liveroom-page {
2
+ height: 100%;
3
+ display: flex;
4
+ flex-direction: column;
5
+ }
1
6
  .invite-rank-page {
2
7
  animation: popping ease 300ms;
3
- height: 1250rpx;
8
+ height: 100%;
9
+ flex: 1;
4
10
  background-color: #fff !important;
5
11
  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
6
12
  background-size: contain;
@@ -8,28 +14,7 @@
8
14
  border-radius: 16px 16px 0 0;
9
15
  }
10
16
  .scrollViewHeight {
11
- height: calc(100vh - 636rpx);
12
- }
13
- .scrollViewDefaultHeight {
14
- height: calc(100vh - 528rpx);
15
- }
16
- .smallModelViewDefaultHeight {
17
- height: calc(100vh - 508rpx);
18
- }
19
- .smallModelVeiwHeight {
20
- height: calc(100vh - 630rpx);
21
- }
22
- .scrollViewPackUpDefaultHeight {
23
- height: calc(100vh - 468rpx);
24
- }
25
- .scrollViewPackUpHeight {
26
- height: calc(100vh - 362rpx);
27
- }
28
- .smallModelViewPackUpDefaultHeight {
29
- height: calc(100vh - 342rpx);
30
- }
31
- .smallModelVeiwPackUpHeight {
32
- height: calc(100vh - 464rpx);
17
+ height: calc(100% - 120rpx);
33
18
  }
34
19
  .container-ranking {
35
20
  animation: popping ease 300ms;
package/miniprogram_dist/ConfirmOrder/components/AddressEdit/index.wxml CHANGED
@@ -2,10 +2,10 @@
2
2
  <view class="address-edit-content">
3
3
  <van-dialog id="van-dialog" />
4
4
  <!-- 获取微信收货地址 -->
5
- <WechatAddress
5
+ <!-- <WechatAddress
6
6
  addressList="{{ addressList }}"
7
7
  bind:createAddress="saveAddress"
8
- ></WechatAddress>
8
+ ></WechatAddress> -->
9
9
  <view class="input-wrapper">
10
10
  <van-field value="{{ address.receiver }}" label="收货人" placeholder="收货人姓名" maxlength="15" bind:change="changeMsg" data-type="receiver" />
11
11
  <van-field value="{{ address.phone }}" label="手机号码" placeholder="收货人手机号" maxlength="11" type="number" bind:change="changeTel" />
package/miniprogram_dist/ConfirmOrder/components/AddressManage/index.wxml CHANGED
@@ -1,11 +1,11 @@
1
1
  <!--src/ConfirmOrder/components/AddressManage/index.wxml-->
2
2
  <view class="address-manage-content">
3
3
  <!-- 获取微信收货地址 -->
4
- <WechatAddress
4
+ <!-- <WechatAddress
5
5
  addressList="{{ addressList }}"
6
6
  bind:createAddress="createAddress"
7
7
  bind:chooseAddress="chooseAddress"
8
- ></WechatAddress>
8
+ ></WechatAddress> -->
9
9
 
10
10
  <view class="address-bar" wx:for="{{ addressList }}" wx:key="key">
11
11
  <view class="left-info" bindtap="chooseAddress" data-item="{{ item }}">
package/miniprogram_dist/ConfirmOrder/components/WechatAddress/index.js CHANGED
@@ -33,29 +33,7 @@ Component({
33
33
  methods: {
34
34
  // 获取微信收货地址
35
35
  getWechat() {
36
- wx.chooseAddress({
37
- success: res => {
38
- // 微信地址与地址列表匹配，不重复添加
39
- res['noCheck'] = true
40
- let compareRes = this.compareWechat(res)
41
- if (compareRes === "") {
42
- this.triggerEvent("createAddress", res)
43
- } else {
44
- if (this.data.pageType === "list") {
45
- this.triggerEvent("chooseAddress", compareRes)
46
- } else {
47
- wx.showToast({
48
- title: '已有相同收货地址',
49
- icon: 'none',
50
- duration: 2000
51
- })
52
- }
53
- }
54
- },
55
- fail: err => {
56
- console.log(err);
57
- }
58
- })
36
+
59
37
  },
60
38
  // 微信地址与地址列表匹配，不重复添加
61
39
  compareWechat(wechatAddress) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "0.3.5-t220418",
3
+ "version": "0.3.5",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/AliveInvite/LiveRoomVertical/components/friends/friends.js CHANGED
@@ -5,14 +5,6 @@ import {
5
5
  } from "../../../../common/api/eLiveInvite";
6
6
  Component({
7
7
  properties: {
8
- // inviteParm: {
9
- // type: String,
10
- // value: ''
11
- // },
12
- // roomInfo: {
13
- // type: Object,
14
- // value: {}
15
- // },
16
8
  switchToControlDialogVisible:{
17
9
  type: Boolean,
18
10
  value:false
@@ -38,32 +30,21 @@ Component({
38
30
  isShowFriends: false,
39
31
  count: 0, // 邀请的好友数
40
32
  inviteParm:'',
41
- friendList: [
33
+ total: 0,
34
+ refreshing: false,
35
+ finishedTxt: '加载中',
36
+ finished: false,
37
+ componentsState: 1,
38
+ page_size: 25,
39
+ page_index: 0,
40
+ friendList:[],
41
+ friendListMockData: [
42
42
  // {
43
43
  // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
44
44
  // wx_nickname: 'wendy'
45
45
  // }, {
46
46
  // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
47
47
  // wx_nickname: 'moira1'
48
- // }, {
49
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
50
- // wx_nickname: 'moira2'
51
- // }
52
- // , {
53
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
54
- // wx_nickname: 'moira333333'
55
- // }
56
- // , {
57
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
58
- // wx_nickname: 'moira4'
59
- // }
60
- // , {
61
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
62
- // wx_nickname: 'moira5'
63
- // }
64
- // , {
65
- // wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
66
- // wx_nickname: 'moira6'
67
48
  // }
68
49
 
69
50
  ] //邀请的好友列表
@@ -72,20 +53,43 @@ Component({
72
53
  switchToControlDialogVisible(val) {
73
54
  if(val){
74
55
  this.showFriends()
56
+ }else{
57
+ this.closeFriends()
75
58
  }
76
- // this.setData({
77
- // isShowFriends:val
78
- // })
79
- // this.getFriendsList()
80
59
  },
81
60
  },
82
61
  ready() {
83
62
  },
84
63
  methods: {
64
+ onLoad(){
65
+ if (this._freshing) return
66
+ this._freshing = true
67
+ this.setData({
68
+ finished: false,
69
+ page_index: 0
70
+ })
71
+ this.getFriendsList()
72
+ },
73
+ onScrolltolower(){
74
+ console.log(this.data.finished, this._freshing )
75
+ if(this.scrolling){return}
76
+ this.scrolling = true
77
+ this.setData({
78
+ finishedTxt: this.data.finished ? "没有更多了" : "加载中"
79
+ })
80
+ if(this.data.finished || this._freshing){
81
+ return
82
+ }
83
+ let onScrolltolower = true
84
+ this.getFriendsList(onScrolltolower)
85
+ },
85
86
  closeFriends() {
86
87
  this.setData({
87
88
  isShowFriends: false
88
89
  })
90
+ this.setData({
91
+ componentsState: this.data.componentsState + 1
92
+ })
89
93
  },
90
94
  showFriends() {
91
95
  this.setData({
@@ -102,22 +106,14 @@ Component({
102
106
  }
103
107
  return base64.encode(JSON.stringify(params))
104
108
  },
105
- getFriendsList() {
106
- // let params = {
107
- // "bizData": {
108
- // "inviteParm": this.data.inviteParm,
109
- // "page": 0,
110
- // "count": 10,
111
- // },
112
- // "user_id": this.properties.userId,
113
- // "app_id": this.properties.appId
114
- // };
109
+ getFriendsList(onScrolltolower = false) {
110
+ let state = this.data.componentsState
115
111
  let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
116
112
  let params = {
117
113
  "bizData": {
118
114
  "inviteParm": inviteParams,
119
- "page": 0,
120
- "count": 10,
115
+ "page": this.data.page_index,
116
+ "count": this.data.page_size,
121
117
  },
122
118
  "user_id": this.properties.userId,
123
119
  "app_id": this.properties.appId
@@ -125,9 +121,36 @@ Component({
125
121
  getInviteDetail(params).then(res => {
126
122
  let DATA = res.data;
127
123
  if (DATA.code === 0) {
128
- this.setData({
129
- friendList: DATA.data
130
- })
124
+ // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
125
+ if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
126
+ return
127
+ }
128
+ var total = DATA.inviteNum
129
+ var finishedTxt = "加载中"
130
+ var finished = false
131
+ this.formatData(DATA.data,onScrolltolower)
132
+ // 下拉加载，且数据返回空
133
+ if(this._freshing && DATA.data.length === 0){
134
+ finishedTxt = "no-data"
135
+ }
136
+ else if (this.data.friendList.length >= total || DATA.data.length === 0) {
137
+ // 获取到所有数据
138
+ finished = true// 没有更多了
139
+ finishedTxt = "没有更多了"
140
+ this.setData({finishedTxt})
141
+ }
142
+ else {
143
+ finishedTxt = "加载中"
144
+ }
145
+ this.setData({
146
+ refreshing: false,
147
+ page_index: this.data.page_index + 1,
148
+ finishedTxt,
149
+ finished,
150
+ total
151
+ })
152
+ this._freshing = false
153
+ this.scrolling = false
131
154
  } else {
132
155
  wx.showToast({
133
156
  title: DATA.msg,
@@ -136,10 +159,24 @@ Component({
136
159
  }
137
160
  }).catch(err => {
138
161
  wx.showToast({
139
- title: err.data.msg,
162
+ title: err.msg,
140
163
  icon: 'error'
141
164
  })
142
165
  });
143
166
  },
167
+ formatData(data,onScrolltolower){
168
+ //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
169
+ let friendList = this.data.friendList
170
+ data.forEach((item,index) => {
171
+ if (!this._freshing) {
172
+ friendList.push(item)
173
+ }
174
+ })
175
+ if (this._freshing && !onScrolltolower) {
176
+ //下拉刷新的时候直接赋值
177
+ friendList = JSON.parse(JSON.stringify(data))
178
+ }
179
+ this.setData({friendList})
180
+ },
144
181
  }
145
182
  })
package/src/AliveInvite/LiveRoomVertical/components/friends/friends.wxml CHANGED
@@ -5,8 +5,9 @@
5
5
  class="icon-left-back"
6
6
  src="../../../images/icon_arrow_up.png"
7
7
  />
8
- <view class="count-style">邀请的好友{{'('+friendList.length+')'}}</view>
8
+ <view class="count-style">邀请的好友{{'('+total+')'}}</view>
9
9
  </view>
10
+ <scroll-view scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}" style="height:calc(100vh - 700rpx)">
10
11
  <view class="friend-list">
11
12
  <view
12
13
  class="friend-item"
@@ -19,5 +20,7 @@
19
20
  </view>
20
21
  </view>
21
22
  </view>
23
+ <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
24
+ </scroll-view>
22
25
  </van-popup>
23
26
  </view>
package/src/AliveInvite/LiveRoomVertical/components/friends/friends.wxss CHANGED
@@ -8,6 +8,13 @@
8
8
  opacity: 1;
9
9
  }
10
10
  }
11
+ .finished-text{
12
+ display: flex;
13
+ justify-content: center;
14
+ color: #999;
15
+ font-size: 28rpx;
16
+ padding-bottom: 20rpx;
17
+ }
11
18
  .container-friends {
12
19
  animation: popping ease 300ms;
13
20
  position: fixed;
@@ -22,10 +29,10 @@
22
29
  background-repeat: no-repeat;
23
30
  border-radius: 16rpx 16rpx 0 0;
24
31
  }
25
- .viewAreaPackUp{
32
+ .viewAreaPackUp {
26
33
  height: calc(100vh - 160rpx);
27
34
  }
28
- .viewUnPackUp{
35
+ .viewUnPackUp {
29
36
  height: calc(100vh - 494rpx);
30
37
  }
31
38
  .header {
@@ -53,7 +60,7 @@
53
60
  padding: 32rpx;
54
61
  }
55
62
  .friend-list {
56
- height: calc(100vh - 700rpx);
63
+ height: calc(100vh - 748rpx);
57
64
  /* flex: 1; */
58
65
  overflow: scroll;
59
66
  /* display: flex; */
package/src/AliveInvite/LiveRoomVertical/index.less CHANGED
@@ -1,6 +1,12 @@
1
+ .invite-entrance-liveroom-page{
2
+ height:100%;
3
+ display:flex;
4
+ flex-direction: column;
5
+ }
1
6
  .invite-rank-page {
2
7
  animation: popping ease 300ms;
3
- height: 1250rpx;
8
+ height: 100%;
9
+ flex:1;
4
10
  background-color: #fff !important;
5
11
  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
6
12
  background-size: contain;
@@ -8,28 +14,7 @@
8
14
  border-radius: 16px 16px 0 0;
9
15
  }
10
16
  .scrollViewHeight{
11
- height:calc(100vh - 636rpx);
12
- }
13
- .scrollViewDefaultHeight{
14
- height:calc(100vh - 528rpx);
15
- }
16
- .smallModelViewDefaultHeight{
17
- height:calc(100vh - 508rpx);
18
- }
19
- .smallModelVeiwHeight{
20
- height:calc(100vh - 630rpx);
21
- }
22
- .scrollViewPackUpDefaultHeight{
23
- height:calc(100vh - 468rpx);
24
- }
25
- .scrollViewPackUpHeight{
26
- height:calc(100vh - 362rpx);
27
- }
28
- .smallModelViewPackUpDefaultHeight{
29
- height:calc(100vh - 342rpx);
30
- }
31
- .smallModelVeiwPackUpHeight{
32
- height:calc(100vh - 464rpx);
17
+ height:calc(100% - 120rpx);
33
18
  }
34
19
  .container-ranking {
35
20
  animation: popping ease 300ms;
package/src/AliveInvite/LiveRoomVertical/index.wxml CHANGED
@@ -3,7 +3,7 @@
3
3
  <view class="invite-rank-page" wx:if="{{isShowRank}}">
4
4
  <view class="mask-layer" bindtap="closeInvitingRank"></view>
5
5
  <scroll-view scroll-y="true"
6
- class="{{!isPackUp?hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewDefaultHeight':'scrollViewHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewDefaultHeight':'smallModelVeiwHeight':hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewPackUpDefaultHeight':'scrollViewPackUpHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewPackUpDefaultHeight':'smallModelVeiwPackUpHeight'}}">
6
+ class="scrollViewHeight">
7
7
  <view class="container-ranking">
8
8
  <view class="img-background">
9
9
  <image
package/src/AliveInvite/LiveRoomVertical/index.wxss CHANGED
@@ -1,6 +1,12 @@
1
+ .invite-entrance-liveroom-page {
2
+ height: 100%;
3
+ display: flex;
4
+ flex-direction: column;
5
+ }
1
6
  .invite-rank-page {
2
7
  animation: popping ease 300ms;
3
- height: 1250rpx;
8
+ height: 100%;
9
+ flex: 1;
4
10
  background-color: #fff !important;
5
11
  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
6
12
  background-size: contain;
@@ -8,28 +14,7 @@
8
14
  border-radius: 16px 16px 0 0;
9
15
  }
10
16
  .scrollViewHeight {
11
- height: calc(100vh - 636rpx);
12
- }
13
- .scrollViewDefaultHeight {
14
- height: calc(100vh - 528rpx);
15
- }
16
- .smallModelViewDefaultHeight {
17
- height: calc(100vh - 508rpx);
18
- }
19
- .smallModelVeiwHeight {
20
- height: calc(100vh - 630rpx);
21
- }
22
- .scrollViewPackUpDefaultHeight {
23
- height: calc(100vh - 468rpx);
24
- }
25
- .scrollViewPackUpHeight {
26
- height: calc(100vh - 362rpx);
27
- }
28
- .smallModelViewPackUpDefaultHeight {
29
- height: calc(100vh - 342rpx);
30
- }
31
- .smallModelVeiwPackUpHeight {
32
- height: calc(100vh - 464rpx);
17
+ height: calc(100% - 120rpx);
33
18
  }
34
19
  .container-ranking {
35
20
  animation: popping ease 300ms;
package/src/ConfirmOrder/components/AddressEdit/index.wxml CHANGED
@@ -2,10 +2,10 @@
2
2
  <view class="address-edit-content">
3
3
  <van-dialog id="van-dialog" />
4
4
  <!-- 获取微信收货地址 -->
5
- <WechatAddress
5
+ <!-- <WechatAddress
6
6
  addressList="{{ addressList }}"
7
7
  bind:createAddress="saveAddress"
8
- ></WechatAddress>
8
+ ></WechatAddress> -->
9
9
  <view class="input-wrapper">
10
10
  <van-field value="{{ address.receiver }}" label="收货人" placeholder="收货人姓名" maxlength="15" bind:change="changeMsg" data-type="receiver" />
11
11
  <van-field value="{{ address.phone }}" label="手机号码" placeholder="收货人手机号" maxlength="11" type="number" bind:change="changeTel" />
package/src/ConfirmOrder/components/AddressManage/index.wxml CHANGED
@@ -1,11 +1,11 @@
1
1
  <!--src/ConfirmOrder/components/AddressManage/index.wxml-->
2
2
  <view class="address-manage-content">
3
3
  <!-- 获取微信收货地址 -->
4
- <WechatAddress
4
+ <!-- <WechatAddress
5
5
  addressList="{{ addressList }}"
6
6
  bind:createAddress="createAddress"
7
7
  bind:chooseAddress="chooseAddress"
8
- ></WechatAddress>
8
+ ></WechatAddress> -->
9
9
 
10
10
  <view class="address-bar" wx:for="{{ addressList }}" wx:key="key">
11
11
  <view class="left-info" bindtap="chooseAddress" data-item="{{ item }}">
package/src/ConfirmOrder/components/WechatAddress/index.js CHANGED
@@ -33,29 +33,7 @@ Component({
33
33
  methods: {
34
34
  // 获取微信收货地址
35
35
  getWechat() {
36
- wx.chooseAddress({
37
- success: res => {
38
- // 微信地址与地址列表匹配，不重复添加
39
- res['noCheck'] = true
40
- let compareRes = this.compareWechat(res)
41
- if (compareRes === "") {
42
- this.triggerEvent("createAddress", res)
43
- } else {
44
- if (this.data.pageType === "list") {
45
- this.triggerEvent("chooseAddress", compareRes)
46
- } else {
47
- wx.showToast({
48
- title: '已有相同收货地址',
49
- icon: 'none',
50
- duration: 2000
51
- })
52
- }
53
- }
54
- },
55
- fail: err => {
56
- console.log(err);
57
- }
58
- })
36
+
59
37
  },
60
38
  // 微信地址与地址列表匹配，不重复添加
61
39
  compareWechat(wechatAddress) {