stash

src/components/navigation-bar/navigation-bar.wxml

@@ -15,7 +15,7 @@
               aria-role="button"
               aria-label="返回"
             >
-              <van-icon name="cross" style="font-size: 40rpx;" />
+              <van-icon name="arrow-left" style="font-size: 40rpx;" />
             </view>
           </view>
         </block>

src/components/tabbar/tabbar.ts

@@ -32,11 +32,13 @@ Component({
         url: "/pages/2/index",
       });
     },
-    handleTabbar4() {
+    handleTabbar3() {
-      wx.reLaunch({
+      wx.navigateTo({
         url: "/pages/4/index",
       });
     },
+    handleTabbar4() {
+    },
     handleTabbar5() {
       // wx.reLaunch({
       //   url: "/pages/6/index",

src/components/tabbar/tabbar.wxml

@@ -5,6 +5,8 @@
     <view class="tabbar-click" wx:else></view>
     <view class="tabbar-click" wx:if="{{current !== 2}}" catch:tap="handleTabbar2"></view>
     <view class="tabbar-click" wx:else></view>
+    <view class="tabbar-click" wx:if="{{current !== 3}}" catch:tap="handleTabbar3"></view>
+    <view class="tabbar-click" wx:else></view>
     <view class="tabbar-click" wx:if="{{current !== 4}}" catch:tap="handleTabbar4"></view>
     <view class="tabbar-click" wx:else></view>
     <view class="tabbar-click" wx:if="{{current !== 5}}" catch:tap="handleTabbar5"></view>

src/pages/1/index.scss

@@ -7,43 +7,44 @@
   left: 0;
   z-index: 1;
   width: 750rpx;
-  height: 260rpx;
+  height: 460rpx;
   background-color: transparent;
 }
 .page-click1 {
   position: absolute;
-  top: 523rpx;
+  top: 718rpx;
   left: 0;
   z-index: 1;
-  width: 750rpx;
+  width: 42vw;
-  height: 230rpx;
+  height: 240rpx;
   background-color: transparent;
 }
 .page-click2 {
   position: absolute;
-  top: 768rpx;
+  top: 718rpx;
-  left: 0;
+  left: 42vw;
   z-index: 1;
-  width: 33vw;
+  width: 42vw;
   height: 240rpx;
   background-color: transparent;
 }
 .page-click3 {
   position: absolute;
-  top: 768rpx;
+  top: 718rpx;
-  left: 33vw;
+  right: 0;
   z-index: 1;
-  width: 34vw;
+  width: 14vw;
   height: 240rpx;
   background-color: transparent;
 }
+
 .page-click4 {
   position: absolute;
-  top: 768rpx;
+  top: 1003rpx;
-  right: 0;
+  left: 0;
   z-index: 1;
-  width: 33vw;
+  width: 750rpx;
-  height: 240rpx;
+  height: 290rpx;
   background-color: transparent;
 }
 

src/pages/1/index.ts

@@ -16,28 +16,28 @@ Page({
     });
   },
   handelTap0() {
-    this.setData({
+    wx.navigateTo({
-      float1: true,
+      url: "/pages/4/index",
     });
   },
   handelTap1() {
     wx.navigateTo({
-      url: "/pages/3/index",
+      url: "/pages/2/index",
     });
   },
   handelTap2() {
     wx.navigateTo({
-      url: "/pages/7/index",
+      url: "/pages/3/index",
     });
   },
   handelTap3() {
     wx.navigateTo({
-      url: "/pages/2/index",
+      url: "/pages/7/index",
     });
   },
   handelTap4() {
-    wx.navigateTo({
+    this.setData({
-      url: "/pages/4/index",
+      float1: true,
     });
   },
   handleFloat1() {

src/pages/4/index.wxml

@@ -9,4 +9,3 @@
 <image wx:if="{{float1}}" class="float1" mode="widthFix" src="{{imageUrl}}psvt/10.png?t={{Timestamp}}" bind:tap="handleFloat1"></image>
 
 
-<tabbar current="{{3}}"></tabbar>

src/pages/start/index.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  }
 }

src/pages/start/index.scss

@@ -15,5 +15,14 @@
   .btn {
     width: 690rpx;
     height: 109rpx;
+    background-color: #319588;
+    color: #fff;
+    border-radius: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .arrow{
+      margin-top: 8rpx;
+    }
   }
 }

src/pages/start/index.wxml

@@ -1,4 +1,7 @@
 <image class="page" mode="widthFix" src="{{imageUrl}}psvt/8.png?t={{Timestamp}}" bind:tap="handlePage1"></image>
-<view class="footer"  bind:tap="handlePage1">
+<view class="footer" bind:tap="handlePage1">
-  <image class="btn" src="{{imageUrl}}psvt/9.png?t={{Timestamp}}"></image>
+  <view class="btn">
+    立即加入
+    <van-icon class="arrow" name="arrow" />
+  </view>
 </view>