Merge branch 'master' of http://47.101.143.145:8090/77975466/pco

# Conflicts:
#	app/pages/business-order/business-order.vue
#	sp-admin/sa-frame/sa-code.js

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{

app/components/noData/noData.vue

@@ -0,0 +1,39 @@
+<template>
+	<view>
+		<view class="nodata">
+			<image class="n-img" src="../../static/noData.png"></image>
+			<text class="n-text">暂无数据</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"noData",
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.nodata{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 750rpx;
+		.n-img{
+			width: 300rpx;
+			height: 300rpx;
+		}
+		.n-text{
+			font-size: 28rpx;
+			color: #666;
+			margin-top: 20rpx;
+		}
+	}
+</style>

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"
             }
             
         },{
@@ -97,6 +95,8 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor":"#0080ff",
+		"navigationBarTextStyle":"#fff"
 	}
 }

app/pages/business-order/business-order.vue

@@ -5,9 +5,9 @@
 				<text class="title">业务订单</text>
 			</view>
 		</view>
-		<!-- 	<u-sticky offset-top="-90">
+		<u-sticky offset-top="0">
 			<u-tabs :list="tabs" @change="change" :current="current" :is-scroll="false"></u-tabs>
-		</u-sticky> -->
+		</u-sticky>
 		<view class="card-box">
 			<view class="card" v-for="(businessItem,index) in businessItemList" :key="index">
 				<view class="t">
@@ -59,6 +59,7 @@
 				</view>
 			</view>
 		</view>
+			<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>

app/pages/customer-management/customer-management.vue

@@ -6,7 +6,7 @@
 			</view>
 		</view>
 		<view class="t-btn" @click="addCustomer()">+添加客户</view>
-		<u-sticky offset-top="-90">
+		<u-sticky offset-top="0">
 			<u-tabs :list="tabs" @change="change" :current="current" :is-scroll="false"></u-tabs>
 		</u-sticky>
 		<view class="card-box">
@@ -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>
@@ -154,7 +156,7 @@
 				// 	this.customerItemList += 5;//接接口后把数据加上，懒得写假数据了
 				// 	if(this.page >= 3) this.status = 'nomore';
 				// 	else this.status = 'loading';
-				// }, 2000)
+				// }, 2000) 
 			}
 		},
 		onShow() {
@@ -272,7 +274,7 @@
 	}
 	.t-btn{
 		width: 400rpx;
-		margin: 0 auto 80rpx auto;
+		margin: 50rpx auto;
 		height: 88rpx;
 		font-weight: bold;
 		display: flex;

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;
 

app/pages/inout-record/inout-record.vue

@@ -5,7 +5,7 @@
 				<text class="title">出入记录</text>
 			</view>
 		</view>
-		<u-sticky offset-top="-90">
+		<u-sticky offset-top="0">
 			<u-tabs :list="tabs" @change="change" :current="current" :is-scroll="false"></u-tabs>
 		</u-sticky>
 		<view class="card-box">
@@ -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>
@@ -127,7 +129,7 @@
 			// 		if(this.page >= 3) this.status = 'nomore';
 			// 		else this.status = 'loading';
 			// 	}, 2000)
-			// }
+			// } 
 		},
 		onShow() {
 			this.getRecordList();

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">

sp-admin/index.html

@@ -3,7 +3,7 @@
 	<head>
 		<title></title>
 		<meta charset="utf-8">
-		<link rel="shortcut icon" type="image/x-icon" href="sa-frame/admin-logo.png" class="admin-icon">
+		<link rel="shortcut icon" type="image/x-icon" href="" class="admin-icon">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link rel="stylesheet" href="static/kj/element-ui/theme-chalk/index.css">
 		<link rel="stylesheet" href="sa-frame/index/index.css">

sp-admin/login.html

@@ -70,10 +70,10 @@
 			// 你所有要改的代码全在这里   ↓↓↓↓↓ 
 			
 			// 所有参考属性  
-			var page_title = 'sa-plus 后台登录';		// 页面标题 
+			var page_title = '场站管理系统 后台登录';		// 页面标题
 			var key = 'sa';							// 默认的账号
 			var password = '123456';				// 默认的password  
-			var logo = 'sa-frame/admin-logo.png';	// logo地址，为空字符串则不显示 
+			var logo = '';	// logo地址，为空字符串则不显示
 			
 			// 点击登录按钮 
 			document.querySelector(".login-button").onclick = function() {

sp-server/src/main/java/com/pj/api/bo/InOutRecordBO.java

@@ -6,11 +6,6 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
- * Created with IntelliJ IDEA.
- *
- * @Auther: lzm
- * @Date: 2022/01/19/18:15
- * @Description:
  */
 @Data
 @Accessors(chain = true)

sp-server/src/main/java/com/pj/api/h5/ApiController.java

@@ -53,6 +53,7 @@ public class ApiController {
 
     @RequestMapping(value = "getInOutRecord")
     public AjaxJson getInOutRecord(){
+        //
         SoMap so = SoMap.getRequestSoMap();
         String currentCustomerId = StpUserUtil.getCustomerId();
         if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
@@ -63,6 +64,7 @@ public class ApiController {
     }
 
     @RequestMapping(value = "getCustomerList")
+    //
     public AjaxJson getCustomerList(){
         SoMap so = SoMap.getRequestSoMap();
         String currentCustomerId = StpUserUtil.getCustomerId();

sp-server/src/main/java/com/pj/api/service/ApiService.java

@@ -29,6 +29,7 @@ public class ApiService {
     TbBusinessService tbBusinessService;
 
     public List<InOutRecordBO> getInOutRecord(SoMap so){
+        //
         int current = so.getInt("current");
         List<TbBusiness> businessList = tbBusinessService.getList(so);
         List<InOutRecordBO> recordList = new ArrayList<>();
@@ -54,6 +55,7 @@ public class ApiService {
     }
 
     public List<TbCostomer> getCustomerList(SoMap so) {
+        //
         int current = so.getInt("current");
         List<TbCostomer> costomerList = new ArrayList<>();
         List<TbCostomer> list = tbCostomerService.getList(so);
@@ -68,6 +70,7 @@ public class ApiService {
     }
 
     public void confirmCustomer(Long customerId) {
+        //
         TbCostomer costomer = tbCostomerService.getById(customerId);
         if(costomer != null && costomer.getJudgeStatus() == 1){
             tbCostomerService.judge(customerId + "", 2, "H5端审核");

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -187,6 +187,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
      * 查集合 - 根据条件（参数为空时代表忽略指定条件）
      */
     public List<TbBusiness> getList(SoMap so) {
+
         return tbBusinessMapper.getList(so);
     }
 

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerService.java

@@ -99,6 +99,7 @@ public class TbCostomerService extends ServiceImpl<TbCostomerMapper, TbCostomer>
      * 查集合 - 根据条件（参数为空时代表忽略指定条件）
      */
     public List<TbCostomer> getList(SoMap so) {
+
         return tbCostomerMapper.getList(so);
     }