Merge branch 'develop-medou' of http://gogs.1hhd.com/1hjz-3N/1hjz-mini into develop-medou

* 'develop-medou' of http://gogs.1hhd.com/1hjz-3N/1hjz-mini:
  no message
  no message
  no message

pages/activity_list/activity_list.js

@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    loading: true,
     repos: [],
     pageNum: 1,
     pageSize: 10,
@@ -54,12 +55,14 @@ Page({
             //最后一页数据添加
             that.setData({
               repos: lists.concat(respList),
+              loading: false,
               hasMoreData: false
             });
           } else {
             that.setData({
               repos: lists.concat(respList),
               hasMoreData: true,
+              loading: false,
               pageNum: that.data.pageNum + 1
             });
           }
@@ -69,6 +72,9 @@ Page({
             icon: 'none',
             duration: 1000
           });
+          that.setData({
+            loading: false,
+          });
         }
       },
       fail: function (e) {
@@ -78,9 +84,13 @@ Page({
           icon: 'none',
           duration: 1000
         });
+        that.setData({
+          loading: false,
+        });
       },
       complete: function (res) {
         // complete
+        that.data.loading = false
         wx.hideNavigationBarLoading() //完成停止加载
         wx.stopPullDownRefresh() //停止下拉刷新
       },
@@ -117,17 +127,16 @@ Page({
 
   switchType: function (activityType) {
     switch (activityType) {
-      case 10: return '拼团'
-      case 20: return '砍价'
-      case 30: return '抽奖'
+      case 10: return '../../images/icon_pintuan.png'
+      case 20: return '../../images/icon_kanjia.png'
+      case 30: return '../../images/icon_duobao.png'
     }
   },
 
   switchImg: function (status) {
     switch (status) {
-      case 0: return '../../images/icon_task_finish.png'
       case 20: return '../../images/icon_task_finish.png'
-      case 90: return '../../images/icon_task_finish.png'
+      case 90: return '../../images/icon_task_fail.png'
     }
   }
 

pages/activity_list/activity_list.wxml

@@ -1,6 +1,6 @@
 <!--pages/activity_list/activity_list.wxml-->
 <view wx:if="{{repos.length > 0}}">
-  
+
   <view wx:for="{{repos}}" wx:key="">
 
     <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active" bindtap="itemClick" data-activityNo="{{item.activityNo}}" data-groupNo="{{item.groupNo}}">
@@ -9,7 +9,7 @@
 
         <view class="weui-media-box__info">
           <view class="weui-media-box-name">{{ item.activityName }}</view>
-          <view class="weui-media-box__type{{item.activityType}}">{{ item.activityTypeStr }}</view>
+          <image class="weui-media-box__type" src="{{ item.activityTypeStr }}" />
         </view>
 
         <view class="weui-media-box-info-meta">参与时间: {{ item.createdAt }}</view>
@@ -29,8 +29,9 @@
   </view>
 </view>
 
-<view wx:else>
+<view wx:if="{{repos.length <= 0 && !loading}}">
   <view class="empty-layout">
-    <text>亲，您还没有参加任何活动！</text>
+    <image class="icon-empty" src="../../images/空.png" />
+    <text class="text-empty">亲，您还没有参加任何活动！</text>
   </view>
 </view>

pages/activity_list/activity_list.wxss

@@ -87,7 +87,15 @@
   vertical-align: top;
 }
 
-.weui-media-box__type10 {
+
+
+.weui-media-box__type{
+  width: 90rpx;
+  height: 40rpx;
+  float: left;
+}
+
+/* .weui-media-box__type10 {
   color: #fff;
   background: #f36619;
   border-radius: 20rpx;
@@ -121,7 +129,7 @@
   line-height: 40rpx;
   width: 90rpx;
   float: left;
-}
+} */
 
 .view_hide {
   display: none;
@@ -130,9 +138,21 @@
 .empty-layout {
   width: 100%;
   height: 100%;
-  padding-top: 65%;
+  padding-top: 50%;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
 }
+
+.icon-empty {
+  width: 80px;
+  height: 80px;
+  vertical-align: top;
+  margin-bottom: 40px;
+}
+
+.text-empty {
+  font-size: 15px;
+  float: left;
+}