From edd8d1ac081339d78dbbef3b1180aedbeb587c31 Mon Sep 17 00:00:00 2001
From: kola-web <l15567540858@gmail.com>
Date: Wed, 20 May 2026 22:00:10 +0800
Subject: [PATCH] stash

---
 .DS_Store              | Bin 0 -> 10244 bytes
 dist.ps1               |  13 ++++-----
 src/.DS_Store          | Bin 0 -> 10244 bytes
 src/app.ts             |   1 +
 src/pages/1/index.scss |  19 ++++--------
 src/pages/1/index.ts   |  40 ++++++++++++++-----------
 src/pages/1/index.wxml |  19 +++++-------
 src/pages/2/index.scss |   7 ++++-
 src/pages/2/index.ts   |  20 ++++++++-----
 src/pages/2/index.wxml |   6 +++-
 src/pages/3/index.wxml |   2 +-
 src/pages/4/index.ts   |  17 ++++++++++-
 src/pages/4/index.wxml |  13 +++++----
 src/pages/5/index.scss |  26 +++++++++++++++++
 src/pages/5/index.ts   |  25 ++++++++++++++++
 src/pages/5/index.wxml |  13 ++++++++-
 src/pages/6/index.scss |  26 +++++++++++++++++
 src/pages/6/index.ts   |  26 +++++++++++++++++
 src/pages/6/index.wxml |  13 ++++++++-
 src/pages/7/index.scss |  77 ++-----------------------------------------------
 src/pages/7/index.ts   |  38 +++++++++---------------
 src/pages/7/index.wxml |  30 +++++++++----------
 typings/index.d.ts     |  10 ++++---
 23 files changed, 253 insertions(+), 188 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 src/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8a619894b7f744a96c13c3e24ef2923a88780412
GIT binary patch
literal 10244
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
G`TtKMGCbx0

literal 0
HcmV?d00001

diff --git a/dist.ps1 b/dist.ps1
index dc79b8f..1cff97d 100644
--- a/dist.ps1
+++ b/dist.ps1
@@ -1,10 +1,7 @@
-# Change to the src/images directory, or exit if the directory doesn't exist
-Set-Location -Path ./src/images/ -ErrorAction Stop
-
-# Add all files to svn, including ignored files and forced additions
+#!/bin/bash
+cd ./src/images/ || exit
 svn add . --no-ignore --force
+svn ci -m "版本更新"
+ssh 39.106.86.127 "cd /data/wwwroot/default/wutian_xueyoubing_b/demo && svn up && exit"
+exit
 
-# Commit the changes with a message
-svn ci -m "update"
-
-ssh hb127 "cd /data/wwwroot/default/wutian_xueyoubing_b/demo && svn up && exit"
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..98b24a3b8bd3f7a314bc1a1dd739932de139ceed
GIT binary patch
literal 10244
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
PJO5{2mvY?y>iqu)QjbO4

literal 0
HcmV?d00001

diff --git a/src/app.ts b/src/app.ts
index d5566f9..922c714 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -4,6 +4,7 @@ import page from "@/utils/page";
 App<IAppOption>({
   globalData: {
     imageUrl: "https://m.wtx.hbraas.com/demo/web/images/",
+    start: 0,
   },
   onLaunch() {
     Page = page as WechatMiniprogram.Page.Constructor;
diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss
index 75b44bd..7f81ee7 100644
--- a/src/pages/1/index.scss
+++ b/src/pages/1/index.scss
@@ -3,33 +3,24 @@
 }
 .page-click1 {
   position: absolute;
-  top: 500rpx;
+  top: 163rpx;
   left: 0;
   z-index: 1;
   width: 750rpx;
-  height: 200rpx;
+  height: 430rpx;
   background-color: transparent;
 }
-
 .page-click2 {
   position: absolute;
-  top: 1080rpx;
-  left: 0;
-  z-index: 1;
-  width: 750rpx;
-  height: 500rpx;
-  background-color: transparent;
-}
-.page-click3 {
-  position: fixed;
-  top: 708rpx;
+  top: 600rpx;
   left: 0;
   z-index: 1;
   width: 750rpx;
-  height: 360rpx;
+  height: 430rpx;
   background-color: transparent;
 }
 
+
 .tabbar {
   position: fixed;
   bottom: 0;
diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts
index ab8971a..7a36e70 100644
--- a/src/pages/1/index.ts
+++ b/src/pages/1/index.ts
@@ -1,19 +1,15 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
-  data: {
-    float1: true,
-    float2: false,
-    float3: false,
-  },
+  data: {},
   onLoad() {
     this.setData({
-      float1: wx.getStorageSync("1float1") !== "1",
+      start: app.globalData.start,
     });
   },
-  handlePage() {
-    wx.navigateTo({
-      url: "/pages/5/index",
+  onShow() {
+    this.setData({
+      start: app.globalData.start,
     });
   },
   handelTap1() {
@@ -23,12 +19,7 @@ Page({
   },
   handelTap2() {
     wx.navigateTo({
-      url: "/pages/8/index",
-    });
-  },
-  handelTap3() {
-    wx.navigateTo({
-      url: "/pages/4/index",
+      url: "/pages/3/index",
     });
   },
   handleFloat1() {
@@ -37,16 +28,31 @@ Page({
     });
     wx.setStorageSync("1float1", "1");
   },
+  handleTabbar1() {
+    wx.reLaunch({
+      url: "/pages/1/index",
+    });
+  },
   handleTabbar2() {
     wx.reLaunch({
       url: "/pages/4/index",
     });
   },
   handleTabbar3() {
-    wx.reLaunch({
+    wx.navigateTo({
       url: "/pages/7/index",
     });
   },
+  handleTabbar4() {
+    wx.reLaunch({
+      url: "/pages/5/index",
+    });
+  },
+  handleTabbar5() {
+    wx.reLaunch({
+      url: "/pages/6/index",
+    });
+  },
 });
 
 export {};
diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml
index afbf1c4..512647c 100644
--- a/src/pages/1/index.wxml
+++ b/src/pages/1/index.wxml
@@ -1,21 +1,16 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}1.png?t={{Timestamp}}" bind:tap="handlePage"></image>
-<view class="page-click1" catch:tap="handelTap1"></view>
-<view class="page-click2" catch:tap="handelTap2"></view>
-<view class="page-click3" catch:tap="handelTap3"></view>
+<image wx:if="{{start}}" class="page" mode="widthFix" src="/images/nmosd/09.png"></image>
+<image wx:else class="page" mode="widthFix" src="/images/nmosd/010.png"></image>
+<view class="{{start ? 'page-click2' : 'page-click1'}}" catch:tap="handelTap1"></view>
+<view class="{{start ? 'page-click1' : 'page-click2'}}" catch:tap="handelTap2"></view>
 
 <view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}tabbar1-1.png?t={{Timestamp}}"></image>
+  <image class="tabbar-img" mode="widthFix" src="/images/nmosd/tabbar1.png"></image>
   <view class="tabbar-wrap">
     <view class="tabbar-click"></view>
     <view class="tabbar-click" catch:tap="handleTabbar2"></view>
     <view class="tabbar-click" catch:tap="handleTabbar3"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar4"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar5"></view>
   </view>
 </view>
 
-<image
-  wx:if="{{float1}}"
-  class="float1"
-  mode="widthFix"
-  src="{{imageUrl}}9.png?t={{Timestamp}}"
-  catch:tap="handleFloat1"
-></image>
diff --git a/src/pages/2/index.scss b/src/pages/2/index.scss
index afaaaa9..6bf1742 100644
--- a/src/pages/2/index.scss
+++ b/src/pages/2/index.scss
@@ -1,3 +1,8 @@
-.page{
+.page {
   width: 100vw;
+  min-height: 200vh;
+  .page-img{
+    width: 100%;
+    height: 100%;
+  }
 }
diff --git a/src/pages/2/index.ts b/src/pages/2/index.ts
index 5d926b7..361b6f3 100644
--- a/src/pages/2/index.ts
+++ b/src/pages/2/index.ts
@@ -1,12 +1,18 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
-  data: {},
-  onLoad() {},
-  handleTap1() {
-    wx.navigateTo({
-      url: "/pages/3/index",
-    });
+  data: {
+    current: 0,
+    page1: true,
+    page2: false,
+    page3: false,
+    page4: false,
+  },
+  onLoad() {
+    app.globalData.start = 1;
+  },
+  handlePage1() {
+    wx.navigateBack();
   },
 });
 
diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml
index 9cddfbb..4344c5e 100644
--- a/src/pages/2/index.wxml
+++ b/src/pages/2/index.wxml
@@ -1,2 +1,6 @@
 <navigation-bar></navigation-bar>
-<image class="page" mode="widthFix" src="{{imageUrl}}8.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<swiper class="page" current="{{current}}">
+  <swiper-item>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="/images/nmosd/011.png"></image>
+  </swiper-item>
+</swiper>
diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml
index 97f0ac7..404c277 100644
--- a/src/pages/3/index.wxml
+++ b/src/pages/3/index.wxml
@@ -1,2 +1,2 @@
 <navigation-bar></navigation-bar>
-<image class="page" mode="widthFix" src="{{imageUrl}}13.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<image class="page" mode="widthFix" src="/images/nmosd/013.png" bind:tap="handleTap1"></image>
diff --git a/src/pages/4/index.ts b/src/pages/4/index.ts
index cf8c286..3932821 100644
--- a/src/pages/4/index.ts
+++ b/src/pages/4/index.ts
@@ -19,11 +19,26 @@ Page({
       url: "/pages/1/index",
     });
   },
-  handleTabbar3() {
+  handleTabbar2() {
     wx.reLaunch({
+      url: "/pages/4/index",
+    });
+  },
+  handleTabbar3() {
+    wx.navigateTo({
       url: "/pages/7/index",
     });
   },
+  handleTabbar4() {
+    wx.reLaunch({
+      url: "/pages/5/index",
+    });
+  },
+  handleTabbar5() {
+    wx.reLaunch({
+      url: "/pages/6/index",
+    });
+  },
 });
 
 export {};
diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml
index b83dfb7..ee74918 100644
--- a/src/pages/4/index.wxml
+++ b/src/pages/4/index.wxml
@@ -1,11 +1,12 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}2.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
-<view class="page-click" catchtap="handleTap2"></view>
+<image class="page" mode="widthFix" src="/images/nmosd/012.png"></image>
 
 <view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}tabbar1-2.png?t={{Timestamp}}"></image>
+  <image class="tabbar-img" mode="widthFix" src="/images/nmosd/tabbar2.png"></image>
   <view class="tabbar-wrap">
-    <view class="tabbar-click" bind:tap="handleTabbar1"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar2"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar3"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar1"></view>
+    <view class="tabbar-click"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar3"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar4"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar5"></view>
   </view>
 </view>
diff --git a/src/pages/5/index.scss b/src/pages/5/index.scss
index afaaaa9..61eadab 100644
--- a/src/pages/5/index.scss
+++ b/src/pages/5/index.scss
@@ -1,3 +1,29 @@
 .page{
   width: 100vw;
 }
+
+.tabbar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100vw;
+  padding-bottom: 20rpx;
+  background-color: #fff;
+  .tabbar-img {
+    width: 100%;
+  }
+  .tabbar-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .tabbar-click {
+      flex: 1;
+      height: 160rpx;
+    }
+  }
+}
diff --git a/src/pages/5/index.ts b/src/pages/5/index.ts
index 7cf179c..38291e4 100644
--- a/src/pages/5/index.ts
+++ b/src/pages/5/index.ts
@@ -6,6 +6,31 @@ Page({
   handleTap1() {
     wx.navigateBack();
   },
+  handleTabbar1() {
+    wx.reLaunch({
+      url: "/pages/1/index",
+    });
+  },
+  handleTabbar2() {
+    wx.reLaunch({
+      url: "/pages/4/index",
+    });
+  },
+  handleTabbar3() {
+    wx.navigateTo({
+      url: "/pages/7/index",
+    });
+  },
+  handleTabbar4() {
+    wx.reLaunch({
+      url: "/pages/5/index",
+    });
+  },
+  handleTabbar5() {
+    wx.reLaunch({
+      url: "/pages/6/index",
+    });
+  },
 });
 
 export {};
diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml
index ada852d..d6588c2 100644
--- a/src/pages/5/index.wxml
+++ b/src/pages/5/index.wxml
@@ -1,2 +1,13 @@
 <navigation-bar></navigation-bar>
-<image class="page" mode="widthFix" src="{{imageUrl}}4.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<image class="page" mode="widthFix" src="/images/nmosd/05.png" bind:tap="handleTap1"></image>
+
+<view class="tabbar">
+  <image class="tabbar-img" mode="widthFix" src="/images/nmosd/tabbar3.png"></image>
+  <view class="tabbar-wrap">
+    <view class="tabbar-click" catch:tap="handleTabbar1"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar2"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar3"></view>
+    <view class="tabbar-click"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar5"></view>
+  </view>
+</view>
diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss
index afaaaa9..61eadab 100644
--- a/src/pages/6/index.scss
+++ b/src/pages/6/index.scss
@@ -1,3 +1,29 @@
 .page{
   width: 100vw;
 }
+
+.tabbar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100vw;
+  padding-bottom: 20rpx;
+  background-color: #fff;
+  .tabbar-img {
+    width: 100%;
+  }
+  .tabbar-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .tabbar-click {
+      flex: 1;
+      height: 160rpx;
+    }
+  }
+}
diff --git a/src/pages/6/index.ts b/src/pages/6/index.ts
index 7cf179c..1f48398 100644
--- a/src/pages/6/index.ts
+++ b/src/pages/6/index.ts
@@ -6,6 +6,32 @@ Page({
   handleTap1() {
     wx.navigateBack();
   },
+
+  handleTabbar1() {
+    wx.reLaunch({
+      url: "/pages/1/index",
+    });
+  },
+  handleTabbar2() {
+    wx.reLaunch({
+      url: "/pages/4/index",
+    });
+  },
+  handleTabbar3() {
+    wx.navigateTo({
+      url: "/pages/7/index",
+    });
+  },
+  handleTabbar4() {
+    wx.reLaunch({
+      url: "/pages/5/index",
+    });
+  },
+  handleTabbar5() {
+    wx.reLaunch({
+      url: "/pages/6/index",
+    });
+  },
 });
 
 export {};
diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml
index db9da65..f783705 100644
--- a/src/pages/6/index.wxml
+++ b/src/pages/6/index.wxml
@@ -1,2 +1,13 @@
 <navigation-bar></navigation-bar>
-<image class="page" mode="widthFix" src="{{imageUrl}}15.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<image class="page" mode="widthFix" src="/images/nmosd/014.png" bind:tap="handleTap1"></image>
+
+<view class="tabbar">
+  <image class="tabbar-img" mode="widthFix" src="/images/nmosd/tabbar4.png"></image>
+  <view class="tabbar-wrap">
+    <view class="tabbar-click" catch:tap="handleTabbar1"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar2"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar3"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar4"></view>
+    <view class="tabbar-click"></view>
+  </view>
+</view>
diff --git a/src/pages/7/index.scss b/src/pages/7/index.scss
index 97be24b..6bf1742 100644
--- a/src/pages/7/index.scss
+++ b/src/pages/7/index.scss
@@ -1,81 +1,8 @@
 .page {
   width: 100vw;
-}
-.page-click1 {
-  position: fixed;
-  top: 380rpx;
-  left: 0;
-  z-index: 1;
-  width: 750rpx;
-  height: 200rpx;
-  background-color: transparent;
-}
-
-.page-click2 {
-  position: fixed;
-  top: 640rpx;
-  left: 0;
-  z-index: 1;
-  width: 750rpx;
-  height: 170rpx;
-  background-color: transparent;
-}
-.page-click3 {
-  position: fixed;
-  top: 830rpx;
-  left: 0;
-  z-index: 1;
-  width: 750rpx;
-  height: 170rpx;
-  background-color: transparent;
-}
-
-.tabbar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100vw;
-  padding-bottom: 20rpx;
-  background-color: #fff;
-  .tabbar-img {
-    width: 100%;
-  }
-  .tabbar-wrap {
-    position: absolute;
-    top: 0;
-    left: 0;
+  min-height: 200vh;
+  .page-img{
     width: 100%;
     height: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .tabbar-click {
-      flex: 1;
-      height: 160rpx;
-    }
   }
 }
-
-.float1 {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
-  width: 100vw;
-}
-
-.float2 {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
-  width: 100vw;
-}
-
-.float3 {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
-  width: 100vw;
-}
diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts
index befbf58..7cb73c1 100644
--- a/src/pages/7/index.ts
+++ b/src/pages/7/index.ts
@@ -2,40 +2,30 @@ const _app = getApp<IAppOption>();
 
 Page({
   data: {
-    float1: false,
-    float2: false,
-    float3: false,
+    current: 0,
+    page1: true,
+    page2: false,
+    page3: false,
+    page4: false,
   },
   onLoad() {},
-  handelTap1() {
+  handlePage1() {
     this.setData({
-      float1: true,
+      current: 1,
     });
   },
-  handelTap2() {
-    wx.reLaunch({
-      url:'/pages/9/index'
-    })
-  },
-  handelTap3() {
-    wx.reLaunch({
-      url:'/pages/18/index'
-    })
-  },
-  handleFloat1() {
+  handlePage2() {
     this.setData({
-      float1: false,
+      current: 2,
     });
   },
-  handleTabbar1() {
-    wx.reLaunch({
-      url: "/pages/1/index",
+  handlePage3() {
+    this.setData({
+      current: 3,
     });
   },
-  handleTabbar2() {
-    wx.reLaunch({
-      url: "/pages/4/index",
-    });
+  handlePage4() {
+    wx.navigateBack();
   },
 });
 
diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml
index eadd2ec..366c112 100644
--- a/src/pages/7/index.wxml
+++ b/src/pages/7/index.wxml
@@ -1,15 +1,15 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}3.png?t={{Timestamp}}"></image>
-<view class="page-click1" bind:tap="handelTap1"></view>
-<view class="page-click2" bind:tap="handelTap2"></view>
-<view class="page-click3" bind:tap="handelTap3"></view>
-
-<view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}tabbar1-3.png?t={{Timestamp}}"></image>
-  <view class="tabbar-wrap">
-    <view class="tabbar-click" bind:tap="handleTabbar1"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar2"></view>
-    <view class="tabbar-click"></view>
-  </view>
-</view>
-
-<image wx:if="{{float1}}" class="float1" mode="widthFix" src="{{imageUrl}}12.png?t={{Timestamp}}" bind:tap="handleFloat1"></image>
+<navigation-bar></navigation-bar>
+<swiper class="page" current="{{current}}">
+  <swiper-item>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="/images/nmosd/02.png"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="/images/nmosd/07.png"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="/images/nmosd/08.png"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="/images/nmosd/03.png"></image>
+  </swiper-item>
+</swiper>
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 3ee60c8..4683528 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -2,7 +2,9 @@
 
 interface IAppOption {
   globalData: {
-    userInfo?: WechatMiniprogram.UserInfo,
-  }
-  userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback,
-}
\ No newline at end of file
+    userInfo?: WechatMiniprogram.UserInfo;
+    imageUrl: string;
+    start: 0 | 1;
+  };
+  userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback;
+}