Browse Source

查看页面和三个公出

test01 3 years ago
parent
commit
6d815f314d

+ 43 - 40
project.config.json

@@ -1,43 +1,46 @@
 {
-  "miniprogramRoot": "dist/",
-  "projectname": "kede-tool-weapp",
-  "description": "科德工具小程序",
-  "appid": "wxff2f5720ed7d7f63",
-  "setting": {
-    "urlCheck": false,
-    "es6": false,
-    "enhance": true,
-    "postcss": false,
-    "preloadBackgroundData": false,
-    "minified": false,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "miniprogramRoot": "dist/",
+    "projectname": "kede-tool-weapp",
+    "description": "科德工具小程序",
+    "appid": "wxff2f5720ed7d7f63",
+    "setting": {
+        "urlCheck": false,
+        "es6": false,
+        "enhance": true,
+        "postcss": false,
+        "preloadBackgroundData": false,
+        "minified": false,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false
     },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
-  },
-  "compileType": "miniprogram",
-  "condition": {}
+    "compileType": "miniprogram",
+    "condition": {}
 }

+ 612 - 0
src/components/common/PickerReduce/timePicker.js

@@ -0,0 +1,612 @@
+import dayjs from "dayjs";
+import {getUserWordTimes,formatDate} from "../../../utils/tools";
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    isPartition:{
+      type: Boolean,
+    },
+    pickerShow: {
+      type: Boolean,
+      observer:function(val){   //弹出动画
+        if(val){
+          let animation = wx.createAnimation({
+            duration: 500,
+            timingFunction: "ease"
+          });
+          let animationOpacity = wx.createAnimation({
+            duration: 500,
+            timingFunction: "ease"
+          });
+          setTimeout(() => {
+            animation.bottom(0).step();
+            animationOpacity.opacity(0.7).step();
+            this.setData({
+              animationOpacity: animationOpacity.export(),
+              animationData: animation.export()
+            })
+          }, 0);
+        }else{
+          let animation = wx.createAnimation({
+            duration: 100,
+            timingFunction: "ease"
+          });
+          let animationOpacity = wx.createAnimation({
+            duration: 500,
+            timingFunction: "ease"
+          });
+          animation.bottom(-320).step();
+          animationOpacity.opacity(0).step();
+          this.setData({
+            animationOpacity: animationOpacity.export(),
+            animationData: animation.export()
+          });
+        }
+
+        // 在picker滚动未停止前点确定,会使startValue数组各项归零,发生错误,这里判断并重新初始化
+        // 微信新增了picker滚动的回调函数,已进行兼容
+        if(this.data.startValue&&this.data.endValue){
+          let s = 0, e = 0;
+          let conf = this.data.config;
+
+          this.data.startValue.map(val => {
+            if (val == 0) {
+              s++
+            }
+          })
+          this.data.endValue.map(val => {
+            if (val == 0) {
+              e++;
+            }
+          });
+          let tmp={
+            hour:4,
+            minute:5,
+            second:6
+          }
+          let n = tmp[conf.column];
+          if (s>=n || e>=n) {
+            this.initPick(this.data.config);
+            this.setData({
+              startValue: this.data.startValue,
+              endValue: this.data.endValue,
+            });
+          }
+        }
+      }
+    },
+    config: Object,
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    // pickerShow:true
+    // limitStartTime: new Date().getTime()-1000*60*60*24*30,
+    // limitEndTime: new Date().getTime(),
+    // yearStart:2000,
+    // yearEnd:2100
+  },
+  detached: function() {
+    console.log("dele");
+  },
+  attached: function() {},
+  ready: function() {
+    this.readConfig();
+    this.initPick(this.data.config || {});
+    this.setData({
+      startValue: this.data.startValue,
+      endValue: this.data.endValue,
+    });
+
+
+
+
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    //阻止滑动事件
+    onCatchTouchMove(e) {
+
+    },
+    //读取配置项
+    readConfig() {
+      let limitEndTime = new Date().getTime();
+      let limitStartTime = new Date().getTime() - 1000 * 60 * 60 * 24 * 30;
+      if (this.data.config) {
+        let conf = this.data.config;
+
+        if (typeof conf.dateLimit == "number") {
+          limitStartTime =
+            new Date().getTime() - 1000 * 60 * 60 * 24 * conf.dateLimit;
+        }
+        if(conf.limitStartTime){
+
+          limitStartTime = new Date(conf.limitStartTime.replace(/-/g,'/')).getTime();
+        }
+
+        if (conf.limitEndTime) {
+          limitEndTime = new Date(conf.limitEndTime.replace(/-/g, '/')).getTime();
+        }
+
+        this.setData({
+          yearStart: conf.yearStart || 2000,
+          yearEnd: conf.yearEnd || 2100,
+          endDate: conf.endDate || false,
+          dateLimit: conf.dateLimit || false,
+          hourColumn:
+            conf.column == "hour" ||
+            conf.column == "minute" ||
+            conf.column == "second",
+          minColumn: conf.column == "minute" || conf.column == "second",
+          secColumn: conf.column == "second"
+        });
+      }
+
+      let limitStartTimeArr = formatTime(limitStartTime);
+      let limitEndTimeArr = formatTime(limitEndTime);
+
+      this.setData({
+        limitStartTime,
+        limitStartTimeArr,
+        limitEndTime,
+        limitEndTimeArr
+      });
+    },
+    //滚动开始
+    handlePickStart:function(e){
+      this.setData({
+        isPicking:true
+      })
+    },
+    //滚动结束
+    handlePickEnd:function(e){
+      this.setData({
+        isPicking:false
+      })
+    },
+    partitionTimeHandle(time){
+      let year = dayjs(time).year();
+      let month = dayjs(time).month()+1;
+      let day = dayjs(time).date();
+      let hour = dayjs(time).hour();
+      let minute = dayjs(time).minute();
+
+      let current = formatDate(year, month, day, hour, minute);
+      const {start,restStart,restEnd,end} = getUserWordTimes();
+      let startArr = start.split(':');
+      let endArr = end.split(':');
+      let restEndArr = restEnd.split(':');
+
+      if(dayjs(dayjs(current).format('YYYY-MM-DD HH:mm')).isBefore(dayjs(dayjs(current).format('YYYY-MM-DD')+start))){
+        current = formatDate(year, month, day,parseInt(startArr[0]), parseInt(startArr[1]));
+      }else if(dayjs(dayjs(current).format('YYYY-MM-DD HH:mm')).isAfter(dayjs(dayjs(current).format('YYYY-MM-DD')+end))){
+        current = formatDate(year, month, day,parseInt(endArr[0]), parseInt(endArr[1]));
+      }else if(
+        dayjs(dayjs(current).format('YYYY-MM-DD HH:mm')).isAfter(dayjs(dayjs(current).format('YYYY-MM-DD')+restStart))
+        &&
+        dayjs(dayjs(current).format('YYYY-MM-DD HH:mm')).isBefore(dayjs(dayjs(current).format('YYYY-MM-DD')+restEnd))
+      ){
+        current = formatDate(year, month, day,parseInt(restEndArr[0]), parseInt(restEndArr[1]));
+      }
+      return current;
+    },
+    onConfirm: function() {
+      //滚动未结束时不能确认
+      if(this.data.isPicking){return}
+      let startTime = new Date(this.data.startPickTime.replace(/-/g, "/"));
+      let endTime = new Date(this.data.endPickTime.replace(/-/g, "/"));
+      let lv = true;
+      this.triggerEvent("conditionaljudgment", {
+        startTime,
+        endTime,
+        setLv:(v)=>{lv = v}
+      });//条件判断
+      wx.nextTick(() => {
+        if(!lv){return}
+        if (startTime <= endTime || !this.data.endDate) {
+          this.setData({
+            startTime,
+            endTime
+          });
+          let startArr = formatTime(startTime).arr;
+          let endArr = formatTime(endTime).arr;
+          let format0 = function(num){
+            return num<10?'0'+num:num
+          }
+
+          let startTimeBack =
+            startArr[0] +
+            "-" +
+            format0(startArr[1]) +
+            "-" +
+            format0(startArr[2]) +
+            " " +
+            (this.data.hourColumn ? format0(startArr[3]) : "00") +
+            ":" +
+            (this.data.minColumn ? format0(startArr[4]) : "00") +
+            ":" +
+            (this.data.secColumn ? format0(startArr[5]) : "00");
+
+          let endTimeBack =
+            endArr[0] +
+            "-" +
+            format0(endArr[1]) +
+            "-" +
+            format0(endArr[2]) +
+            " " +
+            (this.data.hourColumn ? format0(endArr[3]) : "00") +
+            ":" +
+            (this.data.minColumn ? format0(endArr[4]) : "00") +
+            ":" +
+            (this.data.secColumn ? format0(endArr[5]) : "00");
+
+          let time = {
+            startTime: startTimeBack,
+            endTime: endTimeBack
+          };
+          //触发自定义事件
+          //isPartition是否按地区判断工作开始结束时间
+          if(this.data.isPartition){
+            let startTimeInfor = this.partitionTimeHandle(time.startTime);
+            let endTimeInfor = this.partitionTimeHandle(time.endTime);
+            time.selectStartTime = time.startTime;
+            time.selectEndTime = time.endTime;
+            time.startTime = dayjs(startTimeInfor).format('YYYY-MM-DD HH:mm:ss');
+            time.endTime = dayjs(endTimeInfor).format('YYYY-MM-DD HH:mm:ss');
+            this.triggerEvent("setpickertime", time);
+          }else{
+            this.triggerEvent("setpickertime", time);
+          }
+          this.triggerEvent("hidepicker", {},{});
+        } else {
+          wx.showToast({
+            icon: "none",
+            title: "结束时间不能小于开始时间"
+          });
+        }
+      })
+    },
+    hideModal: function(e) {
+      this.triggerEvent("hidepicker",  e.detail,{});
+    },
+    changeStartDateTime: function(e) {
+      let val = e.detail.value;
+
+      this.compareTime(val, "start");
+    },
+
+    changeEndDateTime: function(e) {
+      let val = e.detail.value;
+      this.compareTime(val, "end");
+    },
+    //比较时间是否在范围内
+    compareTime(val_, type) {
+      const val = val_.map(it=>it.toString());
+      let h = val[3] ? this.data.HourList[val[3]] : "00";
+      let m = val[4] ? this.data.MinuteList[val[4]] : "00";
+      let s = val[5] ? this.data.SecondList[val[5]] : "00";
+      let time =
+        this.data.YearList[val[0]] +
+        "-" +
+        this.data.MonthList[val[1]] +
+        "-" +
+        this.data.DayList[val[2]] +
+        " " +
+        h +
+        ":" +
+        m +
+        ":" +
+        s;
+
+      let start = this.data.limitStartTime;
+      let end = this.data.limitEndTime;
+      let timeNum = new Date(time.replace(/-/g, '/')).getTime();
+      let year, month, day, hour, min, sec, limitDate;
+      let tempArr = []
+
+      if (!this.data.dateLimit){
+        limitDate = [
+          this.data.YearList[val[0]],
+          this.data.MonthList[val[1]],
+          this.data.DayList[val[2]],
+          this.data.HourList[val[3]],
+          this.data.MinuteList[val[4]],
+          this.data.SecondList[val[5]]]
+      } else if (type == "start" && timeNum > new Date(this.data.endPickTime.replace(/-/g, '/')) && this.data.config.endDate) {
+        limitDate = formatTime(this.data.endPickTime).arr;
+
+      } else if (type == "end" && timeNum < new Date(this.data.startPickTime.replace(/-/g, '/'))) {
+        limitDate = formatTime(this.data.startPickTime).arr;
+
+      } else if (timeNum < start) {
+        limitDate = this.data.limitStartTimeArr.arr;
+
+      } else if (timeNum > end) {
+        limitDate = this.data.limitEndTimeArr.arr;
+
+      } else {
+        limitDate = [
+          this.data.YearList[val[0]],
+        this.data.MonthList[val[1]],
+        this.data.DayList[val[2]],
+        this.data.HourList[val[3]],
+        this.data.MinuteList[val[4]],
+       this.data.SecondList[val[5]]
+        ]
+
+      }
+
+      year = limitDate[0];
+      month = limitDate[1];
+      day = limitDate[2];
+      hour = limitDate[3];
+      min = limitDate[4];
+      sec = limitDate[5];
+
+      if (type == "start") {
+        this.setStartDate(year, month, day, hour, min, sec);
+      } else if (type == "end") {
+        this.setEndDate(year, month, day, hour, min, sec);
+      }
+    },
+    getDays: function(year, month) {
+      let daysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+      if (month === 2) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0
+          ? 29
+          : 28;
+      } else {
+        return daysInMonth[month - 1];
+      }
+    },
+    initPick: function(initData) {
+      const date = initData.initStartTime ? new Date(initData.initStartTime.replace(/-/g, '/')): new Date();
+      const endDate = initData.initEndTime ? new Date(initData.initEndTime.replace(/-/g, '/')) : new Date();
+      // const startDate = new Date(date.getTime() - 1000 * 60 * 60 * 24);
+      const startDate = date;
+      const startYear = date.getFullYear();
+      const startMonth = date.getMonth() + 1;
+      const startDay = date.getDate();
+      const startHour = date.getHours();
+      const startMinute = date.getMinutes();
+      const startSecond = date.getSeconds();
+
+      const endYear = endDate.getFullYear();
+      const endMonth = endDate.getMonth() + 1;
+      const endDay = endDate.getDate();
+      const endHour = endDate.getHours();
+      const endMinute = endDate.getMinutes();
+      const endSecond = endDate.getSeconds();
+
+      let YearList = [];
+      let MonthList = [];
+      let DayList = [];
+      let HourList = [];
+      let MinuteList = [];
+      let SecondList = [];
+
+      //设置年份列表
+      for (let i = this.data.yearStart; i <= this.data.yearEnd; i++) {
+        YearList.push(i);
+      }
+
+      // 设置月份列表
+      for (let i = 1; i <= 12; i++) {
+        MonthList.push(i);
+      }
+      // 设置日期列表
+      for (let i = 1; i <= 31; i++) {
+        DayList.push(i);
+      }
+      // 设置时列表
+      for (let i = 0; i <= 23; i++) {
+        if (0 <= i && i < 10) {
+          i = "0" + i;
+        }
+        HourList.push(i);
+      }
+      // 分|秒
+      for (let i = 0; i <= 59; i++) {
+        if (0 <= i && i < 10) {
+          i = "0" + i;
+        }
+        MinuteList.push(i);
+        SecondList.push(i);
+      }
+
+      this.setData({
+        YearList,
+        MonthList,
+        DayList,
+        HourList,
+        MinuteList,
+        SecondList
+      });
+
+      this.setStartDate(startYear, startMonth, startDay, startHour, startMinute, startSecond);
+      this.setEndDate(endYear, endMonth, endDay, endHour, endMinute, endSecond);
+
+      //!!!
+      // setTimeout(() => {
+      //   this.setStartDate(nowYear, nowMonth, nowDay, nowHour, nowMinute)
+      //   this.setEndDate(nowYear, nowMonth, nowDay, nowHour, nowMinute)
+      // }, 0);
+    },
+    setPickerDateArr(type, year, month, day, hour, minute, second) {
+      let yearIdx = 0;
+      let monthIdx = 0;
+      let dayIdx = 0;
+      let hourIdx = 0;
+      let minuteIdx = 0;
+      let secondIdx = 0;
+
+      this.data.YearList.map((v, idx) => {
+        if (parseInt(v) === year) {
+          yearIdx = idx;
+        }
+      });
+
+      this.data.MonthList.map((v, idx) => {
+        if (parseInt(v) === month) {
+          monthIdx = idx;
+        }
+      });
+
+      // 重新设置日期列表
+      let DayList = [];
+      for (let i = 1; i <= this.getDays(year, month); i++) {
+        DayList.push(i);
+      }
+
+      DayList.map((v, idx) => {
+        if (parseInt(v) === day) {
+          dayIdx = idx;
+        }
+      });
+      if (type == "start") {
+        this.setData({ startDayList: DayList });
+      } else if (type == "end") {
+        this.setData({ endDayList: DayList });
+      }
+
+      this.data.HourList.map((v, idx) => {
+        if (parseInt(v) === parseInt(hour)) {
+          hourIdx = idx;
+        }
+      });
+
+      this.data.MinuteList.map((v, idx) => {
+        if (parseInt(v) === parseInt(minute)) {
+          minuteIdx = idx;
+        }
+      });
+      this.data.SecondList.map((v, idx) => {
+        if (parseInt(v) === parseInt(second)) {
+          secondIdx = idx;
+        }
+      });
+
+      return {
+        yearIdx,
+        monthIdx,
+        dayIdx,
+        hourIdx,
+        minuteIdx,
+        secondIdx
+      };
+    },
+    setStartDate: function(year, month, day, hour, minute, second) {
+      let pickerDateArr = this.setPickerDateArr(
+        "start",
+        year,
+        month,
+        day,
+        hour,
+        minute,
+        second
+      );
+      this.setData({
+        startYearList: this.data.YearList,
+        startMonthList: this.data.MonthList,
+        // startDayList: this.data.DayList,
+        startHourList: this.data.HourList,
+        startMinuteList: this.data.MinuteList,
+        startSecondList: this.data.SecondList,
+        startValue: [
+          pickerDateArr.yearIdx,
+          pickerDateArr.monthIdx,
+          pickerDateArr.dayIdx,
+          pickerDateArr.hourIdx,
+          pickerDateArr.minuteIdx,
+          pickerDateArr.secondIdx
+        ],
+        startPickTime:
+          this.data.YearList[pickerDateArr.yearIdx] +
+          "-" +
+          this.data.MonthList[pickerDateArr.monthIdx] +
+          "-" +
+          this.data.DayList[pickerDateArr.dayIdx] +
+          " " +
+          this.data.HourList[pickerDateArr.hourIdx] +
+          ":" +
+          this.data.MinuteList[pickerDateArr.minuteIdx] +
+          ":" +
+          this.data.SecondList[pickerDateArr.secondIdx]
+      });
+    },
+    setEndDate: function(year, month, day, hour, minute, second) {
+      let pickerDateArr = this.setPickerDateArr(
+        "end",
+        year,
+        month,
+        day,
+        hour,
+        minute,
+        second
+      );
+
+      this.setData({
+        endYearList: this.data.YearList,
+        endMonthList: this.data.MonthList,
+        // endDayList: this.data.DayList,
+        endHourList: this.data.HourList,
+        endMinuteList: this.data.MinuteList,
+        endSecondList: this.data.SecondList,
+        endValue: [
+          pickerDateArr.yearIdx,
+          pickerDateArr.monthIdx,
+          pickerDateArr.dayIdx,
+          pickerDateArr.hourIdx,
+          pickerDateArr.minuteIdx,
+          pickerDateArr.secondIdx
+        ],
+        endPickTime:
+          this.data.YearList[pickerDateArr.yearIdx] +
+          "-" +
+          this.data.MonthList[pickerDateArr.monthIdx] +
+          "-" +
+          this.data.DayList[pickerDateArr.dayIdx] +
+          " " +
+          this.data.HourList[pickerDateArr.hourIdx] +
+          ":" +
+          this.data.MinuteList[pickerDateArr.minuteIdx] +
+          ":" +
+          this.data.SecondList[pickerDateArr.secondIdx]
+      });
+    },
+  }
+});
+
+
+function formatTime(date) {
+
+  if (typeof date == 'string' || 'number') {
+    try {
+      date = date.replace(/-/g, '/')//兼容ios
+    } catch (error) {
+    }
+    date = new Date(date)
+  }
+
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+
+  return {
+    str: [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':'),
+    arr: [year, month, day, hour, minute, second]
+  }
+}
+function formatNumber(n) {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}

+ 4 - 0
src/components/common/PickerReduce/timePicker.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

+ 69 - 0
src/components/common/PickerReduce/timePicker.wxml

@@ -0,0 +1,69 @@
+<!--components/timePicker/timePicker.wxml-->
+<!-- 去除时分秒版 -->
+<!-- 自定义时间筛选器 -->
+<view hidden="{{!pickerShow}}">
+  <view class="picker-container {{pickerShow?'show_picker':'hide_picker'}}" animation="{{animationData}}">
+
+    <view class="btn-box" catchtouchmove="onCatchTouchMove">
+      <view class="pick_btn" bindtap="hideModal">取消</view>
+      <view class='pick_btn' style="color: #19f" bindtap="onConfirm">确定</view>
+    </view>
+
+    <view>
+      <picker-view class='sensorTypePicker' indicator-style='height: 35px;' bindchange="changeStartDateTime"
+        value="{{startValue}}" style="height: {{endDate?'120px':'250px'}};" bindpickstart="handlePickStart" bindpickend="handlePickEnd">
+        <picker-view-column style="min-width: 70px;flex-shrink: 0">
+          <view class='picker-item' wx:for="{{startYearList}}" wx:key='*this'>{{item}}年</view>
+        </picker-view-column>
+        <picker-view-column>
+          <view class='picker-item' wx:for="{{startMonthList}}" wx:key='*this'>{{item}}月</view>
+        </picker-view-column>
+        <picker-view-column>
+          <view class='picker-item' wx:for="{{startDayList}}" wx:key='*this'>{{item}}日</view>
+        </picker-view-column>
+        <!-- <picker-view-column hidden="{{!hourColumn}}">
+          <view class='picker-item' wx:for="{{startHourList}}" wx:key='*this'>{{item}}时</view>
+        </picker-view-column>
+        <picker-view-column hidden="{{!minColumn}}">
+          <view class='picker-item' wx:for="{{startMinuteList}}" wx:key='*this'>{{item}}分</view>
+        </picker-view-column>
+        <picker-view-column hidden="{{!secColumn}}">
+          <view class='picker-item' wx:for="{{startSecondList}}" wx:key='*this'>{{item}}秒</view>
+        </picker-view-column> -->
+      </picker-view>
+    </view>
+
+    <view wx:if="{{endDate}}">
+      <view class='to' style='margin-top: 4px;margin-bottom: 4px;'>至</view>
+        <picker-view class='sensorTypePicker' indicator-style='height: 35px;' bindchange="changeEndDateTime" bindpickstart="handlePickStart" bindpickend="handlePickEnd"
+          value="{{endValue}}">
+          <picker-view-column style="min-width: 70px;flex-shrink: 0">
+            <view class='picker-item' wx:for="{{endYearList}}" wx:key='*this' style="min-width: 70px;">{{item}}年</view>
+          </picker-view-column>
+          <picker-view-column>
+            <view class='picker-item' wx:for="{{endMonthList}}" wx:key='*this'>{{item}}月</view>
+          </picker-view-column>
+          <picker-view-column>
+            <view class='picker-item' wx:for="{{endDayList}}" wx:key='*this'>{{item}}日</view>
+          </picker-view-column>
+          <!-- <picker-view-column hidden="{{!hourColumn}}" >
+            <view class='picker-item' wx:for="{{endHourList}}" wx:key='*this'>{{item}}时</view>
+          </picker-view-column>
+          <picker-view-column hidden="{{!minColumn}}">
+            <view class='picker-item' wx:for="{{endMinuteList}}" wx:key='*this'>{{item}}分</view>
+          </picker-view-column>
+          <picker-view-column hidden="{{!secColumn}}">
+            <view class='picker-item' wx:for="{{startSecondList}}" wx:key='*this'>{{item}}秒</view>
+          </picker-view-column> -->
+
+
+        </picker-view>
+    </view>
+
+
+    <!-- <view class='sure' bindtap="onConfirm">确定</view> -->
+
+  </view>
+  <!-- 遮罩 -->
+  <view class="sensorType-screen" bindtap="hideModal" catchtouchmove="onCatchTouchMove" animation="{{animationOpacity}}"/>
+</view>

+ 96 - 0
src/components/common/PickerReduce/timePicker.wxss

@@ -0,0 +1,96 @@
+/* components/timePicker/timePicker.wxss */
+
+.picker-item{
+  line-height: 100rpx;  
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* 自定义时间 */
+.picker-container {
+  display: flex;
+  flex-direction: column;
+  /* justify-content: center; */
+  align-items: center;
+
+  width: 100%;
+  overflow: hidden;
+  position: fixed;
+  bottom: -640rpx;
+  left: 0;
+  /* height: 0; */
+  transition: height 0.5s;
+  z-index: 2000;
+  background: white;
+  border-top: 1px solid #EFEFF4;
+}
+.sensorType-screen{
+  width: 100vw;
+  /* height:400rpx; */
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: #000;
+  opacity: 0;
+  overflow: hidden;
+  z-index: 1999;
+  color: #fff;
+}
+.sensorTypePicker{
+  width: 690rpx;
+  height: 240rpx;
+  /* padding: 45px 0; */
+}
+.picker-item{
+  line-height: 100rpx;  
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 32rpx;
+  /* overflow: hidden; */
+}
+.box{
+   padding: 0 20rpx; 
+}
+
+/* 至 */
+.to{
+  width:100%;
+  display: flex;
+  justify-content: center;align-items: center;
+  color:rgb(138,138,138);
+  /* font-size:30rpx; */
+}
+
+/* 确定 */
+.sure{
+  width:100%;
+  height:90rpx;
+  border-top: 2rpx solid #EFEFF4;
+  display: flex;justify-content: center;align-items: center;
+  color: rgb(36,123,255);
+  font-size:16px;
+}
+
+.btn-box{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 2rpx solid #eee;
+}
+.pick_btn{
+  padding: 14rpx 30rpx;
+  color: #ccc;
+  /* background-color: #159; */
+}
+
+.show_picker{
+  /* height: 320px; */
+}
+.hide_picker{
+  /* height: 0; */
+}

+ 56 - 5
src/pages/applyDepart/publicContent.jsx

@@ -31,6 +31,8 @@ class PublicContent extends Component{
       rangeEndMinuteVal:'',
       rangeStartMinuteVal:'',
       reason:'',
+      plan:'',
+      expectedEffect:'',
       imgs:[],
       validDates:[],
       totalDuration:0,
@@ -58,6 +60,9 @@ class PublicContent extends Component{
         rangeEndMinuteVal:'',
         rangeStartMinuteVal:'',
         reason:'',
+        plan:'',
+        expectedEffect:'',
+
         imgs:[],
         validDates:[],
         totalDuration:0,
@@ -88,7 +93,15 @@ class PublicContent extends Component{
       return ;
     }
     if(!this.state.reason){
-      Taro.showToast({title:'请输入公出事由',icon:'none'})
+      Taro.showToast({title:'请输入公出目标',icon:'none'})
+      return ;
+    }
+    if(!this.state.plan){
+      Taro.showToast({title:'请输入公出计划',icon:'none'})
+      return ;
+    }
+    if(!this.state.expectedEffect){
+      Taro.showToast({title:'请输入预计效果',icon:'none'})
       return ;
     }
     if(this.state.totalDuration === 0){
@@ -103,6 +116,8 @@ class PublicContent extends Component{
       releaseStarts:this.state.rangeStartMinuteVal,
       releaseEnds:this.state.rangeEndMinuteVal,
       remarks:this.state.reason,
+      plan:this.state.plan,
+      expectedEffect:this.state.expectedEffect,
       userName: this.props.selectArrderLocation.name,
       longitude: this.props.selectArrderLocation.longitude,
       latitude: this.props.selectArrderLocation.latitude,
@@ -183,7 +198,7 @@ class PublicContent extends Component{
       rangeStartMinuteVal: data.selectStartTime,
       rangeEndMinuteVal: data.selectEndTime
     });
-
+    console.log(this.state.rangeStartMinuteVal);
     let arr = [];
     if(data.startTime && data.endTime){
       let a = dayjs(data.startTime);
@@ -347,11 +362,13 @@ class PublicContent extends Component{
               <AtIcon value='chevron-right' size='30' color='#bbbbbb'/>
           </View>
         </View>
-        <View className='tips'>移动红标只需要拖动地图即可</View>
+        <View className='tips'>以地图为中心100米范围为可打卡区域,移动红标只需要拖动地图即可</View>
         <View className='formItem' style={{display:'block',paddingTop:'15px'}}>
-          <View className='formName'>公出事由:<View className='formNameTips'>请填写今天去企业计划怎么沟通?</View></View>
+          {/* 公出目标 */}
+          <View className='formName'><Text style={{color:'red'}}>*公出目标:</Text>
           <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>
             <AtTextarea
+              height={46}
               value={this.state.reason}
               onChange={(v)=>{
                 this.setState({
@@ -359,10 +376,44 @@ class PublicContent extends Component{
                 })
               }}
               maxLength={200}
-              placeholder='请输入公出事由'
+              placeholder='本次公出目标,谈的思路与步骤?'
             />
           </View>
+          </View>
+          {/* 公出计划 */}
+          <View className='formName'><Text style={{color:'red'}}>*公出计划:</Text>
+          <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>
+            <AtTextarea
+              height={46}
+              value={this.state.plan}
+              onChange={(v)=>{
+                this.setState({
+                  plan:v
+                })
+              }}
+              maxLength={200}
+              placeholder='本次公出准备工作'
+            />
+          </View>
+          </View>
+          {/* 预计效果 */}
+          <View className='formName'><Text style={{color:'red'}}>*预计效果:</Text>
+          <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>
+            <AtTextarea
+              height={46}
+              value={this.state.expectedEffect}
+              onChange={(v)=>{
+                this.setState({
+                  expectedEffect:v
+                })
+              }}
+              maxLength={200}
+              placeholder='预计本次公出效果'
+            />
+          </View>
+          </View>
         </View>
+        {/*  */}
         <View className='formItem' style={{display:'block'}}>
           <View className='formName'>附件:</View>
           <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>

+ 26 - 5
src/pages/egressDetails/index.jsx

@@ -42,7 +42,8 @@ class EgressDetails extends Component{
       publicReleaseLog:[],
       isDetailedOpened:false,
       isModifyOpened:false,
-      selectArrderLocation:{}
+      selectArrderLocation:{},
+      current:''
     }
     this.examinePublicRelease= this.examinePublicRelease.bind(this);
     this.getReleasetDails= this.getReleasetDails.bind(this);
@@ -50,6 +51,10 @@ class EgressDetails extends Component{
   }
 
   componentDidMount() {
+    this.setState({
+      current:this.$instance.router.params.status || '',
+    })
+    console.log(this.$instance.router.params.status);
     this.getReleasetDails();
   }
 
@@ -192,7 +197,8 @@ class EgressDetails extends Component{
   }
 
   render() {
-    const {dtails} = this.state;
+    const {dtails,current} = this.state;
+    console.log(dtails);
     return (
       <View className='egressDetails'>
         <MessageNoticebar/>
@@ -291,12 +297,27 @@ class EgressDetails extends Component{
                 {dtails.nickname}
               </View>
             </View>
+            {/* 公出目标 */}
             <View className='item'>
-              <View className='title'>公出原因</View>
+              <View className='title'>公出目标</View>
               <View className='value'>
                 {dtails.remarks}
               </View>
             </View>
+            {/* 公出计划 */}
+            <View className='item'>
+              <View className='title'>公出计划</View>
+              <View className='value'>
+                {dtails.plan}
+              </View>
+            </View>
+            {/* 预计效果 */}
+            <View className='item'>
+              <View className='title'>预计效果</View>
+              <View className='value'>
+                {dtails.expectedEffect}
+              </View>
+            </View>
             {dtails.annexUrl && dtails.annexUrl.length > 0 ? <View className='item'>
               <View className='title'>附件</View>
               <View className='value'>
@@ -306,7 +327,7 @@ class EgressDetails extends Component{
               </View>
             </View> : null}
             {
-              dtails.permission === 1 && dtails.status === 1 ?
+              dtails.permission === 1 && dtails.status === 1 &&  current !== '2' ?
                 <View className='item'>
                   <View className='title'>填写审批意见<View className='titleTips'>根据公出申请记录指导怎么沟通?并提出详细指导建议</View></View>
                   <AtTextarea
@@ -322,7 +343,7 @@ class EgressDetails extends Component{
                 </View> : null
             }
             {
-              dtails.permission === 1 && dtails.status === 1 ?
+              dtails.permission === 1 && dtails.status === 1 &&  current !== '2' ?
                 <View className='operation'>
                   <AtButton type='secondary' circle loading={this.state.loading} onClick={()=>{
                     this.setState({

+ 53 - 8
src/pages/egressDetails/publicContent.jsx

@@ -32,6 +32,8 @@ class PublicContent extends Component{
       rangeEndMinuteVal:'',
       rangeStartMinuteVal:'',
       reason:'',
+      plan:'',
+      expectedEffect:'',
       imgs:[],
       validDates:[],
       totalDuration:0,
@@ -78,6 +80,8 @@ class PublicContent extends Component{
       rangeEndMinuteVal:'',
       rangeStartMinuteVal:'',
       reason:'',
+      plan:'',
+      expectedEffect:'',
       imgs:[],
       validDates:[],
       totalDuration:0,
@@ -128,7 +132,15 @@ class PublicContent extends Component{
       return ;
     }
     if(!this.state.reason){
-      Taro.showToast({title:'请输入公出事由',icon:'none'})
+      Taro.showToast({title:'请输入公出目标',icon:'none'})
+      return ;
+    }
+    if(!this.state.plan){
+      Taro.showToast({title:'请输入公出计划',icon:'none'})
+      return ;
+    }
+    if(!this.state.expectedEffect){
+      Taro.showToast({title:'请输入预计效果',icon:'none'})
       return ;
     }
     if(this.state.totalDuration === 0){
@@ -144,6 +156,8 @@ class PublicContent extends Component{
       releaseStarts:this.state.rangeStartMinuteVal,
       releaseEnds:this.state.rangeEndMinuteVal,
       remarks:this.state.reason,
+      plan:this.state.plan,
+      expectedEffect:this.state.expectedEffect,
       userName: this.props.locationInfor.name,
       longitude: this.props.locationInfor.longitude,
       latitude: this.props.locationInfor.latitude,
@@ -380,15 +394,13 @@ class PublicContent extends Component{
               <AtIcon value='chevron-right' size='30' color='#bbbbbb'/>
           </View>
         </View>
-        <View className='tips'>移动红标只需要拖动地图即可</View>
+        <View className='tips'>以地图为中心100米范围为可打卡区域,移动红标只需要拖动地图即可</View>
         <View className='formItem' style={{display:'block',paddingTop:'15px'}}>
-          <View className='formName' style={{
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent:'space-between'
-          }}>公出事由:<View className='formNameTips'>请填写今天去企业计划怎么沟通?</View></View>
+          {/* 公出目标 */}
+          <View className='formName'><Text style={{color:'red'}}>*公出目标:</Text>
           <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>
             <AtTextarea
+              height={46}
               value={this.state.reason}
               onChange={(v)=>{
                 this.setState({
@@ -396,9 +408,42 @@ class PublicContent extends Component{
                 })
               }}
               maxLength={200}
-              placeholder='请输入公出事由'
+              placeholder='本次公出目标,谈的思路与步骤?'
             />
           </View>
+          </View>
+          {/* 公出计划 */}
+          <View className='formName'><Text style={{color:'red'}}>*公出计划:</Text>
+          <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>
+            <AtTextarea
+              height={46}
+              value={this.state.plan}
+              onChange={(v)=>{
+                this.setState({
+                  plan:v
+                })
+              }}
+              maxLength={200}
+              placeholder='本次公出准备工作'
+            />
+          </View>
+          </View>
+          {/* 预计效果 */}
+          <View className='formName'><Text style={{color:'red'}}>*预计效果:</Text>
+          <View className='formValue' style={{paddingTop:'10px',textAlign:'left'}}>
+            <AtTextarea
+              height={46}
+              value={this.state.expectedEffect}
+              onChange={(v)=>{
+                this.setState({
+                  expectedEffect:v
+                })
+              }}
+              maxLength={200}
+              placeholder='预计本次公出效果'
+            />
+          </View>
+          </View>
         </View>
         <View className='formItem' style={{display:'block'}}>
           <View className='formName'>附件:</View>

+ 3 - 0
src/pages/examine/index.config.js

@@ -2,4 +2,7 @@ export default {
   navigationBarTitleText: '审核',
   enablePullDownRefresh: true,
   onReachBottomDistance: 50,
+  usingComponents: {
+    timePicker: '../../components/common/PickerReduce/timePicker'
+  }
 }

+ 440 - 170
src/pages/examine/index.jsx

@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import Taro from '@tarojs/taro';
-import { View ,Picker,ScrollView} from '@tarojs/components'
+import { View, Picker, ScrollView } from '@tarojs/components'
 import { getPublicReleaseList } from '../../utils/servers/servers';
+import dayjs from 'dayjs';
 import {
   AtSearchBar,
   AtTabs,
@@ -10,7 +11,7 @@ import {
   AtListItem,
   AtIcon
 } from 'taro-ui';
-import {clockState} from '../../utils/tools/config';
+import { clockState } from '../../utils/tools/config';
 
 import './index.less';
 
@@ -28,7 +29,7 @@ class Examine extends Component {
 
   constructor(props) {
     super(props);
-    this.state= {
+    this.state = {
       current: 0,
 
       list: [],
@@ -37,41 +38,68 @@ class Examine extends Component {
 
       examinelist: [],
       examinePageNo: 1,
+      seePageNo: 1,
+      seeList: [],
       examineListState: 'LOADING',
-
+      seeListState: 'LOADING',
       starts: {},
       clockInStarts: '',
 
-
-      rangeStartVal1:'',
-      rangeEndVal1:'',
-      starts1:{},
-      clockInStarts1:''
+      rangeStartVal2:'',
+      rangeEndVal2: '',
+      starts2: {},
+      clockInStarts2: '',
+      rangeStartVal1: '',
+      rangeEndVal1: '',
+      starts1: {},
+      clockInStarts1: '',
+      isPickerRender:false,
+      rangeStartMinuteVal:'',
+      rangeEndMinuteVal1:'',
+      rangeStartMinuteVal1:'',
+      rangeEndMinuteVal2:'',
+      rangeStartMinuteVal2:'',
+      rangeEndMinuteVal:'',
+      rangeEndVal:'',
+      rangeStartVal:'',
+      validDates:''
     }
-    this.getPublicReleaseList= this.getPublicReleaseList.bind(this);
-    this.getMyList= this.getMyList.bind(this);
-    this.getExamineList= this.getExamineList.bind(this);
+    this.getPublicReleaseList = this.getPublicReleaseList.bind(this);
+    this.getMyList = this.getMyList.bind(this);
+    this.getExamineList = this.getExamineList.bind(this);
+    this.getSeeList = this.getSeeList.bind(this);
+    this.onSetPickerTime = this.onSetPickerTime.bind(this);
+    this.onPickerHide = this.onPickerHide.bind(this)
   }
 
-  componentDidShow(){
-    Taro.eventCenter.on('listOperation',(data)=>{
-      if(data.type === 1 && (!isNaN(parseInt(data.index)))){
+  componentDidShow() {
+    Taro.eventCenter.on('listOperation', (data) => {
+      if (data.type === 1 && (!isNaN(parseInt(data.index)))) {
         let arr = this.state.examinelist.concat([]);
         arr[data.index] = {
           ...arr[data.index],
           ...data
         }
         this.setState({
-          examinelist:arr
+          examinelist: arr
         })
-      }else if(data.type === 0 && (!isNaN(parseInt(data.index)))){
+      } else if (data.type === 0 && (!isNaN(parseInt(data.index)))) {
         let arr = this.state.list.concat([]);
         arr[data.index] = {
           ...arr[data.index],
           ...data
         }
         this.setState({
-          list:arr
+          list: arr
+        })
+      } else if(data.type === 2 && (!isNaN(parseInt(data.index)))) {
+        let arr = this.state.seeList.concat([]);
+        arr[data.index] = {
+          ...arr[data.index],
+          ...data
+        }
+        this.setState({
+          seeList: arr
         })
       }
     })
@@ -81,79 +109,111 @@ class Examine extends Component {
     await this.getPublicReleaseList();
   }
 
-  onPullDownRefresh(){
+  onPullDownRefresh() {
     this.getPublicReleaseList();
   }
 
-  onReachBottom(){
+  onReachBottom() {
     this.getPublicReleaseList(true);
   }
 
-  onTabItemTap(obj){
-    if(obj.index === 1){
+  onTabItemTap(obj) {
+    if (obj.index === 1) {
       this.onTabTap();
     }
   }
+  onPickerHide(){
+    this.setState({
+      isPickerRender: false,
+    });
+  }
 
-  async onTabTap(){
+async  onSetPickerTime(val){
+    let data = val.detail;
+    if(this.state.current === 0) {
+    await  this.setState({
+        rangeStartMinuteVal: dayjs(data.selectStartTime).format("YYYY-MM-DD"),
+        rangeEndMinuteVal: dayjs(data.selectEndTime).format("YYYY-MM-DD")
+      })
+      await this.getMyList(1);
+    }else if(this.state.current === 1){
+      await  this.setState({
+        rangeStartMinuteVal1: dayjs(data.selectStartTime).format("YYYY-MM-DD"),
+        rangeEndMinuteVal1: dayjs(data.selectEndTime).format("YYYY-MM-DD")
+      })
+      await this.getExamineList(1);
+    }else if(this.state.current === 2) {
+      await  this.setState({
+        rangeStartMinuteVal2: dayjs(data.selectStartTime).format("YYYY-MM-DD"),
+        rangeEndMinuteVal2: dayjs(data.selectEndTime).format("YYYY-MM-DD")
+      })
+      await this.getSeeList(1);
+    } 
+  }
+  async onTabTap() {
     await this.getMyList(1);
     await this.getExamineList(1);
+    await this.getSeeList(1);
   }
 
-  async getPublicReleaseList (lv){
-    if(this.state.current === 0){
+  async getPublicReleaseList(lv) {
+    if (this.state.current === 0) {
       await this.getMyList(lv ? this.state.pageNo + 1 : 1);
       Taro.stopPullDownRefresh();
-    } else if(this.state.current === 1){
+    } else if (this.state.current === 1) {
       await this.getExamineList(lv ? this.state.examinePageNo + 1 : 1);
       Taro.stopPullDownRefresh();
+    } else if (this.state.current === 2) {
+      console.log(lv,this.state.seePageNo);
+      await this.getSeeList(lv ? this.state.seePageNo + 1 : 1);
+      Taro.stopPullDownRefresh();
     }
   }
 
-  async getMyList(pageNo){
+  async getMyList(pageNo) {
     this.setState({
       listState: 'LOADING'
     })
     let data = {
       pageNo: pageNo,
       pageSize: 10,
-      type:'0',
+      type: '0',
 
-      releaseStarts:this.state.rangeStartVal || undefined,
-      releaseEnds:this.state.rangeEndVal || undefined,
+      releaseStarts: this.state.rangeStartMinuteVal || undefined,
+      releaseEnds: this.state.rangeEndMinuteVal || undefined,
       status: isNaN(parseInt(this.state.starts.id)) ? undefined : String(this.state.starts.id),
-      clockIn:this.state.clockInStarts || undefined,
-      userName:this.state.searchValue || undefined,
+      clockIn: this.state.clockInStarts || undefined,
+      userName: this.state.searchValue || undefined,
     }
-    for(let i in data){
-      if(!data[i]){
+    for (let i in data) {
+      if (!data[i]) {
         delete data[i]
       }
     }
     let msg = await getPublicReleaseList(data);
-    if(msg.error.length === 0){
-      if(msg.data.totalCount === 0){
+    if (msg.error.length === 0) {
+      if (msg.data.totalCount === 0) {
         this.setState({
           listState: 'NO_DATA'
         })
-      }else if(msg.data.totalCount === this.state.list.length && pageNo !== 1){
-        Taro.showToast({title:'没有更多数据了',icon:'none'});
+      } else if (msg.data.totalCount === this.state.list.length && pageNo !== 1) {
+        Taro.showToast({ title: '没有更多数据了', icon: 'none' });
         this.setState({
           listState: 'NO_MORE_DATA'
         })
-      }else{
-        if(msg.data.totalCount === (pageNo === 1 ? msg.data.list : this.state.list.concat(msg.data.list)).length){
+      } else {
+        if (msg.data.totalCount === (pageNo === 1 ? msg.data.list : this.state.list.concat(msg.data.list)).length) {
           this.setState({
             listState: 'NO_MORE_DATA'
           })
         }
       }
       this.setState({
-        list:pageNo === 1 ? msg.data.list : this.state.list.concat(msg.data.list),
+        list: pageNo === 1 ? msg.data.list : this.state.list.concat(msg.data.list),
         pageNo: msg.data.pageNo
       })
-    }else{
-      Taro.showToast({title:msg.error[0].message,icon:'none'});
+    } else {
+      Taro.showToast({ title: msg.error[0].message, icon: 'none' });
       this.setState({
         listState: msg.error[0].field === '403' ? 'NO_DATA' : 'RELOAD'
       })
@@ -161,154 +221,226 @@ class Examine extends Component {
     Taro.stopPullDownRefresh();
   }
 
-  async getExamineList(pageNo){
+  async getExamineList(pageNo) {
     this.setState({
       examineListState: 'LOADING'
     })
     let data = {
       pageNo: pageNo,
       pageSize: 10,
-      type:'1',
+      type: '1',
 
-      releaseStarts:this.state.rangeStartVal1 || null,
-      releaseEnds:this.state.rangeEndVal1 || null,
-      status:isNaN(parseInt(this.state.starts1.id)) ? undefined : String(this.state.starts1.id),
-      clockIn:this.state.clockInStarts1 || null,
-      userName:this.state.searchValue1 || undefined,
+      releaseStarts: this.state.rangeStartMinuteVal1 || null,
+      releaseEnds: this.state.rangeEndMinuteVal1 || null,
+      status: isNaN(parseInt(this.state.starts1.id)) ? undefined : String(this.state.starts1.id),
+      clockIn: this.state.clockInStarts1 || null,
+      userName: this.state.searchValue1 || undefined,
     }
-    for(let i in data){
-      if(!data[i]){
+    for (let i in data) {
+      if (!data[i]) {
         delete data[i]
       }
     }
     let msg = await getPublicReleaseList(data);
-    if(msg.error.length === 0){
-      if(msg.data.totalCount === 0){
+    if (msg.error.length === 0) {
+      if (msg.data.totalCount === 0) {
         this.setState({
           examineListState: 'NO_DATA'
         })
-      }else if(msg.data.totalCount === this.state.examinelist.length && pageNo !== 1){
-        Taro.showToast({title:'没有更多数据了',icon:'none'});
+      } else if (msg.data.totalCount === this.state.examinelist.length && pageNo !== 1) {
+        Taro.showToast({ title: '没有更多数据了', icon: 'none' });
         this.setState({
           examineListState: 'NO_MORE_DATA'
         })
-      }else{
-        if(msg.data.totalCount === (pageNo === 1 ? msg.data.list : this.state.examinelist.concat(msg.data.list)).length){
+      } else {
+        if (msg.data.totalCount === (pageNo === 1 ? msg.data.list : this.state.examinelist.concat(msg.data.list)).length) {
           this.setState({
             examineListState: 'NO_MORE_DATA'
           })
         }
       }
       this.setState({
-        examinelist:pageNo === 1 ? msg.data.list : this.state.examinelist.concat(msg.data.list),
+        examinelist: pageNo === 1 ? msg.data.list : this.state.examinelist.concat(msg.data.list),
         examinePageNo: msg.data.pageNo
       })
-    }else{
-      Taro.showToast({title:msg.error[0].message,icon:'none'});
+    } else {
+      Taro.showToast({ title: msg.error[0].message, icon: 'none' });
       this.setState({
         examineListState: msg.error[0].field === '403' ? 'NO_DATA' : 'RELOAD'
       })
     }
     Taro.stopPullDownRefresh();
   }
+  // 查看
+  async getSeeList(pageNo) {
+    console.log(pageNo);
+    this.setState({
+      seeListState: 'LOADING',
+    })
+    console.log(this.state.clockInStarts2);
+    let data = {
+      pageNo: pageNo,
+      pageSize: 10,
+      type: '2',
 
-  onPageScroll(event){
+      releaseStarts: this.state.rangeStartMinuteVal2 || null,
+      releaseEnds: this.state.rangeEndMinuteVal2 || null,
+      status: isNaN(parseInt(this.state.starts2.id)) ? undefined : String(this.state.starts2.id),
+      clockIn: this.state.clockInStarts2 || null,
+      userName: this.state.searchValue2 || undefined,
+    }
+    for (let i in data) {
+      if (!data[i]) {
+        delete data[i]
+      }
+    }
+    let msg = await getPublicReleaseList(data);
+    if (msg.error.length === 0) {
+      if (msg.data.totalCount === 0) {
+        this.setState({
+          seeListState: 'NO_DATA'
+        })
+      } else if (msg.data.totalCount === this.state.seeList.length && pageNo !== 1) {
+        Taro.showToast({ title: '没有更多数据了', icon: 'none' });
+        this.setState({
+          seeListState: 'NO_MORE_DATA'
+        })
+      } else {
+        if (msg.data.totalCount === (pageNo === 1 ? msg.data.list : this.state.seeList.concat(msg.data.list)).length) {
+          this.setState({
+            seeListState: 'NO_MORE_DATA'
+          })
+        }
+      }
+      this.setState({
+        seeList: pageNo === 1 ? msg.data.list : this.state.seeList.concat(msg.data.list),
+        seePageNo: msg.data.pageNo
+      })
+    } else {
+      Taro.showToast({ title: msg.error[0].message, icon: 'none' });
+      this.setState({
+        seeListState: msg.error[0].field === '403' ? 'NO_DATA' : 'RELOAD'
+      })
+    }
+    Taro.stopPullDownRefresh();
+  }
+  onPageScroll(event) {
     let touchMove = event.scrollTop;
-    if(touchMove >= 37){
+    if (touchMove >= 37) {
       this.setState({
-        openSearch:true
+        openSearch: true
       })
-    }else{
+    } else {
       this.setState({
-        openSearch:false
+        openSearch: false
       })
     }
   }
 
-  render () {
+  render() {
     return (
       <View className='indexPage' >
-        <MessageNoticebar/>
+        <MessageNoticebar />
         <View className='searchContent'>
           <View className='searchTop'>
             <AtSearchBar
               showActionButton
               placeholder='请输入企业名称'
-              value={this.state.current === 0 ? this.state.searchValue : this.state.searchValue1}
-              onActionClick={()=>{
+              value={this.state.current === 0 ? this.state.searchValue : this.state.current === 1 ? this.state.searchValue1 : this.state.searchValue2}
+              onActionClick={() => {
                 this.getPublicReleaseList();
               }}
-              onChange={(value)=>{
-                if(this.state.current === 0){
+              onChange={(value) => {
+                if (this.state.current === 0) {
                   this.setState({
-                    searchValue:value
+                    searchValue: value
                   })
-                }else{
+                } else if(this.state.current === 1) {
                   this.setState({
-                    searchValue1:value
+                    searchValue1: value
+                  })
+                } else if(this.state.current === 2) {
+                  this.setState({
+                    searchValue2: value
                   })
                 }
               }}
-              onClear={()=>{
-                if(this.state.current === 0){
+              onClear={() => {
+                if (this.state.current === 0) {
+                  this.setState({
+                    searchValue: ''
+                  })
+                } else if(this.state.current === 1) {
                   this.setState({
-                    searchValue:''
+                    searchValue1: ''
                   })
-                }else{
+                } else if(this.state.current === 2) {
                   this.setState({
-                    searchValue1:''
+                    searchValue2: ''
                   })
                 }
               }}
             />
           </View>
-          <ScrollView className={this.state.openSearch ? 'searchBottomLOL' : ''} scrollX style={{width:'100%'}}>
+          <ScrollView className={this.state.openSearch ? 'searchBottomLOL' : ''} scrollX style={{ width: '100%' }}>
             <View className='searchBottom'>
-              <View className='searchItem' style={{paddingLeft:'5px'}}>
-                <Picker value={this.state.current === 0 ? this.state.starts.id : this.state.starts1.id} range={clockState} rangeKey='title' mode='selector' onChange={(e)=>{
-                  if(this.state.current === 0){
+              <View className='searchItem' style={{ paddingLeft: '5px' }}>
+                <Picker value={this.state.current === 0 ? this.state.starts.id : this.state.current === 1 ? this.state.starts1.id : this.state.starts2.id } range={clockState} rangeKey='title' mode='selector' onChange={(e) => {
+                  if (this.state.current === 0) {
+                    this.setState({
+                      starts: clockState[e.detail.value],
+                    }, () => {
+                      this.getPublicReleaseList();
+                    })
+                  } else if(this.state.current === 1) {
                     this.setState({
-                      starts:clockState[e.detail.value],
-                    },()=>{
+                      starts1: clockState[e.detail.value],
+                    }, () => {
                       this.getPublicReleaseList();
                     })
-                  }else{
+                  } else if(this.state.current === 2){
                     this.setState({
-                      starts1:clockState[e.detail.value],
-                    },()=>{
+                      starts2: clockState[e.detail.value],
+                    }, () => {
                       this.getPublicReleaseList();
                     })
                   }
                 }}>
                   {
-                    (this.state.current === 0 && !this.state.starts.title) || (this.state.current === 1 && !this.state.starts1.title) ?
+                    (this.state.current === 0 && !this.state.starts.title) || (this.state.current === 1 && !this.state.starts1.title) || (this.state.current === 2 && !this.state.starts2.title) ?
                       <View className='shortValuecontent'>
                         <View className='selectTitle'>审核状态</View>
                         <View className='iconContent'><AtIcon value='chevron-down' size='10' color='#FFFFFF' /></View>
                       </View> :
                       <View className='shortValuecontent'>
                         <View className='selectValue'>
-                          {this.state.current === 0? this.state.starts.title: this.state.starts1.title}
+                          {this.state.current === 0 ? this.state.starts.title : this.state.current === 1 ? this.state.starts1.title : this.state.starts2.title}
                         </View>
-                        <View className='iconContent'/>
+                        <View className='iconContent' />
                       </View>
                   }
                 </Picker>
                 {
-                  (this.state.current === 0 && this.state.starts.title) || (this.state.current === 1 && this.state.starts1.title) ?
+                  (this.state.current === 0 && this.state.starts.title) || (this.state.current === 1 && this.state.starts1.title) || (this.state.current === 2 && this.state.starts2.title) ?
                     <View className='searchSelectContent'>
-                      <View className='selectIcon' onClick={(e)=>{
+                      <View className='selectIcon' onClick={(e) => {
                         e.stopPropagation();
-                        if(this.state.current === 0){
+                        if (this.state.current === 0) {
+                          this.setState({
+                            starts: {}
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        } else if(this.state.current === 1) {
                           this.setState({
-                            starts:{}
-                          },()=>{
+                            starts1: {}
+                          }, () => {
                             this.getPublicReleaseList();
                           })
-                        }else{
+                        }else if(this.state.current === 2) {
                           this.setState({
-                            starts1:{}
-                          },()=>{
+                            starts2: {}
+                          }, () => {
                             this.getPublicReleaseList();
                           })
                         }
@@ -318,58 +450,71 @@ class Examine extends Component {
                     </View> : null
                 }
               </View>
-              <View className='searchItem'>
-                <Picker value={this.state.current === 0 ? this.state.clockInStarts : this.state.clockInStarts1} range={[
+              <View className='searchItem' >
+                <Picker value={this.state.current === 0 ? this.state.clockInStarts : this.state.current === 1 ? this.state.clockInStarts1 : this.state.clockInStarts2} range={[
                   '未打卡',
                   '已打卡'
-                ]} mode='selector' onChange={(e)=>{
-                  if(this.state.current === 0){
+                ]} mode='selector' onChange={(e) => {
+                  if (this.state.current === 0) {
+                    this.setState({
+                      clockInStarts: String(e.detail.value)
+                    }, () => {
+                      this.getPublicReleaseList();
+                    })
+                  } else if(this.state.current === 1){
                     this.setState({
-                      clockInStarts:String(e.detail.value)
-                    },()=>{
+                      clockInStarts1: String(e.detail.value)
+                    }, () => {
                       this.getPublicReleaseList();
                     })
-                  }else{
+                  } else if(this.state.current === 2) {
                     this.setState({
-                      clockInStarts1:String(e.detail.value)
-                    },()=>{
+                      clockInStarts2: String(e.detail.value)
+                    }, () => {
                       this.getPublicReleaseList();
                     })
                   }
                 }}>
                   {
-                    (this.state.current === 0 && !this.state.clockInStarts) || (this.state.current === 1 && !this.state.clockInStarts1) ?
+                    (this.state.current === 0 && !this.state.clockInStarts) || (this.state.current === 1 && !this.state.clockInStarts1) || (this.state.current === 2 && !this.state.clockInStarts2) ?
                       <View className='shortValuecontent'>
                         <View className='selectTitle'>打卡状态</View>
                         <View className='iconContent'><AtIcon value='chevron-down' size='10' color='#FFFFFF' /></View>
                       </View> :
                       <View className='shortValuecontent'>
                         <View className='selectValue'>
-                          {this.state.current === 0? (
+                          {this.state.current === 0 ? (
                             this.state.clockInStarts === '1' ? '已打卡' :
-                              this.state.clockInStarts === '0' ? '未打卡' :''
-                          ): this.state.clockInStarts1 === '1' ? '已打卡' :
-                            this.state.clockInStarts1 === '0' ? '未打卡' :''}
+                              this.state.clockInStarts === '0' ? '未打卡' : ''
+                          ) : this.state.current === 1 ? (this.state.clockInStarts1 === '1' ? '已打卡' :
+                              this.state.clockInStarts1 === '0' ? '未打卡' : '') : this.state.clockInStarts2 === '1' ? '已打卡' :
+                              this.state.clockInStarts2 === '0' ? '未打卡' : ''}
                         </View>
-                        <View className='iconContent'/>
+                        <View className='iconContent' />
                       </View>
                   }
                 </Picker>
                 {
-                  (this.state.current === 0 && this.state.clockInStarts) || (this.state.current === 1 && this.state.clockInStarts1) ?
+                  (this.state.current === 0 && this.state.clockInStarts) || (this.state.current === 1 && this.state.clockInStarts1) || (this.state.current === 2 && this.state.clockInStarts2) ? 
                     <View className='searchSelectContent'>
-                      <View className='selectIcon' onClick={(e)=>{
+                      <View className='selectIcon' onClick={(e) => {
                         e.stopPropagation();
-                        if(this.state.current === 0){
+                        if (this.state.current === 0) {
                           this.setState({
                             clockInStarts: '',
-                          },()=>{
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        } else if(this.state.current === 1){
+                          this.setState({
+                            clockInStarts1: '',
+                          }, () => {
                             this.getPublicReleaseList();
                           })
-                        }else{
+                        } else if(this.state.current === 2) {
                           this.setState({
-                            clockInStarts1:'',
-                          },()=>{
+                            clockInStarts2: '',
+                          }, () => {
                             this.getPublicReleaseList();
                           })
                         }
@@ -379,51 +524,152 @@ class Examine extends Component {
                     </View> : null
                 }
               </View>
-              <View className='searchItem'>
-                <Picker mode='date' onChange={(e)=>{
-                  if(this.state.current === 0){
+              {/*  */}
+              {/* 多选时间框 */}
+              <View  className='searchItem' onClick={()=>{
+                this.setState({
+                  isPickerRender:true
+                })
+              }}>
+              <View>
+                 {
+                    (this.state.current === 0 && !this.state.rangeStartMinuteVal) || (this.state.current === 1 && !this.state.rangeStartMinuteVal1) || 
+                    (this.state.current === 2 && !this.state.rangeStartMinuteVal2) ?
+                      <View className='valuecontent' style={{width:'200px'}}>
+                        <View className='selectTitle' style={{paddingLeft:'50px'}}>开始及结束时间</View>
+                        <View className='iconContent' style={{paddingLeft:'20px'}}><AtIcon value='chevron-down' size='10' color='#FFFFFF' /></View>
+                      </View> :
+                      <View className='valuecontent' style={{width:'200px'}}>
+                        <View className='selectValue' >
+                          {this.state.current === 0 ? this.state.rangeStartMinuteVal +"~"+ this.state.rangeEndMinuteVal : this.state.current === 1 ? this.state.rangeStartMinuteVal1 +"~"+ this.state.rangeEndMinuteVal1 : this.state.rangeStartMinuteVal2 +"~"+ this.state.rangeEndMinuteVal2}
+                        </View>
+                        <View className='iconContent' />
+                      </View>
+                  }
+            </View>
+            {
+                  (this.state.current === 0 && this.state.rangeStartMinuteVal) || (this.state.current === 1 && this.state.rangeStartMinuteVal1) 
+                  || (this.state.current === 2 && this.state.rangeStartMinuteVal2) ?
+                    <View className='searchSelectContent'>
+                      <View className='selectIcon' onClick={(e) => {
+                        e.stopPropagation();
+                        if (this.state.current === 0) {
+                          this.setState({
+                            rangeStartMinuteVal: '',
+                            rangeEndMinuteVal: '',
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        } else if(this.state.current === 1) {
+                          this.setState({
+                            rangeStartMinuteVal1: '',
+                            rangeEndMinuteVal1: '',
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        } else if(this.state.current === 2) {
+                          this.setState({
+                            rangeStartMinuteVal2: '',
+                            rangeEndMinuteVal2: '',
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        }
+                      }}>
+                        <AtIcon value='close-circle' size='10' color='#FFFFFF' />
+                      </View>
+                    </View> : null
+                }
+                </View>
+              <timePicker
+              config={{
+                endDate: true,
+                column: "minute",
+                dateLimit: false,
+                // initStartTime: "2019-01-01 12:32:44", //默认开始时间
+                // initEndTime: "2019-12-01 12:32:44",   //默认结束时间
+                limitStartTime: dayjs().subtract(3,'year').format('YYYY-MM-DD '),
+                limitEndTime: dayjs().add(3,'year').format('YYYY-MM-DD ')
+              }}
+              isPartition
+              pickerShow={this.state.isPickerRender}
+              onconditionaljudgment={(v)=>{
+                // let a = dayjs(dayjs(v.detail.endTime).second(0).format('YYYY-MM-DD'));
+                // let b = dayjs(dayjs().second(0).format('YYYY-MM-DD'))
+                // if(a.isBefore(b)){
+                //   Taro.showToast({
+                //     title:'结束时间不能小于当前时间',
+                //     icon:'none'
+                //   })
+                //   v.detail.setLv(false);
+                // }
+              }}
+              onhidepicker={()=>{
+                this.onPickerHide()
+              }}
+              onsetpickertime={(v)=>{
+                this.onSetPickerTime(v)
+              }}>
+              </timePicker>
+              {/* <View className='searchItem'>
+                <Picker mode='date' onChange={(e) => {
+                  if (this.state.current === 0) {
+                    this.setState({
+                      rangeStartVal: e.detail.value,
+                    }, () => {
+                      this.getPublicReleaseList();
+                    })
+                  } else if(this.state.current === 1) {
                     this.setState({
-                      rangeStartVal:e.detail.value,
-                    },()=>{
+                      rangeStartVal1: e.detail.value,
+                    }, () => {
                       this.getPublicReleaseList();
                     })
-                  }else{
+                  } else if(this.state.current === 2) {
                     this.setState({
-                      rangeStartVal1:e.detail.value,
-                    },()=>{
+                      rangeStartVal2: e.detail.value,
+                    }, () => {
                       this.getPublicReleaseList();
                     })
                   }
                 }}>
                   {
-                    (this.state.current === 0 && !this.state.rangeStartVal) || (this.state.current === 1 && !this.state.rangeStartVal1) ?
+                    (this.state.current === 0 && !this.state.rangeStartVal) || (this.state.current === 1 && !this.state.rangeStartVal1) || 
+                    (this.state.current === 2 && !this.state.rangeStartVal2) ?
                       <View className='valuecontent'>
                         <View className='selectTitle'>开始时间</View>
                         <View className='iconContent'><AtIcon value='chevron-down' size='10' color='#FFFFFF' /></View>
                       </View> :
                       <View className='valuecontent'>
                         <View className='selectValue'>
-                          {this.state.current === 0? this.state.rangeStartVal: this.state.rangeStartVal1}
+                          {this.state.current === 0 ? this.state.rangeStartVal : this.state.current === 1 ? this.state.rangeStartVal1 : this.state.rangeStartVal2}
                         </View>
-                        <View className='iconContent'/>
+                        <View className='iconContent' />
                       </View>
                   }
                 </Picker>
                 {
-                  (this.state.current === 0 && this.state.rangeStartVal) || (this.state.current === 1 && this.state.rangeStartVal1) ?
+                  (this.state.current === 0 && this.state.rangeStartVal) || (this.state.current === 1 && this.state.rangeStartVal1) 
+                  || (this.state.current === 2 && this.state.rangeStartVal2) ?
                     <View className='searchSelectContent'>
-                      <View className='selectIcon' onClick={(e)=>{
+                      <View className='selectIcon' onClick={(e) => {
                         e.stopPropagation();
-                        if(this.state.current === 0){
+                        if (this.state.current === 0) {
+                          this.setState({
+                            rangeStartVal: ''
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        } else if(this.state.current === 1) {
                           this.setState({
-                            rangeStartVal:''
-                          },()=>{
+                            rangeStartVal1: ''
+                          }, () => {
                             this.getPublicReleaseList();
                           })
-                        }else{
+                        } else if(this.state.current === 2) {
                           this.setState({
-                            rangeStartVal1:''
-                          },()=>{
+                            rangeStartVal2: ''
+                          }, () => {
                             this.getPublicReleaseList();
                           })
                         }
@@ -432,52 +678,64 @@ class Examine extends Component {
                       </View>
                     </View> : null
                 }
-              </View>
-              <View className='searchItem' style={{marginRight:'5px'}}>
-                <Picker mode='date' onChange={(e)=>{
-                  if(this.state.current === 0){
+              </View> */}
+              {/* <View className='searchItem' style={{ marginRight: '5px' }}>
+                <Picker mode='date' onChange={(e) => {
+                  if (this.state.current === 0) {
+                    this.setState({
+                      rangeEndVal: e.detail.value,
+                    }, () => {
+                      this.getPublicReleaseList();
+                    })
+                  } else if(this.state.current === 1){
                     this.setState({
-                      rangeEndVal:e.detail.value,
-                    },()=>{
+                      rangeEndVal1: e.detail.value,
+                    }, () => {
                       this.getPublicReleaseList();
                     })
-                  }else{
+                  } else if(this.state.current === 2) {
                     this.setState({
-                      rangeEndVal1:e.detail.value,
-                    },()=>{
+                      rangeEndVal2: e.detail.value,
+                    }, () => {
                       this.getPublicReleaseList();
                     })
                   }
                 }}>
                   {
-                    (this.state.current === 0 && !this.state.rangeEndVal) || (this.state.current === 1 && !this.state.rangeEndVal1) ?
+                    (this.state.current === 0 && !this.state.rangeEndVal) || (this.state.current === 1 && !this.state.rangeEndVal1) || (this.state.current === 2 && !this.state.rangeEndVal2) ?
                       <View className='valuecontent'>
                         <View className='selectTitle'>结束时间</View>
                         <View className='iconContent'><AtIcon value='chevron-down' size='10' color='#FFFFFF' /></View>
                       </View> :
                       <View className='valuecontent'>
                         <View className='selectValue'>
-                          {this.state.current === 0? this.state.rangeEndVal: this.state.rangeEndVal1}
+                          {this.state.current === 0 ? this.state.rangeEndVal :  this.state.current === 1 ? this.state.rangeEndVal1 : this.state.rangeEndVal2}
                         </View>
-                        <View className='iconContent'/>
+                        <View className='iconContent' />
                       </View>
                   }
                 </Picker>
                 {
-                  (this.state.current === 0 && this.state.rangeEndVal) || (this.state.current === 1 && this.state.rangeEndVal1) ?
+                  (this.state.current === 0 && this.state.rangeEndVal) || (this.state.current === 1 && this.state.rangeEndVal1) || (this.state.current === 2 && this.state.rangeEndVal2) ?
                     <View className='searchSelectContent'>
-                      <View className='selectIcon' onClick={(e)=>{
+                      <View className='selectIcon' onClick={(e) => {
                         e.stopPropagation();
-                        if(this.state.current === 0){
+                        if (this.state.current === 0) {
+                          this.setState({
+                            rangeEndVal: ''
+                          }, () => {
+                            this.getPublicReleaseList();
+                          })
+                        } else if(this.state.current === 1) {
                           this.setState({
-                            rangeEndVal:''
-                          },()=>{
+                            rangeEndVal1: ''
+                          }, () => {
                             this.getPublicReleaseList();
                           })
-                        }else{
+                        }else if(this.state.current === 2) {
                           this.setState({
-                            rangeEndVal1:''
-                          },()=>{
+                            rangeEndVal2: ''
+                          }, () => {
                             this.getPublicReleaseList();
                           })
                         }
@@ -486,15 +744,15 @@ class Examine extends Component {
                       </View>
                     </View> : null
                 }
-              </View>
+              </View> */}
             </View>
           </ScrollView>
         </View>
-        <AtTabs current={this.state.current || 0} tabList={[{ title: '我的' }, { title: '审核' }]} onClick={(current)=>{
+        <AtTabs current={this.state.current || 0} tabList={[{ title: '我的' }, { title: '审核' }, { title: '查看' }]} onClick={(current) => {
           this.setState({
-            current
-          },()=>{
-            if((current === 0 && this.state.pageNo === 1) || (current === 1 && this.state.examinePageNo === 1)){
+            current,
+          }, () => {
+            if ((current === 0 && this.state.pageNo === 1) || (current === 1 && this.state.examinePageNo === 1) || (current === 2 && this.state.seePageNo === 1)) {
               this.getPublicReleaseList();
             }
           })
@@ -502,20 +760,32 @@ class Examine extends Component {
           <AtTabsPane current={this.state.current} index={0} >
             <MyList
               type={0}
+              seeView={this.state.current}
               list={this.state.list}
               listState={this.state.listState}
-              onRefresh={()=>{
+              onRefresh={() => {
                 this.getPublicReleaseList(true);
-              }}/>
+              }} />
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
             <MyList
               type={1}
+              seeView={this.state.current}
               list={this.state.examinelist}
               listState={this.state.examineListState}
-              onRefresh={()=>{
+              onRefresh={() => {
+                this.getPublicReleaseList(true);
+              }} />
+          </AtTabsPane>
+          <AtTabsPane current={this.state.current} index={2}>
+            <MyList
+              type={2}
+              seeView={this.state.current}
+              list={this.state.seeList}
+              listState={this.state.seeListState}
+              onRefresh={() => {
                 this.getPublicReleaseList(true);
-              }}/>
+              }} />
           </AtTabsPane>
         </AtTabs>
       </View>

+ 7 - 1
src/pages/examine/myList.jsx

@@ -17,6 +17,8 @@ class MyList extends Component {
   }
 
   render () {
+    let seeView = this.props.seeView
+    // console.log(this.props.seeView);
     return (
       <View className='indexPage'>
         <View className='list'>
@@ -37,7 +39,11 @@ class MyList extends Component {
             this.props.list.map((v,k)=>(
               <View key={k} className='item' onClick={()=>{
                 Taro.navigateTo({
-                  url:'/pages/egressDetails/index?id='+v.id+'&index='+k
+                  url:'/pages/egressDetails/index?id='+v.id+'&index='+k+'&status='+seeView,
+                  // success: function (res) {
+                  //   // 通过eventChannel向被打开页面传送数据
+                  //   res.eventChannel.emit('seeView', { data:seeView })
+                  // }
                 })
               }}>
                 {v.status === 3 ? <View className='revoke'>