update the market page

add pull down to refresh and add loading item before show the data
Cha0s0000 · Apr 22, 2018 · 550fd69 · 550fd69
1 parent f2225a7
commit 550fd69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/pages/market/market.js b/pages/market/market.js
@@ -6,7 +6,8 @@ Page({
   /**
    * The initial data of the page
    */
-  data: {   
+  data: {
+    hidden: false,
 
   },
 
@@ -51,6 +52,8 @@ Page({
    * Page correlation event handler - listen to the user to pull.
    */
   onPullDownRefresh: function () {
+    this.setData({ hidden:false})
+    this.onLoad();
 
   },
 
@@ -264,7 +267,7 @@ Page({
                 sbdPrice.time.push(that.getTime(data[i].time * 1000));
               }
               console.log(sbdPrice);
-              that.setData({ sbdPrice: sbdPrice });
+              that.setData({ sbdPrice: sbdPrice,hidden:true});
             }
           },
         })

diff --git a/pages/market/market.wxml b/pages/market/market.wxml
@@ -1,12 +1,12 @@
 <!--pages/market/market.wxml-->
-<view class="chart-container">
+<view class="chart-container" hidden="{{!hidden}}">
   <view class="chart-title">
     STEEM/SBD price history
   </view>
   <canvas canvas-id="priceHistory" disable-scroll="true" class="canvas" bindtouchstart="touchHandler"></canvas>
   <button type="primary" bindtap="updateData">更新数据</button>
 </view>
-<view class="table-container">
+<view class="table-container" hidden="{{!hidden}}">
   <view class="instruction">STEEM SBD 单位为 /USD</view>
   <view class="table">
     <view class="tr">
@@ -22,4 +22,7 @@
       <view class="td"> {{sbdPrice.price[priceHistory.time.length-index-1]}} </view>
     </view>
   </view>
-</view>
+</view>
+<loading hidden="{{hidden}}">
+  Loading...
+</loading>