提交

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/team/team",
     "pages/login/login",
     "pages/home/home",
     "pages/perssonal/perssonal",
@@ -11,6 +10,7 @@
     "pages/news/news",
     "pages/newsDetail/newsDetail",
     "pages/card/card",
+    "pages/team/team",
     "pages/integral/integral",
     "pages/exchange/exchange",
     "pages/exchange/exchangeList",

pages/card/card.js

@@ -48,10 +48,6 @@ Page({
   typeChange: function (e) {
     this.setData({ "form.type": this.data.typeList[e.detail.value].name })
   },
-  // 选择时间
-  dateChange: function (e) {
-    this.setData({ "form.create_time": e.detail.value })
-  },
   //事件处理函数
   formSubmit: function (e) {
     console.log(e.detail.value);

pages/card/card.wxml

@@ -57,12 +57,6 @@
         <text class="label">支付宝账号</text>
         <input type='text' name="zfb" value="{{form.zfb}}" placeholder='支付宝账号'></input>
       </view>
-      <view class="formData">
-        <text class="label">办卡时间</text>
-        <picker class="createTime" mode="date" name="create_time" value="{{form.create_time}}" bindchange="dateChange">
-          <view class="picker">{{form.create_time||'选择办卡时间'}}</view>
-        </picker>
-      </view>
       <view class="forminput">
         <text class="label">推荐人</text>
         <input type='text' name="tjr" value="{{form.tjr}}" placeholder='推荐人' disabled></input>

pages/team/team.js

@@ -1,90 +1,165 @@
 //index.js
 //获取应用实例
-const app = getApp()
 
-Page({
-  data: {
-    provinceList: [
-      { name: '吉林省' },
-      { name: '黑龙江省' },
-      { name: '辽宁省' },
-    ],
-    province: '',
-    form: {},
-    // 类型
-    typeList: [
-      { name: '余额' },
-      { name: '花呗' },
-      { name: '微信' },
-    ],
-    // 套餐列表
-    mealList: [
-      { name: '169套餐' },
-      { name: '129套餐' },
-    ],
-    // 时间列表
-    dateList: [
-      { name: '全部', },
-      { name: '本天', },
-      { name: '本周', },
-      { name: '本月', },
-      { name: '本年', },
-    ],
-    // 筛选
-    show: true
+const app = getApp();
+import moment from '../../utils/moment.min';
+moment.locale('en', {
+  longDateFormat: {
+    l: "YYYY-MM-DD",
+    L: "YYYY-MM-DD HH:mm:ss",
   },
-  //事件处理函数
-  // 选择省份
-  provinceChange: function (e) {
-    this.setData({ "province": this.data.provinceList[e.detail.value].name })
-  },
-  // 选择类型
-  typeChange: function (e) {
-    this.setData({ "form.type": this.data.typeList[e.detail.value].name })
-  },
-  // 选择套餐
-  mealChange: function (e) {
-    this.setData({ "form.meal": this.data.mealList[e.detail.value].name })
-  },
-  // 选择时间
-  dateChange: function (e) {
-    this.setData({ "form.create_time": this.data.dateList[e.detail.value].name })
-  },
-  // 自主选择时间段
-  changeStart: function (e) {
-    this.setData({ "form.start_time": e.detail.value })
-  },
-  changeEnd: function (e) {
-    this.setData({ "form.end_time": e.detail.value })
-  },
-  // 弹出层
-  showPopup: function () {
-    var that = this;
-    that.setData({ show: true })
-  },
-  // 关闭弹出层
-  onClose: function () {
-    var that = this;
-    that.setData({ show: false })
-  },
-  // 取消
-  cancelBtn: function () {
-    console.log('s');
-    var that = this;
-    that.setData({ show: false })
-  },
-  // 重置
-  resetBtn: function () {
-    var that = this;
-    that.setData({ show: false })
-  },
-  // 确定
-  formSubmit: function (e) {
-    console.log(e);
-    // var that = this;
-    // that.setData({ show: false })
-  },
-
-  onLoad: function () {
-  },
-})
+}),
+  Page({
+    data: {
+      provinceList: [
+        { name: '吉林省' },
+        { name: '黑龙江省' },
+        { name: '辽宁省' },
+      ],
+      province: '',
+      form: {},
+      // 类型
+      typeList: [
+        { name: '全部' },
+        { name: '余额' },
+        { name: '花呗' },
+        { name: '微信' },
+      ],
+      // 套餐列表
+      mealList: [
+        { name: '全部' },
+        { name: '169套餐' },
+        { name: '129套餐' },
+      ],
+      // 时间列表
+      dateList: [
+        { name: '全部', },
+        { name: '本天', },
+        { name: '本周', },
+        { name: '本月', },
+        { name: '本年', },
+      ],
+      // 筛选
+      show: false,
+      // 数据列表
+      list: []
+    },
+    //事件处理函数
+    // 选择省份
+    provinceChange: function (e) {
+      this.setData({ "province": this.data.provinceList[e.detail.value].name })
+    },
+    // 选择类型
+    typeChange: function (e) {
+      let value = parseInt(e.detail.value);
+      if (value) {
+        let value = this.data.typeList[e.detail.value].name;
+        this.setData({ "form.type": value });
+      } else {
+        this.setData({ "form.type": e.detail.value });
+      }
+      // 调用查询方法
+      this.search(this.data.form);
+    },
+    // 选择套餐
+    mealChange: function (e) {
+      let value = Number(e.detail.value);
+      if (value) {
+        let value = this.data.mealList[e.detail.value].name;
+        this.setData({ "form.meal": value });
+      } else {
+        this.setData({ "form.meal": e.detail.value });
+      }
+      // 调用查询方法
+      this.search(this.data.form);
+    },
+    // 选择时间
+    dateChange: function (e) {
+      let value = this.data.dateList[e.detail.value].name;
+      this.setData({ "form.create_time": value });
+      if (value == '本天') {
+        var start_time = moment().format('YYYY-MM-DD 00:00:00');
+        var end_time = moment().format('YYYY-MM-DD 23:59:59');
+      } else if (value == '本周') {
+        var start_time = moment().week(moment().week()).startOf('week').format('YYYY-MM-DD hh:mm:ss');
+        var end_time = moment().week(moment().week()).endOf('week').format('YYYY-MM-DD hh:mm:ss');
+      } else if (value == '本月') {
+        var start_time = moment().month(moment().month()).startOf('month').format('YYYY-MM-DD hh:mm:ss');
+        var end_time = moment().month(moment().month()).endOf('month').format('YYYY-MM-DD hh:mm:ss');
+      } else if (value == '本年') {
+        var start_time = moment().month(moment().month()).startOf('year').format('YYYY-MM-DD hh:mm:ss');
+        var end_time = moment().month(moment().month()).endOf('year').format('YYYY-MM-DD hh:mm:ss');
+      }
+      if (start_time && end_time) {
+        this.setData({ "form.start_time": start_time })
+        this.setData({ "form.end_time": end_time })
+      } else {
+        this.setData({ "form.start_time": '' })
+        this.setData({ "form.end_time": '' })
+      }
+      // 调用查询方法
+      this.search(this.data.form);
+    },
+    // 自主选择时间段
+    changeStart: function (e) {
+      var start_time = e.detail.value + ' ' + '00:00:00';
+      this.setData({ "form.start_time": start_time })
+    },
+    changeEnd: function (e) {
+      var end_time = e.detail.value + ' ' + '00:00:00';
+      this.setData({ "form.end_time": end_time })
+    },
+    // 弹出层
+    showPopup: function () {
+      var that = this;
+      that.setData({ show: true })
+    },
+    // 关闭弹出层
+    onClose: function () {
+      var that = this;
+      that.setData({ show: false })
+    },
+    // 取消
+    cancelBtn: function () {
+      console.log('s');
+      var that = this;
+      that.setData({ show: false })
+    },
+    // 重置
+    formReset(e) {
+      this.setData({ chosen: '' });
+      this.setData({ form: {} });
+    },
+    // 确定
+    formSubmit: function (e) {
+      let data = e.detail.value;
+      // 调用查询方法
+      this.search(data);
+      var that = this;
+      that.setData({ show: false })
+    },
+    // 查询
+    search: function (data) {
+      console.log(data);
+    },
+    onLoad: function () {
+      let data = [
+        {
+          name: '顾红伟',
+          phone: '17319450324',
+          create_time: '2020-12-12',
+          meal: '129套餐'
+        },
+        {
+          name: '你猜呢',
+          phone: '17319450324',
+          create_time: '2020-12-12',
+          meal: '169套餐'
+        },
+      ];
+      for (const val of data) {
+        val.danName = val.name.split("")[0]
+      }
+      this.setData({ list: data })
+    },
+  })

pages/team/team.wxml

@@ -17,8 +17,7 @@
       </view>
       <view class="topTwo">
         <view class="topTwoView">
-          <picker class="createTime" bindchange="typeChange" name="type" value="{{form.type}}" range="{{typeList}}"
-            range-key="{{'name'}}">
+          <picker class="createTime" bindchange="typeChange" name="type" range="{{typeList}}" range-key="{{'name'}}">
             <view class="picker textOver">{{form.type||'类型'}}
               <van-icon name="arrow-down" />
             </view>
@@ -48,7 +47,23 @@
       </view>
     </view>
     <view class="down">
-      底部
+      <view class="list" wx:key="unique" wx:for="{{list}}" wx:for-item="item">
+        <view data-item="{{item}}">
+          <view class="name">
+            <text>{{item.danName}}</text>
+          </view>
+          <view class="message">
+            <view class="messageTop">
+              <text>{{item.name}}</text>
+              <text>{{item.phone}}</text>
+            </view>
+            <view class="messageDown">
+              <text class="textOver">{{item.create_time}}</text>
+              <text class="textOver">{{item.meal}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
   </view>
 </view>
@@ -58,25 +73,25 @@
       <view class="one">
         <view class="title"> 类型 </view>
         <view class="radio">
-          <radio-group name="radio" bindchange="typeChange">
-            <label wx:key="unique" wx:for="{{typeList}}" wx:for-item="item">
-              <radio value="{{index}}" color="#ff0000" />{{item.name}}</label>
+          <radio-group name="type" bindchange="typeChange">
+            <label wx:for="{{typeList}}" wx:key="unique">
+              <radio value="{{item.name}}" color="#ff0000" />{{item.name}}</label>
           </radio-group>
         </view>
       </view>
       <view class="one">
         <view class="title">套餐</view>
         <view class="radio">
-          <radio-group name="radio" bindchange="mealChange">
-            <label wx:key="unique" wx:for="{{mealList}}" wx:for-item="item">
-              <radio value="{{index}}" color="#ff0000" />{{item.name}}</label>
+          <radio-group name="meal" bindchange="mealChange">
+            <label wx:for="{{mealList}}" wx:key="unique">
+              <radio value="{{item.name}}" color="#ff0000" />{{item.name}}</label>
           </radio-group>
         </view>
       </view>
       <view class="one">
         <view class="title">时间</view>
         <view class="radio">
-          <radio-group name="radio" bindchange="dateChange">
+          <radio-group name="create_time" value="{{form.create_time}}" bindchange="dateChange">
             <label wx:key="unique" wx:for="{{dateList}}" wx:for-item="item">
               <radio value="{{index}}" color="#ff0000" />{{item.name}}</label>
           </radio-group>
@@ -88,8 +103,8 @@
         </view>
         <view class="dateAuto">
           <view class="datePar">
-            <picker class="createTime" mode="date" name="start_time" value="{{form.start_time}}"
-              bindchange="changeStart">
+            <picker class="createTime" mode="date" name="start_time" bindchange="changeStart"
+              value="{{form.start_time}}">
               <view class="picker">{{form.start_time||'选择开始时间'}}</view>
             </picker>
           </view>
@@ -103,7 +118,7 @@
       </view>
       <view class="btn">
         <button bindtap="cancelBtn">取消</button>
-        <button bindtap="resetBtn">重置</button>
+        <button formType="reset">重置</button>
         <button form-type="submit">确定</button>
       </view>
     </view>

pages/team/team.wxss

@@ -71,6 +71,85 @@
   font-size: 25rpx;
 }
 
+.main .two .down {
+  float: left;
+  width: 95%;
+  padding: 0 20rpx;
+  margin: 10rpx 0;
+}
+
+.main .two .down .list {
+  float: left;
+  width: 98%;
+  background-color: #ffffff;
+  padding: 20rpx 10rpx;
+  margin: 0 0 15rpx 0;
+  border-radius: 10rpx;
+}
+
+.main .two .down .list .name {
+  float: left;
+  width: 18%;
+}
+
+.main .two .down .list .name text {
+  float: left;
+  background-color: red;
+  border-radius: 360rpx;
+  width: 100rpx;
+  height: 100rpx;
+  text-align: center;
+  line-height: 100rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #fff;
+}
+
+.main .two .down .list .message {
+  float: left;
+  width: 82%;
+}
+
+.main .two .down .list .message .messageTop {
+  float: left;
+  width: 100%;
+}
+
+.main .two .down .list .message .messageTop text:nth-child(1) {
+  font-weight: bold;
+  margin: 0 20rpx 0 0;
+}
+
+.main .two .down .list .message .messageTop text:nth-child(2) {
+  border: 1px solid #ff0000;
+  color: #ff0000;
+  padding: 0 10rpx;
+  border-radius: 10rpx;
+  font-size: 30rpx;
+}
+
+.main .two .down .list .message .messageDown {
+  float: left;
+  width: 100%;
+  float: left;
+  width: 100%;
+  font-size: 30rpx;
+  color: #666;
+  margin: 20rpx 0 0 0;
+}
+
+.main .two .down .list .message .messageDown text:nth-child(1) {
+  float: left;
+  width: 50%;
+}
+
+.main .two .down .list .message .messageDown text:nth-child(2) {
+  float: right;
+  width: 50%;
+  text-align: right;
+}
+
+
 .popup {
   float: left;
   width: 94%;