wxy 4 years ago
parent
commit
33153851bd
3 changed files with 98 additions and 44 deletions
  1. 43 2
      pages/integral/integral.js
  2. 36 34
      pages/integral/integral.wxml
  3. 19 8
      pages/integral/integral.wxss

+ 43 - 2
pages/integral/integral.js

@@ -18,7 +18,7 @@ Page({
         id:2,
         status:'未结算',
         name:'张三哈',
-        money:'300.00',
+        money:'900.00',
         grade:'一级',
         time:'2020-10-2',
         num:'11111111111'
@@ -27,12 +27,53 @@ Page({
         id:3,
         status:'未结算',
         name:'张三哈',
-        money:'300.00',
+        money:'200.00',
         grade:'一级',
         time:'2020-10-2',
         num:'11111111111'
        },
     ],
+    cardList:[
+      {
+        id:1,
+        status:'已结算',
+        name:'宋某某',
+        money:'100.00',
+        grade:'一级',
+        time:'2020-10-2',
+        num:'11111111111',
+       },
+       {
+         id:2,
+         status:'已结算',
+         name:'刘某某',
+         money:'300.00',
+         grade:'一级',
+         time:'2020-10-2',
+         num:'11111111111'
+        },
+    ],
+    //卡单分红
+    bonusList:[
+      {
+        id:1,
+        status:'已结算',
+        name:'张三哈',
+        money:'300.00',
+        grade:'一级',
+        time:'2020-10-2',
+        num:'11111111111',
+       },
+       {
+         id:2,
+         status:'未结算',
+         name:'张三哈',
+         money:'900.00',
+         grade:'一级',
+         time:'2020-10-2',
+         num:'11111111111'
+        }
+    ]
   },
   //事件处理函数
   bindViewTap: function () {

+ 36 - 34
pages/integral/integral.wxml

@@ -5,19 +5,6 @@
   <view class="two">
     <van-tabs active="{{ active }}">
       <van-tab title="直推积分">
-        <!-- <view class="companyNews">
-          <view class="list" wx:key="unique" wx:for="{{companyList}}" wx:for-item="item">
-            <view bindtap="companyBtn" data-item="{{item}}">
-              <view class="title">
-                <text class="textOver">{{item.title}}</text>
-                <text>{{item.create_time}}</text>
-              </view>
-              <view class="brief">
-                简介:{{item.brief||'暂无'}}
-              </view>
-            </view>
-          </view>
-        </view> -->
         <view class="integral" wx:for="{{integralList}}" wx:key="id">
           <view class="list">
             <view class="status">
@@ -32,41 +19,56 @@
                 <text class="name">等级:{{item.grade}}</text>
               </view>
             </view>
+            <view class="right1">
+              <view class="money">{{item.money}}</view>
+              <view class="time">{{item.time}}</view>
+            </view>
           </view>
         </view>
       </van-tab>
       <van-tab title="开卡量">
-        <!-- <view class="workNews">
-          <view class="list" wx:key="unique" wx:for="{{workNewsList}}" wx:for-item="item">
-            <view bindtap="companyBtn" data-item="{{item}}">
-              <view class="title">
-                {{item.title}}
+        <view class="integral" wx:for="{{cardList}}" wx:key="id">
+          <view class="list">
+            <view class="status">
+              <text class="text">{{item.status}}</text>
+            </view>
+            <view class="left1">
+              <view class="top1">
+                <text class="name">{{item.name}}</text>
+                <text class="num">{{item.num}}</text>
               </view>
-              <view class="other">
-                <text>{{item.orgin}}</text>
-                <text>{{item.create_time}}</text>
+              <view class="foot1">
+                <text class="name">等级:{{item.grade}}</text>
               </view>
             </view>
+            <view class="right1">
+              <view class="money">{{item.money}}</view>
+              <view class="time">{{item.time}}</view>
+            </view>
           </view>
-        </view> -->
+        </view>
       </van-tab>
       <van-tab title="卡单分红">
-        <!-- <view class="jobsNews">
-          <view class="list" wx:key="unique" wx:for="{{jobsNewsList}}" wx:for-item="item">
-            <view bindtap="companyBtn" data-item="{{item}}">
-              <view class="image">
-                <image src="{{item.imgUrl}}" wx:if="{{item.imgUrl}}"></image>
-                <image src="../images/banner2.png" wx:else></image>
+        <view class="integral" wx:for="{{bonusList}}" wx:key="id">
+          <view class="list">
+            <view class="status">
+              <text class="text">{{item.status}}</text>
+            </view>
+            <view class="left1">
+              <view class="top1">
+                <text class="name">{{item.name}}</text>
+                <text class="num">{{item.num}}</text>
               </view>
-              <view class="other">
-                <view class="title">{{item.title}}</view>
-                <view class="type">
-                  <text>{{item.type}}</text>
-                </view>
+              <view class="foot1">
+                <text class="name">等级:{{item.grade}}</text>
               </view>
             </view>
+            <view class="right1">
+              <view class="money">{{item.money}}</view>
+              <view class="time">{{item.time}}</view>
+            </view>
           </view>
-        </view> -->
+        </view>
       </van-tab>
     </van-tabs>
   </view>

+ 19 - 8
pages/integral/integral.wxss

@@ -59,19 +59,30 @@
 }
 
 .main .two .integral .list .left1 .top1 .name {
-  font-size: 38rpx;
+  font-weight: bold;
 }
 
 .main .two .integral .list .left1 .top1 .num {
-  font-size: 20rpx;
-  border: 1px solid red;
-  margin-left: 10rpx;
-  padding: 10rpx;
+  margin-left: 20rpx;
+  border: 1px solid #ff0000;
+  color: #ff0000;
+  padding: 0 10rpx;
   border-radius: 10rpx;
-  color: red;
+  font-size: 30rpx;
 }
 
-.main .two .integral .list .foot1 {
+.main .two .integral .list .left1 .foot1 {
+  font-size: 30rpx;
+  color: #666;
+  margin: 20rpx 0 0 0;
   margin-left: 25rpx;
-  margin-top: 20rpx;
+}
+.main .two .integral .list .right1{
+  color: #ff0000;
+  text-align: right;
+}
+.main .two .integral .list .right1 .time{
+  margin: 20rpx 0 0 0;
+  color: #666;
+  font-size: 30rpx;
 }