diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index 558a9fe..dba7d77 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -1,14 +1,13 @@
-
+
-
+
-
+
@@ -17,37 +16,98 @@
\ No newline at end of file
diff --git a/pages/address/list.vue b/pages/address/list.vue
index c638a37..3433c50 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -2,70 +2,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 默认地址
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -111,8 +102,6 @@
return {
tabList ,
searchParam: {
- pageNo: 1,
- pageSize: 10,
keyword: '',
addressType: tabList[0].val
},
@@ -120,8 +109,9 @@
tab: tabList[0].val, // 当前tab
type: '', // 'choose' 选择操作
},
- dataList: [
- ],
+ resData: {
+ list: []
+ },
showLoadMore: false,
loadedAll: false
}
@@ -143,41 +133,10 @@
methods: {
getAddressDetail,
initData(){
- uni.stopPullDownRefresh();
- this.setListData(true)
- },
- async setListData(reload) {
- if(reload) {
- this.searchParam.pageNo = 1
- this.showLoading()
- }
- const res = await apiService.getCustomerUserAddressList(this.searchParam)
- const list = res.rows || []
- if(reload) {
- this.dataList = list
- this.hideLoading()
- } else {
- this.dataList = this.dataList.concat(list)
- }
+
},
+ getListFun: apiService.getCustomerUserAddressList,
- async onScrollBottom() {
- if (this.loadedAll) {
- return;
- }
- this.showLoadMore = true;
- this.searchParam.pageNo ++
- await this.setListData();
- this.showLoadMore = false;
- },
- handleSearchParamChange(key, val) {
- if(key) {
- this.searchParam[key] = val
- }
- setTimeout(()=> {
- this.setListData(true)
- }, 300)
- },
handleItemClick(item){
switch(this.queryOption.type) {
case 'choose':