stash

dist.ps1

@@ -1,10 +1,7 @@
-# Change to the src/images directory, or exit if the directory doesn't exist
+#!/bin/bash
-Set-Location -Path ./src/images/ -ErrorAction Stop
+cd ./src/images/ || exit
-
-# Add all files to svn, including ignored files and forced additions
 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"

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;

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;
+  top: 600rpx;
-  left: 0;
-  z-index: 1;
-  width: 750rpx;
-  height: 500rpx;
-  background-color: transparent;
-}
-.page-click3 {
-  position: fixed;
-  top: 708rpx;
   left: 0;
   z-index: 1;
   width: 750rpx;
-  height: 360rpx;
+  height: 430rpx;
   background-color: transparent;
 }
 
+
 .tabbar {
   position: fixed;
   bottom: 0;

src/pages/1/index.ts

@@ -1,19 +1,15 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
-  data: {
+  data: {},
-    float1: true,
-    float2: false,
-    float3: false,
-  },
   onLoad() {
     this.setData({
-      float1: wx.getStorageSync("1float1") !== "1",
+      start: app.globalData.start,
     });
   },
-  handlePage() {
+  onShow() {
-    wx.navigateTo({
+    this.setData({
-      url: "/pages/5/index",
+      start: app.globalData.start,
     });
   },
   handelTap1() {
@@ -23,12 +19,7 @@ Page({
   },
   handelTap2() {
     wx.navigateTo({
-      url: "/pages/8/index",
+      url: "/pages/3/index",
-    });
-  },
-  handelTap3() {
-    wx.navigateTo({
-      url: "/pages/4/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 {};

src/pages/1/index.wxml

@@ -1,21 +1,16 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}1.png?t={{Timestamp}}" bind:tap="handlePage"></image>
+<image wx:if="{{start}}" class="page" mode="widthFix" src="/images/nmosd/09.png"></image>
-<view class="page-click1" catch:tap="handelTap1"></view>
+<image wx:else class="page" mode="widthFix" src="/images/nmosd/010.png"></image>
-<view class="page-click2" catch:tap="handelTap2"></view>
+<view class="{{start ? 'page-click2' : 'page-click1'}}" catch:tap="handelTap1"></view>
-<view class="page-click3" catch:tap="handelTap3"></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>

src/pages/2/index.scss

@@ -1,3 +1,8 @@
 .page {
   width: 100vw;
+  min-height: 200vh;
+  .page-img{
+    width: 100%;
+    height: 100%;
+  }
 }

src/pages/2/index.ts

@@ -1,12 +1,18 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
-  data: {},
+  data: {
-  onLoad() {},
+    current: 0,
-  handleTap1() {
+    page1: true,
-    wx.navigateTo({
+    page2: false,
-      url: "/pages/3/index",
+    page3: false,
-    });
+    page4: false,
+  },
+  onLoad() {
+    app.globalData.start = 1;
+  },
+  handlePage1() {
+    wx.navigateBack();
   },
 });
 

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>

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>

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 {};

src/pages/4/index.wxml

@@ -1,11 +1,12 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}2.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<image class="page" mode="widthFix" src="/images/nmosd/012.png"></image>
-<view class="page-click" catchtap="handleTap2"></view>
 
 <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" catch:tap="handleTabbar1"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar2"></view>
+    <view class="tabbar-click"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar3"></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>

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;
+    }
+  }
+}

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 {};

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>

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;
+    }
+  }
+}

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 {};

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>

src/pages/7/index.scss

@@ -1,81 +1,8 @@
 .page {
   width: 100vw;
-}
+  min-height: 200vh;
-.page-click1 {
+  .page-img{
-  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;
     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;
-}

src/pages/7/index.ts

@@ -2,40 +2,30 @@ const _app = getApp<IAppOption>();
 
 Page({
   data: {
-    float1: false,
+    current: 0,
-    float2: false,
+    page1: true,
-    float3: false,
+    page2: false,
+    page3: false,
+    page4: false,
   },
   onLoad() {},
-  handelTap1() {
+  handlePage1() {
     this.setData({
-      float1: true,
+      current: 1,
     });
   },
-  handelTap2() {
+  handlePage2() {
-    wx.reLaunch({
-      url:'/pages/9/index'
-    })
-  },
-  handelTap3() {
-    wx.reLaunch({
-      url:'/pages/18/index'
-    })
-  },
-  handleFloat1() {
     this.setData({
-      float1: false,
+      current: 2,
     });
   },
-  handleTabbar1() {
+  handlePage3() {
-    wx.reLaunch({
+    this.setData({
-      url: "/pages/1/index",
+      current: 3,
     });
   },
-  handleTabbar2() {
+  handlePage4() {
-    wx.reLaunch({
+    wx.navigateBack();
-      url: "/pages/4/index",
-    });
   },
 });
 

src/pages/7/index.wxml

@@ -1,15 +1,15 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}3.png?t={{Timestamp}}"></image>
+<navigation-bar></navigation-bar>
-<view class="page-click1" bind:tap="handelTap1"></view>
+<swiper class="page" current="{{current}}">
-<view class="page-click2" bind:tap="handelTap2"></view>
+  <swiper-item>
-<view class="page-click3" bind:tap="handelTap3"></view>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="/images/nmosd/02.png"></image>
-
+  </swiper-item>
-<view class="tabbar">
+  <swiper-item>
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}tabbar1-3.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="/images/nmosd/07.png"></image>
-  <view class="tabbar-wrap">
+  </swiper-item>
-    <view class="tabbar-click" bind:tap="handleTabbar1"></view>
+  <swiper-item>
-    <view class="tabbar-click" bind:tap="handleTabbar2"></view>
+    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="/images/nmosd/08.png"></image>
-    <view class="tabbar-click"></view>
+  </swiper-item>
-  </view>
+  <swiper-item>
-</view>
+    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="/images/nmosd/03.png"></image>
-
+  </swiper-item>
-<image wx:if="{{float1}}" class="float1" mode="widthFix" src="{{imageUrl}}12.png?t={{Timestamp}}" bind:tap="handleFloat1"></image>
+</swiper>

typings/index.d.ts

@@ -2,7 +2,9 @@
 
 interface IAppOption {
   globalData: {
-    userInfo?: WechatMiniprogram.UserInfo,
+    userInfo?: WechatMiniprogram.UserInfo;
-  }
+    imageUrl: string;
-  userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback,
+    start: 0 | 1;
+  };
+  userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback;
 }