Merge remote-tracking branch 'origin/master'

src/common/commonApi.js

@@ -12,6 +12,11 @@ export default {
         return api.fetchLoadingLogin('/business/content/selectBaseDataList');
     },
 
+    //获取感兴趣字典表接口
+    getIntersetedDictZhAxios() {
+        return api.fetchLoadingGet('/business/activityEnter/selectActivityDataList');
+    },
+
     //提交感兴趣领域标签
     postIntersetedDictAxios(params) {
         return api.fetchLoadingPost('/business/content/addEmpDataLabel', params);

src/common/lang/zh.js

@@ -1967,7 +1967,7 @@ module.exports = {
         topSearch: "地区",
         industrySearch:"行业分类",
         timeSearch:"全时段",
-        noActivity: "暂无活动",
+        noActivity: "没有找到相应的活动，请更换筛选条件！",
         applying: "报名中",
         applyEnd: "报名截止",
         activityEnd: "活动已结束",

src/components/apply/hotCitySearch.vue

@@ -611,7 +611,7 @@
         height: 100%;
         padding-bottom: 1rem;
         overflow: auto;
-        z-index: 101;
+        z-index: 2001;
     }
 
     .transit {

src/components/apply/industrySearch.vue

@@ -5,7 +5,7 @@
             <span>{{$t("activityInfo.industrySearch")}}</span>
             <span></span>
         </p>
-        <selectFlag @postData="postData" v-if="intersetedFlag" :selectedFlag="intersetedFlag"
+        <selectFlag @postData="postData" :lang="lang" v-if="intersetedFlag" :selectedFlag="intersetedFlag"
                     :isSearch="true" :isCmpt="false"></selectFlag>
     </div>
 </template>
@@ -22,6 +22,10 @@
             intersetedFlag:{
                 type:Array,
                 default:[]
+            },
+            lang:{
+                type:Number,
+                default:1
             }
         },
         data() {

src/views/mobile/activityApply/list.vue

@@ -202,7 +202,7 @@
                             </div>
                         </li>
                     </ul>
-                    <div v-if="lang==1" class="lookMoreBtn" @click="loadBottom">查看更多活动 <i
+                    <div v-if="lang==1&&totalPage>8" class="lookMoreBtn" @click="loadBottom">查看更多活动 <i
                             class="iconfont icon-xiala"></i></div>
                 </div>
                 <div class="divHeight15px" v-if="lang==1"></div>
@@ -424,7 +424,7 @@
         </div>
         <applyLoginCmpt v-if="isLogin" @isShowLoginDialogFunc="isShowLoginDialogFunc" :registerType="loginType"
                         :visible="isLogin"></applyLoginCmpt>
-        <indusrtyCmpt v-if="industryVisible" :intersetedFlag="interstedFlagArr" @postSelectedData="postSelectedData"
+        <indusrtyCmpt v-if="industryVisible" :intersetedFlag="interstedFlagArr" :lang="lang" @postSelectedData="postSelectedData"
                       @closeIndustry="closeIndustry"></indusrtyCmpt>
         <div class="timeWrap" :class="top>=220?'timeWrapFixed':'timeWrapRelative'" v-show="timeVisible"
              @click.self="handleSelectTime()">
@@ -507,7 +507,7 @@
                 searchtext: '',
                 tableData: [],
                 page: 1,
-                pageSize: 10,
+                pageSize: 8,
                 totalPage: 1,
                 allLoaded: false,
                 stateData: {},
@@ -568,7 +568,8 @@
                 locationHref:document.location.href,
                 frontImgUrl: "",
                 currentTopic:null,
-                dialogVisible:false
+                dialogVisible:false,
+                resetPage:false
 
 
             }
@@ -609,14 +610,14 @@
 
             closeIndustry() {
                 this.industryVisible = false;
-                this.page = 1;
+                this.resetPage = true;
                 this.getInitFunc();
             },
 
             postSelectedData(data) {
                 this.dataIds = data.join(",");
                 this.industryVisible = false;
-                this.page = 1;
+                this.resetPage = true;
                 this.getInitFunc();
             },
 
@@ -624,7 +625,7 @@
             tochildevent(data) {
                 this.selectCity = data;
                 this.channelCity = data.geoId;
-                this.page = 1;
+                this.resetPage = true;
                 this.getInitFunc();
             },
 
@@ -648,7 +649,7 @@
                     }
                 }
                 let params = {
-                    pageIndex: this.page,
+                    pageIndex: this.resetPage?1:this.page,
                     pageSize: this.pageSize,
                     keyName: this.keyName,
                     timeType: this.timeVal == 100 ? null : this.timeVal,
@@ -693,7 +694,7 @@
             },
 
             loadTop() {
-                this.page = 1;
+                this.resetPage = true;
                 this.$store.dispatch('applyListPageAction', {path: this.$route.path, pars: this.page});
                 // 加载更多数据
                 this.getInitFunc();
@@ -712,7 +713,7 @@
                 if (isHaveMore && this.lang == 2) {
                     this.allLoaded = false;
                 }
-                if (this.lang == 1 && !isHaveMore && this.page != 1) {
+                if (this.lang == 1 && !isHaveMore && this.page != 1 && this.totalPage>8) {
                     this.$toast("没有更多数据了")
                 }
             },
@@ -1031,7 +1032,7 @@
                 if (this.startTime && this.endTime) this.handleChange(this.startTime, this.endTime);
                 else {
                     this.timeVisible = false;
-                    this.page = 1;
+                    this.resetPage = true;
                     this.getInitFunc();
                 }
             },
@@ -1048,7 +1049,7 @@
                     }
                     this.timeVal = 3;
                     this.timeVisible = false;
-                    this.page = 1;
+                    this.resetPage = true;
                     this.getInitFunc();
                 }
 
@@ -1937,7 +1938,7 @@
 
     .timeWrapRelative {
         position: absolute;
-        top: 290px;
+        top: 5.6rem;
         width: 100%;
     }
 

src/views/mobile/selectInterset.vue

@@ -56,6 +56,10 @@
                 type: Boolean,
                 default: false
             },
+            lang:{
+                type: Number,
+                default: 1
+            }
         },
         data() {
             return {
@@ -85,7 +89,8 @@
                         })
                     }
                 } else {
-                    this.initAllData()
+                    if(this.lang==1) this.initAllDataZh();
+                        else this.initAllData();
                 }
 
             },
@@ -122,6 +127,37 @@
                     });
             },
 
+            initAllDataZh(){
+                var that = this;
+                api.getIntersetedDictZhAxios().then(response => {
+                    if (response.code == 0) {
+                        if (response.result.length > 0) {
+                            response.result.forEach((item, index) => {
+                                item.checked = false;
+                                that.intersetList.push(item)
+                            })
+                            if (that.selectedFlagArr.length > 0) {
+                                var dataArr = that.selectedFlagArr.map((item) => {
+                                    return item.dataId;
+                                })
+
+                                for (let i = 0; i < that.intersetList.length; i++) {
+                                    if (dataArr.indexOf(that.intersetList[i].dataId) < 0) that.intersetList[i].checked = false;
+                                    else that.intersetList[i].checked = true;
+                                }
+                            }
+                        }
+
+
+                    } else {
+                        this.$toast(response.msg);
+                    }
+                })
+                    .catch(error => {
+                        return false;
+                    });
+            },
+
             handleConfirm(data) {
                 var that = this;
                 if (this.disabledFlag == 0) {