Merge remote-tracking branch 'origin/master'

jiangping

2024-06-11 fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7

Merge remote-tracking branch 'origin/master'

 h5/pages/staff/meetingCalendar.vue

@@ -234,7 +234,7 @@
          return {

            time: j.monthDate,

            pointText: j.meetingNum,

            pointTextColor: 'red'

            pointTextColor: '#fff'

          }

        })

      })

@@ -264,6 +264,7 @@
            this.myMeetingList = []

      this.activeRoom = { ...e.value[0] }

      this.isShowStatus = false

      this.myPage = 1

      this.getDayMeeting()

    },

    handleDetail(id) {


 h5/pages/staff/meetingDetail.vue

@@ -33,7 +33,7 @@
              v-for="mem in detail.userResponseList"
              :key="mem.id"
            >
              <image :src="mem.avatar" class="avatar" mode=""></image>
              <image :src="mem.avatar ? mem.avatar : require('@/static/meeting/common/default_user@2x.png')" class="avatar" mode=""></image>
              <view class="name">{{ mem.realname }}</view>
            </view>
          </view>

 h5/pages/staff/meetingManager.vue

@@ -163,7 +163,7 @@
          return {

            time: j.monthDate,

            pointText: j.meetingNum,

            pointTextColor: 'red'

            pointTextColor: '#fff'

          }

        })

      })

@@ -177,6 +177,7 @@
    seletedStatus(e) {

            this.myMeetingList = []

      this.activeRoom = { ...e.value[0] }

      this.recordPage = 1

      this.isShowStatus = false

      this.getDayMeeting()

    },


 h5/pages/staff/task/index.vue

@@ -114,7 +114,7 @@
          <view class="box_list_item_nr_x"></view>
          <view class="box_list_item_nr_text">
            <text class="time">{{ item.createDate }}提交</text>
            <text class="btn" @click="handleAppr(item)">去处理</text>
            <text v-if="item.status == '0'" class="btn" @click="handleAppr(item)">去处理</text>
          </view>
        </view>
      </view>

 h5/pages/staff/vehicle/sendACar.vue

@@ -139,10 +139,12 @@
      this.getList()
    },
    seletedDate(e) {
      setTimeout(() => {
      this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
      this.pagination.page = 0
      this.isShowDate = false
      this.getList()
      })
    },
    endtimeClose() {
      this.param.endTime = ''