YUPENG-SHI 3 anni fa
parent
commit
d3dc26ecfb

+ 5 - 2
app/common/common.scss

@@ -5,11 +5,14 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			background-color: #0080ff;
+			padding: 50rpx 0;
+			padding-top: 0;
+			//border-radius: 0 0 30rpx 30rpx;
 			.title{
 				font-size: 50rpx;
 				font-weight: bold;
-				color: #191919;
-				margin: 100rpx;
+				color: #fff;
 			}
 		}
 		.item{

+ 20 - 20
app/pages.json

@@ -6,7 +6,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页",
+				"navigationBarTitleText": "",//首页
 				"navigationStyle":"custom"
 			}
 		}
@@ -14,8 +14,8 @@
             "path" : "pages/enterprise-reg/enterprise-reg",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "企业注册",
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//企业注册
+				//"navigationStyle":"custom"
             }
             
         }
@@ -23,8 +23,8 @@
             "path" : "pages/login/login",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "登录",
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//登录
+				//"navigationStyle":"custom"
             }
             
         }
@@ -32,8 +32,8 @@
             "path" : "pages/business-entering/business-entering",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "业务录入",
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//业务录入
+				//"navigationStyle":"custom"
             }
             
         }
@@ -41,8 +41,8 @@
             "path" : "pages/business-order/business-order",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "业务订单",
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//业务订单
+				//"navigationStyle":"custom"
             }
             
         }
@@ -50,8 +50,8 @@
             "path" : "pages/customer-management/customer-management",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "客户管理",
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//客户管理
+				//"navigationStyle":"custom"
             }
             
         }
@@ -59,8 +59,8 @@
             "path" : "pages/inout-record/inout-record",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "出入记录",
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//出入记录
+				//"navigationStyle":"custom"
             }
             
         }
@@ -68,18 +68,16 @@
             "path" : "pages/choose-business/choose-business",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "选择业务",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//选择业务
+				//"navigationStyle":"custom"
             }
             
         },{
             "path" : "pages/ok/registerSuccess",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "注册成功",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
+                "navigationBarTitleText": ""//注册成功
+				//"navigationStyle":"custom"
             }
             
         }
@@ -88,6 +86,8 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor":"#0080ff",
+		"navigationBarTextStyle":"#fff"
 	}
 }

+ 2 - 0
app/pages/business-order/business-order.vue

@@ -39,6 +39,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 没有数据时显示noData -->
+		<noData v-if="businessItemList.length==0"></noData>
 		<u-loadmore style="margin: 30rpx;" :status="status"/>
 		<uni-popup ref="fkpopup" type="dialog">
 		    <uni-popup-dialog type="success" title="确定已付款吗?" :duration="2000" @confirm="fkconfirm"></uni-popup-dialog>

+ 3 - 1
app/pages/customer-management/customer-management.vue

@@ -44,6 +44,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 没有数据时显示noData -->
+		<noData v-if="customerItemList.length==0"></noData>
 		<u-loadmore style="margin: 30rpx;" :status="status"/>
 		<uni-popup ref="shpopup" type="center">
 		    <uni-popup-dialog type="success" title="确定审核吗?" :duration="2000" @confirm="shconfirm"></uni-popup-dialog>
@@ -272,7 +274,7 @@
 	}
 	.t-btn{
 		width: 400rpx;
-		margin: 0 auto 80rpx auto;
+		margin: 50rpx auto;
 		height: 88rpx;
 		font-weight: bold;
 		display: flex;

+ 85 - 7
app/pages/index/index.vue

@@ -1,5 +1,24 @@
 <template>
 	<view>
+		<view class="top-nav">
+			<view class="l">
+				<block v-if="isLogin">
+					<image class="user-img" src="../../static/user.png"></image>
+					<view class="l-r">
+						<text class="u-name">{{userName}}</text>
+						<text class="c-name">{{companyName}}</text>
+					</view>
+				</block>
+				<block v-else>
+					<view class="login-btn">请先登录</view>
+				</block>
+			</view>
+			<view class="r" v-if="isLogin">
+				<view class="l-out">
+					退出登录
+				</view>
+			</view>
+		</view>
 		<view class="top-bg"></view>
 		<view class="top">
 			<text class="title">集散区临时消杀场</text>
@@ -22,6 +41,9 @@
 	export default {
 		data() {
 			return {
+				isLogin:false,//是否登录状态
+				userName:'张三',
+				companyName:'爱你一万年有限公司',
 				qrcoderlc: 'https://shiyupeng.com/data/img/ewm.png',
 				indexItemList: [{
 						auth: false,
@@ -63,11 +85,12 @@
 			navTo(item) {
 				let auth = item.auth;
 				let token = uni.getStorageSync('token');
-				if (!auth||token) {
-					this.$common.to(item.url)
-				} else {
-					this.$common.to('/pages/login/login')
-				}
+				this.$common.to(item.url)
+				// if (!auth||token) {
+				// 	this.$common.to(item.url)
+				// } else {
+				// 	this.$common.to('/pages/login/login')
+				// }
 			}
 		}
 	}
@@ -77,7 +100,62 @@
 	page {
 		background-color: #fff;
 	}
-
+	.top-nav{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 0;
+		background-color: #0080ff;
+		.l{
+			display: flex;
+			align-items: center;
+			.login-btn{
+				border: 1rpx solid #359aff;
+				border-radius: 8rpx;
+				color: #fff;
+				padding: 10rpx 20rpx;
+				font-size: 28rpx;
+				margin-left: 30rpx;
+			}
+			.user-img{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin-left: 30rpx;
+				margin: 20rpx;
+			}
+			.l-r{
+				display: flex;
+				flex-direction: column;
+				.u-name{
+					font-size: 30rpx;
+					color: #fff;
+					font-weight: bold;
+				}
+				.c-name{
+					font-size: 24rpx;
+					color: #fff;
+				}
+			}
+		}
+		.r{
+			display: flex;
+			align-items: center;
+			.l-out{
+				border: 1rpx solid #359aff;
+				border-radius: 8rpx;
+				color: #c8e4ff;
+				padding: 10rpx 20rpx;
+				font-size: 28rpx;
+				margin-right: 30rpx;
+			}
+		}
+	}
 	.top-bg {
 		position: relative;
 		top: 0;
@@ -94,7 +172,7 @@
 		align-items: center;
 		justify-content: center;
 		margin: 60rpx 0;
-		margin-top: -440rpx;
+		margin-top: -300rpx;
 		position: relative;
 		z-index: 2;
 

+ 2 - 0
app/pages/inout-record/inout-record.vue

@@ -45,6 +45,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 没有数据时显示noData -->
+		<noData v-if="recordItemList.length==0"></noData>
 		<u-loadmore style="margin: 30rpx;" :status="status"/>
 		<!-- <uni-popup ref="shpopup" type="dialog">
 		    <uni-popup-dialog type="success" title="确定审核吗?" :duration="2000" @confirm="shconfirm"></uni-popup-dialog>

+ 1 - 1
app/pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="box">
-			<view class="top">
+			<view class="top" style="margin-bottom: 50rpx;">
 				<text class="title">登录</text>
 			</view>
 			<view class="item">