改了通知列表和搜索列表的样式

api/asset.js

@@ -42,4 +42,7 @@ export function getFaultDetail(id){
 //管理：故障处理
 export function handleFaultReport(data){
 	return fly.put('/asset/fault/process',data).then(res=>res)
+}
+export function keywordSearch(pageNum,pageSize,data){
+	return fly.get(`/asset/asset/search/list/${pageNum}/${pageSize}`,data).then(res=>res)
 }

api/notice.js

@@ -1,11 +1,21 @@
 import fly from '@/utils/request.js'
 
-export function getNewInform(data){
-	return fly.get('/system/notice/newInform',{number:data}).then(res=>res)
+export function getNewInform(x,y){
+	return fly.get('/system/notice/list',{
+		noticeType:1,
+		status:0,
+		pageNum:x,
+		pageSize:y
+	}).then(res=>res)
 }
 
-export function getNewNotice(){
-	return fly.get('/system/notice/newNotice',{number:data}).then(res=>res)
+export function getNewNotice(x,y){
+	return fly.get('/system/notice/list',{
+		noticeType:1,
+		status:0,
+		pageNum:x,
+		pageSize:y
+	}).then(res=>res)
 }
 
 export function getNoticeDetail(id){

pages.json

@@ -7,7 +7,6 @@
 		    {
 		        "enablePullDownRefresh": false,
 				"navigationBarTitleText": "实验室管理系统"
-				
 		    }
 		},
 		{
@@ -115,6 +114,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/notice-list/notice-list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "通知",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/borrow/borrow.vue

@@ -278,14 +278,20 @@
 						}
 						uni.hideLoading()
 						let msg = ""
+						let iconName = ""
 						if(num===1){
-							msg = "借用成功!"
+							msg = "借用成功！"
+							iconName = 'success'
 						}else if(num===2){
-							msg = "归还成功!"
+							msg = "归还成功！"
+							iconName = 'success'
+						}else if(num===0){
+							msg = "加载成功！"
+							iconName = 'none'
 						}
 						uni.showToast({
 							title: msg,
-							icon:'success'
+							icon:iconName
 						});
 						this.assetObj = res
 					})

pages/home/home.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="home">
+		
 		<view class="search-area">
 			<u-search 
 			placeholder="搜索设备" 
@@ -13,13 +14,18 @@
 			color="#000"
 			placeholder-color="#5c5b5b"
 			@search="search"
+			bgColor="#fff"
+			height="40"
 			@custom="search"></u-search>
 		</view>
 		<view class="box">
 			<view class="rule-area">
 				<view class="notice">
-					<i class="iconfont icon-a-shezhi2"></i>
-					<span>通知</span>
+					<view >
+						<!-- <i class="iconfont icon-a-shezhi2"></i> -->
+						<text>通知</text>
+					</view>
+					<text @click="toMoreNotice">更多>></text>
 				</view>
 				<ul v-if="informList.length===0?false:true">
 					<li  v-for="item in informList" :key="item.noticeId" @click="toNotice(item.noticeId)"> 
@@ -31,8 +37,11 @@
 			</view>
 			<view class="rule-area" >
 				<view class="notice">
-					<i class="iconfont icon-a-shezhi2"></i>
-					<span>最新借用设备</span>				
+					<view >
+						<!-- <i class="iconfont icon-a-shezhi2"></i> -->
+						<span>最新借用设备</span>	
+					</view>
+								
 				</view>
 				<ul v-if="borList.length===0?false:true">
 					<li  v-for="item in borList" :key="item.id" class="notice-li" @click="toDetail(item.assetBarCode)"> 
@@ -40,7 +49,6 @@
 							<i class="iconfont icon-shebei"></i>
 							<text>设备编码：{{item.assetBarCode}}</text>
 						</view>
-						
 						<text>{{handleDate(item.borrowDate)}}</text>
 					</li>
 				</ul>
@@ -72,6 +80,11 @@
 			}
 		},
 		methods: {
+			toMoreNotice(){
+				uni.navigateTo({
+					url:'/pages/notice-list/notice-list'
+				})
+			},
 			search(){
 				if(this.keyword===""){
 					uni.showToast({
@@ -92,9 +105,10 @@
 					mask:true
 				})
 				try{
-					getNewInform(4).then(res=>{
-						if(res instanceof Array){
-							that.informList = res
+					getNewInform(1,4).then(res=>{
+						// console.log(res)
+						if(res.data.msg ==="查询成功"){
+							that.informList = res.data.rows
 							getBorrowList({
 								pageNum:1,
 								pageSize:1,
@@ -108,6 +122,12 @@
 						}else{
 							uni.hideLoading()
 						}
+						// if(res instanceof Array){
+						// 	that.informList = res
+							
+						// }else{
+						// 	uni.hideLoading()
+						// }
 					})
 				}catch(err){
 					uni.hideLoading()
@@ -155,9 +175,12 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+page{
+	background-color: #f5f6fa;
+}
 .home{
-	padding: 20rpx;
+	padding: 20rpx 24rpx;
 	display: flex;
 	flex-direction: column;
 	height: 100vh;
@@ -168,10 +191,10 @@
 	flex-shrink: 0;
 	position: relative;
 	input{
-		height: 76rpx;
-		border: 2rpx solid #000;
-		line-height: 76rpx;
-		padding-left:80rpx ;
+		height: 80rpx;
+		// border: 2rpx solid #252525;
+		line-height: 80rpx;
+		// padding-left:80rpx ;
 	}
 	.iconfont{
 		position: absolute;
@@ -187,20 +210,25 @@
 		z-index: 2;
 		flex-shrink: 0;
 		border-radius: 18rpx;
-		box-shadow:  0 1rpx 8rpx 0 rgba(0, 0, 0, 0.2);
-		padding: 16rpx;
+		// box-shadow:  0 1rpx 8rpx 0 rgba(0, 0, 0, 0.2);
+		box-shadow: 0px 0px 21px 0px #ececec;
+		padding: 30rpx;
 		.notice{
 			display: flex;
 			flex-direction: row;
 			font-size: 36rpx;
 			font-weight: bolder;
+			color: #252525;
 			padding-bottom: 10rpx;
 			align-items: center;
-			border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+			justify-content: space-between;
+			// border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+			border-bottom: 1px solid rgba(134, 134, 134, 0.1);
 			i {
 				margin-right: 10rpx;
 				font-size: 36rpx;
 				color: orange;
+				display: inline-block;
 			}
 		}
 		
@@ -217,6 +245,7 @@
 			text-overflow: ellipsis; /*省略号*/
 			display: flex;
 			align-items: center;
+			color: #252525;
 			i {
 				padding-right: 10rpx;
 				color: #2979ff;
@@ -284,6 +313,7 @@
 		.iconfont{
 			font-size: 80rpx;
 			margin: 20rpx 0;
+			
 		}
 		-webkit-box-reflect: below 10rpx -webkit-linear-gradient(transparent, transparent 75%, rgba(255, 255, 255, .3));
 	}

pages/menus/menu/menu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="mine-area">
-		<image style="width: 100%;" mode="aspectFill" :src="require('@/static/images/微信图片_20230411112151.png')"></image>
+		<image style="width: 100%;" mode="aspectFill" :src="require('@/static/images/20230411112151.png')"></image>
 		<view class="big-circle"></view>
 		<view class="avatar-area z10" >
 			<u-avatar :src="src" size="80" shape="circle"></u-avatar>
@@ -234,6 +234,7 @@
 			this.init()
 		},
 		onShow(){
+			this.init()
 			this.name = cache.session.getJSON('nickName')
 			this.role = cache.session.getJSON('role')
 		}

pages/notice-list/notice-list.vue

@@ -0,0 +1,127 @@
+<template>
+	<view style="padding:30rpx 0 0 0;height: 100vh;box-sizing: border-box;">
+		<u-list @scrolltolower="scrolltolower" class="notice-ul" height="100%">
+			<u-list-item  v-for="data in noticeData" :key="data.noticeId">
+				<view class="notice-area">
+					<view class="area-header">
+						<view style="width: 100%;display: flex;">
+							<i class="iconfont icon-tongzhi"></i>
+							<text 
+							style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+							{{data.noticeTitle}}
+							</text>
+						</view>
+						<text class="up-date">分布时间：{{data.updateTime}}</text>
+					</view>
+					<view class="area-content">
+						<rich-text 
+						:nodes="data.noticeContent" 
+						style="overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;line-height: 60rpx;">
+						</rich-text>
+					</view>
+				</view>
+			</u-list-item>
+			<u-list-item v-if="textShow">
+				<view style="text-align: center;margin-bottom: 30rpx;">
+					已加载全部通知
+				</view>
+			</u-list-item>
+		</u-list>
+		
+	</view>
+</template>
+
+<script>
+	import { getNewInform } from '@/api/notice.js'
+	export default {
+		data() {
+			return {
+				noticeData:[],
+				page:1,
+				total:6,
+				pageSize:5,
+				textShow:false
+			};
+		},
+		methods:{
+			handleDate(val){
+				let date = new Date(val)
+				let year = date.getFullYear()
+				let month = date.getMonth()+1
+				let day = date.getDate()
+				return year+"-"+month+"-"+day;
+			},
+			scrolltolower(){
+				if(Math.ceil(this.total/this.pageSize)<this.page){
+					return;
+				}else if(Math.ceil(this.total/this.pageSize)>=this.page){
+					this.getNoticeList(this.page,this.pageSize)
+				}
+			},
+			getNoticeList(x,y){
+				const that = this
+				uni.showLoading({
+					icon:"none",
+					title:"记载中"
+				})
+				try{
+					getNewInform(x,y).then(res=>{
+						uni.hideLoading()
+						if(res.data.rows){
+							if(that.page===1){
+								that.noticeData = res.data.rows
+							}else{
+								that.noticeData = [...that.noticeData,...res.data.rows]
+							}
+							that.total = res.data.total
+							that.page = that.page +1
+							if(Math.ceil(that.total/that.pageSize)<that.page){
+								that.textShow = true
+							}else{
+								that.textShow = false
+							}
+						}
+					})
+				}catch(err){
+					uni.hideLoading()
+				}
+				
+			}
+		},
+		onLoad() {
+			this.getNoticeList(1,this.pageSize)
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #f5f6fa;height: 100%;
+}
+.notice-area{
+	background-color: #fff;
+	margin: 0rpx 25rpx 30rpx 25rpx;
+	padding: 30rpx 32rpx;
+	border-radius: 30rpx;
+	box-shadow: 0px 0px 21px 0px rgba(241, 241, 241, 1);
+	.area-header{
+		padding-bottom: 10rpx;
+		font-size: 40rpx;
+		font-weight: bold;
+		color: #323232;
+		i{
+			font-size: 50rpx;
+			padding-right: 10rpx;
+			color: #228ff6;
+		}
+		.up-date{
+			color: #9b9b9b;
+			font-size: 26rpx;
+			font-weight: 500;
+		}
+	}
+	.area-content{
+		padding-top: 10rpx;
+	}
+}
+</style>

pages/notice/notice.vue

@@ -36,7 +36,7 @@
 .home{
 	padding:0 30rpx 30rpx;
 	.title{
-		color: rgba(80, 80, 80, 1);
+		color: #252525;
 		font-size: 40rpx;
 		line-height: 300%;
 		text-align: center;
@@ -48,7 +48,7 @@
 		text-align: left;
 	}
 	.content{
-		color: rgba(102, 102, 102, 1);
+		color: #252525;
 		font-size: 30rpx;
 		line-height: 190%;
 		text-align: left;

pages/search/search.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="home">
-		<view class="search-area" style="margin-bottom: 20rpx;">
+		<view class="search-area" style="padding:20rpx 0;background-color: #f5f6fa;">
 			<u-search 
 			placeholder="搜索设备" 
 			v-model="keyword" 
@@ -11,9 +11,11 @@
 			:animation="true"
 			search-icon-color="#000"
 			color="#000"
+			bgColor="#fff"
+			height="40"
 			placeholder-color="#5c5b5b"
-			@search="search(keyword)"
-			@custom="search(keyword)"></u-search>
+			@search="search(1,keyword)"
+			@custom="search(1,keyword)"></u-search>
 		</view>
 		<u-empty
 			:show="emptyShow"
@@ -21,7 +23,32 @@
 			:icon="require('@/static/images/search.png')"
 		>
 		</u-empty>
-		<view v-show="!emptyShow">
+		<view v-show="!emptyShow" style="height: 100%;">
+			<u-list @scrolltolower="scrolltolower" height="100%">
+				<u-list-item
+					v-for="(item, index) in dataList"
+					:key="index"
+				>
+					<view class="data-box" @click="toBorrow(item.barCode)">
+						<view style="display: flex;justify-content: space-between;margin-bottom: 10rpx;">
+							<view class="data-header">
+								<image style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" 
+								:src="require('@/static/images/shebeiname1.png')" 
+								mode="aspectFit"></image>
+								<text>{{item.name}}</text>
+							</view>
+							<text :style="{color:`${item.borrowStatus==='可借出'?'#19be6b':item.borrowStatus==='已借出'?'#fa3534':'#ff9900'}`}">{{item.borrowStatus}}</text>
+						</view>
+						
+						<view class="data-content">
+							<text>设备编码：{{item.number}}</text><br/>
+							<text>设备条形码：{{item.barCode}}</text>
+						</view>
+					</view>
+				</u-list-item>
+			</u-list>
+		</view>
+		<!-- <view v-show="!emptyShow">
 			<u-cell-group :border="true">
 				<u-cell  
 				title="设备" 
@@ -36,50 +63,79 @@
 				:label="item.barCode"
 				@click="toBorrow(item.barCode)"
 				>
-				<!-- :value="item.borrowStatus" :style="{color:`${item.isreturn==='0'?'#439dea':'#000000'}`}"-->
 				<view slot="value" class="u-slot-value">
 					<i class="iconfont icon-yuandian" :style="{color:`${item.borrowStatus==='可借出'?'#19be6b':item.borrowStatus==='已借出'?'#fa3534':'#ff9900'}`}"></i>
 					<text class="list-name" :style="{color:`${item.borrowStatus==='可借出'?'#19be6b':item.borrowStatus==='已借出'?'#fa3534':'#ff9900'}`}">{{item.borrowStatus}}</text>
 				</view>
 				</u-cell>
 			</u-cell-group>
-		</view>
+		</view> -->
 	</view>
 </template>
 
 <script>
-	import { searchAsset } from "@/api/asset.js"
+	import { keywordSearch } from "@/api/asset.js"
+	// searchAsset,
 	export default {
 		data() {
 			return {
 				keyword:"",
 				checked:false,
 				emptyShow:false,
-				dataList:[]
+				dataList:[],
+				pageNum:1,
+				pageSize:5,
+				total:0
 			};
 		},
 		onLoad:function(option){
 			this.keyword = option.keyword
 		},
 		onShow(){
-			this.search(this.keyword)
+			this.pageNum = 1
+			this.search(this.pageNum,this.keyword)
 		},
 		methods:{
-			search(val){
+			scrolltolower(){
+				console.log(222222333)
+				if(Math.ceil(this.total/this.pageSize)<this.pageNum){
+					return;
+				}else if(Math.ceil(this.total/this.pageSize)>=this.pageNum){
+					this.search(this.pageNum,this.keyword)
+				}
+			},
+			search(page,val){
 				uni.showLoading({
 					title: "正在加载中",
 					mask: true
 				})
 				try{
-					searchAsset({numberOrName: val}).then(res=>{
-						if(res.length===0){
-							this.emptyShow = true
-						}else{
-							this.emptyShow = false
-							this.dataList = res
-						}
+					if(page===1){
+						this.dataList=[]
+					}
+					keywordSearch(page,this.pageSize,{numberOrName: val}).then(res=>{
 						uni.hideLoading()
+						console.log(res.records,111)
+						if(res.records){
+							if(res.records.length===0&&page==1){
+								this.emptyShow = true
+							}else{
+								this.emptyShow = false
+								this.dataList = [...this.dataList,...res.records]
+								this.pageNum = page + 1
+								this.total = res.total
+							}
+						}
 					})
+					// searchAsset({numberOrName: val}).then(res=>{
+					// 	if(res.length===0){
+					// 		this.emptyShow = true
+					// 	}else{
+					// 		this.emptyShow = false
+					// 		this.dataList = res
+					// 	}
+					// 	uni.hideLoading()
+					// })
 				}catch(err){
 					uni.hideLoading()
 				}
@@ -94,12 +150,16 @@
 	}
 </script>
 
-<style lang="scss" scoped> 
+<style lang="scss" > 
+page{
+	background-color: #f5f6fa;
+}
 .home{
-	padding: 20rpx 20rpx 30rpx;
-	display: flex;
-	flex-direction: column;
-	box-sizing: border-box;
+	padding: 0 24rpx 30rpx;
+	// display: flex;
+	// flex-direction: column;
+	height: 100vh;
+	// box-sizing: border-box;
 }
 .u-slot-value {
 	display: flex;
@@ -116,4 +176,22 @@
 	border-left: 1rpx solid #d6d7d9;
 	border-right: 1rpx solid #d6d7d9;
 }
+.data-box{
+	// border: 1px solid black;
+	margin: 14rpx 0;
+	padding: 30rpx;
+	background-color: #fff;
+	border-radius: 18rpx;
+	color: #252525;
+	.data-header{
+		display: flex;
+		align-items: center;
+		font-size: 36rpx;
+		letter-spacing: 4rpx;
+	}
+	.data-content{
+		line-height: 160%;
+		font-size: 30rpx;
+	}
+}
 </style>

unpackage/dist/dev/mp-weixin/app.json

@@ -12,7 +12,8 @@
     "pages/fault/fault-report/fault-report",
     "pages/notice/notice",
     "pages/fault/fault-list/fault-list",
-    "pages/fault/fault-handle/fault-handle"
+    "pages/fault/fault-handle/fault-handle",
+    "pages/notice-list/notice-list"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--input/u--input"],{284:function(n,e,t){"use strict";t.r(e);var u=t(285),r=t(287);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var o,c=t(37),d=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],o);d.options.__file="node_modules/uview-ui/components/u--input/u--input.vue",e["default"]=d.exports},285:function(n,e,t){"use strict";t.r(e);var u=t(286);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},286:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=!1,o=[];r._withStripped=!0},287:function(n,e,t){"use strict";t.r(e);var u=t(288),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},288:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(289)),i=function(){t.e("node-modules/uview-ui/components/u-input/u-input").then(function(){return resolve(t(440))}.bind(null,t)).catch(t.oe)},o={name:"u--input",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvInput:i}};e.default=o}).call(this,t(2)["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--input/u--input"],{293:function(n,e,t){"use strict";t.r(e);var u=t(294),r=t(296);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var o,c=t(37),d=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],o);d.options.__file="node_modules/uview-ui/components/u--input/u--input.vue",e["default"]=d.exports},294:function(n,e,t){"use strict";t.r(e);var u=t(295);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},295:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=!1,o=[];r._withStripped=!0},296:function(n,e,t){"use strict";t.r(e);var u=t(297),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},297:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(298)),i=function(){t.e("node-modules/uview-ui/components/u-input/u-input").then(function(){return resolve(t(449))}.bind(null,t)).catch(t.oe)},o={name:"u--input",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvInput:i}};e.default=o}).call(this,t(2)["default"])}}]);
 //# sourceMappingURL=../../../../../.sourcemap/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'node-modules/uview-ui/components/u--input/u--input-create-component',
     {
         'node-modules/uview-ui/components/u--input/u--input-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(284))
+            __webpack_require__('2')['createComponent'](__webpack_require__(293))
         })
     },
     [['node-modules/uview-ui/components/u--input/u--input-create-component']]

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--text/u--text"],{537:function(e,n,t){"use strict";t.r(n);var u=t(538),r=t(540);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);var i,c=t(37),d=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],i);d.options.__file="node_modules/uview-ui/components/u--text/u--text.vue",n["default"]=d.exports},538:function(e,n,t){"use strict";t.r(n);var u=t(539);t.d(n,"render",(function(){return u["render"]})),t.d(n,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(n,"components",(function(){return u["components"]}))},539:function(e,n,t){"use strict";var u;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return i})),t.d(n,"recyclableRender",(function(){return o})),t.d(n,"components",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},o=!1,i=[];r._withStripped=!0},540:function(e,n,t){"use strict";t.r(n);var u=t(541),r=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=r.a},541:function(e,n,t){"use strict";(function(e){var u=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=u(t(542)),o=function(){Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(550))}.bind(null,t)).catch(t.oe)},i={name:"u--text",mixins:[e.$u.mpMixin,r.default,e.$u.mixin],components:{uvText:o}};n.default=i}).call(this,t(2)["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--text/u--text"],{546:function(e,n,t){"use strict";t.r(n);var u=t(547),r=t(549);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);var i,c=t(37),d=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],i);d.options.__file="node_modules/uview-ui/components/u--text/u--text.vue",n["default"]=d.exports},547:function(e,n,t){"use strict";t.r(n);var u=t(548);t.d(n,"render",(function(){return u["render"]})),t.d(n,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(n,"components",(function(){return u["components"]}))},548:function(e,n,t){"use strict";var u;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return i})),t.d(n,"recyclableRender",(function(){return o})),t.d(n,"components",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},o=!1,i=[];r._withStripped=!0},549:function(e,n,t){"use strict";t.r(n);var u=t(550),r=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=r.a},550:function(e,n,t){"use strict";(function(e){var u=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=u(t(551)),o=function(){Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(559))}.bind(null,t)).catch(t.oe)},i={name:"u--text",mixins:[e.$u.mpMixin,r.default,e.$u.mixin],components:{uvText:o}};n.default=i}).call(this,t(2)["default"])}}]);
 //# sourceMappingURL=../../../../../.sourcemap/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'node-modules/uview-ui/components/u--text/u--text-create-component',
     {
         'node-modules/uview-ui/components/u--text/u--text-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(537))
+            __webpack_require__('2')['createComponent'](__webpack_require__(546))
         })
     },
     [['node-modules/uview-ui/components/u--text/u--text-create-component']]

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"],{529:function(e,n,t){"use strict";t.r(n);var u=t(530),r=t(532);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);t(535);var i,c=t(37),a=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,"758fd84f",null,!1,u["components"],i);a.options.__file="node_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.vue",n["default"]=a.exports},530:function(e,n,t){"use strict";t.r(n);var u=t(531);t.d(n,"render",(function(){return u["render"]})),t.d(n,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(n,"components",(function(){return u["components"]}))},531:function(e,n,t){"use strict";var u;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return i})),t.d(n,"recyclableRender",(function(){return o})),t.d(n,"components",(function(){return u}));var r=function(){var e=this,n=e.$createElement,t=(e._self._c,e.__get_style([e.style]));e.$mp.data=Object.assign({},{$root:{s0:t}})},o=!1,i=[];r._withStripped=!0},532:function(e,n,t){"use strict";t.r(n);var u=t(533),r=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=r.a},533:function(e,n,t){"use strict";(function(e){var u=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=u(t(534)),o={name:"u-safe-bottom",mixins:[e.$u.mpMixin,e.$u.mixin,r.default],data:function(){return{safeAreaBottomHeight:0,isNvue:!1}},computed:{style:function(){var n={};return e.$u.deepMerge(n,e.$u.addStyle(this.customStyle))}},mounted:function(){}};n.default=o}).call(this,t(2)["default"])},535:function(e,n,t){"use strict";t.r(n);var u=t(536),r=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=r.a},536:function(e,n,t){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"],{538:function(e,n,t){"use strict";t.r(n);var u=t(539),r=t(541);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);t(544);var i,c=t(37),a=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,"758fd84f",null,!1,u["components"],i);a.options.__file="node_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.vue",n["default"]=a.exports},539:function(e,n,t){"use strict";t.r(n);var u=t(540);t.d(n,"render",(function(){return u["render"]})),t.d(n,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(n,"components",(function(){return u["components"]}))},540:function(e,n,t){"use strict";var u;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return i})),t.d(n,"recyclableRender",(function(){return o})),t.d(n,"components",(function(){return u}));var r=function(){var e=this,n=e.$createElement,t=(e._self._c,e.__get_style([e.style]));e.$mp.data=Object.assign({},{$root:{s0:t}})},o=!1,i=[];r._withStripped=!0},541:function(e,n,t){"use strict";t.r(n);var u=t(542),r=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=r.a},542:function(e,n,t){"use strict";(function(e){var u=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=u(t(543)),o={name:"u-safe-bottom",mixins:[e.$u.mpMixin,e.$u.mixin,r.default],data:function(){return{safeAreaBottomHeight:0,isNvue:!1}},computed:{style:function(){var n={};return e.$u.deepMerge(n,e.$u.addStyle(this.customStyle))}},mounted:function(){}};n.default=o}).call(this,t(2)["default"])},544:function(e,n,t){"use strict";t.r(n);var u=t(545),r=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=r.a},545:function(e,n,t){}}]);
 //# sourceMappingURL=../../../../../.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom-create-component',
     {
         'node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(529))
+            __webpack_require__('2')['createComponent'](__webpack_require__(538))
         })
     },
     [['node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom-create-component']]

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-toolbar/u-toolbar"],{487:function(n,e,t){"use strict";t.r(e);var r=t(488),u=t(490);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(493);var i,c=t(37),f=Object(c["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6d25fc6f",null,!1,r["components"],i);f.options.__file="node_modules/uview-ui/components/u-toolbar/u-toolbar.vue",e["default"]=f.exports},488:function(n,e,t){"use strict";t.r(e);var r=t(489);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},489:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,i=[];u._withStripped=!0},490:function(n,e,t){"use strict";t.r(e);var r=t(491),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},491:function(n,e,t){"use strict";(function(n){var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=r(t(492)),o={name:"u-toolbar",mixins:[n.$u.mpMixin,n.$u.mixin,u.default],methods:{cancel:function(){this.$emit("cancel")},confirm:function(){this.$emit("confirm")}}};e.default=o}).call(this,t(2)["default"])},493:function(n,e,t){"use strict";t.r(e);var r=t(494),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},494:function(n,e,t){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-toolbar/u-toolbar"],{496:function(n,e,t){"use strict";t.r(e);var r=t(497),u=t(499);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(502);var i,c=t(37),f=Object(c["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6d25fc6f",null,!1,r["components"],i);f.options.__file="node_modules/uview-ui/components/u-toolbar/u-toolbar.vue",e["default"]=f.exports},497:function(n,e,t){"use strict";t.r(e);var r=t(498);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},498:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,i=[];u._withStripped=!0},499:function(n,e,t){"use strict";t.r(e);var r=t(500),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},500:function(n,e,t){"use strict";(function(n){var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=r(t(501)),o={name:"u-toolbar",mixins:[n.$u.mpMixin,n.$u.mixin,u.default],methods:{cancel:function(){this.$emit("cancel")},confirm:function(){this.$emit("confirm")}}};e.default=o}).call(this,t(2)["default"])},502:function(n,e,t){"use strict";t.r(e);var r=t(503),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},503:function(n,e,t){}}]);
 //# sourceMappingURL=../../../../../.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'node-modules/uview-ui/components/u-toolbar/u-toolbar-create-component',
     {
         'node-modules/uview-ui/components/u-toolbar/u-toolbar-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(487))
+            __webpack_require__('2')['createComponent'](__webpack_require__(496))
         })
     },
     [['node-modules/uview-ui/components/u-toolbar/u-toolbar-create-component']]

unpackage/dist/dev/mp-weixin/pages/home/home.wxss

@@ -24,62 +24,66 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.home.data-v-92bb8f34 {
-  padding: 20rpx;
+page {
+  background-color: #f5f6fa;
+}
+.home {
+  padding: 20rpx 24rpx;
   display: flex;
   flex-direction: column;
   height: 100vh;
   box-sizing: border-box;
 }
-.search-area.data-v-92bb8f34 {
+.search-area {
   margin-bottom: 20rpx;
   flex-shrink: 0;
   position: relative;
 }
-.search-area input.data-v-92bb8f34 {
-  height: 76rpx;
-  border: 2rpx solid #000;
-  line-height: 76rpx;
-  padding-left: 80rpx;
+.search-area input {
+  height: 80rpx;
+  line-height: 80rpx;
 }
-.search-area .iconfont.data-v-92bb8f34 {
+.search-area .iconfont {
   position: absolute;
   font-size: 40rpx;
   top: 20rpx;
   left: 16rpx;
 }
-.box.data-v-92bb8f34 {
+.box {
   border-radius: 18rpx;
 }
-.box .rule-area.data-v-92bb8f34 {
+.box .rule-area {
   background-color: rgba(255, 255, 255, 0.6);
   z-index: 2;
   flex-shrink: 0;
   border-radius: 18rpx;
-  box-shadow: 0 1rpx 8rpx 0 rgba(0, 0, 0, 0.2);
-  padding: 16rpx;
+  box-shadow: 0px 0px 21px 0px #ececec;
+  padding: 30rpx;
 }
-.box .rule-area .notice.data-v-92bb8f34 {
+.box .rule-area .notice {
   display: flex;
   flex-direction: row;
   font-size: 36rpx;
   font-weight: bolder;
+  color: #252525;
   padding-bottom: 10rpx;
   align-items: center;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+  justify-content: space-between;
+  border-bottom: 1px solid rgba(134, 134, 134, 0.1);
 }
-.box .rule-area .notice ._i.data-v-92bb8f34 {
+.box .rule-area .notice ._i {
   margin-right: 10rpx;
   font-size: 36rpx;
   color: orange;
+  display: inline-block;
 }
-.box .rule-area ._ul.data-v-92bb8f34 {
-  -webkit-animation-name: ruleArea-data-v-92bb8f34;
-          animation-name: ruleArea-data-v-92bb8f34;
+.box .rule-area ._ul {
+  -webkit-animation-name: ruleArea;
+          animation-name: ruleArea;
   -webkit-animation-duration: 0.5s;
           animation-duration: 0.5s;
 }
-.box .rule-area ._li.data-v-92bb8f34 {
+.box .rule-area ._li {
   padding: 10rpx 0;
   width: 100%;
   overflow: hidden;
@@ -90,25 +94,26 @@
   /*省略号*/
   display: flex;
   align-items: center;
+  color: #252525;
 }
-.box .rule-area ._li ._i.data-v-92bb8f34 {
+.box .rule-area ._li ._i {
   padding-right: 10rpx;
   color: #2979ff;
 }
-.box .rule-area.data-v-92bb8f34:nth-child(2) {
+.box .rule-area:nth-child(2) {
   margin-top: 24rpx;
 }
-.box .rule-area:nth-child(2) ._i.data-v-92bb8f34 {
+.box .rule-area:nth-child(2) ._i {
   color: #19be6b;
 }
-.box .rule-area:nth-child(2) ._li.data-v-92bb8f34 {
+.box .rule-area:nth-child(2) ._li {
   display: flex;
   justify-content: space-between;
 }
-.box .rule-area:nth-child(2) ._li.data-v-92bb8f34:first-child {
+.box .rule-area:nth-child(2) ._li:first-child {
   padding-top: 10rpx;
 }
-@-webkit-keyframes ruleArea-data-v-92bb8f34 {
+@-webkit-keyframes ruleArea {
 from {
     max-height: 0;
 }
@@ -116,7 +121,7 @@ to {
     max-height: 400rpx;
 }
 }
-@keyframes ruleArea-data-v-92bb8f34 {
+@keyframes ruleArea {
 from {
     max-height: 0;
 }
@@ -124,23 +129,23 @@ to {
     max-height: 400rpx;
 }
 }
-.borrow-area_bck.data-v-92bb8f34 {
+.borrow-area_bck {
   flex-shrink: 0;
   margin-bottom: 20rpx;
   height: 120rpx;
 }
-.borrow-area_bck .notice-li.data-v-92bb8f34 {
+.borrow-area_bck .notice-li {
   line-height: 200%;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
 }
-.scan-area.data-v-92bb8f34 {
+.scan-area {
   flex-shrink: 1;
   height: 100%;
   position: relative;
 }
-.scan-area .scan-code.data-v-92bb8f34 {
+.scan-area .scan-code {
   width: 280rpx;
   height: 280rpx;
   background-color: rgba(21, 184, 88, 0.9);
@@ -160,11 +165,11 @@ to {
   font-size: 36rpx;
   -webkit-box-reflect: below 10rpx -webkit-linear-gradient(transparent, transparent 75%, rgba(255, 255, 255, 0.3));
 }
-.scan-area .scan-code .iconfont.data-v-92bb8f34 {
+.scan-area .scan-code .iconfont {
   font-size: 80rpx;
   margin: 20rpx 0;
 }
-.scan-area .scan-mine.data-v-92bb8f34 {
+.scan-area .scan-mine {
   width: 80rpx;
   height: 80rpx;
   color: #505050;

unpackage/dist/dev/mp-weixin/pages/search/search.json

@@ -4,7 +4,7 @@
   "usingComponents": {
     "u-search": "/node-modules/uview-ui/components/u-search/u-search",
     "u-empty": "/node-modules/uview-ui/components/u-empty/u-empty",
-    "u-cell-group": "/node-modules/uview-ui/components/u-cell-group/u-cell-group",
-    "u-cell": "/node-modules/uview-ui/components/u-cell/u-cell"
+    "u-list": "/node-modules/uview-ui/components/u-list/u-list",
+    "u-list-item": "/node-modules/uview-ui/components/u-list-item/u-list-item"
   }
 }

unpackage/dist/dev/mp-weixin/pages/search/search.wxss

@@ -24,25 +24,43 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.home.data-v-4cedc0c6 {
-  padding: 20rpx 20rpx 30rpx;
-  display: flex;
-  flex-direction: column;
-  box-sizing: border-box;
+page {
+  background-color: #f5f6fa;
+}
+.home {
+  padding: 0 24rpx 30rpx;
+  height: 100vh;
 }
-.u-slot-value.data-v-4cedc0c6 {
+.u-slot-value {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.u-slot-value ._i.data-v-4cedc0c6 {
+.u-slot-value ._i {
   flex: 1;
 }
-.u-slot-value text.data-v-4cedc0c6 {
+.u-slot-value text {
   flex: 4;
 }
-.data-v-4cedc0c6 .u-cell-group__wrapper {
+ .u-cell-group__wrapper {
   border-left: 1rpx solid #d6d7d9;
   border-right: 1rpx solid #d6d7d9;
 }
+.data-box {
+  margin: 14rpx 0;
+  padding: 30rpx;
+  background-color: #fff;
+  border-radius: 18rpx;
+  color: #252525;
+}
+.data-box .data-header {
+  display: flex;
+  align-items: center;
+  font-size: 36rpx;
+  letter-spacing: 4rpx;
+}
+.data-box .data-content {
+  line-height: 160%;
+  font-size: 30rpx;
+}
 

utils/baseurl.js

@@ -1,4 +1,5 @@
-let devUrl = 'http://192.168.0.103:80/dev-api';
+// let devUrl = 'http://192.168.0.103:80/dev-api';
+let devUrl = 'http://localhost:80/dev-api';
 let prodUrl = 'http://localhost:8089/prod-api';
 let baseUrl = process.env.NODE_ENV === 'development' ? devUrl : prodUrl;
 

utils/request.js

@@ -86,6 +86,8 @@ fly.interceptors.response.use((res) => {
 		let mess = ""
 		if(resmsg==="用户不存在/密码错误"){
 			mess = "工号/密码错误"
+		}else if(resmsg==="登录用户： 不存在"){
+			mess = "用户不存在"
 		}else{
 			mess = resmsg
 		}