Merge remote-tracking branch 'origin/main'

xuxy

2024-06-27 6f72ffa93bb3141b22d1c22c3458c04a57e58156

 pages/login/farmer-login.vue

@@ -117,8 +117,8 @@
            // uni.switchTab({
            //    url: '/pages/index/index'
            // })
            uni.navigateTo({
               url: '/pages/login/farmer-reg'
            uni.redirectTo({
               url: '/sub_pages/farmer/farmer-reg/farmer-reg'
            })

         },