Merge remote-tracking branch 'origin/v2' into v2

陶杰

2024-09-10 dd2922d3facbfba5add501f35de5649b80b6cf05

Merge remote-tracking branch 'origin/v2' into v2

 components/banner3d/banner3d.vue

@@ -5,6 +5,7 @@
            :autoplay="swiperConfig.autoplay" :interval="swiperConfig.interval" :duration="swiperConfig.duration"
            :circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
            :next-margin="swiperConfig.nextMargin" @change="swiperChange" @animationfinish="animationfinish">
			
            <swiper-item v-for="(item, i) in bannerList" :key="i">
                <!-- 1.当前展示为第1项时，bannerList最后一项和第二项的justifyContent值分别为flex-end和flex-start，其余项值为center -->
                <!-- 2.当前展示为最后一项时，bannerList倒数第2项和第1项的justifyContent值分别为flex-end和flex-start，其余项值为center -->
@@ -15,7 +16,12 @@
                  transitionDuration: '.3s',
                  transitionTimingFunction: 'ease'
                }" :class="[curIndex===0?((i===listLen-1)?'item-left':(i===1?'item-right':'item-center')):(curIndex===listLen-1?(i===0?'item-right':(i===listLen-2?'item-left':'item-center')):(i===curIndex-1?'item-left':(i===curIndex+1?'item-right':'item-center')))]">
                    <image :src="item.bg" class="slide-image" />
                    <image :src="item.bg" class="slide-image">

                    </image>
                    <view v-if="item.currentMsg" class="top-msg" :class="[`v${i+1}`]">
                        {{item.currentMsg}}
                    </view>
                    <image :src="item.picture" class="icon-image" :class="[`v${i+1}`]" mode="aspectFit"></image>
                    <view class="container" :class="[`v${i+1}`]">
                        <view class="title">{{bannerList[i].title}}</view>
@@ -133,6 +139,43 @@
                z-index: 200;
                position: relative;
                z-index: 0;

            }

            .top-msg {
                position: absolute;
                top: 31px;
                left: 45rpx;
                background-color: #9DBEDF;
                padding: 8rpx 14rpx;
                color: #fff;
                border-top-left-radius: 8rpx;
                border-bottom-right-radius: 8rpx;
                text-align: center;
                line-height: 48rpx;
                min-width: 132rpx;
                z-index: 1;
                font-size: 24rpx;
                display: block;
            }

            .top-msg.v1 {
                background-color: #B6D6AF;

            }

            .top-msg.v2 {
                background-color: #9DBEDF;

            }

            .top-msg.v3 {
                background-color: #BF9653;

            }

            .top-msg.v4 {
                background-color: #F1A582;
            }

            .icon-image {

 environments/index.js

@@ -1,7 +1,7 @@
export default {
    
    // httpBaseUri: 'https://www.hmyxianhua.com/flower',
    httpBaseUri: 'http://47.99.58.211/flower',
    httpBaseUri: 'https://www.hmyxianhua.com/flower',
    // httpBaseUri: 'http://47.99.58.211/flower',
    // httpBaseUri: 'http://localhost:8080/flower',
    clientId: '',
    secret: '',

 pages.json

@@ -471,7 +471,7 @@
                    "style": {

                        "navigationBarTitleText": "积分兑换",

                        "navigationStyle": "custom",

                        "enablePullDownRefresh": false

                        "enablePullDownRefresh": true

                    }

                },

                {


 sub_pages/customer/coupon/coupon-self.vue

@@ -86,7 +86,7 @@

            this.getList()
        },
onReachBottom() {
        onReachBottom() {
            this.getMore()
        },
        methods: {

 sub_pages/customer/coupon/good-all.vue

@@ -2,7 +2,8 @@
    <view class="good-list-container">
        <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
            <!-- ../../../static/images/customer/coupon/good-top-bg.png -->
            <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
            <image class="component-bg"
                src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
                mode="scaleToFill" />

            <view class="title">
@@ -19,7 +20,7 @@
                        <uni-icons class="icon" type="right" size="32"></uni-icons>
                    </view>
                </view>
                <view class="m-l-a m-r-0 rule"  @click="goto('/pages/help/content?id=积分规则',false)">
                <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)">
                    <view class="flex w-fit m-l-a m-r-15">
                        <view class="m-r-10">规则</view>
                        <image src="../../../static/images/customer/coupon/icon-rule.png" class="rule-icon">
@@ -102,6 +103,7 @@
            changeTab(flg) {
                this.flg = '' + flg
                this.listApi = this.tabs[flg].api
                this.list = []
                this.refreshList()
            },
            async exchange(type, item) {
@@ -121,12 +123,15 @@
                    data: {
                        couponId: item.id,
                        goodsId: item.id, //兼容2个
                        num:1
                        num: 1
                    }
                })
                this.$message.hideLoading()
                if (code == 0) {
                    this.$message.showToast('兑换成功')
                    //刷新积分					
                    this.$store.dispatch('getCurrentInfo');
                    await this.$message.showToast('兑换成功')

                }
            },
            toDetail(item) {
@@ -134,7 +139,7 @@
                    url: '/sub_pages/customer/coupon/good-detail?id=' + item.id
                })
            },
            changeScore(item){
            changeScore(item) {
                this.query.pointLower = item.min || 0
                this.query.pointUpper = item.max || 990000
                this.refreshList()
@@ -187,6 +192,13 @@
        },
        onLoad() {
            this.listApi = '/api/customer/point/goods/list'
            this.getList()
        },
        onPullDownRefresh() {
            //刷新积分和刷新商品
            this.$store.dispatch('getCurrentInfo');
            // this.list = []
            this.refreshList()
        },

        onReachBottom() {
@@ -211,7 +223,7 @@
                }

                .title {
                    padding:18rpx 18rpx 0rpx 18rpx;
                    padding: 18rpx 18rpx 0rpx 18rpx;
                    font-weight: 600;
                    font-size: 32rpx;
                    color: #000000;
@@ -225,7 +237,7 @@
                    font-weight: 400;
                    font-size: 24rpx;
                    color: #44775A;
                    padding:18rpx;
                    padding: 18rpx;
                    padding-bottom: 28rpx;

                    .score {
@@ -261,6 +273,7 @@

        .query-scores {
            overflow-x: scroll;

            // width: max-content;
            .item {
                min-width: fit-content;
@@ -274,7 +287,7 @@
                height: 50rpx;
                border-radius: 26rpx;
                // width: fit-content;
				

            }

            .item.active {

 sub_pages/customer/self/member-center.vue

@@ -9,7 +9,8 @@
            <view class="info bg-white p20">
                <view class="flex">
                    <view>成长值规则</view>
                    <view class="m-l-a m-r-0 text-right desc-gray" @click="goto('/pages/help/content?id=会员协议',false)">点击查看会员协议
                    <view class="m-l-a m-r-0 text-right desc-gray" @click="goto('/pages/help/content?id=会员协议',false)">
                        点击查看会员协议
                    </view>
                </view>

@@ -22,7 +23,8 @@
                </view>
                <view>
                    <view class="m-t-12">积分达到
                        {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetStartPoint || '-'}}</view>
                        {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetStartPoint || '-'}}
                    </view>
                    <view class="m-t-12">优惠
                        {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎
                    </view>
@@ -70,9 +72,16 @@
                //         targetMemberLevel: "钻石会员"
                //         targetStartPoint: 10001
                //计算下一个等级的差距
                let name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel

                for (var tmp of this.bannerList) {
                    tmp.point = {
                        current: this.currentInfo.customerDTO.userGrowthRecord.currentGrowthValue || 0
                    }
                    tmp.currentMsg = ''
                    if (tmp.title === name) {
                        //说明是当前等级，其他待定
                        tmp.currentMsg = '当前等级'
                    }
                }
                if (this.currentInfo.customerDTO.userGrowthRecord.targetMemberInfos) {
@@ -93,7 +102,7 @@

                this.init = true
                this.$nextTick(() => {
                    var name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
                    // var name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
                    var index = -1
                    for (var tmp of this.bannerList) {
                        index += 1
@@ -116,26 +125,27 @@
            return {
                init: false,
                bannerList: [{
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/d3/d31e9011d1c140068942c106c2f7e37bTFDUPzQRgaHx7a20dcefe1fb5eb12e18d294b8c1f86e.png',
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/74/74cae150ea44463f92abbe1f9dd3c561fKcsrp0hOcNYa1cfb5eb753e56876fddcba7ea1e1a32.png',
                    picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ef/ef96604518db467fbd344c08e48d1fac8jZdk1ED0Yq023d4f86c2ec36975c981ba522c2bfe3f.png',
                    title: '普通会员',
                    // description: '一万年太久，就现在，给你爱',
                    path: '',
                    point: undefined
                    point: undefined,
                }, {
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/cf/cff11dd119174483a46858ace7ddc2a3lJlA3kEXom5H82b85fac5f2db00d50ece7e650207f78.png',
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/25/2534864ad275400b9e8db4042b87bfeaBv7NbzOZG0ptc7fca5df83dcd97fd02b4027518cc593.png',
                    picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/07/075db9222f7a41e981c5b263d7210ed5Ztljs5yDHKILd37c3399011f84f401b755477bb8a323.png',
                    title: '银卡会员',
                    // description: '花中樱，鱼乃鲷花中樱，鱼乃鲷',
                    path: ''
                    path: '',
                    // currentMsg:''
                }, {
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/5b/5b9bcdeb29ab4ab7a7a7871e430e9180kwtx0q4ovEGpe93cd3cc7772e4b31a6cfea199663815.png',
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/4d/4d8ab63e75ca462fa9e3bb480ff2da68ID5KnLIH9DwM23f9a04d99cc1f3306a8655c1eff34bf.png',
                    picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/f1/f192b651606045ddba5c5f04a34a00c2R8MmH6mVsprH81cab47fbe889222f6088f4ca2cf20d5.png',
                    title: '金卡会员',
                    // description: '取材自湘西苗族传统的烟熏文化',
                    path: ''
                }, {
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ce/ce13a8fe5d7d48aeb6e6dec8217d8cbeWia6N8vcYrbse93cd3cc7772e4b31a6cfea199663815.png',
                    bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/db/db6b0cefdbb949cca9c8da824a5ebdebXsPsk2ROfxZu22f9b09e3feece76753b0df971fdc301.png',
                    picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c9/c94d8f444af94b899d1e1593cebb933eDyZyhyoyDxTRaf60a4d692f097e5d790cdb88fae9d0c.png',
                    title: '钻石会员',
                    // description: '在自己的小世界里，日日好日，夜夜好清宵',

 sub_pages/customer/shopping/confirm.vue

@@ -25,7 +25,8 @@
                    if (this.cache_coupon.couponDiscountType === 'zero') {
                        return this.cache_coupon.couponDiscountValue || 0
                    } else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
                        var total = ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0)
                        var total = ((this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
                                0) || 0)
                            .toFixed(2)
                        if (total >= this.cache_coupon.minOrderAmount) {
                            return this.cache_coupon.couponDiscountValue || 0
@@ -471,8 +472,8 @@
                    {{ (current_transport.fee || 0) }}
                </view>
            </view>
            <view class="desc flex">
                <view>优惠:</view>
            <view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
                <view>优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):</view>
                <view class="m-l-a m-r-0 text-right">
                    -{{ coupon_fee || 0 }}
                </view>

 sub_pages/customer/trade/trade.vue

@@ -1,17 +1,13 @@
<template>

    <view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">

        <view class="search-container m-t-12 flex" v-if="!hidefooter">

            <!-- <view class="flex m-r-20">

            <view class="flex m-r-20">

                <view class="m-r-10" style="line-height: 80rpx;" @click="changeSearchType">

                    {{type=='category'?'按分类':'按店铺'}}

                </view>

                <u-icon name="arrow-down"></u-icon>



            </view> -->

            <view class="flex m-r-20">

                <um-dropdown width="200rpx" style="line-height: 80rpx;" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>

            </view>

			
            <view class="flex1 input">

                <u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable

                    @confirm="buttonSearchFlow" @clear="()=>{

@@ -58,18 +54,18 @@
                                </image>

                            </view>

                            <view class="cateen_infos list">

                                <view class="title">{{item.name}}</view>

                                <!-- #ifdef PUB_CUSTOMER_DEV -->

								
                                <view class="price">

                                    <view>会员价</view>

                                    <view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>

                                </view>								
                                <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>

								
                                <!-- #endif -->

                                <!-- #ifndef PUB_CUSTOMER_DEV -->

                                <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>

                                <view class="title">{{item.name}}</view>
                                <!-- #ifdef PUB_CUSTOMER_DEV -->
								
                                <view class="price">
                                    <view>会员价</view>
                                    <view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
                                </view>								
                                <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
								
                                <!-- #endif -->
                                <!-- #ifndef PUB_CUSTOMER_DEV -->
                                <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                                <!-- #endif -->

                                <view class="desc">在售 {{item.stock||'0'}} 扎</view>

                            </view>

@@ -134,22 +130,10 @@
                },

                currentCategory: {},

                type: 'category', //supplier

                def: 0,

                typeList:[

                    {

                        label: '按分类',

                        value: 'category',

                    },

                    {

                        label: '按店铺',

                        value: 'supplier',

                    },

                ],





            }

        },



        // #ifdef PUB_CUSTOMER

        onShareAppMessage() {

            let that = this;

@@ -212,9 +196,6 @@
            })

        },

        methods: {

            fnChange(e) {

                this.type = e.value

            },

            changeSearchType() {

                if (this.type == 'category') {

                    this.type = 'supplier'

@@ -320,7 +301,7 @@
                }

            },

            toDetailList(item) {

                //去商品列表页面

                //去商品列表页面
                console.log('toDetailList',this.supplierId)

                uni.navigateTo({

                    url: `/sub_pages/customer/trade/list?categoryId=${item.id}&supplierId=${this.supplierId||''}`


 sub_pages/partner/delivery/delivery-supplier-detail-list.vue

@@ -7,7 +7,7 @@
                    stationId: '',
                    stationName: '',
                    statusStr: '',
                    status: '',
                    status: 'ARRIVED,PENDING',
                    warehouseLocationCode: '',
                },
                show_select_station: false,
@@ -45,6 +45,16 @@
                    }
                ],
                target_levels: [],
                tabs: [{
                        name: '待质检',
                        status: 'ARRIVED,PENDING',
                    },
                    {
                        name: '已质检',
                        status: 'CHECKED',
                    },
                ],
                flg: '0',
            }
        },
        onLoad(options) {
@@ -62,19 +72,19 @@

            this.getList()

            this.$http.request('get', '/api/code/value', {
                params: {
                    type: 'DELIVERY_ORDER_STATUS'
                }
            }).then(res => {
                var data = res.data || []
                this.status_columns = [data || []]
                this.status_columns[0].unshift({
                    label: '全部',
                    value: ''
                })
                console.log('status_columns', this.status_columns)
            })
            // this.$http.request('get', '/api/code/value', {
            //     params: {
            //         type: 'DELIVERY_ORDER_STATUS'
            //     }
            // }).then(res => {
            //     var data = res.data || []
            //     this.status_columns = [data || []]
            //     this.status_columns[0].unshift({
            //         label: '全部',
            //         value: ''
            //     })
            //     console.log('status_columns', this.status_columns)
            // })
            this.$http.request('get', '/api/code/value', {
                params: {
                    type: 'FLOWER_LEVEL'
@@ -94,7 +104,7 @@
            uni.stopPullDownRefresh()
        },
        methods: {

		
            callTel(tel) {
                if (tel) {
                    uni.makePhoneCall({
@@ -298,7 +308,11 @@

                }
            },

            changeTab(flg) {
                this.flg = '' + flg
                this.query.status = this.tabs[flg].status
                this.refreshList()
            },
        }
    }
</script>
@@ -306,9 +320,19 @@
    <!-- 列表页面 -->
    <view class="page-delivery">
        <view class="p15" style="min-height: calc(100vh - 260rpx);">
            <view class="search-container m-t-12 flex" v-if="!query.supplierId">
                <view class="flex1 input">
            <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon">

            </top-tabs>
            <view class="search-container m-t-15 flex" v-if="!query.supplierId">
                <view class="flex1 input m-r-5">
                    <u-input placeholder="请输入供应商名称" v-model="query.supplierName">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
                    </u-input>
                </view>
                <view class="flex1 input m-l-5">
                    <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
@@ -316,21 +340,15 @@
                </view>
            </view>

            <view class="search-container m-t-12 flex">
                <view class="flex1 input">
                    <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
                    </u-input>
                </view>
                <view class="component-filter-container p10 bg-white m-l-10">
            <!-- <view class="search-container m-t-12 flex"> -->
				
                <!--     <view class="component-filter-container p10 bg-white m-l-10">
                    <view class="flex1" @click="show_select_status=true">
                        配送单状态:{{ query.statusStr || '全部' }}
                        <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
                    </view>
                </view>
            </view>
                </view> -->
            <!-- </view> -->


            <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>

 sub_pages/partner/delivery/delivery.vue

@@ -7,14 +7,27 @@
                    stationId: '',
                    stationName: '',
                    statusStr: '',
                    status: '',
                    status: 'ARRIVED,PENDING',
                    warehouseLocationCode: '',
                    date: '',
                },
                show_select_station: false,
                show_select_status: false,
                selecttoday: true,
                columns_station: [],
                status_columns: [],
                show_time_picker_time: false,
                tmp_picker_time: new Date(),
                flg: '0',
                tabs: [{
                        name: '待质检',
                        status: 'ARRIVED,PENDING',
                    },
                    {
                        name: '已质检',
                        status: 'CHECKED',
                    },
                ],
            }
        },
        onLoad(options) {
@@ -32,19 +45,19 @@
            //     var data = res.data
            //     this.columns_station = [data || []]
            // })
            this.$http.request('get', '/api/code/value', {
                params: {
                    type: 'DELIVERY_ORDER_STATUS'
                }
            }).then(res => {
                var data = res.data || []
                this.status_columns = [data || []]
                this.status_columns[0].unshift({
                    label: '全部',
                    value: ''
                })
                console.log('status_columns', this.status_columns)
            })
            // this.$http.request('get', '/api/code/value', {
            //     params: {
            //         type: 'DELIVERY_ORDER_STATUS'
            //     }
            // }).then(res => {
            //     var data = res.data || []
            //     this.status_columns = [data || []]
            //     this.status_columns[0].unshift({
            //         label: '全部',
            //         value: ''
            //     })
            //     console.log('status_columns', this.status_columns)
            // })

        },
        onReachBottom() {
@@ -56,12 +69,23 @@
            uni.stopPullDownRefresh()
        },
        methods: {
            async select_time_picker_time(e) {
                console.log('select_time_picker_time', e)
                var vv = e.value && new Date(e.value) || new Date()
                // if (vv) {
                //     vv = vv.replace('aN:', '00:')
                // }
                // var time = new Date(`2023-8-21 ${vv}:00`)
                this.show_time_picker_time = false
                this.query.date = this.$util.toDate(vv) || ''
            },
            changeSelecrRange() {
                this.selecttoday = !this.selecttoday

                this.$nextTick(() => {
                    if (this.selecttoday) {
                        this.listApi = '/api/delivery/check/list/today'
                        this.query.date = ''
                    } else {
                        this.listApi = '/api/delivery/check/list'
                    }
@@ -116,7 +140,12 @@
                    //     tmp.$forceUpdate()
                    // }, 500)
                }
            }
            },
            changeTab(flg) {
                this.flg = '' + flg
                this.query.status = this.tabs[flg].status
                this.refreshList()
            },
        }
    }
</script>
@@ -124,9 +153,19 @@
    <!-- 列表页面 -->
    <view class="page-delivery">
        <view class="p15" style="min-height: calc(100vh - 260rpx);">
            <view class="search-container m-t-12 flex">
                <view class="flex1 input">
            <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon">

            </top-tabs>
            <view class="search-container m-t-15 flex">
                <view class="flex1 input m-r-5">
                    <u-input placeholder="请输入供应商名称" v-model="query.supplierName">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
                    </u-input>
                </view>
                <view class="flex1 input m-l-5">
                    <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
@@ -134,22 +173,21 @@
                </view>
            </view>

            <view class="search-container m-t-12 flex">
                <view class="flex1 input">
                    <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
                    </u-input>
                </view>
                <view class="component-filter-container p10 bg-white m-l-10">
            <!-- <view class="search-container m-t-12 flex"> -->

            <!--     <view class="component-filter-container p10 bg-white m-l-10">
                    <view class="flex1" @click="show_select_status=true">
                        配送单状态:{{ query.statusStr || '全部' }}
                        <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
                    </view>
                </view> -->
            <!-- </view> -->
            <view class="m-t-12 m-b-12 flex">
                <view class="" v-if="!selecttoday" :class="[query.date?'':'desc-gray']"
                    @click="show_time_picker_time=true">
                    <!-- 选择日期 -->
                    {{query.date || '请选择日期'}}
                </view>
            </view>
            <view class="m-t-12 m-b-12">
                <view class="m-l-a m-r-20 w-fit flex">
                    <radio :checked="selecttoday" @click="changeSelecrRange"></radio>
                    <view>只查看今日</view>
@@ -210,6 +248,10 @@
                        <view class="form-item-label">送达时间</view>
                        <view class="form-item-value">{{ item.arriveTime || '-' }}</view>
                    </view> -->
                    <view class="form-item flex1">
                        <view class="form-item-label">待质检数</view>
                        <view class="form-item-value">{{ item.uncheckedCount || '0' }}</view>
                    </view>


                    <view class="line-gray"></view>
@@ -233,6 +275,9 @@
        <u-picker @confirm="select_status" keyName="label" @cancel="show_select_status=false" :show="show_select_status"
            :columns="status_columns"></u-picker>

        <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"
            @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="date"></u-datetime-picker>


    </view>
</template>