Merge remote-tracking branch 'origin/master'

rk

2026-04-28 908b9876dde97acbb09c53dc6debe3eecbb9d1b4

 small-program/pages/itinerary/itinerary.vue

@@ -14,7 +14,7 @@
                     :key="item.value"
                     class="filter-tab"
                     :class="{ active: activeTab === item.value }"
                     @tap="activeTab = item.value"
                     @click="changeTab(item) "
                  >
                     {{ item.label }}
                  </view>
@@ -206,7 +206,7 @@
                  <image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
               </view>
               <text class="pickup-code">{{ currentOrder.memberVerifyCode||'' }}</text>
               <text class="pickup-tip" @tap="copyCode">点击复制自提码</text>
               <text class="pickup-tip" @tap="copyCode">点击复制核销码</text>
            </view>
         </view>
      </u-popup>
@@ -254,11 +254,11 @@
            dataList: []
         }
      },
      watch: {
         activeTab() {
           this.getFirstPageData()
         }
      },
      // watch: {
      //    activeTab() {
      //      this.getFirstPageData()
      //    }
      // },
      onLoad(options) {
         console.log(options )
         this.activeTab = -1
@@ -306,7 +306,6 @@
               this.activeTab =  Number(orderStatus)
            }
         }
         if(this.ac)
         uni.clearStorageSync("orderStatus")
         this.getFirstPageData()
      },
@@ -314,6 +313,10 @@
         this.getDataList();
      },
      methods: {
         changeTab(item){
             this.activeTab = item.value
             this.getFirstPageData()
         },
         payOrderFee(info){
            var that = this;
            uni.showLoading({ title: '发起支付中...', mask: true })
@@ -475,7 +478,7 @@
               data: this.currentOrder.memberVerifyCode,
               success: () => {
                  uni.showToast({
                     title: '已复制自提码',
                     title: '已复制核销码',
                     icon: 'none'
                  })
               }
@@ -876,6 +879,7 @@
      color: #8C939F;
   }
   .price-line{
      padding: 0 30rpx;
      box-sizing: border-box;
      display: flex;
      align-items: flex-end;