添加薪水页面

@@ -37,6 +37,8 @@
     "pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail",
 
     "pages/main/rewardpoint/home",
+    "pages/main/rewardpoint/cashout/cashout",
+    "pages/main/rewardpoint/exchange/exchange",
 
     "pages/login/login",
     "pages/main/advancepayment/adPayDetails/adPayDetails",

+// pages/main/rewardpoint/cashout/cashout.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "提现"
+}
\ No newline at end of file

+<view style="background:#f5f5f5;width:100%;height:1600rpx">
+
+	<view class='card_rectangle_bg_row' style='padding:30rpx;flex-direction:column'>
+		<view style="flex-direction:row;padding-top:14rpx">
+			<text style="font-size:28rpx;color:#333">到账银行卡：</text>
+			<view style="float:right">
+					<image src="/images/reward_point.png" style="width:64rpx;height:64rpx"></image>
+					<view style="font-size:30rpx;color:#333;line-height:64rpx">招商银行(9214)</view>
+					<image src="/images/arrow_right.png" style="width:64rpx;height:64rpx"></image>
+			</view>
+		</view>
+    <view style="width:100%;float:right;margin-right:60rpx;font-size:28rpx;color:#333">2小时内到账</view>
+		<view style="font-size:28rpx;color:#999;line-height:96rpx">提现金额</view>
+		<view></view>
+	</view>
+	<view class="view_bottom">
+		<button wx:if="{true}" class="btn_white_radius" style="margin:20rpx" bindtap='cashout'> 提现</button>
+		<button wx:else class="btn_blue_radius" style="margin:20rpx" bindtap='goexchange'> 提现</button>
+	</view>
+</view>
\ No newline at end of file

+/* pages/main/rewardpoint/cashout/cashout.wxss */
+.view_bottom {
+  background: #fff;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  display: flex;
+  flex-direction: row;
+}
+
+.btn_blue_radius {
+  background: #357aeb;
+  border-radius: 5px;
+  flex: 1;
+  color: #fff;
+}
+
+.btn_white_radius {
+  flex: 1;
+  height: 42px;
+  background: #FFFFFF;
+  border-radius: 5px;
+  border: 1px solid #EEEEEE;
+  color: #666666;
+}
\ No newline at end of file

+// pages/main/rewardpoint/exchange/exchange.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "积分兑换商城"
+}
\ No newline at end of file

+<view>
+ <web-view src="https://github.com/MardaWang0518"></web-view>
+</view>

+/* pages/main/rewardpoint/exchange/exchange.wxss */
\ No newline at end of file

@@ -39,12 +39,20 @@ Page({
    /**
    * 提现
    */
-  cashout:function(){},
+  cashout:function(){
+    wx.navigateTo({
+      url: 'cashout/cashout',
+    })
+  },
 
   /**
    * 兑换
    */
-  goexchange:function(){},
+  goexchange:function(){
+    wx.navigateTo({
+      url: 'exchange/exchange',
+    })
+  },
 
   /**
    * Lifecycle function--Called when page unload

-<view class= 'page'>
+<view style="background:#f5f5f5;width:100%;height:100%;margin-bottom:140rpx">
 
-<view style="position:relative">
+<view style="position:relative;height: 240rpx;">
   <image src="/images/reward_point_bg.png" style="width:100%;height:240rpx"></image>
-  <text style="font-size:80rpx;color:#fff;text-align:center;position:absolute;left:0;right:0;top:50rpx">39190.89</text>
-  <text style="font-size:26rpx;color:#fff;text-align:center;position:absolute;left:0;right:0;bottom:50rpx">我的积分</text>
+  <text style="font-size:72rpx;color:#fff;text-align:center;position:absolute;left:0;right:0;top:50rpx;">39190.89</text>
+  <text style="font-size:26rpx;color:#fff;text-align:center;position:absolute;left:0;right:0;top:180rpx">我的积分</text>
 </view>
 
-<view style="padding:26rpx;background:#fff;display:flex;flex-direction:row">
- <view style="background:#357aeb;width: 8rpx;height: 46rpx;margin-right:10rpx"></view>
+<view style="background:#fff;display:flex;flex-direction:row;padding:26rpx;">
+ <view style="background:#357aeb;width: 8rpx;height: 46rpx;margin-right:10rpx;"></view>
  <view class="text_gray_32">积分明细</view> 
 </view>
 
-<view wx:if="true" wx:for="{'',''}" style="background:#fff;width:100%;height:140rpx">
+<view wx:if="{true}" wx:for="{'',''}" style="background:#fff;width:100%;height:140rpx">
     <view style='background:#f5f5f5;height:2rpx;'></view>
     <view style="margin:26rpx 40rpx">
       <view style="float:left;display:flex;flex-direction:column;">
@@ -23,7 +23,6 @@
         <text style="font-size:24rpx;color:#999;margin-top:10rpx">余额 200.37</text>
       </view>
     </view>
-    
 </view>
 
 <view class="view_bottom" >

 /* pages/main/rewardpoint/home.wxss */
-.page {
-  background-color: #fcfcfc;
-}
+
 
 .text_gray_32 {
   font-size: 32rpx;