Merge remote-tracking branch 'origin/master'

doum

2026-04-29 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 small-program/components/custom-tabbar/custom-tabbar.vue

@@ -12,7 +12,6 @@

<script>
   import { mapState } from 'vuex'

   export default {
      name: 'CustomTabbar',
      data() {
@@ -107,6 +106,9 @@
               }
            } else {
               if (currentPath !== item.pagePath) {
                  if(item.pagePath ==='/pages/itinerary/itinerary'){
                     uni.setStorageSync("orderStatus",-1)
                  }
                  uni.switchTab({
                     url: item.pagePath
                  })