Merge remote-tracking branch 'origin/master'

src/components/index/PageTop.vue

@@ -44,7 +44,6 @@
         <div class="drawer">
             <el-drawer
                     custom-class="userInfo-drawer"
-                    style="width: 100%;height: 100%;top: 0;"
                     :visible.sync="drawer"
                     append-to-body
                     :direction="direction"
@@ -145,10 +144,6 @@
                     id: 4,
                     name: 'Findevent',
                     path:'/eventpage',
-                }, {
-                    id: 6,
-                    name: "industry",
-                    path:'/industryReport',
                 }],
                 currentIndex: this.publicFun.getCookie("currentNav")==null||this.publicFun.getCookie("currentNav")==undefined||this.publicFun.getCookie("currentNav")==1||this.publicFun.getCookie("currentNav")==2?0:this.publicFun.getCookie("currentNav"),
                 lang: this.$i18n.locale,
@@ -420,6 +415,11 @@
                 this.publicFun.setUserInfoCookie("currentNav",data);
             })
             if(this.diven_zh){
+                this.list.splice(4,0,{
+                    id: 6,
+                    name: "industry",
+                    path:'/industryReport',
+                });
                 this.list.splice(5,0,{
                     id: 5,
                     name: "cooperationcase",
@@ -436,6 +436,11 @@
                     name: "topic",
                     path:'/topicList',
                 });
+                this.list.splice(6,0,{
+                    id: 6,
+                    name: "industry",
+                    path:'/industryReport',
+                });
             }
         },
         activated(){

src/views/industryreportspage/industryall.vue

@@ -7,9 +7,9 @@
                 </el-row>
                 <el-row class="statebottm" style="line-height: 60px;">
                     <span style="font-weight: bold;padding: 0 45px 0 10px;">版本：</span>
-                    <el-radio @change="getsearchreports()" v-model="searchs.languageType" label="0">全部</el-radio>
-                    <el-radio @change="getsearchreports()" v-model="searchs.languageType" label="zh">中文</el-radio>
-                    <el-radio @change="getsearchreports()" v-model="searchs.languageType" label="en">英文</el-radio>
+                    <el-radio @change="languageTypechange()" v-model="searchs.languageType" label="0">全部</el-radio>
+                    <el-radio @change="languageTypechange()" v-model="searchs.languageType" label="zh">中文</el-radio>
+                    <el-radio @change="languageTypechange()" v-model="searchs.languageType" label="en">英文</el-radio>
                 </el-row>
                 <el-row style="margin: 20px 0 0 10px" class="contnetform">
                     <el-form :inline="true" label-width="80px" label-position="left"  style="width: 100%;">
@@ -129,6 +129,11 @@
                 this.searchs.dataIds = data;
                 this.getsearchreports();
             },
+            //版本检索
+            languageTypechange(){
+                this.searchs.pageIndex = 1;
+                this.getsearchreports();
+            },
             searchCik(){
                 this.searchs.pageIndex = 1;
                 this.getsearchreports();

src/views/innovatecompany/demandaudit/seedemand.vue

@@ -208,14 +208,17 @@
                 }
             },
             typeData(a){
+                this.cur_page = 1;
                 this.search.registerType = a;
                 this.add();
             },
             submitTypes(a){
+                this.cur_page = 1;
                 this.search.submitType = a;
                 this.add();
             },
             screenData(a,b){
+                this.cur_page = 1;
                 this.search.industryId = a;
                 this.search.cindustryIds = b;
                 this.add();

src/views/innovatecompany/peopleaudit/seepeople.vue

@@ -194,11 +194,13 @@
                 }
             },
             typeData(a){
+                this.cur_page = 1;
                 this.search.registerType = a;
                 this.add();
 
             },
             peopletypeData(a){
+                this.cur_page = 1;
                 this.search.empType = a;
                 this.add();
             },

src/views/innovatecompany/projectaudit/seeaudit.vue

@@ -210,15 +210,18 @@
                 }
             },
             typeData(a){
+                this.cur_page = 1;
                 this.search.registerType = a;
                 this.add();
 
             },
             submitTypes(a){
+                this.cur_page = 1;
                 this.search.submitType = a;
                 this.add();
             },
             screenData(a,b){
+                this.cur_page = 1;
                 this.search.industryId = a;
                 this.search.cindustryIds = b;
                 this.add();

src/views/innovatecompany/registeruser/registeruserlist.vue

@@ -164,22 +164,26 @@
         methods : {
             //账号类型
             typeData(a){
+                this.cur_page = 1;
                 this.search.registerType = a;
                 this.add();
 
             },
             //用户类型
             peopletypeData(a){
+                this.cur_page = 1;
                 this.search.empType = a;
                 this.add();
             },
             //认证状态
             authenticationData(a){
+                this.cur_page = 1;
                 this.search.authenticationState = a;
                 this.add();
             },
             //账号状态
             accountData(a){
+                this.cur_page = 1;
                 this.search.frozenState = a;
                 this.add();
             },

src/views/mobile/article/articlelist.vue

@@ -35,8 +35,8 @@
                         globalMsg.$emit("sendIndex",5)
                     }
                     if(this.$route.name=="industryReport"){
-                        this.publicFun.setUserInfoCookie("currentNav",6);
-                        globalMsg.$emit("sendIndex",6)
+                        this.publicFun.setUserInfoCookie("currentNav",this.$i18n.locale=='zh-CN'?6:4);
+                        globalMsg.$emit("sendIndex",this.$i18n.locale=='zh-CN'?6:4)
                     }
 
                 }

src/views/mobile/logined.vue

@@ -169,8 +169,8 @@
                         globalMsg.$emit("sendIndex",5)
                     }
                     if(this.$route.name=="industryReport"){
-                        this.publicFun.setUserInfoCookie("currentNav",6);
-                        globalMsg.$emit("sendIndex",6)
+                        this.publicFun.setUserInfoCookie("currentNav",this.$i18n.locale=='zh-CN'?6:4);
+                        globalMsg.$emit("sendIndex",this.$i18n.locale=='zh-CN'?6:4)
                     }
                     if(this.$route.name=="duijiephoneRequireDetail"){
                         this.publicFun.setUserInfoCookie("currentNav",2);