12/16 解决合并冲突

src/components/banner.vue

@@ -71,20 +71,12 @@ export default {
     },
     getBanners() {
       getBannerList().then((res) => {
-<<<<<<< HEAD
         if(res.data.code == 0){
           console.log("活动列表ID：", res);
           let $res = res.data;
           let $activities = $res.data;
           let $new_act = $activities.pop();
           console.log("轮播图", $new_act);
-=======
-        // console.log("活动列表ID：", res);
-        let $res = res.data;
-        let $activities = $res.data;
-        let $new_act = $activities.pop();
-        // console.log("轮播图", $new_act);
->>>>>>> 40eff8c3bfb4c1bbb7dfe943fd86665d24cd02aa
 
           $this.banners[1].src = $new_act["img"]
             ? "https://img.shuimuai.com/" + $new_act["img"]