Merge branch 'dev_fix_sub' into user_action

peng

昨天 58c78011ca0567a597d8c1e51696e317a3086604

Merge branch 'dev_fix_sub' into user_action

# Conflicts:
#	pages/order/myOrder.vue
#	pages/tabbar/user/my.vue

 pages/order/myOrder.vue

@@ -389,7 +389,7 @@
              param.sessionId = this.pageSessionNo
              userAction(param)
          }
      })	
      })
    if(this.$options.filters.tipsToLogin()){
      if (!this.tabCurrentIndex) {
        this.initData(0);
@@ -714,14 +714,14 @@
     * 查看物流
     */
    navigateToLogistics(order) {
      uni.navigateTo({
        url:
          "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
      });
      // uni.navigateTo({
      //   url:
      //     "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
      //       `/pages/order/deliverDetail?order_sn=${order.sn}`,
      // });
      uni.navigateTo({
        url:
          `/pages/order/deliverDetail?order_sn=${order.sn}`,
      });
    },
  },
};

 pages/order/orderDetail.vue

@@ -10,7 +10,7 @@
    </div>
    <!-- 物流信息 -->
    <view class="info-view logistics-view">
      <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 ">
      <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 && !(orderPackage && orderPackage.length)">
        <view class="logistics-List-title">
          {{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }}
        </view>

 pages/tabbar/user/my.vue

@@ -205,17 +205,6 @@
      } catch (e) {
        console.error('存储失败：', e);
      }
    }else{
      shareStoreId = uni.getStorageSync('shareStoreId');
      shareStoreId = uni.getStorageSync('shareTime');
      console.log('从缓存读取参数:', { shareStoreId, shareTime });
      // this.bindMemberAndStore(shareStoreId, shareTime)
      if (shareStoreId && shareTime) {
        console.log('检测到有效参数，调用后端接口');
        this.bindMemberAndStore(shareStoreId, shareTime);
      } else {
        console.log('无有效参数，执行正常逻辑');
      }
    }
    this.initCOS()
    },
@@ -246,6 +235,7 @@
            userAction(param)
        }
      })

    this.userInfo = this.$options.filters.isLogin() || {};
    if (this.$options.filters.isLogin("auth")) {
      this.getUserOrderNum();
@@ -254,6 +244,16 @@
      this.couponNum = 0;
      this.footNum = 0;
    }

    let shareStoreId = uni.getStorageSync('shareStoreId');
    let shareTime = uni.getStorageSync('shareTime');
    console.log('从缓存读取参数:', { shareStoreId, shareTime });
    if (shareStoreId && shareTime) {
      console.log('检测到有效参数，调用后端接口');
      this.bindMemberAndStore(shareStoreId, shareTime);
    } else {
      console.log('无有效参数，执行正常逻辑');
    }
  },
  onPullDownRefresh() {
    this.getUserOrderNum();
@@ -270,6 +270,23 @@

  mounted() { },
  methods: {
      // 解析URL参数
      parseUrlParams(url) {
          const params = {};
          // 处理可能存在的hash（如果有的话）
          const cleanUrl = url.split('#')[0];
          const queryStr = cleanUrl.split('?')[1] || '';

          queryStr.split('&').forEach(pair => {
              const [key, value] = pair.split('=');
              if (key) {
                  // 如果值存在，则解码，否则设为空字符串
                  params[key] = value ? decodeURIComponent(value) : '';
              }
          });

          return params;
      },
    async bindMemberAndStore(shareStoreId, shareTime){
      let form ={
        shareStoreId: shareStoreId,