Merge remote-tracking branch 'origin/master'

src/components/index/PageLeft.vue

@@ -195,7 +195,25 @@
                             "functionTypeName":null,
                             "selected":null,
                             "systemFunctionlist":null
-                        }];
+                        },{
+                            "functionId":23,
+                            "functionName":this.$t("topNav.Findevent"),
+                            "functionNameEn":"Find Events",
+                            "functionUrl":"/activitylist",
+                            "functionMethod":"GET",
+                            "functionLevel":null,
+                            "functionTitle":null,
+                            "functionIcon":"huodong",
+                            "functionPid":18,
+                            "functionType":null,
+                            "pidList":null,
+                            "isButton":1,
+                            "functionParentName":null,
+                            "buttonCode":null,
+                            "functionTypeName":null,
+                            "selected":null,
+                            "systemFunctionlist":null
+                        },];
                 }else{
                     api.getLeftNavAxios().then((res) => {
                         if (res.code == 0) {

src/views/mobile/logined.vue

@@ -21,7 +21,7 @@
         </div>
         <tabCmpt v-if="visible&&isMobile==1" :isMargin="isMargin"></tabCmpt>
 
-
+        <PageBottom v-if="isMobile!=1" @itemBtn="sendbtn" @aboutwebtn="aboutwebtn" style="z-index: 1;position: relative;"></PageBottom>
     </div>
 </template>