1.4.2

mini-pro-web/src/views/machine/index.vue

@@ -25,6 +25,10 @@
				</div>
			</div>
			<template v-else-if="isErr==2">
				<div class="dinamic-info">
					<div>{{temperature||0}}℃</div>
					<div>{{humidity||0}}%</div>
				</div>
				<div class="video-swipe">
					<van-swipe ref="videoSwipe" @change="videoSwipeChange" :touchable="false" :autoplay="0" indicator-color="white">
						<template v-if="videoList&& videoList.length">
@@ -137,6 +141,8 @@ export default {
			nextOrderDetail: '',
			oldCardNo: '',
			reconnect: false,
			humidity: '',
			temperature: ''
    	}
  	},
	watch:{
@@ -299,6 +305,9 @@ export default {
                    console.log('findDeviceByIdNoLogin', res)
                    this.$toast.clear()
					this.isErr = res.obj.saleStatus==1? 2 : 1
					this.humidity = res.obj.nowHumidity
					this.temperature = res.obj.nowTemperature
                })
                .catch(err=>{
                    console.error(err)
@@ -466,6 +475,10 @@ export default {
				if(this.heartbitTimeout){
					clearTimeout(this.heartbitTimeout)
				}
			} else if(msgobj.type == 'humidity_temperature'){
				var mess = JSON.parse(msgobj.mess)
				this.humidity = mess.now_humidity
				this.temperature = mess.now_temperature
			} else {
				this.checkNextEvent(msgobj.type)
			}
@@ -1029,6 +1042,17 @@ export default {
			}
			
		}
		.dinamic-info{
			font-size: 12px;
			font-weight: bold;
			position: fixed;
			right: 7px;
			top: 7px;
			line-height: 15px;
			color: #fff;
			text-align: right;
		}
	}
	.van-swipe{

mini-pro-web/src/views/order/list.vue

@@ -1,20 +1,40 @@
<template>
    <div class='order-list'>
        <van-sticky :offset-top="offsetTop">
            <div class="top-banner  fs-14  ">
                <form action="/">
                    <van-search
                        v-model="searchText"
                        placeholder="订单号、手机号"
                        show-action
                        @search="onSearch"
                        shape="round"
                    >
                    <div v-if="type!='pending'" slot="action" class="plr5">
            <div class="top-banner  fs-14 kitbox ">
                <div class="box-flex-1">
                    <form action="/">
                        <van-search
                            v-model="searchText"
                            placeholder="订单号、手机号、社区名称"
                            @search="onSearch"
                            shape="round"
                        >
                        <!-- <div v-if="type!='pending'" slot="action" class="plr5 search-action">
                            <div class="sort-panel" @click.stop="onSort">
                                <div>时间</div>
                                <div>
                                    <img v-show="sortAsc===true" src="@/assets/images/z-paixu.png" alt="">
                                    <img v-show="sortAsc===false" src="@/assets/images/z-paixu1.png" alt="">
                                </div>
                            </div>
                            <van-icon @click="filterShow=true" style="vertical-align: text-bottom;" color="#17b3ec" size="20px" name="filter-o" />
                        </div> -->
                        </van-search>
                    </form>
                </div>
                <div>
                    <div v-if="type!='pending'" slot="action" class="pr15 search-action">
                        <div class="sort-panel" @click.stop="onSort">
                            <div>时间</div>
                            <div>
                                <img v-show="sortAsc===true" src="@/assets/images/z-paixu.png" alt="">
                                <img v-show="sortAsc===false" src="@/assets/images/z-paixu1.png" alt="">
                            </div>
                        </div>
                        <van-icon @click="filterShow=true" style="vertical-align: text-bottom;" color="#17b3ec" size="20px" name="filter-o" />
                    </div>
                    </van-search>
                </form>
                </div>
                <!-- <div @click="drowMenuShow=false" class="kitbox pl15 search-date ptb10">
@@ -163,7 +183,8 @@ export default{
                    {name: '审方不通过', value: -1},
                    {name: '取消审方', value: -2},
                ],
            }]
            }],
            sortAsc: false 
        }
    },
    watch: {
@@ -205,6 +226,7 @@ export default{
                p = {
                    userId: this.user.id,
                    content: this.searchText,
                    timeSort: this.sortAsc? 1 : 2,
                    page: page,
                    size: pageSize
                }
@@ -223,7 +245,8 @@ export default{
                    reviewerState: this.extendList[0].value,
                    town,
                    page: page,
                    size: pageSize
                    size: pageSize,
                    timeSort: this.sortAsc? 1 : -1,
                } 
            }
            console.log('params', p)
@@ -373,6 +396,10 @@ export default{
                console.error(err)
            })
            
        },
        onSort(){
            this.sortAsc = !this.sortAsc
            this.$refs.customList.refresh(true)
        }
    },
}
@@ -446,6 +473,26 @@ export default{
                } 
            }
        }
        .search-action{
            display: -webkit-box;
            -webkit-box-align: center;
            -webkit-box-pack: center;
            background: #fff;
            height: 54px;
            .sort-panel{
                font-size: 16px;
                display: -webkit-box;
                -webkit-box-align: center;
                margin-right: 20px;
                img{
                    display: block;
                    width: 10px;
                    height: 10px;
                    margin-left: 7px;
                }
            }
        }
        
        // ::v-deep .van-dropdown-menu__bar{
        //     position: absolute;
        //     bottom: -10px;