活动翻译

public/css/phone.scss

@@ -681,7 +681,7 @@ i, em {
       padding-top: .3rem;
     }
   }
-  .articleContent {
+  .articleContent,.industryReport {
     text-align: left;
     background: #fff;
     ul{
@@ -689,6 +689,17 @@ i, em {
     }
   }
 
+  .industryReport li{
+    background: #fff;
+    padding: .3rem 0;
+    font-size: .32rem;
+    color: #1A1A1E;
+    border-bottom: 1px solid #E8EAF3;
+    &:last-of-type{
+      border-bottom:unset;
+    }
+  }
+
   .articleContent li{
     background: #fff;
     padding: .3rem 0;

src/common/lang/en.js

@@ -142,6 +142,10 @@ module.exports = {
         auditingAuthBusiness:"Your information is being verified. After verification， you can view additional information.",
         auditRejectBusiness:"Your information has been rejected. Please resubmit your information",
         iKnowTitle:"Understand",
+        notHasContent:"No more",
+        uprefresh:"Release Update",
+        upPull:"Pull up and refresh",
+        downPull:"Pull down to refresh"
 
     },
 

src/common/lang/zh.js

@@ -141,6 +141,10 @@ module.exports = {
         auditingAuthBusiness:"您提交的信息正在审核中，审核通过后方可查看更多内容",
         auditRejectBusiness:"您的个人信息被驳回，请重新提交",
         iKnowTitle:"我知道了",
+        notHasContent:"没有更多内容",
+        uprefresh:"释放更新",
+        upPull:"上拉刷新",
+        downPull:"下拉刷新"
 
     },
 

src/main.js

@@ -175,7 +175,7 @@ router.beforeEach((to, from, next) => {
         if (i18n.locale== "zh-CN") router.replace({path:'/loginByPhone',query:to.query});
     }
     if(!publicFun.getCookie("userInfo")){
-        if(to.name == 'dashboard'||to.name=='indexView'|| to.name == 'login' || to.name == 'mobileLoginCmpt'|| to.name == 'emailLoginCmpt'|| to.name == 'mobileRegisterCmpt'|| to.name == 'emailRegisterCmpt'||to.name=='completeInfoCmpt'|| to.name == 'successCmpt'||to.name=='findPasswordCmpt'||to.name=='modifyPasswordCmpt'||to.name=='passSuccessCmpt'||to.name=='indexView'||to.name=="mobileIndex"||to.name=="mobileLogin"||to.name=="loginByPhone"||to.name=="loginByEmail"||to.name=="mobileRegister"||to.name=="duijieshareRequire"||to.name=="duijieshareProject"||to.name=="knowledgeList"||to.name=="knowledgeDetail"||to.name=='vip'||to.name=='vipList'||to.name=='loadEmail'||to.name=='openEmail'||to.name=="viewRequire"||to.name=="duijiephoneBusinessList"||to.name=="duijiephoneBusinessDetail"||to.name=="duijiephoneRequireDetail"||to.name=="bigBusinessList"||to.name=="bigBusinessDetail"||to.name=="requireDetail"||to.name=="mixSearch"||to.name=="activitylist"||to.name=="activitydetail"||to.name=="activitySearchResult"||to.name=="activityapplyForProject"||to.name=='wechatLogin'||to.name=='newPage'||to.name=='bindAccount'||to.name=='subjectsecondStage'||to.name=='subjectsecondStageDetail'||to.name=='subjectmasterComment'||to.name=='subjectmasterList'||to.name=='subjectmasterDetail'||to.name=='subjectfirstStage'||to.name=='subjectcommentMore'||to.name=='subjectList'||to.name=="subjectresultpage"||to.name=="mineIndex"||to.name=="subjectStage"||to.name=="articleList"||to.name=="articleFlagList"||to.name=="articleDetail"||to.name=="mobileSearch"||to.name=="tryNewPage"){
+        if(to.name == 'dashboard'||to.name=='indexView'|| to.name == 'login' || to.name == 'mobileLoginCmpt'|| to.name == 'emailLoginCmpt'|| to.name == 'mobileRegisterCmpt'|| to.name == 'emailRegisterCmpt'||to.name=='completeInfoCmpt'|| to.name == 'successCmpt'||to.name=='findPasswordCmpt'||to.name=='modifyPasswordCmpt'||to.name=='passSuccessCmpt'||to.name=='indexView'||to.name=="mobileIndex"||to.name=="mobileLogin"||to.name=="loginByPhone"||to.name=="loginByEmail"||to.name=="mobileRegister"||to.name=="duijieshareRequire"||to.name=="duijieshareProject"||to.name=="knowledgeList"||to.name=="knowledgeDetail"||to.name=='vip'||to.name=='vipList'||to.name=='loadEmail'||to.name=='openEmail'||to.name=="viewRequire"||to.name=="duijiephoneBusinessList"||to.name=="duijiephoneBusinessDetail"||to.name=="duijiephoneRequireDetail"||to.name=="bigBusinessList"||to.name=="bigBusinessDetail"||to.name=="requireDetail"||to.name=="mixSearch"||to.name=="activitylist"||to.name=="activitydetail"||to.name=="activitySearchResult"||to.name=="activityapplyForProject"||to.name=='wechatLogin'||to.name=='newPage'||to.name=='bindAccount'||to.name=='subjectsecondStage'||to.name=='subjectsecondStageDetail'||to.name=='subjectmasterComment'||to.name=='subjectmasterList'||to.name=='subjectmasterDetail'||to.name=='subjectfirstStage'||to.name=='subjectcommentMore'||to.name=='subjectList'||to.name=="subjectresultpage"||to.name=="mineIndex"||to.name=="subjectStage"||to.name=="articleList"||to.name=="articleFlagList"||to.name=="articleDetail"||to.name=="mobileSearch"||to.name=="tryNewPage"||to.name=="industryReport"){
         } else{
             if(to.path == '/contentall'||to.path == '/contentdetail'||to.path == '/tabconnect'||to.path == '/thirdStage'||to.path == '/questionfill'||to.path == '/questionfillpc'||to.path == '/casedetailschild'||to.path == '/lndustryfocuschild'||to.path == '/successfulcasechild'||to.path == '/projectdetails'||to.path == '/seeprojectlist'||to.path == '/projectlist'||to.path == '/viewproject'||to.path == '/templateMobile1'||to.path == '/knowledge'||to.path == '/knowledgedetails'||to.path == '/termserviceed'||to.path == '/privacypolicyed'||to.path == '/contactused'||to.path == '/aboutused'||to.path == '/casedetailsed'||to.path == '/lndustryfocused'||to.path == '/successfulcaseed'||to.path == '/usehelped'||to.path == '/useHelp'||to.path == '/reminder'||to.path == '/contactus' ||to.path == '/privacypolicy' ||to.path == '/termservice' ||to.path == '/casedetails' ||to.path == '/successfulcase' ||to.path == '/lndustryfocus' ||to.path == '/aboutus'||to.path=='/applicationnotice' ){
 

src/router.js

@@ -1166,7 +1166,7 @@ const router = new Router({
                             path:"/articleFlagList",
                             components:{
                                 default:resolve => require(['views/mobile/article/list.vue'], resolve).catch(routerUtils.catchImport),
-                                other:resolve=>require(['views/mobile/article/detail.vue'],resolve).catch(routerUtils.catchImport)
+                                other:resolve=>require(['views/conmanagementpage/contentall.vue'],resolve).catch(routerUtils.catchImport)
                             }
                         }
 
@@ -1193,7 +1193,23 @@ const router = new Router({
                     path:"/collection",
                     name:"articleColletcion",
                     component:articleColletcion
-                }
+                },
+                {
+                    path:'/industryReport',
+                    name:"industryReport",
+                    component:articleList,
+                    children:[
+                        {
+                            name:"industryReport",
+                            path:"/industryReport",
+                            components:{
+                                default:resolve => require(['views/mobile/industryReport/list.vue'], resolve).catch(routerUtils.catchImport),
+                                other:resolve=>require(['views/conmanagementpage/contentall.vue'],resolve).catch(routerUtils.catchImport)
+                            }
+                        }
+
+                    ]
+                },
             ]
         },
 

src/views/mobile/activityApply/list.vue

@@ -14,7 +14,7 @@
                 </p>
             </div>
             <div class="content_data" v-if="tableData.length!= 0">
-                <mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
+                <mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :top-status.sync="topStatus" :bottom-status.sync="bottomStatus" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
                     <ul>
                         <li v-for="(item,index) in tableData" :key="index">
                             <div class="leftInfo" @click="handleToDetail(item)">
@@ -40,6 +40,14 @@
                             </div>
                         </li>
                     </ul>
+                    <div slot="top" class="mint-loadmore-top">
+                        <span v-show="topStatus !== 'loading'" :class="{ 'rotate': topStatus === 'drop' }">{{$t("commonTips.downPull")}}</span>
+                        <span v-show="topStatus === 'loading'">Loading...</span>
+                    </div>
+                    <div slot="bottom" class="mint-loadmore-bottom">
+                        <span v-show="bottomStatus !== 'loading'" :class="{ 'rotate': bottomStatus === 'drop' }">{{$t("commonTips.upPull")}}</span>
+                        <span v-show="bottomStatus === 'loading'">Loading...</span>
+                    </div>
                 </mt-loadmore>
             </div>
         </div>
@@ -80,7 +88,9 @@
                 channelCity:null,
                 currentData:null,
                 applyVisible:false,
-                detailInfo:null
+                detailInfo:null,
+                topStatus:"drop",
+                bottomStatus:"drop"
             }
         },
         methods:{

src/views/mobile/article/articlelist.vue

 <template>
     <div class="overfolowWrapper">
         <router-view v-if="isMobile==1"></router-view>
-        <router-view name="other" v-else></router-view>
+        <router-view name="other" v-if="isMobile==0"></router-view>
     </div>
 </template>
 
@@ -10,7 +10,7 @@
         name: "articlelist",
         data() {
             return {
-                isMobile:this.publicFun.getCookie('ismobile')
+                isMobile:navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Linux') > -1||navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|MacWechat NetType)/i)?1:0
 
             }
         },

src/views/mobile/industryReport/api.js

+import api from '../../../api/api';
+import Qs from 'qs';
+export default {
+    //获取频道列表
+    getChannelListAxios(){
+        return api.fetchLoadingLogin("/business/content/selectContentChannelList");
+    },
+}
\ No newline at end of file