From ecebf497de36601dbead1812914866b4257f6d1c Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 21 Apr 2020 14:56:12 +0800
Subject: [PATCH] no message

---
 app.json               |  1 -
 pages/index/index.wxml | 14 +--------
 pages/login/index.js   | 71 +++++++++++-------------------------------
 pages/login/index.json |  6 +++-
 pages/login/index.wxml | 10 +++++-
 pages/login/index.wxss | 12 ++++++-
 pages/logs/logs.js     | 33 --------------------
 pages/logs/logs.json   |  6 ----
 pages/logs/logs.wxml   | 10 ------
 pages/logs/logs.wxss   | 10 ------
 10 files changed, 45 insertions(+), 128 deletions(-)
 delete mode 100644 pages/logs/logs.js
 delete mode 100644 pages/logs/logs.json
 delete mode 100644 pages/logs/logs.wxml
 delete mode 100644 pages/logs/logs.wxss

diff --git a/app.json b/app.json
index 465d87b..ba9be0a 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,5 @@
 {
   "pages":[
-    "pages/logs/logs",
     "pages/login/index",
     "pages/index/index"
   ],
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 087cb93..04df161 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,18 +1,6 @@
 <!--index.wxml-->
-<van-nav-bar left-text="返回" left-arrow title="标题" fixed />
+<van-nav-bar left-text="返回" left-arrow title="标题" fixed placeholder/>
 
-<view class="container">
-	<view class="userinfo">
-		<button wx:if="{{!hasUserInfo && canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-		<block wx:else>
-			<image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
-			<text class="userinfo-nickname">{{userInfo.nickName}}</text>
-		</block>
-	</view>
-	<view class="usermotto">
-		<text class="user-motto">{{motto}}</text>
-	</view>
-</view>
 <van-button type="primary">按钮</van-button>
 <van-button type="primary">按钮</van-button>
 <van-button type="primary">按钮</van-button>
diff --git a/pages/login/index.js b/pages/login/index.js
index 9181094..8c41ddb 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -1,66 +1,33 @@
-// pages/login/index.js
+// refresh.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
+    refresherState: false
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
+  onRefresh(e) {
+    console.log('onRefresh>>>>')
+    this.setData({
+      refresherState: true
+    })
+    setTimeout(() => {
+      this.setData({
+        refresherState: false
+      })
+    }, 3000)
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  onLoad() {
+    setTimeout(() => {
+      this.setData({
+        refresherState: true
+      })
+    }, 3000)
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+  onPulling(e) {
   }
 })
\ No newline at end of file
diff --git a/pages/login/index.json b/pages/login/index.json
index 8835af0..55859b2 100644
--- a/pages/login/index.json
+++ b/pages/login/index.json
@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-nav-bar": "/components/nav-bar/index",
+    "van-button": "/components/button/index",
+    "refresh-view": "/components/refresher/index"
+  }
 }
\ No newline at end of file
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 6166f01..248dccd 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -1,2 +1,10 @@
 <!--pages/login/index.wxml-->
-<text>pages/login/index.wxml</text>
+<van-nav-bar title="登录" fixed placeholder/>
+
+<view class="container white">
+  <refresh-view custom-class="yoo" bind:refresh="onRefresh" triggered="{{ refresherState }}" bind:pulling="onPulling">
+    <view class="test-block"></view>
+    <view class="test-block"></view>
+    
+  </refresh-view>
+</view>
diff --git a/pages/login/index.wxss b/pages/login/index.wxss
index 0681818..4bc8fba 100644
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -1 +1,11 @@
-/* pages/login/index.wxss */
\ No newline at end of file
+/* pages/login/index.wxss */
+.test-block {
+  width: 100vw;
+  height: 500px;
+  background: pink;
+}
+
+.yoo {
+  width: 100vw;
+  height: 400px;
+}
diff --git a/pages/logs/logs.js b/pages/logs/logs.js
deleted file mode 100644
index 8c41ddb..0000000
--- a/pages/logs/logs.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// refresh.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    refresherState: false
-  },
-
-  onRefresh(e) {
-    console.log('onRefresh>>>>')
-    this.setData({
-      refresherState: true
-    })
-    setTimeout(() => {
-      this.setData({
-        refresherState: false
-      })
-    }, 3000)
-  },
-
-  onLoad() {
-    setTimeout(() => {
-      this.setData({
-        refresherState: true
-      })
-    }, 3000)
-  },
-
-  onPulling(e) {
-  }
-})
\ No newline at end of file
diff --git a/pages/logs/logs.json b/pages/logs/logs.json
deleted file mode 100644
index 1f9960a..0000000
--- a/pages/logs/logs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "查看启动日志",
-  "usingComponents": {
-    "refresh-view": "/components/refresher/index"
-  }
-}
\ No newline at end of file
diff --git a/pages/logs/logs.wxml b/pages/logs/logs.wxml
deleted file mode 100644
index c070f6f..0000000
--- a/pages/logs/logs.wxml
+++ /dev/null
@@ -1,10 +0,0 @@
-<view style="height:150rpx;width:100%">
-</view>
-
-<view class="container white">
-  <refresh-view custom-class="yoo" bind:refresh="onRefresh" triggered="{{ refresherState }}" bind:pulling="onPulling">
-    <view class="test-block"></view>
-    <view class="test-block"></view>
-    
-  </refresh-view>
-</view>
\ No newline at end of file
diff --git a/pages/logs/logs.wxss b/pages/logs/logs.wxss
deleted file mode 100644
index d2b6cce..0000000
--- a/pages/logs/logs.wxss
+++ /dev/null
@@ -1,10 +0,0 @@
-.test-block {
-  width: 100vw;
-  height: 500px;
-  background: pink;
-}
-
-.yoo {
-  width: 100vw;
-  height: 400px;
-}