Merge remote-tracking branch 'origin/master'

src/views/mobile/activityApply/list.vue

@@ -202,8 +202,9 @@
                             </div>
                         </li>
                     </ul>
-                    <div v-if="lang==1&&totalPage>8" class="lookMoreBtn" @click="loadBottom">查看更多活动 <i
+                    <div v-if="lang==1&&totalPage>8&&page<pages" class="lookMoreBtn" @click="loadBottom">查看更多活动 <i
                             class="iconfont icon-xiala"></i></div>
+                    <div v-if="lang==1&&(totalPage<=8||page==pages)" class="lookMoreBtn">没有更多数据了</div>
                 </div>
                 <div class="divHeight15px" v-if="lang==1"></div>
                 <div class="partnerInfo" v-if="lang==1&&partnerInfo&&partnerInfo.length>0">
@@ -509,6 +510,7 @@
                 page: 1,
                 pageSize: 8,
                 totalPage: 1,
+                pages:0,
                 allLoaded: false,
                 stateData: {},
                 cityVisible: false,
@@ -610,7 +612,9 @@
 
             closeIndustry() {
                 this.industryVisible = false;
-                this.resetPage = true;
+                if(this.lang==2) this.resetPage = false;
+                this.page = 1;
+                this.$store.dispatch('applyListPageAction', {path: this.$route.path, pars: this.page});
                 this.getInitFunc();
             },
 
@@ -625,7 +629,10 @@
             tochildevent(data) {
                 this.selectCity = data;
                 this.channelCity = data.geoId;
-                this.resetPage = true;
+                if(this.lang==2) this.resetPage = false;
+                else this.resetPage = true;
+                this.page =1;
+                this.$store.dispatch('applyListPageAction', {path: this.$route.path, pars: this.page});
                 this.getInitFunc();
             },
 
@@ -661,6 +668,7 @@
                 };
                 api.getActivityListAxios(params).then(response => {
                     if (response.code == 0) {
+                        this.pages = response.result.pages;
                         if (response.result.records.length > 0) {
                             response.result.records.forEach((item) => {
                                 item.disabledFlag = 0;
@@ -694,7 +702,7 @@
             },
 
             loadTop() {
-                this.resetPage = true;
+                this.page = 1;
                 this.$store.dispatch('applyListPageAction', {path: this.$route.path, pars: this.page});
                 // 加载更多数据
                 this.getInitFunc();
@@ -714,12 +722,13 @@
                     this.allLoaded = false;
                 }
                 if (this.lang == 1 && !isHaveMore && this.page != 1 && this.totalPage>8) {
-                    this.$toast("没有更多数据了")
+                    // this.$toast("没有更多数据了")
                 }
             },
 
             more: function () {
                 // 分页查询
+                if(this.lang==2) this.resetPage = false;
                 this.page = parseInt(this.page) + 1;
                 this.$store.dispatch('applyListPageAction', {path: this.$route.path, pars: this.page});
                 this.getInitFunc(1);