Merge remote-tracking branch 'origin/master'

src/components/mobile/searchList.vue

@@ -56,7 +56,7 @@
 <!--        <selectScreenProject v-if="isVisible&&$route.query.tab==1" @active="groupdataProject"></selectScreenProject>-->
 <!--    </div>-->
     <div>
-        <div class="newcontentList" :style="isMargin?'padding-top:0;':''">
+        <div class="newcontentList" :style="isMargin?'padding-top:0;':'padding-top:1rem;'">
             <mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
                 <ul v-if="tableData">
                     <li v-for="(item,index) in tableData" :key="item.businessId" v-if="$route.query.tab==2||isMargin" @click="handleToDetail(item)">

src/views/innovatecompany/bannerconfig/bannerconfigs.vue

@@ -102,7 +102,7 @@
                     <el-input v-model="expertData.showTitle" maxlength="36" placeholder="请输入标题"></el-input>
                 </el-form-item>
                 <el-form-item label="展示图片：" ref="guestimg" prop="showPictureUrl">
-                    <p class="imgTitle">{{search.showType == 2?'建议尺寸2560*1060px；仅支持PNG，JPG，JPEG，最大不超过400K':'建议尺寸750*280px；仅支持PNG，JPG，JPEG，最大不超过200K'}}</p>
+                    <p class="imgTitle">{{search.showType == 2?'建议尺寸2880*1060px；仅支持PNG，JPG，JPEG，最大不超过400K':'建议尺寸750*280px；仅支持PNG，JPG，JPEG，最大不超过200K'}}</p>
                     <div class="uploadImg">
                         <up-img :actionUrl="'/base/upload/uploadOriginalImg'" @dataEvent="Backimg" :channelPic="expertData.showPictureUrl" :upmax="search.showType == 2?0.4:0.2"></up-img>
                     </div>

src/views/mobile/tabconnect.vue

@@ -15,8 +15,10 @@
             <project-list v-if="addprojecttype==1" ref="project"></project-list>
             <business-list v-if="addprojecttype==2" :isMargin="true" :isVisible="isVisible" :is-which="2" ref="business"></business-list>
             <div v-if="!publicFun.isgetUserRoleFunc(2)&&!publicFun.isgetUserRoleFunc(5)" style="position: absolute;right: 0px;bottom: 1.4rem;">
-                <p><img src="../../assets/img/pushproject.png" alt="" style="width: 1.26rem;" @click="$router.push({path:'/projectrelease',query:{}})"></p>
-                <p><img src="../../assets/img/pushbusiness.png" alt="" style="width: 1.26rem;" @click="$router.push({path:'/addPhoneRequire',query:{}})"></p>
+                <p v-if="publicFun.getCookie('language') == 'en'"><img src="../../assets/img/pushprojecten.png" alt="" style="width: 1.26rem;" @click="$router.push({path:'/projectrelease',query:{}})"></p>
+                <p v-if="publicFun.getCookie('language') == 'en'"><img src="../../assets/img/pushbusinessen.png" alt="" style="width: 1.26rem;" @click="$router.push({path:'/addPhoneRequire',query:{}})"></p>
+                <p v-if="publicFun.getCookie('language') != 'en'"><img src="../../assets/img/pushproject.png" alt="" style="width: 1.26rem;" @click="$router.push({path:'/projectrelease',query:{}})"></p>
+                <p v-if="publicFun.getCookie('language') != 'en'"><img src="../../assets/img/pushbusiness.png" alt="" style="width: 1.26rem;" @click="$router.push({path:'/addPhoneRequire',query:{}})"></p>
             </div>
         </div>
     </div>
@@ -39,7 +41,7 @@
         beforeRouteEnter(to, from, next) {
             next(vm=>{          //  这里的vm指的就是vue实例，可以用来当做this使用
                 vm.pathfrom = from.path;
-                if(vm.pathfrom == '/phoneBusinessDetail'||vm.pathfrom == '/projectrelease'){
+                if(vm.pathfrom == '/phoneBusinessDetail'){
                     vm.addprojecttype = 2;
                 }else{
                     if(vm.pathfrom !="/index"&&vm.pathfrom!="/mobileSuccess") vm.addprojecttype = 1;
@@ -86,7 +88,7 @@
         background: #FFFFFF;
         z-index: 1;
         >ul{
-            width: 50%;
+            width: 56%;
             margin: .1rem auto 0;
             display: flex;
             font-weight: bold;

src/views/publishactivity/applyactivity.vue

@@ -37,7 +37,7 @@
                     </el-table-column>
                     <el-table-column v-if="$route.query.type==2" :label="$t('listjson.action')" width="100" align='center'>
                         <template slot-scope="scope">
-                            <el-button type="text" @click="$router.push({path:'/applydetail',query:{enterId:scope.row.enterId,channelTitle:$route.query.channelTitle,type:$route.query.type,channelId:$route.query.channelId}})">
+                            <el-button type="text" @click="$router.push({path:'/applydetail',query:{enterId:scope.row.enterId,channelTitle:$route.query.channelTitle,type:$route.query.type,channelId:$route.query.channelId,isstate:isstate}})">
                                 {{$t('listjson.seeaction')}}
                             </el-button>
                         </template>
@@ -80,6 +80,7 @@
                 channelTitle:this.$route.query.channelTitle,
                 title:'',
                 isroute:'',
+                isstate:this.$route.query.isstate,
             }
         },
         beforeRouteEnter(to, from, next) {
@@ -87,10 +88,22 @@
                 vm.pathfrom = from.path;
                 if(vm.pathfrom == '/activityaudit'){
                     vm.title = '活动审核';
-                }else{
+                    vm.isroute = '/activityaudit';
+                    vm.isstate = false;
+                }else if(vm.pathfrom == '/proactivity'){
                     vm.title = '活动';
+                    vm.isroute = '/proactivity';
+                    vm.isstate = true;
+                }else if(vm.pathfrom == '/applydetail'&&from.query.isstate == false){
+                    vm.title = '活动审核';
+                    vm.isroute = '/activityaudit';
+                    vm.isstate = false;
+                }else if(vm.pathfrom == '/applydetail'&&from.query.isstate == true){
+                    vm.title = '活动';
+                    vm.isroute = '/proactivity';
+                    vm.isstate = true;
                 }
-                vm.isroute = vm.pathfrom;
+
             })
         },
         methods: {