文字

hdPad/src/pages/home/cash.vue

@@ -13,7 +13,7 @@
 		<template v-else>
 			<view class="app-casher-area">
 				<view class="nav-left">
-					<navComponent></navComponent>
+					<navComponent navType="casher"></navComponent>
 				</view>
 				<!-- 已选花材列表 -->
 				<view class="itemList-box">

hdPad/src/pages/home/components/nav.vue

@@ -1,6 +1,8 @@
 <template>
   <view class="nav-left">
-    <view class="item-list" v-for="(s, idx) in nav" @tap="goTo(s)" :key="idx">{{s.name}}</view>
+    <view :class="['item-list',navType==s.flag ?'selected':'']" v-for="(s, idx) in nav" @tap="goTo(s)" :key="idx">
+      <view class="name">{{s.name}}</view>
+     </view>
     <keyboard-listener v-if="device == 'PAD'" @keyup="getScan"></keyboard-listener>
   </view>
 </template>
@@ -11,13 +13,19 @@ export default {
   name: "navComponet",
   mixins: [scanMins],
   components: { keyboardListener },
+	props: {
+		navType: {
+			type: String,
+			default: ''
+		}
+  },
   data() {
     return {
       nav: [
-        { name: "收银", page: "/pages/home/cash" },
-        { name: "制作单", page: "/pages/home/work" },
-        { name: "选品建单", page: "/pages/home/selectMake" },
-        { name: "选材建单", page: "/pages/home/make" },
+        { name: "收银", page: "/pages/home/cash",flag:'casher' },
+        { name: "制作单", page: "/pages/home/work",flag:'work' },
+        { name: "选品建单", page: "/pages/home/selectMake",flag:'selGoods' },
+        { name: "选材建单", page: "/pages/home/make",flag:'selItem' }
       ],
       device:'',
     };
@@ -65,10 +73,18 @@ export default {
   }
   & .item-list {
     font-size: 10upx;
-    text-align: center;
-    padding: 20upx 0;
     color: white;
-    width: 28upx;
+    text-align: center;
+    width: 32upx;
+    height:50upx;
+    display:flex;
+    & .name{
+      width:28upx;
+    }
+  }
+  & .selected{
+    font-weight: bold;
+    color:#11eb7e;
   }
 }
 </style>

hdPad/src/pages/home/components/workList.vue

@@ -2,9 +2,9 @@
     <view class="itemList-box">
         <view class="title">列表</view>
         <view class="order-status">
+            <view @tap="changeStatus('')" :class="[{'checked':status===''}]">全部</view>
             <view @tap="changeStatus(0)" :class="[{'checked':status===0}]">待完成</view>
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">已完成</view>
-            <view @tap="changeStatus('')" :class="[{'checked':status===''}]">全部</view>
         </view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
         :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">

hdPad/src/pages/home/make.vue

@@ -2,7 +2,7 @@
     <view>
         <view class="app-casher-area">
             <view class="nav-left">
-                <casherNav></casherNav>
+                <casherNav navType="selItem"></casherNav>
             </view>
             <!-- 已选花材列表 -->
             <view class="itemList-box">

hdPad/src/pages/home/selectMake.vue

@@ -2,7 +2,7 @@
     <view>
         <view class="app-casher-area">
             <view class="nav-left">
-                <casherNav></casherNav>
+                <casherNav navType="selGoods"></casherNav>
             </view>
             <!-- 已选商品列表 -->
             <view class="itemList-box">

hdPad/src/pages/home/work.vue

@@ -3,7 +3,7 @@
     <view>
         <view class="app-casher-area">
             <view class="nav-left">
-                <casherNav></casherNav>
+                <casherNav navType="work"></casherNav>
             </view>
             <view class="work-order-list">
                 <workList @getOrder="getOrder"></workList>
@@ -52,7 +52,7 @@ export default {
 	display: flex;
 	height: 100vh;
 	& .nav-left {
-		flex: 6;
+		flex: 5;
 		background-color: rgba(72, 91, 107, 1);
 	}
 	& .work-order-list {