新增水滴兑换

pages/water/index.js

@@ -11,6 +11,7 @@ Page({
     data: {
         logsArr     : [],      // 提货列表数据
         score       : '',      //总数量
+        isExchange  : '',      //是否兑换
         page        : {},      //分页信息
         lodingStats : false,  //加载状态
     },
@@ -42,6 +43,7 @@ Page({
             if(page == 1 || page == undefined) listArr = []
             newData = listArr.concat(res.data.logs.data)
             this.setData({
+                isExchange  : res.data.is_exchange,
                 score       : res.data.score,
                 logsArr     : newData,
                 page        : res.data.logs.page,

pages/water/index.wxml

@@ -2,15 +2,18 @@
     水滴的使用规则：可以进行商品兑换
     <image src="/static/icons/water_close.png"></image>
 </view>
-<view class="water">
+<view class="water {{isExchange ? 'active' : ''}}">
     <view class="water-top">
         水滴账户<image src="/static/icons/water_icon.png"></image>
     </view>
     <view class="water-number">
         {{score}}
     </view>
+    <view class="water-convert" wx:if="{{isExchange}}">
+        <navigator hover-class="none" url="/pages/recruit/exchange/exchange" class="water-convert-go">水滴兑换 ></navigator>
+    </view>
 </view>
-<view class="detailed">
+<view class="detailed {{isExchange ? 'active' : ''}}">
     <view class="title">
         水滴明细
     </view>

pages/water/index.wxss

@@ -31,6 +31,10 @@
     z-index: 9;
 }
 
+.water.active {
+    height: 230rpx;
+}
+
 .water-top image {
     width: 30rpx;
     height: 30rpx;
@@ -43,7 +47,22 @@
     margin-top: 10rpx;
     color: #5283ea;
     font-weight: 600;
+}
 
+.water-convert {
+    width: 100%;
+    text-align: center;
+    margin-top: 30rpx;
+}
+
+.water-convert-go {
+    background-color: #ffde49;
+    color: #3a2f00;
+    display: inline-block;
+    line-height: 68rpx;
+    padding: 0 35rpx;
+    border-radius: 80rpx;
+    font-size: 30rpx;
 }
 
 .detailed {
@@ -57,6 +76,10 @@
     overflow-y: scroll;
 }
 
+.detailed.active {
+    top: 400rpx;
+}
+
 .title {
     text-align: center;
     color: #5283ea;