头部整理

mini-pro-web/src/components/layout/NavLayout.vue

@@ -9,7 +9,7 @@
			@click-left="onClickLeft"
			>
		</van-nav-bar>
		<div class="main-container" :class="{pt50:hasTop, mainNobotHasTop: hasTop, 'has-bot': hasBot}">
		<div class="main-container" :class="{pt46:hasTop, mainNobotHasTop: hasTop, 'has-bot': hasBot}">
			<app-main/>
		</div>
		<AppBotNav v-if="hasBot"></AppBotNav>
@@ -44,7 +44,7 @@ export default {
	},
	computed: {
		hasTop(){
			return false
			// return false
			return !(this.$route.meta&&this.$route.meta.hasTop===false)
		},
		title() {

mini-pro-web/src/mixins/common.js

@@ -21,18 +21,19 @@ Vue.mixin({
        hasBack() {
			return (this.$navigation.getRoutes().length>1) && !_.includes(this.indexPages, this.$route.path)
		},
		hasTop(){
			if(this.isApp) {
				return true
			}
			return (this.$route.meta&&this.$route.meta.hasTop===true);
		},
        hasTop(){
            return !(this.$route.meta&&this.$route.meta.hasTop===false)
        },
		hasBot(){
			if(!this.$route.meta){
				return false
			}
			return (this.$route.meta&&this.$route.meta.hasBot);
		}
		},
        offsetTop(){
            debugger
            return !(this.$route.meta&&this.$route.meta.hasTop===false)? '12.26667vw' : '0'
        }
    },
    methods:{
        _refreshPageData(instance, params) {

mini-pro-web/src/router/device.js

@@ -14,7 +14,7 @@ const device = [
                meta: {
                    title: '设备管理',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -24,7 +24,7 @@ const device = [
                meta: {
                    title: '设备',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -34,7 +34,7 @@ const device = [
                meta: {
                    title: '温度控制',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -44,7 +44,7 @@ const device = [
                meta: {
                    title: '开启温度控制',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -54,7 +54,7 @@ const device = [
                meta: {
                    title: '湿度控制',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -64,7 +64,7 @@ const device = [
                meta: {
                    title: '开启湿度控制',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -74,7 +74,7 @@ const device = [
                meta: {
                    title: '货道状态',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -84,7 +84,7 @@ const device = [
                meta: {
                    title: '货道状态',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -94,7 +94,7 @@ const device = [
                meta: {
                    title: '设备状态',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -104,7 +104,7 @@ const device = [
                meta: {
                    title: '设备重启',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -114,7 +114,7 @@ const device = [
                meta: {
                    title: '信息日志',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            {
@@ -124,7 +124,7 @@ const device = [
                meta: {
                    title: '在售停售',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
        ]

mini-pro-web/src/router/index.js

@@ -35,7 +35,8 @@ const routes = [
        name: 'login',
        component: Login,
        meta: {
            title: '登录'
            title: '登录',
            hasTop: false
        }
    },
    {
@@ -51,7 +52,7 @@ const routes = [
        name: 'fotgetPassword',
        component: FotgetPassword,
        meta: {
            title: '忘记密码'
            title: '忘记密码',
        }
    },
    {
@@ -73,11 +74,17 @@ const routes = [
    {
        path: '/drugList',
        name: 'drugList',
        component: DrugList,
        meta: {
            title: '选择药品'
        }
        component: NavLayout,
        children: [{
            path: '/drugList',
            name: 'drugList',
            component: DrugList,
            meta: {
                title: '选择药品'
            }
        }]
    },
    
]
const whiteList = [

mini-pro-web/src/router/me.js

@@ -14,7 +14,7 @@ const me = [
                meta: {
                    title: '切换账号',
                    hasBot: false,
                    hasTop: false
                    // hasTop: false
                }
            },
            

mini-pro-web/src/router/order.js

@@ -10,7 +10,7 @@ const routeMap = [
                name: "orderList",
                meta: {
                    title: "订单管理",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/order/list.vue")
@@ -20,7 +20,7 @@ const routeMap = [
                name: "orderDetail",
                meta: {
                    title: "订单详情",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/order/detail/index.vue")

mini-pro-web/src/router/personal.js

@@ -20,7 +20,7 @@ const routeMap = [
                name: "personalChangePassword",
                meta: {
                    title: "修改密码",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/personal/changePassword.vue")

mini-pro-web/src/router/replenishment.js

@@ -20,7 +20,7 @@ const routeMap = [
                name: "replenishmentDeviceList",
                meta: {
                    title: "设备商品概况",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/device/list.vue")
@@ -30,7 +30,7 @@ const routeMap = [
                name: "replenishmentDeviceDetail",
                meta: {
                    title: "设备商品概况",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/device/detail.vue")
@@ -40,7 +40,7 @@ const routeMap = [
                name: "replenishmentRecordList",
                meta: {
                    title: "补货记录",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/record/list.vue")
@@ -50,7 +50,7 @@ const routeMap = [
                name: "replenishmentRecordDetail",
                meta: {
                    title: "补货记录详情",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/record/detail.vue")
@@ -60,7 +60,7 @@ const routeMap = [
                name: "replenishmentPickingList",
                meta: {
                    title: "备货单",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/picking/list.vue")
@@ -70,7 +70,7 @@ const routeMap = [
                name: "replenishmentPickingDetail",
                meta: {
                    title: "备货单详情",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/picking/detail.vue")
@@ -80,7 +80,7 @@ const routeMap = [
                name: "replenishmentStockUpDeviceList",
                meta: {
                    title: "查看缺货设备",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/stockUp/deviceList.vue")
@@ -90,7 +90,7 @@ const routeMap = [
                name: "replenishmentStockUpDetail",
                meta: {
                    title: "查看缺货汇总",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/stockUp/detail.vue")
@@ -101,7 +101,7 @@ const routeMap = [
                name: "replenishmentStartDeviceList",
                meta: {
                    title: "选择设备",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/start/deviceList.vue")
@@ -111,7 +111,7 @@ const routeMap = [
                name: "replenishmentStartDeviceDetail",
                meta: {
                    title: "补货",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/start/deviceDetail.vue")
@@ -121,7 +121,7 @@ const routeMap = [
                name: "replenishmentStartProductDetail",
                meta: {
                    title: "商品详情",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/start/productDetail.vue")
@@ -131,7 +131,7 @@ const routeMap = [
                name: "replenishmentStartSelProduct",
                meta: {
                    title: "选择商品",
                    hasTop: false,
                    // hasTop: false,
                    hasBot: false
                },
				component: () => import("@/views/replenishment/start/selProduct.vue")

mini-pro-web/src/views/device/cargoLane/index.vue

@@ -1,6 +1,6 @@
<template>
    <div class='cargoLaneIndex'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <div class='grid-4 c-f14 c-border-b c-333 ptb15 bgc-fff'>
                <div class="c-t-center">
                    <div class='c-ff5e6c c-f16 mb5'>{{deviceInfo.layer || 0}}</div>
@@ -79,7 +79,7 @@ export default{
            closeCount: 0
        }
    },
     created() {
    created() {
        this.findMediicinecabinetInventoryByDeviceId()
        this.findDeviceById()
    },

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

@@ -1,6 +1,6 @@
<template>
    <div class='deviceIndex'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <van-field
                v-model="searchText"
                center

mini-pro-web/src/views/drug/css/drugSel.scss

@@ -13,7 +13,7 @@
    }
}
.has-top{
.mainNobotHasTop{
    .drug-sel{
        .search{
            top: 46px;

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

@@ -1,6 +1,6 @@
<template>
    <div class="drug-list">
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <div class="search">
                <form action="/">
                    <van-search
@@ -81,6 +81,7 @@ export default {
			if(val&&val.length>=2){
                var p = {
                    content: this.value,
                    userId: this.user.id,
                    page: 1,
                    size: 999
                }

mini-pro-web/src/views/machine/components/Result.vue

@@ -29,8 +29,8 @@
				<img @click="$emit('outDrug'); rsType=3;" v-show="rsType==1" src="../img/quanbuquyao_icon.png" alt="">
				<img @click="$emit('onBack')" v-show="rsType==2" src="../img/yaofangquyao_icon.png" alt="">
				<img @click="$emit('onBackIndex')" v-show="rsType==4" src="../img/back.png" alt="">
				<img @click="$emit('onPrint')" v-show="rsType==4" src="../img/dayin.png" alt="">
				<img @click="$emit('onBackIndex')" class="mr5" v-show="rsType==4" src="../img/back.png" alt="">
				<img @click="$emit('onPrint')" class="ml5" v-show="rsType==4" src="../img/dayin.png" alt="">
				<img class="jiantou" v-show="rsType==5" src="../img/tjiantou.png" alt="">
				<img class="check-btn" v-show="rsType==5" src="../img/shangfangdingdan.png" alt="">
@@ -102,13 +102,13 @@ export default {
			text-align: center;
			img{
				display: inline-block;
				margin: calc(186px / 6) auto 0;
				margin-top: calc(186px / 6) auto 0;
				width: calc(790px / 6);
				&:first-child{
				&.mr5{
					margin-right: calc(60px / 6);
				}
				&:last-child{
				&.ml5{
					margin-left: calc(60px / 6);
				}
			}

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

@@ -19,7 +19,7 @@
			</div>
			<div class="video-swipe">
				<van-swipe :autoplay="0" indicator-color="white">
				<van-swipe :touchable="false" :autoplay="0" indicator-color="white">
					<template v-if="videoList&& videoList.length">
						<van-swipe-item v-for="(item, i) in videoList" :key="i">
							<video class="swipe-item-video" :autoplay="i==0" loop controls muted :src="setImgUrl(item.url)"></video>
@@ -32,7 +32,7 @@
			</div>
			<div class="img-swipe">
				<van-swipe :autoplay="3000" indicator-color="white">
				<van-swipe :touchable="false" :autoplay="3000" indicator-color="white">
					<template v-if="imgList && imgList.length">
						<van-swipe-item v-for="(item, i) in imgList" :key="i">
							<img class="swipe-item-img" :src="setImgUrl(item.url)">
@@ -91,7 +91,7 @@ export default {
  	data() {
    	return {
			deviceNum: this.$route.query.deviceNum || '',//14912202107000001500000000000000  
			step: 0, //0启动页  1首页  2扫码页  3订单页
			step: 3, //0启动页  1首页  2扫码页  3订单页
			curImg: '',
			illustrationMskShow: false,
			socketUrl: '',
@@ -103,7 +103,7 @@ export default {
			heartbitInterval: '',
			currindex: 0,
			orderdetail: [],
			rsType: 0,// 1:订单信息 2订单错误  3订单成功  4出药完成  5订单列表
			rsType: 4,// 1:订单信息 2订单错误  3订单成功  4出药完成  5订单列表
			imgList: [],
			videoList: [],
			inCheckBarcode: false,
@@ -126,7 +126,9 @@ export default {
		}
	},
	created(){
		
		if(this.deviceNum){
			this.step = 1
		}
	},
  	methods: {
		onPrev(){

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

@@ -1,6 +1,6 @@
<template>
    <div class='order-list'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <div class="top-banner kitbox fs-14 ptb10 pl15">
                <div @click="pickDate(1)" class="date-item">{{$moment(startDate).format('YYYY-MM-DD')}}</div>
                <div class="ptb5 plr10">至</div>

mini-pro-web/src/views/replenishment/picking/list.vue

@@ -1,6 +1,6 @@
<template>
    <div class='replenishment-picking-list'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <van-tabs v-model="active" @change="onChange">
                <!-- <van-tab title="全部"></van-tab> -->
                <van-tab title="备货中"></van-tab>

mini-pro-web/src/views/replenishment/record/list.vue

@@ -1,6 +1,6 @@
<template>
    <div class='replenishment-record-list'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <van-tabs v-model="active">
                <van-tab title="补货"></van-tab>
                <van-tab title="换货"></van-tab>

mini-pro-web/src/views/replenishment/start/deviceDetail.vue

@@ -1,6 +1,6 @@
<template>
    <div class='replenishment-start-device-detail fs-14'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <div class="bgc-17b3ec c-fff">
                <div class="pt10 plr15 ellipsis_1">当前货柜：{{deviceInfo.equName}}</div>
                <van-row>
@@ -179,4 +179,14 @@ export default{
        
    }
}
</style>
<style lang="scss">
.mainNobotHasTop{
    .replenishment-start-device-detail{
        .list, .left-list{
            height: calc(100vh - 199px);
        }
    }
}
</style>

mini-pro-web/src/views/replenishment/start/deviceList.vue

@@ -1,6 +1,6 @@
<template>
    <div class='replenishment-start-device-list'>
        <van-sticky>
        <van-sticky :offset-top="offsetTop">
            <van-tabs v-model="active">
                <van-tab title="缺货设备"></van-tab>
                <van-tab title="全部设备"></van-tab>
@@ -117,4 +117,13 @@ export default{
        }
    }
}
</style>
<style lang="scss">
.mainNobotHasTop{
    .replenishment-start-device-list{
        .custom-list .search{
            top: 96px;
        }
    }
}
</style>

mini-pro-web/src/views/replenishment/stockUp/detail.vue

@@ -1,7 +1,7 @@
<template>
    <div class='replenishment-stock-up-detail fs-14'>
        <div class="list bgc-fff ">
            <van-sticky>
            <van-sticky :offset-top="offsetTop">
                <div class="row kitbox bgc-fff"  >
                    <div class="box-flex-1 pl10">商品名称</div>
                    <div class="tc">现料数</div>