stash

src/app.ts

@@ -4,6 +4,7 @@ import page from "@/utils/page";
 App<IAppOption>({
   globalData: {
     imageUrl: "https://m.wtx.hbraas.com/demo/web/images/",
+    float1_1: null,
   },
   onLaunch() {
     Page = page as WechatMiniprogram.Page.Constructor;

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

@@ -1,8 +1,10 @@
 <view class="weui-navigation-bar {{extClass}}">
-  <view class="weui-navigation-bar__inner {{ios ? 'ios' : 'android'}}" style="color: {{color}}; background: {{background}}; {{displayStyle}}; {{innerPaddingRight}}; {{safeAreaTop}};">
-
+  <view
+    class="weui-navigation-bar__inner {{ios ? 'ios' : 'android'}}"
+    style="color: {{color}}; background: {{background}}; {{displayStyle}}; {{innerPaddingRight}}; {{safeAreaTop}};"
+  >
     <!-- 左侧按钮 -->
-    <view class='weui-navigation-bar__left' style="{{leftWidth}};">
+    <view class="weui-navigation-bar__left" style="{{leftWidth}};">
       <block wx:if="{{back || homeButton}}">
         <!-- 返回上一页 -->
         <block wx:if="{{back}}">
@@ -40,13 +42,9 @@
     </view>
 
     <!-- 标题 -->
-    <view class='weui-navigation-bar__center'>
+    <view class="weui-navigation-bar__center" bindtap="back">
       <view wx:if="{{loading}}" class="weui-navigation-bar__loading" aria-role="alert">
-        <view
-          class="weui-loading"
-          aria-role="img"
-          aria-label="加载中"
-        ></view>
+        <view class="weui-loading" aria-role="img" aria-label="加载中"></view>
       </view>
       <block wx:if="{{title}}">
         <text>{{title}}</text>
@@ -57,7 +55,7 @@
     </view>
 
     <!-- 右侧留空 -->
-    <view class='weui-navigation-bar__right'>
+    <view class="weui-navigation-bar__right">
       <slot name="right"></slot>
     </view>
   </view>

src/pages/1/index.scss

@@ -4,7 +4,7 @@
 }
 .page-click1 {
   position: absolute;
-  top: 676rpx;
+  top: 836rpx;
   left: 0;
   z-index: 1;
   width: 50vw;
@@ -14,7 +14,7 @@
 
 .page-click2 {
   position: absolute;
-  top: 676rpx;
+  top: 836rpx;
   right: 0;
   z-index: 1;
   width: 50vw;
@@ -23,11 +23,31 @@
 }
 .page-click3 {
   position: absolute;
-  top: 1270rpx;
+  top: 1190rpx;
   left: 0;
   z-index: 1;
+  width: 50vw;
+  height: 220rpx;
+  background-color: transparent;
+}
+
+.page-click4 {
+  position: absolute;
+  top: 388rpx;
+  right: 72rpx;
+  z-index: 2;
+  width: 64rpx;
+  height: 64rpx;
+  background-color: transparent;
+}
+
+.page-click5 {
+  position: absolute;
+  top: 356rpx;
+  right: 0;
+  z-index: 1;
   width: 100vw;
-  height: 180rpx;
+  height: 302rpx;
   background-color: transparent;
 }
 
@@ -53,8 +73,17 @@
     align-items: center;
     .tabbar-click {
       flex: 1;
-      height: 160rpx;
+      height: 220rpx;
     }
   }
 }
 
+.float1 {
+  position: fixed;
+  z-index: 3;
+  bottom: 248rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 256rpx;
+  height: 122rpx;
+}

src/pages/1/index.ts

@@ -1,45 +1,77 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
   data: {
-    float1: true,
-    float2: false,
-    float3: false,
+    float1: false,
   },
-  onLoad() {
+  onShow() {
     this.setData({
-      float1: wx.getStorageSync("1float1") !== "1",
+      float1: app.globalData.float1_1 === null ? true : false,
     });
   },
   handelTap1() {
     wx.navigateTo({
       url: "/pages/2/index",
     });
+    this.handleHideFloat1()
   },
   handelTap2() {
     wx.navigateTo({
       url: "/pages/3/index",
     });
+    this.handleHideFloat1()
   },
   handelTap3() {
     wx.navigateTo({
       url: "/pages/4/index",
     });
+    this.handleHideFloat1()
+  },
+  handelTap4() {
+    wx.navigateTo({
+      url: "/pages/9/index?current=3",
+    });
+    this.handleHideFloat1()
+  },
+  handelTap5() {
+    wx.navigateTo({
+      url: "/pages/9/index",
+    });
+    this.handleHideFloat1()
   },
   handleTabbar2() {
     wx.reLaunch({
       url: "/pages/5/index",
     });
+    this.handleHideFloat1()
+  },
+  handleTabbar3() {
+    wx.navigateTo({
+      url: "/pages/9/index",
+    });
+    this.handleHideFloat1()
   },
   handleTabbar4() {
     wx.navigateTo({
       url: "/pages/6/index",
     });
+    this.handleHideFloat1()
   },
   handleTabbar5() {
     wx.reLaunch({
       url: "/pages/7/index",
     });
+    this.handleHideFloat1()
+  },
+
+  handleFloat1() {
+    this.setData({
+      float1: false,
+    });
+    this.handleHideFloat1()
+  },
+  handleHideFloat1() {
+    app.globalData.float1_1 = "1";
   },
 });
 

src/pages/1/index.wxml

@@ -2,14 +2,24 @@
 <view class="page-click1" catch:tap="handelTap1"></view>
 <view class="page-click2" catch:tap="handelTap2"></view>
 <view class="page-click3" catch:tap="handelTap3"></view>
+<view class="page-click4" catch:tap="handelTap4"></view>
+<view class="page-click5" catch:tap="handelTap5"></view>
 
 <view class="tabbar">
   <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}qs/tabbar1.png?t={{Timestamp}}"></image>
   <view class="tabbar-wrap">
     <view class="tabbar-click"></view>
     <view class="tabbar-click" catch:tap="handleTabbar2"></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>
+
+<image
+  wx:if="{{float1}}"
+  class="float1"
+  mode="widthFix"
+  src="{{imageUrl}}qs/tabbar-tip.png?t={{Timestamp}}"
+  bind:tap="handleFloat1"
+></image>

src/pages/2/index.json

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

src/pages/2/index.ts

@@ -16,6 +16,19 @@ Page({
     });
   },
   handlePage3() {
+    this.setData({
+      current: 3,
+    });
+  },
+  handlePage4() {
+    this.setData({
+      current: 4,
+    });
+  },
+  handlePage5() {
+    wx.navigateBack();
+  },
+  handleBack() {
     wx.navigateBack();
   },
 });

src/pages/2/index.wxml

@@ -1,4 +1,6 @@
-<navigation-bar title="生活质量自评"></navigation-bar>
+<navigation-bar back="{{current<4}}">
+  <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" />
+</navigation-bar>
 <swiper class="page" current="{{current}}">
   <swiper-item class="swiper-item1">
     <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/2.png?t={{Timestamp}}"></image>
@@ -9,4 +11,10 @@
   <swiper-item>
     <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}qs/4.png?t={{Timestamp}}"></image>
   </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="{{imageUrl}}qs/15.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage5" class="page-img" mode="widthFix" src="{{imageUrl}}qs/17.png?t={{Timestamp}}"></image>
+  </swiper-item>
 </swiper>

src/pages/5/index.scss

@@ -41,7 +41,7 @@ page {
     align-items: center;
     .tabbar-click {
       flex: 1;
-      height: 160rpx;
+      height: 220rpx;
     }
   }
 }

src/pages/5/index.ts

@@ -25,6 +25,11 @@ Page({
       url: "/pages/1/index",
     });
   },
+  handleTabbar3() {
+    wx.navigateTo({
+      url: "/pages/9/index",
+    });
+  },
   handleTabbar4() {
     wx.navigateTo({
       url: "/pages/6/index",

src/pages/5/index.wxml

@@ -17,7 +17,7 @@
   <view class="tabbar-wrap">
     <view class="tabbar-click" catch:tap="handleTabbar1"></view>
     <view class="tabbar-click"></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>

src/pages/6/index.json

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

src/pages/6/index.ts

@@ -18,6 +18,9 @@ Page({
       url: "/pages/7/index",
     });
   },
+  handleBack() {
+    wx.navigateBack();
+  },
 });
 
 export {};

src/pages/6/index.wxml

@@ -1,2 +1,4 @@
-<navigation-bar></navigation-bar>
+<navigation-bar back="{{false}}">
+  <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" />
+</navigation-bar>
 <image class="page" mode="widthFix" src="{{imageUrl}}qs/12.png?t={{Timestamp}}"></image>

src/pages/7/index.scss

@@ -3,7 +3,7 @@
 }
 .page-click1 {
   position: fixed;
-  top: 388rpx;
+  top: 508rpx;
   left: 0;
   z-index: 1;
   width: 750rpx;
@@ -33,7 +33,7 @@
     align-items: center;
     .tabbar-click {
       flex: 1;
-      height: 160rpx;
+      height: 220rpx;
     }
   }
 }

src/pages/7/index.ts

@@ -22,6 +22,11 @@ Page({
       url: "/pages/4/index",
     });
   },
+  handleTabbar3() {
+    wx.navigateTo({
+      url: "/pages/9/index",
+    });
+  },
   handleTabbar4() {
     wx.navigateTo({
       url: "/pages/6/index",

src/pages/7/index.wxml

@@ -6,7 +6,7 @@
   <view class="tabbar-wrap">
     <view class="tabbar-click" catch:tap="handleTabbar1"></view>
     <view class="tabbar-click" catch:tap="handleTabbar2"></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"></view>
   </view>

src/pages/9/index.json

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

src/pages/9/index.scss

@@ -1,18 +1,14 @@
 .page {
-  width: 100%;
-}
-.float1 {
-  position: fixed;
-  z-index: 3;
-  bottom: 0;
-  left: 0;
-  width: 100%;
+  width: 100vw;
+  min-height: 3000rpx;
+  .page-img {
+    width: 100vw;
+  }
 }
 
-.float2 {
-  position: fixed;
-  z-index: 3;
-  bottom: 0;
-  left: 0;
-  width: 100%;
+.float1 {
+  display: block;
+  margin: 0 auto;
+  width: 670rpx;
+  height: 706rpx;
 }

src/pages/9/index.ts

@@ -2,25 +2,41 @@ const _app = getApp<IAppOption>();
 
 Page({
   data: {
-    float1: true,
-    float2: false,
+    current: 0,
+    float1: false,
+  },
+  onLoad(options) {
+    this.setData({
+      current: Number(options.current),
+    });
+  },
+  handlePage1() {
+    this.setData({
+      current: 1,
+    });
   },
-  onLoad() {},
-  handleTap1() {
+  hadnleFloat1() {
     this.setData({
-      float2: true,
+      float1: true,
     });
   },
-  handleFloat1() {
+  handlePage2() {
     this.setData({
       float1: false,
+      current: 2,
     });
   },
-  handleFloat2() {
-    wx.navigateTo({
-      url: "/pages/10/index",
+  handlePage3() {
+    this.setData({
+      current: 3,
     });
   },
+  handlePage4() {
+    wx.navigateBack();
+  },
+  handleBack() {
+    wx.navigateBack();
+  },
 });
 
 export {};

src/pages/9/index.wxml

@@ -1,4 +1,27 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}17.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<navigation-bar back="{{false}}">
+  <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" />
+</navigation-bar>
+<swiper class="page" current="{{current}}">
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/18.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="hadnleFloat1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/19.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}qs/21.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="{{imageUrl}}qs/22.png?t={{Timestamp}}"></image>
+  </swiper-item>
+</swiper>
 
-<image wx:if="{{float1}}" class="float1" mode="widthFix" src="{{imageUrl}}16.png?t={{Timestamp}}" bind:tap="handleFloat1"></image>
-<image wx:if="{{float2}}" class="float2" mode="widthFix" src="{{imageUrl}}10.png?t={{Timestamp}}" bind:tap="handleFloat2"></image>
+<van-popup
+  show="{{ float1 }}"
+  position="bottom"
+  bind:close="handlePage2"
+  custom-style="background:transparent"
+  safe-area-inset-bottom="{{false}}"
+>
+  <image bind:tap="handlePage2" class="float1" mode="widthFix" src="{{imageUrl}}qs/20.png?t={{Timestamp}}"></image>
+</van-popup>

typings/index.d.ts

@@ -2,7 +2,8 @@
 
 interface IAppOption {
   globalData: {
-    userInfo?: WechatMiniprogram.UserInfo,
-  }
-  userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback,
+    float1_1: null | string;
+    userInfo?: WechatMiniprogram.UserInfo;
+  };
+  userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback;
 }