Merge remote-tracking branch 'origin/master'

src/admin/index/pages/sys.role.vue

@@ -204,6 +204,7 @@
                 });
                 this.roleIded = obj.roleId;
                 this.dataList(this.roleIded);
+                this.cur_pageunbind = 1;
                 this.tableListbind();
                 this.addData.roleName = obj.roleName;
                 this.addData.roleDes = obj.roleDes;

src/views/findeventpage/eventlive.vue

@@ -6,7 +6,7 @@
                 <img class="event_iconchange_img" src="../../assets/img/changeImg.png" alt="">
             </el-tooltip>
         </div>
-        <div v-if="isVisible" class="gendisplay event_all">
+        <div v-if="isVisible&&userClick" class="gendisplay event_all">
             <div @click="userClick = false" class="event_l"></div>
             <div class="event_r" :class="userClick?'event_rshow':''">
                 <img @click="userClick = false" src="../../assets/img/pull.png" :style="userClick?'':'display: none;'">
@@ -57,6 +57,7 @@
                 newstotalResult:0,
                 isVisible:false,
                 activityId:Number(this.$route.query.id),
+                isVisibleTimer:null,
                 userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
             }
         },
@@ -113,19 +114,33 @@
             newstotal(val){
                 this.newstotalResult = val;
             },
+            isVisibleTimerOut(){
+                var that = this;
+                this.isVisibleTimer = setInterval(function(){
+                    that.isShowChange(true);
+                },60000*5);
+            },
         },
         mounted() {
             globalMsg.$emit('topisInit', false);
             globalMsg.$emit('sendIndex', 3);
             document.getElementsByTagName("body")[0].style.overflow = "hidden";
             this.userHistory(0);
-            this.isShowChange();
+            if(this.$i18n.locale=='zh-CN'){
+                this.isShowChange();
+                this.isVisibleTimerOut();
+            }
             setTimeout(function () {
                 document.body.scrollTop=document.documentElement.scrollTop=0;
             },1500)
         },
         beforeRouteLeave(to,from,next) { // 在组件生命周期结束的时候销毁。、
             // this.userHistory(1);
+            var that = this;
+            if(this.isVisibleTimer){
+                clearInterval(that.isVisibleTimerOut);
+                this.isVisibleTimer = null;
+            }
             document.getElementsByTagName("body")[0].style.overflow = "auto";
             next();
         },

src/views/indexAccepting/kolProfessorsManage.vue

@@ -6,7 +6,7 @@
             </el-row>
             <el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
                 <el-col :span="12">
-                    <span style="font-weight: bold;margin: 0 60px 0 40px;">区域：</span>
+                    <span style="font-weight: bold;margin: 0 22px 0 25px;">区域：</span>
                     <el-select v-model="search.orgList" multiple placeholder="请选择区域" style="width: 280px;">
                         <el-option
                                 v-for="item in areaList"

src/views/indexAccepting/projectManage.vue

@@ -6,7 +6,7 @@
             </el-row>
             <el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
                 <el-col :span="12">
-                    <span style="font-weight: bold;margin: 0 60px 0 40px;">区域：</span>
+                    <span style="font-weight: bold;margin: 0 22px 0 25px;">区域：</span>
                     <el-select v-model="search.selectOrgIdList" multiple placeholder="请选择区域" style="width: 280px;">
                         <el-option
                                 v-for="item in areaList"

src/views/kolExpert/addkolExpert.vue

@@ -96,6 +96,7 @@
                 activeName: 'first',
                 expertData:{
                     dataList:[],
+                    remarks:'',
                 },
                 //校验
                 rules: {
@@ -150,6 +151,7 @@
             },
             resetCik(){
                 this.expertData.empLogo = '';
+                this.expertData.remarks = '';
                 this.$refs.expertData.resetFields();
             },
             addexpert(){