优化uview组件的样式，优化表格距底样式，优化登录页样式

canteen/pages.json

@@ -15,7 +15,8 @@
 				"navigationBarTitleText": "登录",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor":"#11D189",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		},
 		{

canteen/pages/delivery/apply.vue

@@ -21,6 +21,7 @@
 				width="max-content" height="80vh"
 				v-if="contents.length"></wyb-table>
 		</view>
+		<view style="height: 140rpx;"></view>
 		<!-- 操作按钮 -->
 		<view class="fixed-bottom lf-p-l-32 lf-p-r-32" style="justify-content: space-between;" v-if="enter_type == 1">
 			<view></view>
@@ -211,6 +212,7 @@
 		justify-content: center;
 		align-items: center;
 		border-top: 1rpx solid #E5E5E5;
+		background-color: #fff;
 		.btn{
 			width: 320rpx;
 			height: 82rpx;

canteen/pages/login/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
-		<view class="head"></view>
+		<view class="head">
+			<view class="nav">
+				<view>登录</view>
+			</view>
+			<image src="../../static/images/login_bg.png"></image>
+		</view>
 		<view class="content">
 			<view>
 				<!-- 账号 -->
@@ -14,7 +19,7 @@
 					:adjust-position="false" 
 					:auto-blur="true" 
 					placeholder="请输入账号" 
-					@focus="inputFocus(170)" 
+					@focus="inputFocus(190)" 
 					@blur="inputBlur" />
 				<!-- 密码 -->
 				<view class="lf-flex lf-m-b-10 lf-m-t-60">
@@ -28,7 +33,7 @@
 					:auto-blur="true" 
 					placeholder="请输入密码" 
 					:password="true" 
-					@focus="inputFocus(220)" 
+					@focus="inputFocus(230)" 
 					@blur="inputBlur"
 					@confirm="login" />
 			</view>
@@ -55,12 +60,6 @@
 		onLoad(options){
 			// todo 优化：input输入后有clear按钮
 		},
-		onReady(){
-			// #ifndef MP
-			var a = document.getElementsByClassName('uni-page-head-hd')[0];
-			a.style.display = 'none';
-			// #endif
-		},
 		methods: {
 			inputFocus(scrollTop){
 				time = setTimeout(() => {
@@ -103,9 +102,26 @@
 		margin-top: 60rpx;
 	}
 	.head{
-		height: 604rpx;
+		height: 750rpx;
 		width: 750rpx;
 		background-color: #11D189;
+		position: relative;
+		image{
+			width: 626.5rpx;
+			height: 582rpx;
+			position: absolute;
+			top: calc(50% - 240rpx);
+			left: calc(50% - 313rpx);
+			z-index: 0;
+		}
+		.nav{
+			text-align: center;
+			padding-top: 70rpx;
+			padding-bottom: 34rpx;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
 	}
 	.content{
 		width: 686rpx;
@@ -120,10 +136,12 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
+		position: relative;
+		z-index: 2;
 		.input{
 			// padding: 20rpx 0;
 			border-bottom: 1rpx solid #e5e5e5;
-			font-size: 60rpx;
+			font-size: 48rpx;
 			/* #ifdef MP */
 			height: 90rpx;
 			line-height: 90rpx;

canteen/pages/purchase/order.vue

@@ -97,10 +97,15 @@
 			stateClass(){
 				return function(val){
 					let class_name = {
-						'等待接单': 'quoted-price',
-						'等待发货': 'wait',
-						'已完成': 'passed',
-						'已退单': 'refuse'
+						'待发单': 'quoted-price',
+						'待审核': 'quoted-price',
+						'待接单': 'quoted-price',
+						'备货中': 'wait',
+						'已发货': 'wait',
+						'已收货': 'passed',
+						'已入库': 'passed',
+						'已退单': 'refuse',
+						'已撤销': 'refuse'
 					}
 					return class_name[val];
 				}

canteen/uview-ui/components/u-tabs/u-tabs.vue

@@ -11,7 +11,7 @@
 						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
 						{{ item[name] || item['name']}}
 					</view>
-					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
+					<!-- <view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view> -->
 				</view>
 			</scroll-view>
 		</view>

supplier/pages.json

@@ -6,17 +6,16 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/login/index",
 			"style": {
 				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor":"#1833F2",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		},
 		{

supplier/pages/login/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
-		<view class="head"></view>
+		<view class="head">
+			<view class="nav">
+				<view>登录</view>
+			</view>
+			<image src="../../static/images/login_bg.png"></image>
+		</view>
 		<view class="content">
 			<view>
 				<!-- 账号 -->
@@ -14,7 +19,7 @@
 					:adjust-position="false" 
 					:auto-blur="true" 
 					placeholder="请输入账号" 
-					@focus="inputFocus(170)" 
+					@focus="inputFocus(190)" 
 					@blur="inputBlur" />
 				<!-- 密码 -->
 				<view class="lf-flex lf-m-b-10 lf-m-t-60">
@@ -28,7 +33,7 @@
 					:auto-blur="true" 
 					placeholder="请输入密码" 
 					:password="true" 
-					@focus="inputFocus(220)" 
+					@focus="inputFocus(230)" 
 					@blur="inputBlur"
 					@confirm="login" />
 			</view>
@@ -52,12 +57,6 @@
 				user_pw: ''
 			}
 		},
-		onReady(){
-			// #ifndef MP
-			var a = document.getElementsByClassName('uni-page-head-hd')[0];
-			a.style.display = 'none';
-			// #endif
-		},
 		methods: {
 			inputFocus(scrollTop){
 				time = setTimeout(() => {
@@ -100,9 +99,26 @@
 		margin-top: 60rpx;
 	}
 	.head{
-		height: 604rpx;
+		height: 750rpx;
 		width: 750rpx;
 		background-color: #1833F2;
+		position: relative;
+		image{
+			width: 626.5rpx;
+			height: 582rpx;
+			position: absolute;
+			top: calc(50% - 240rpx);
+			left: calc(50% - 313rpx);
+			z-index: 0;
+		}
+		.nav{
+			text-align: center;
+			padding-top: 70rpx;
+			padding-bottom: 34rpx;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
 	}
 	.content{
 		width: 686rpx;
@@ -117,10 +133,12 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
+		position: relative;
+		z-index: 2;
 		.input{
 			// padding: 20rpx 0;
 			border-bottom: 1rpx solid #e5e5e5;
-			font-size: 60rpx;
+			font-size: 48rpx;
 			/* #ifdef MP */
 			height: 90rpx;
 			line-height: 90rpx;

supplier/pages/offer/index.vue

@@ -34,6 +34,7 @@
 				@onInputChange="onInputChange" 
 				width="100%" height="80vh"></wyb-table>
 		</view>
+		<view style="height: 140rpx;"></view>
 		<!-- 操作按钮 -->
 		<view class="fixed-bottom">
 			<button class="btn btn1" @click="save(0)">临时保存</button>
@@ -101,7 +102,6 @@
 			}
 		},
 		onLoad(options){
-			// todo 编辑的处理
 			this.code = options.code || '';
 			this.type = options.type || 0;
 			if(options.type == 1){
@@ -128,6 +128,11 @@
 				that.node_top = num;
 	　　    }).exec()
 		},
+		onPageScroll(){
+			if(this.is_show){
+				this.is_show = false;
+			}
+		},
 		methods: {
 			// 获取物资列表
 			getMaterialList(){
@@ -336,6 +341,7 @@
 		justify-content: center;
 		align-items: center;
 		border-top: 1rpx solid #E5E5E5;
+		background-color: #fff;
 		.btn{
 			width: 320rpx;
 			height: 82rpx;
@@ -380,7 +386,7 @@
 				padding: 0 32rpx;
 				border-bottom: 1rpx solid #E5E5E5;
 				color: #222222;
-				font-size: 24rpx;
+				font-size: 28rpx;
 			}
 		}
 	}

supplier/pages/order/detail.vue

@@ -1,6 +1,10 @@
 <template>
 	<view>
 		<view class="head">
+			<view class="lf-row-between list">
+				<view>批次号</view>
+				<view class="lf-color-black">{{ order.batch_sn }}</view>
+			</view>
 			<view class="lf-row-between list">
 				<view>订单编号</view>
 				<view class="lf-color-black">{{ order.q_sn }}</view>
@@ -31,7 +35,7 @@
 			</view>
 			<view v-if="type == 3 || type == 4" class="lf-row-between">
 				<button class="btn btn1" @click="$url('/pages/offer/index?type=2&code='+ order.q_sn)">复用报价单</button>
-				<button class="btn btn1" @click="$url('/pages/offer/index?type=3&code='+ order.batch_sn)">复用批次号</button>
+				<button class="btn btn1" @click="$url('/pages/offer/index?type=3&code='+ order.batch_sn)">复用本批次</button>
 				<view class="lf-font-32" style="color: #11D189;" v-if="type == 3">报价已通过</view>
 				<view class="lf-font-32" style="color: #FF0000;" v-if="type == 4">报价已被拒绝</view>
 			</view>

supplier/pages/order/index.vue

@@ -17,6 +17,9 @@
 							<view class="lf-font-28 lf-color-333">订单状态</view>
 							<view class="order-btn" :class="stateClass(item.state)">{{ item.state }}</view>
 						</view>
+						<view class="lf-row-between lower" style="padding-bottom: 0;">
+							<view>批次号 {{ item.batch_sn }}</view>
+						</view>
 						<view class="lf-row-between lower">
 							<view>报价单号 {{ item.q_sn }}</view>
 							<view>{{ item.deadline }}</view>

supplier/uview-ui/components/u-tabs/u-tabs.vue

@@ -11,7 +11,7 @@
 						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
 						{{ item[name] || item['name']}}
 					</view>
-					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
+					<!-- <view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view> -->
 				</view>
 			</scroll-view>
 		</view>