'解决冲突'

zhangxiaoxu123

2022-07-28 50072669bacb4c0fc842817ea0129cef98932d0b

 pages/home/home.vue

@@ -691,9 +691,12 @@
            justify-content: center;
            align-content: center;
            margin-right: vww(10);
<<<<<<< Updated upstream
            &:nth-last-child(1) {
               margin-right: 0;
            }
=======
>>>>>>> Stashed changes
            view {
               display: inline-block;
            }