Merge remote-tracking branch 'origin/master'

pages.json

@@ -379,7 +379,7 @@
 			}
 		},
 		{
-			"path": "pages/me/nameAuthentication",
+			"path": "pages/me/nameAuthentication/nameAuthentication",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -389,7 +389,7 @@
 			}
 		},
 		{
-			"path": "pages/me/officialAuthentication",
+			"path": "pages/me/officialAuthentication/officialAuthentication",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",

pages/me/me.vue

@@ -40,12 +40,12 @@ export default {
 					open: false,
 				},
 				{
-					id: 'me/nameAuthentication',
+					id: 'me/nameAuthentication/nameAuthentication',
 					name: '实名认证',
 					open: false,
 				},
 				{
-					id: 'me/officialAuthentication',
+					id: 'me/officialAuthentication/officialAuthentication',
 					name: '官方认证',
 					open: false,
 				},

pages/me/nameAuthentication.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-    import upload from '../../components/upload/index.vue'
+    import upload from '../../../components/upload/index.vue'
     import {appletAdd,getUserInfo} from '@/api/me/nameAuthentication.js'
 
     export default {

pages/me/officialAuthentication.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-    import upload from '../../components/upload/index.vue'
+    import upload from '../../../components/upload/index.vue'
     import {appletAdd,getUserInfo} from '@/api/me/officialAuthentication.js'
 
     export default {

pages/quotations/quotations.vue

@@ -89,6 +89,7 @@ export default {
   onPullDownRefresh() {
     this.queryParams.pageNum = 1;
     this.quotationsList = [];
+    this.categories = [];
     this.getList()
   },
   //上拉加载

pages/specialService/financialInfrastructure/financialInfrastructure.vue

@@ -12,6 +12,8 @@
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
+        <!-- 我是有底线的 -->
+        <uni-load-more :status="status" :content-text="contentText"/>
     </view>
 </template>
 
@@ -20,6 +22,21 @@ import { listServer, getServer, delServer, addServer, updateServer } from '@/api
 export default {
     data() {
         return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
             list: [
                 {
                     titleName:"-",
@@ -27,6 +44,27 @@ export default {
                 }
             ],
         };
+    },
+    onPullDownRefresh() {
+        console.log("onPullDownRefresh  "+this.queryParams.pageNum)
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList(9)
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList(9)
+        }
     }
     /**
      * 生命周期函数--监听页面加载
@@ -39,7 +77,17 @@ export default {
         getList(type) {
             this.loading = true;
             listServer({type: type}).then(response => {
-                this.list = response.rows;
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
             });
         },
         /** 查询详情 */

pages/specialService/legalService/legalService.vue

@@ -12,6 +12,8 @@
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
+        <!-- 我是有底线的 -->
+        <uni-load-more :status="status" :content-text="contentText"/>
     </view>
 </template>
 
@@ -20,6 +22,21 @@ import { listServer, getServer, delServer, addServer, updateServer } from '@/api
 export default {
     data() {
         return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
             list: [
                 {
                     titleName:"-",
@@ -27,6 +44,27 @@ export default {
                 }
             ],
         };
+    },
+    onPullDownRefresh() {
+        console.log("onPullDownRefresh  "+this.queryParams.pageNum)
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList(8)
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList(8)
+        }
     }
     /**
      * 生命周期函数--监听页面加载
@@ -39,7 +77,17 @@ export default {
         getList(type) {
             this.loading = true;
             listServer({type: type}).then(response => {
-                this.list = response.rows;
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
             });
         },
         /** 查询详情 */

pages/specialService/loveAtVillage/loveAtVillage.vue

@@ -12,6 +12,8 @@
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
+        <!-- 我是有底线的 -->
+        <uni-load-more :status="status" :content-text="contentText"/>
     </view>
 </template>
 
@@ -20,6 +22,21 @@ import { listServer, getServer, delServer, addServer, updateServer } from '@/api
 export default {
     data() {
         return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
             list: [
                 {
                     titleName:"-",
@@ -27,6 +44,27 @@ export default {
                 }
             ],
         };
+    },
+    onPullDownRefresh() {
+        console.log("onPullDownRefresh  "+this.queryParams.pageNum)
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList(7)
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList(7)
+        }
     }
     /**
      * 生命周期函数--监听页面加载
@@ -39,7 +77,17 @@ export default {
         getList(type) {
             this.loading = true;
             listServer({type: type}).then(response => {
-                this.list = response.rows;
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
             });
         },
         /** 查询详情 */