Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-20 142eac0ef7640add5362eed3afb595596793f24d

Merge remote-tracking branch 'origin/master'

 admin/src/components/business/OperaMemberCardWindow.vue

@@ -17,7 +17,7 @@
                    <el-option
                        v-for="item in member"
                        :key="item.id"
                        :label="item.name + ' - ' + item.companyName"
                        :label="item.name"
                        :value="item.id">
                    </el-option>
                </el-select>
@@ -81,12 +81,13 @@
      open (title, target) {
        this.title = title
        this.visible = true
        if (target && target.isType) {
        if (target.isType === 1) {
          this.getMember()
          this.form.memberId = target.memberId
          console.log(this.form.memberId)
          return
        }
        }
        // 新建
        if (target == null) {
          this.$nextTick(() => {

 admin/src/views/business/empower.vue

@@ -70,7 +70,7 @@
                        </div>
                    </template>
                </el-table-column>
                <el-table-column prop="sendDate" label="创建时间" min-width="150px"></el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
                <el-table-column label="是否删除" min-width="100px">
                    <template slot-scope="{row}">
                        <span style="color: green;" v-if="row.isdeleted === 0">否</span>

 h5/pages/visitorApplication/visitorApplication.vue

@@ -107,8 +107,8 @@
        <u-datetime-picker
            v-if="form1.starttime"
            :show="show5"
            :minDate="new Date(form1.starttime).getTime()"
            :maxDate="new Date(maxTime).getTime()"
            :minDate="formatTimeStamp(form1.starttime)"
            :maxDate="formatTimeStamp(maxTime)"
            mode="datetime"
            @cancel="show5 = false"
            @confirm="setoutDate"
@@ -619,6 +619,9 @@
                this.form1.endtime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM');
                this.show5 = false
            },
            formatTimeStamp(date) {
                return Date.parse(new Date(`${date}`)) || Date.parse(new Date(`${date.replace(/-/g,'/')}`))
            },
            // 查询用户
            getUser() {
                if (this.verify === '0') {