Merge remote-tracking branch 'origin/master'

src/views/findeventpage/newEventpage.vue

@@ -99,7 +99,7 @@
                 </div>
                 <div v-else class="content_btn">
                     <p v-if="sizeListResult > searchs.pageIndex" @click="load">查看更多活动</p>
-                    <span v-else>没有更多了</span>
+                    <span v-else>没有更多活动数据了</span>
                 </div>
             </div>
             <div class="left_tabs" v-if="activityPartnerList.length >= 1">

src/views/index/pages/index.vue

@@ -973,24 +973,34 @@
                 //友情链接
                 friendlyLink: [
                     {
-                        id: 0,
-                        imageUrl: require("../../../assets/img/index/investsh.png"),
-                        href: "http://www.investsh.org.cn"
-                    }, {
+                        id: 4,
+                        imageUrl: require("../../../assets/img/index/webcar.jpg"),
+                        href: "http://www.chinanev.net/"
+
+                    },{
+                        id: 5,
+                        imageUrl: require("../../../assets/img/index/webggld.jpg"),
+                        href: "https://www.gg-lb.com/"
+
+                    },{
                         id: 1,
                         imageUrl: require("../../../assets/img/index/webgushu.png"),
                         href: "https://www.kapbook.com?site_from=taiku"
-                    }, {
-                        id: 2,
-                        imageUrl: require("../../../assets/img/index/webhuaweiyun.png"),
-                        href: "https://www.huaweicloud.com/"
-
-                    }, {
+                    },{
                         id: 3,
                         imageUrl: require("../../../assets/img/index/webzhongfa.png"),
                         href: "http://www.zfa.cn/"
 
-                    }],
+                    },{
+                        id: 0,
+                        imageUrl: require("../../../assets/img/index/investsh.png"),
+                        href: "http://www.investsh.org.cn"
+                    },  {
+                        id: 2,
+                        imageUrl: require("../../../assets/img/index/webhuaweiyun.png"),
+                        href: "https://www.huaweicloud.com/"
+
+                    }, ],
                 userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
                 articleList: [],//资讯
                 datelist:[{value:'实时榜',type:1},{value:'近7日榜',type:2},{value:'近30日榜',type:3}],
@@ -1732,23 +1742,21 @@
         }
     }
     .friendshiplink{
-        justify-content: space-around;
+        flex-wrap: wrap;
+        /*justify-content: space-around;*/
         margin-top: 20px;
         >p{
-            margin-left: 13px;
+            margin:0 10px 15px 0;
             padding: 0 5px;
             border: 1px solid #F2F2F2;
             border-radius: 3px;
             line-height: 51px;
-            width: calc(100% / 4);
+            width: calc((100% / 4 ) - 10px);
             cursor: pointer;
             >img{
                 width: 100%;
             }
         }
-        >p:nth-child(1){
-            margin: 0;
-        }
     }
     .content_left_spacing{
         >div:nth-child(1){