Merge remote-tracking branch 'origin/main'

xuxy

2024-06-27 6f72ffa93bb3141b22d1c22c3458c04a57e58156

 pages/login/login.scss

@@ -1,6 +1,6 @@
.login-container{
   min-height: 99vh;
      background-image: url('../../static/images/farmer/login/bg.png');
      background-image: url('@/static/images/farmer/login/bg.png');
      .nav-title{
         font-weight: 400;
         font-size: 32rpx;