update

2026-02-09 19:34:32 +08:00 · 2026-02-09 19:34:32 +08:00 · 06c85a31bc
commit 06c85a31bc
parent 7263d3cb28
6 changed files with 70 additions and 14 deletions
--- a/App.vue
+++ b/App.vue
@ -6,6 +6,9 @@ export default {
  computed: {
    ...mapGetters({ user: "getUser" }),
  },
+  globalData: {
+    isSkip: "",// 判断是否跳转过
+  },
  methods: {
    ...mapActions(["memberLogin", "getLoginCode"]),
    ...mapMutations(["setVisitChannels"]),
@ -29,6 +32,7 @@ export default {
    },
  },
  onLaunch: function (options) {
+    uni.setStorageSync('isSkip', '')
    uni.getSystemInfo({
      success: function (e) {
        // #ifndef MP
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -4378,8 +4378,18 @@ export default {
            }
            if (!this.isShowFestival) {
              this.isShowFestival = "other";
+              uni.setStorageSync("festival", this.isShowFestival);
+            } else {
+              let isSkip = uni.getStorageSync('isSkip')
+              if (!isSkip) {
+                this.$util.toNextRoute(
+                  "navigateTo",
+                  `/pages/nationalPage/springTravel?selectType=2`
+                );
+                uni.setStorageSync('isSkip', true)
+              }
+              uni.setStorageSync("festival", this.isShowFestival);
            }
-            uni.setStorageSync("festival", this.isShowFestival);

            await this.getData(this.option);
          }
@ -4448,10 +4458,22 @@ export default {
        this.currentFestivalObj = obj
      }
    }
+
    if (!this.isShowFestival) {
      this.isShowFestival = "other";
+      uni.setStorageSync("festival", this.isShowFestival);
+    } else {
+      let isSkip = uni.getStorageSync('isSkip')
+      if (!isSkip) {
+        this.$util.toNextRoute(
+          "navigateTo",
+          `/pages/nationalPage/springTravel?selectType=2`
+        );
+        uni.setStorageSync('isSkip', true)
+      }
+      uni.setStorageSync("festival", this.isShowFestival);
    }
-    uni.setStorageSync("festival", this.isShowFestival);
+

    // 顶部显示的时间
    this.single = timestampToTimeMonth(new Date(this.lastDay).getTime());
--- a/pages/nationalPage/merchantRevenue.vue
+++ b/pages/nationalPage/merchantRevenue.vue
@ -43,7 +43,7 @@
              <view class="content">
                <view class="uni-input">{{
                  springService.SERVERPART_NAME
-                  }}</view>
+                }}</view>
                <p class="area" v-if="springService.Serverpart_ID">
                  {{ springService.SPREGIONTYPE_NAME }}
                </p>
@ -59,8 +59,8 @@
          <image class="searchIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/searchIconService.svg" />
          <text class="searchText">请输入想看的服务区</text>
        </view>
-        <image v-if="selectFestival === 1 || selectFestival === 2" class="titleSvg" :style="{ bottom: '-20rpx' }"
-          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/serviceDetail.svg" />
+        <!-- <image v-if="selectFestival === 1 || selectFestival === 2" class="titleSvg" :style="{ bottom: '-20rpx' }"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/serviceDetail.svg" /> -->
      </div>

      <!--      <scroll-view :style="{top:menu.bottom + 24 + 'px' }" scroll-x="true" class="headerNavList" :scrollIntoView="currentServerPart" :scroll-with-animation="true">-->
@ -161,7 +161,7 @@
            <!--            <text class="sortText">{{ `24年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
            <text class="sortText">{{
              `${curYear.toString().slice(2, 4)}年`
-              }}</text>
+            }}</text>
            <view class="sortIconBox" style="margin-right: 60rpx">
              <image class="upIcon" :style="{
                transform:
@ -194,7 +194,7 @@
            <!--            <text class="sortText">{{ `23年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
            <text class="sortText">{{
              `${compareYear.toString().slice(2, 4)}年`
-              }}</text>
+            }}</text>
            <view class="sortIconBox">
              <image class="upIcon" :style="{
                transform:
@ -310,7 +310,7 @@
                <div class="itemRight" :style="{ width: 'calc(100% - 128rpx)' }">
                  <div class="firstItemText">{{
                    item.ServerpartShopName || "-"
-                    }}</div>
+                  }}</div>

                  <div style="display: flex;">
                    <div class="item" style="width: 110rpx">{{
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@ -34,9 +34,9 @@
        " :style="{ height: menu.height + menu.top + 'px', top: 0 + 'px' }">
        <image :style="{ bottom: (statusBarHeight - 24) / 4 + 'px' }" class="backArrow"
          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack" />
-        <image v-if="selectFestival === 1 || selectFestival === 2"
+        <!-- <image v-if="selectFestival === 1 || selectFestival === 2"
          :style="{ bottom: (statusBarHeight - 24) / 4 + 'px' }" class="titleSvg"
-          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/customerSales.svg" />
+          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/customerSales.svg" /> -->
      </div>
    </div>

@ -838,6 +838,7 @@ export default {
        let m = time.getMonth() + 1;
        let d = time.getDate();
        this.allDateDay = `${m < 10 ? "0" + m : m}月${d < 10 ? "0" + d : d}日`;
+
      } else {
        this.currentScroll = "item" + date;
        const time = new Date(date);
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@ -70,6 +70,10 @@
            }}</span>
            <image class="changeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg" />
          </div>
+          <view class="jumpBtn" @click.stop="goToRobot">
+            <image class="jumpBtnIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/AIAssistant.svg" />
+            数智助手
+          </view>
          <!-- <image
            :style="{
              width:
@ -187,7 +191,8 @@
                              ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayAllData.png'
                              : ''
                  " />
-                <text class="titleNotice">/共统计节日数据{{ currentHoliday }}天</text>
+                <!-- <text class="titleNotice">/共统计节日数据{{ currentHoliday }}天</text> -->
+                <text class="titleNotice">/共统计节日数据{{ currentDayNumber }}天</text>
                <!-- <text
                  class="titleNotice"
                  v-if="!isShowWarningTime && selectFestival === 0"
@ -1755,7 +1760,7 @@
                ? 'scrollItem selectItem'
                : 'scrollItem'
                " v-for="(item, index) in scrollList" :key="index" :id="'item' + item.value"
-                @click="handleChangeTime(item.value)">
+                @click="handleChangeTime(item.value, index)">
                {{ item.label }}
              </div>
            </scroll-view>
@ -3651,6 +3656,7 @@ export default {
      StatisticsDate: "", // 请求时间
      currentHoliday: 0, // 当前时间是这个节日的第几天
      canSelectFestivalList: [], // 可以选择的节日列表
+      currentDayNumber: 0,// 拿到当前累计到第几天
    };
  },
  async onLoad(query) {
@ -3750,6 +3756,7 @@ export default {
        }
        this.currentHoliday = dayNumber;
        this.currentScroll = "item" + this.lastDay;
+        this.currentDayNumber = dayNumber
        this.StatisticsDate = this.lastDay;
      } else if (new Date(currentObj.endTime).getTime() <= nowTime) {
        // 当前时间已经过了这个时间范围了
@ -3777,6 +3784,7 @@ export default {
        this.StatisticsDate = moment(currentObj.startTime)
          .add(dayNumber - 1, "days")
          .format("YYYY-MM-DD");
+        this.currentDayNumber = dayNumber
      }
    }
    console.log("dayList", dayList);
@ -4019,6 +4027,9 @@ export default {
    uni.removeStorageSync("springService");
  },
  methods: {
+    goToRobot() {
+      this.$util.toNextRoute("navigateTo", `/pages/robot/index`);
+    },
    // 改变节日
    async handleChangeFestival(e) {
      this.handleResest();
@ -4055,6 +4066,7 @@ export default {
            }
          }
          this.currentHoliday = dayNumber;
+          this.currentDayNumber = dayNumber
          this.currentScroll = "item" + this.lastDay;
          this.StatisticsDate = this.lastDay;
        } else if (new Date(currentObj.endTime).getTime() <= nowTime) {
@ -4074,6 +4086,7 @@ export default {
            }
          }
          this.currentHoliday = dayNumber;
+          this.currentDayNumber = dayNumber
          this.currentScroll = "item" + moment(currentObj.startTime)
            .add(dayNumber - 1, "days")
            .format("YYYY-MM-DD");
@ -5153,13 +5166,14 @@ export default {
      });
    },
    //   切换时间的方法
-    async handleChangeTime(value) {
+    async handleChangeTime(value, index) {
      this.currentScroll = "item" + value;
      this.StatisticsDate = value;
      this.selectDateText = value;
      this.pageData = null;
      this.areaDataList = [];
      this.handleReset();
+      this.currentDayNumber = index + 1
      uni.showLoading({
        title: "正在加载...",
      });
@ -5579,6 +5593,7 @@ export default {
    .festivalChangeBox {
      display: flex;
      align-items: center;
+      justify-content: space-between;
      width: 100%;
      box-sizing: border-box;
      padding: 32rpx;
@ -5605,6 +5620,20 @@ export default {
        }
      }

+      .jumpBtn {
+        padding: 8rpx 16rpx;
+        background-color: #fff;
+        border-radius: 32rpx;
+        display: flex;
+        align-items: center;
+
+        .jumpBtnIcon {
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 8rpx;
+        }
+      }
+
      // .festivalImg {
      //   width: 168rpx;
      //   height: 68rpx;
--- a/pages/operatingStatements/index.vue
+++ b/pages/operatingStatements/index.vue
@ -202,7 +202,7 @@

    <view class="modle-title" style="margin-bottom: 12rpx;">
      <image src="https://eshangtech.com/ShopICO/ahyd-BID/revenue/yestoday-region.png" mode="aspectFit"></image>
-      <text>运营报表</text>
+      <text>子公司报表</text>
    </view>