全局样式

App.vue

@@ -21,5 +21,5 @@
 	/*每个页面公共css */
 	@import '@/common/style/reset.css';
 	@import '@/common/style/uni.css';
-	@import '@/common/style/layout.css';
+	@import '@/common/style/layout.styl';
 </style>

common/style/layout.styl

@@ -107,7 +107,7 @@ uni-button:after {
 .zd_content {
 	width: 100%;
 	height: auto;
-	padding: 108rpx 15rpx 120rpx 14rpx;
+	padding: calc(var(--status-bar-height) + 108rpx) 15rpx 120rpx 14rpx;
 }
 .zd_wrapper {
 	width: 100%;
@@ -268,20 +268,16 @@ uni-button:after {
 	color: #4e6ef2;
 	font-weight: bold;
 }
+.slide_new table thead tr th.fontcol2,.slide_new table tbody tr td.fontcol2 {
+	color: #d7592f;
+	font-weight: bold;
+}
 .slide_new table tbody tr.checked td {
-	border-top: 1px solid #D7592F;
-	border-bottom: 1px solid #D7592F;
+	background-color: #f0c560;
+	color: #fff;
 }
 .slide_new table tbody tr.checked td:first-child {
-	border-left: 1px solid #D7592F;
-	border-top-left-radius: 8rpx;
-	border-bottom-left-radius: 8rpx;
-}
-.slide_new table tbody tr.checked td:last-child {
-	border-right: 1px solid #D7592F;
-	border-top-right-radius: 8rpx;
-	border-bottom-right-radius: 8rpx;
-	
+	border-left: 6rpx solid #ff8227;
 }
 
 /** 提交栏 **/
@@ -302,14 +298,14 @@ uni-button:after {
 	border-radius: 10rpx;
 }
 .btn-default {
-	color: #D7592F ;
-	background-color: #fff;
-	border: 1px solid #D7592F ;
+	color: #ff6800;
+	background: #fff;
+	border: 1px solid #ff9856;
 }
 .btn-success {
 	color: #fff;
-	border: 1px solid #D7592F ;
-	background-color: #D7592F ;
+	border: 1px solid #ff9856;
+	background: linear-gradient(-45deg, #ff6800, #ff9856);
 }
 .btn-info {
 	color: #fff;

common/style/mixin.styl

@@ -1,4 +1,8 @@
-$red = #D7592F 
+$red = #D7592F
+$red1 = #ff6800
+$red2 = #ff8227
+$red3 = #ff9856
+$red4 = #ff6800
 $green = #6CBE8B
 $yellow = #E9B451
 $blue = #6798ef

components/NavBar.vue

@@ -53,10 +53,11 @@
 .header
 	_fj()
 	position fixed
-	_wh(100%, 88rpx)
+	_wh(100%, calc(var(--status-bar-height) + 88rpx))
 	background-color $red
+	background linear-gradient(to bottom, $red1, $red2)
 	z-index 200
-	padding 0 20rpx
+	padding var(--status-bar-height) 20rpx 0 20rpx
 .page_name
 	_font(32rpx, 32rpx, #fff,700,center)
 </style>

components/upTop.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="back-top" @tap="toTop" v-show="showBtn">
-		<uni-icons type="up" size="26" color="#9a9a9a"></uni-icons>
+		<uni-icons type="arrow-up" size="26" color="#9a99ac"></uni-icons>
 	</view>
 </template>
 
@@ -37,13 +37,13 @@
 .back-top
 	position: fixed;
 	z-index: 9999;
-	right: 20rpx;
-	bottom: 150rpx;
-	// background-color: rgba(150,150,150,.3);
-	width: 80rpx;
-	height: 80rpx;
-	// line-height: 80rpx;
-	// border-radius: 50%;
-	// text-align: center;
-	// box-shadow: 0 4rpx 16rpx rgba(28,31,35,.3);
+	right: 10rpx;
+	bottom: 130rpx;
+	background-color: #fff;
+	width: 70rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+	border-radius: 50%;
+	text-align: center;
+	box-shadow: 0 4rpx 16rpx rgba(28,31,35,.3);
 </style>

pages/SecondPhase/DeliveryUnbind.vue

@@ -23,7 +23,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th>单据号</th>
+								<th class="fontcol1">单据号</th>
 								<th>状态</th>
 								<th>总重量</th>
 								<th>明细数</th>
@@ -41,7 +41,7 @@
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.bill_code === pkId}">
-								<td>{{e.bill_code}}</td>
+								<td class="fontcol1">{{e.bill_code}}</td>
 								<td>{{e.bill_status}}</td>
 								<td>{{e.total_qty}}</td>
 								<td>{{e.detail_count}}</td>
@@ -74,8 +74,8 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
-	// import {twoPdaIvtQuery} from '@/utils/getData2.js'
-	import {twoPdaIvtQuery} from '@/utils/mork2.js'
+	import {twoPdaIvtQuery} from '@/utils/getData2.js'
+	// import {twoPdaIvtQuery} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar,

pages/SecondPhase/DeliveryUnbindConfirm.vue

@@ -23,7 +23,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th class="fontcol1">木箱号</th>
+								<th class="fontcol2">木箱号</th>
 								<th>点位编码</th>
 								<th>点位名称</th>
 								<th>重量</th>
@@ -34,7 +34,7 @@
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @tap="_twoPdaIvtbBoxDtlQuery(e.package_box_sn)">
-								<td class="fontcol1">{{e.package_box_sn}}</td>
+								<td class="fontcol2">{{e.package_box_sn}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.point_name}}</td>
 								<td>{{e.box_weight}}</td>

pages/home/home.vue

@@ -1,16 +1,25 @@
 <template>
-	<view class="home_wraper">
+	<view class="zd_container">
+		<view class="header"><span class="page_name">首页</span></view>
 		<view class="zd_content">
-			<view class="header">首页</view>
-			<view class="userInfo-wrap">
-				<view class="userInfo">
-					<text v-if="userName !== ''" class="p1">{{userName}}</text>
-					<text class="p2">欢迎进入铜箔手持系统！</text>
+			<view class="userInfo_wrap">
+				<view class="userInfo_content">
+					<view class="userInfo">
+						<text v-if="userName !== ''" class="p1">{{userName}}</text>
+						<text class="p2">欢迎进入铜箔手持系统！</text>
+					</view>
+					<view class="exit" @tap="Quit">
+						<view class="icon-exit"></view>
+						<view class="exit-text">退出</view>
+					</view>
 				</view>
-				<view class="exit" @tap="Quit">
-					<view class="icon-exit"></view>
-					<view class="exit-text">退出</view>
+			</view>
+			<view class="zd-row relative jcflexstart tabs_wrap">
+				<view class="zd-col-6 tab_active" :style="{'left': tab === 2 ? '25%' : '0'}">
+					<view class="tab_line_active"></view>
 				</view>
+				<view class="zd-col-6 tab_item" :class="{'tab_item_active': tab === 1}" @tap="changeTab(1)">一期</view>
+				<view class="zd-col-6 tab_item" :class="{'tab_item_active': tab === 2}" @tap="changeTab(2)">二期</view>
 			</view>
 			<view class="zd_home_wrapper">
 				<view class="menu-wrap">
@@ -22,9 +31,6 @@
 			</view>
 		</view>
 		<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
-			<!-- <view class="cancel">
-				<view class="iconfont cancel_icon" @tap="show = false"></view>
-			</view> -->
 			<view class="line"></view>
 			<view class="sec_menu_w">
 				<view class="sec_menu-item" :style="{'background-image': 'url(' + require('../../static/image/menu/' + icon + '.png') + ')'}" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
@@ -42,11 +48,14 @@
 	export default {
 		data() {
 			return {
-				userName: '',
+				userName: 'admin',
 				menuList: [],
+				menuList1: [],
+				menuList2: [],
 				show: false,
 				secM: [],
-				icon: ''
+				icon: '',
+				tab: 1
 			};
 		},
 		created () {
@@ -58,7 +67,18 @@
 		methods: {
 			async _authority () {
 				let res = await authority()
-				this.menuList = [...res.result.sonTree]
+				this.menuList1 = [...res.result.sonTree1]
+				this.menuList2 = [...res.result.sonTree2]
+				this.menuList = [...this.menuList1]
+			},
+			changeTab (type) {
+				if (type === 1) {
+					this.menuList = [...this.menuList1]
+					this.tab = 1
+				} else {
+					this.menuList = [...this.menuList2]
+					this.tab = 2
+				}
 			},
 			toPage1 (e) {
 				if (e.sonTree.length > 0) {
@@ -85,38 +105,35 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
-.home_wraper
-	_wh(100%, 100%)
-	overflow: hidden
-.zd_content
-	padding 0 20rpx
-	height calc(100% - var(--status-bar-height) - 88rpx)
-	// background linear-gradient(to bottom, #f8e6db 0%, #f6f6f6 30%, #f6f6f6 100%)
-	margin-top calc(var(--status-bar-height) + 88rpx)
 .header
+	_fj(center)
 	position fixed
-	left 0
-	top 0
-	padding-top var(--status-bar-height)
-	z-index 100
 	_wh(100%, calc(var(--status-bar-height) + 88rpx))
-	// background-color  #f8e6db
-	_font(36rpx,88rpx,#333,,center)
-.userInfo-wrap
-	_fj()
-	_wh(100%,160rpx)
+	z-index 200
+	padding var(--status-bar-height) 20rpx 0 20rpx
+	background-color #f6f6f6
+.page_name
+	_font(36rpx, 88rpx, #444,700,center)
+.zd_content
+	padding-top calc(var(--status-bar-height) + 88rpx)
+	padding-bottom 20rpx
+.userInfo_wrap
+	_wh(100%,173rpx)
 	padding 0 30rpx
-	background-color $red
-	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
+	background linear-gradient(to bottom, $red1, $red3)
 	border-radius 12rpx
-	margin-bottom 24rpx
+	margin-bottom 68rpx
+.userInfo_content
+	_fj()
+	_wh(100%, 100%)
+	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 .userInfo
 	_fj(,flex-start,column)
 .p1
-	_font(32rpx,1,#fff)
+	_font(34rpx,1,#fff)
 	padding-bottom 18rpx
 .p2
-	_font(28rpx,1,#fff)
+	_font(26rpx,1,#fff)
 .exit
 	_fj()
 	height 48rpx
@@ -127,16 +144,16 @@
 	_wh(22rpx, 22rpx)
 	_bis('../../static/image/exit.png',22rpx)
 .exit-text
-	_font(28rpx,48rpx,#fff,,right)
+	_font(24rpx,48rpx,#fff,,right)
 	padding-left 10rpx
 .zd_home_wrapper
-	_wh(100%, calc(100% - 208rpx))
+	width 100%
 	background-color #fff
-	border-radius: 12rpx;
+	border-radius: 0 0 12rpx 12rpx;
 	padding: 24rpx 14rpx;
 	margin-bottom: 24rpx;
 	overflow-y auto
-	box-shadow 0 4rpx 10rpx 2rpx rgba(0,0,0,.1)
+	box-shadow 0 4rpx 4rpx 4rpx rgba(180, 182, 186, 0.4)
 .menu-wrap
 	_wh(100%, auto)
 	_fj(flex-start,flex-start,,wrap)
@@ -229,4 +246,40 @@
 	background linear-gradient(to right, rgba(83, 191, 194,0.8) 0%, rgba(119, 198, 201,0.8) 100%)
 .bgc_7
 	background linear-gradient(to right, rgba(244, 97, 61,0.8) 0%, rgba(245, 130, 102,0.8) 100%)
+.tabs_wrap
+	border-radius 20rpx 20rpx 0 0
+	background-color #ecedef
+	margin-top 40rpx
+.tab_item
+	z-index 1
+	_font(26rpx, 60rpx, #666,,center)
+.tab_active
+	position absolute
+	bottom -4rpx
+	height 90rpx
+	border-radius 20rpx 20rpx 0 0
+	background-color #fff
+	box-shadow -4rpx -4rpx 4rpx rgba(180, 182, 186, 0.4)
+	// box-shadow -3px -3px 3px rgba(28,31,33,.1)
+.tab_item_active
+	font-size 30rpx
+	color #000
+	font-weight 700
+.tab_line_active
+	position absolute
+	left calc(50% - 30rpx)
+	bottom 0
+	_wh(60rpx, 6rpx)
+	background-color $blue
+	&:before
+		position absolute
+		top -6rpx
+		left 50%
+		transform translateX(-50%)
+		content ''
+		width: 0;
+		height: 0;
+		border-left: 6rpx solid transparent;
+		border-right: 6rpx solid transparent;
+		border-bottom: 6rpx solid $blue
 </style>

pages/login/login.vue

@@ -171,7 +171,7 @@
 	_font(28rpx, 28rpx,#333)
 	padding-left: 10rpx
 .setup-text
-	_font(28rpx, 28rpx,$red,,right)
+	_font(28rpx, 28rpx,$red4,,right)
 	padding-left 25rpx
 .bg
 	background-color: #fff;
@@ -180,7 +180,7 @@
   width 100%
   border-radius 46rpx
   _font(36rpx,92rpx,#fff,,center)
-  background-color $red
+  background linear-gradient(45deg, $red1, $red3)
 .zd_content
 	position: relative
 	height: 100%

utils/mork2.js

@@ -2,7 +2,7 @@ export const authority = () => {
 	let res = {
 		code: '1',
 		result: {
-		sonTree: [
+		sonTree1: [
 			{menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [
 				{menu_id: '1', title: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'},
 				{menu_id: '2', title: '生箔工序', path: '/pages/ProductManage/SboProcess'},
@@ -51,13 +51,24 @@ export const authority = () => {
 				{menu_id: '1', title: '任务管理', path: '/pages/DispatchManage/TaskManage'},
 				{menu_id: '2', title: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'}
 				]}
+		],
+		sonTree2: [
+			{menu_id: '1', path: 'RF08', title: '载具入库', sonTree: [
+				{menu_id: '1', title: '空载具入库', path: '/pages/SecondPhase/EmptyVehicleInStore'}
+			]},
+			{menu_id: '2', path: 'RF11', title: '空木箱入库', sonTree: [
+				{menu_id: '1', title: '空木箱入库', path: '/pages/SecondPhase/EmptyBoxInStore'}
+			]},
+			{menu_id: '3', path: 'RF12', title: '发货区', sonTree: [
+				{menu_id: '1', title: '发货区解绑', path: '/pages/SecondPhase/DeliveryUnbind'}
+			]}
 		]
 	}}
 	return res
 }
 export const twoPdaIvtQuery = (no, code) => {
 	let res = {
-		data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}]
+		data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '3', bill_status: 'ljdjldj'}, {bill_code: '4'}, {bill_code: '5', bill_status: 'ljdjldj'}, {bill_code: '6'}, {bill_code: '7', bill_status: 'ljdjldj'}, {bill_code: '8'}, {bill_code: '9', bill_status: 'ljdjldj'}, {bill_code: '12', confirm_time: '2020-10-20'}]
 	}
 	return res
 }