.

.gitignore

@@ -5,6 +5,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 **/*.log
+unpackage/
 
 tests/**/coverage/
 tests/e2e/reports
@@ -19,5 +20,6 @@ selenium-debug.log
 *.sln
 *.local
 
+
 package-lock.json
 yarn.lock

App.vue

@@ -22,4 +22,7 @@
 		height: var(--status-bar-height);
 		width: 100%;
 	}
+	uni-modal{
+		z-index: 19999 !important;
+	}
 </style>

api/asset.js

@@ -31,3 +31,15 @@ export function sumBorrow(data){
 export function reportFault(data){
 	return fly.post('/asset/fault/save',data).then(res=>res)
 }
+//管理员故障处理列表
+export function getFaultReport(){
+	return fly.get('/asset/fault/list').then(res=>res)
+}
+//管理员:获取故障详细，处理故障
+export function getFaultDetail(id){
+	return fly.get(`/asset/fault/${id}`).then(res=>res)
+}
+//管理：故障处理
+export function handleFaultReport(data){
+	return fly.put('/asset/fault/process',data).then(res=>res)
+}

api/user.js

@@ -4,19 +4,12 @@ export function login(username, password) {
     username,
     password
   }
-  return fly.post('/login', data,{headers:{isToken:false}}).then(res => res)
+  return fly.post('/login',data,{headers:{isToken:false}}).then(res => res)
 }
 // 获取用户详细信息
 export function getInfo() {
   return fly.get('/getInfo').then(res=>res)
 }
-// 退出方法
-export function logout() {
-  return request({
-    url: '/logout',
-    method: 'post'
-  })
-}
 //修改用户信息
 export function saveUserInfo(data){
 	return fly.put('/system/user/profile',data).then(res=>res)
@@ -28,7 +21,7 @@ export function savePassword(oldPwd,newPwd){
 		newPassword:newPwd
 	}).then(res=>res)
 }
-
-// export function logout(){
-	
-// }
+//退出
+export function logout(){
+	return fly.post('/logout').then(res=>res)
+}

common/iconfont/icon.scss

@@ -1,8 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3968184 */
-  src: url('//at.alicdn.com/t/c/font_3968184_1h1j5lpg1dk.woff2?t=1680144700686') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3968184_1h1j5lpg1dk.woff?t=1680144700686') format('woff'),
-       url('//at.alicdn.com/t/c/font_3968184_1h1j5lpg1dk.ttf?t=1680144700686') format('truetype');
+  src:
+	   url('//at.alicdn.com/t/c/font_3968184_ktsc58pj9jo.woff2?t=1680488905338') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3968184_ktsc58pj9jo.woff?t=1680488905338') format('woff'),
+       url('//at.alicdn.com/t/c/font_3968184_ktsc58pj9jo.ttf?t=1680488905338') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +14,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tuichu:before {
+  content: "\e6bc";
+}
+
 .icon-liebiao:before {
   content: "\e600";
 }

component/LayoutRow.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="layout-row">
+		<u-row
+			justify="space-between"
+			gutter="10">
+			 <u-col span="4">
+				<view class="demo-layout">{{rowTitle?rowTitle:""}}</view>
+			</u-col>
+			<u-col span="8">
+				<view class="demo-layout">{{rowValue?rowValue:""}}</view>
+			</u-col>
+		</u-row>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				// rowTitle:"存放地点",
+				// rowValue:"222"
+			}
+		},
+		props: {
+		    rowTitle: { // 接收父组件传入值
+		        type: String || "",
+		        default: ""
+		    },
+			rowValue: { // 接收父组件传入值
+			    type: String || "",
+			    default: ""
+			},
+		 }
+	}
+</script>
+
+<style lang="scss">
+	.layout-row{
+		border-top: 1rpx solid #d6d7d9;
+		padding: 20rpx 0 ;
+	}
+	.demo-layout {
+		height: 25px;
+		box-sizing: border-box;
+		// padding: 0 10rpx;
+	}
+</style>

pages.json

@@ -97,6 +97,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/fault/fault-list/fault-list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "故障处理记录",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/fault/fault-handle/fault-handle",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "故障处理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/borrow/borrow.vue

@@ -1,164 +1,19 @@
 <template>
 	<view class="home">
 		<view class="detail-area">
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">
-							资产编号
-						</view>
-					</u-col>
-					<u-col span="8" >
-						<view class="demo-layout">{{assetObj.number?assetObj.number:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">资产名称</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.name?assetObj.name:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">资产种类</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.kind?assetObj.kind:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">资产分类</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.categoryNumber?assetObj.categoryNumber:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">使用部门</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.deptName?assetObj.deptName:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">资产原值(元)</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.amount?assetObj.amount:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">数量</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.quantity?assetObj.quantity:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">存放地点</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.placeName?assetObj.placeName:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">设备状态</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.borrowStatus?assetObj.borrowStatus:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">登记人</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.registrant?assetObj.registrant:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">取得日期</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.buildDate?assetObj.buildDate:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">资产用途</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.purpose?assetObj.purpose:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="layout-row">
-				<u-row
-					justify="space-between"
-					gutter="10">
-					 <u-col span="4">
-						<view class="demo-layout">规格型号</view>
-					</u-col>
-					<u-col span="8">
-						<view class="demo-layout">{{assetObj.specificationsModel?assetObj.specificationsModel:""}}</view>
-					</u-col>
-				</u-row>
-			</view>
+			<layout-row rowTitle="资产编号" :rowValue="assetObj.number"></layout-row>
+			<layout-row rowTitle="资产名称" :rowValue="assetObj.name"></layout-row>
+			<layout-row rowTitle="资产种类" :rowValue="assetObj.kind"></layout-row>
+			<layout-row rowTitle="资产分类" :rowValue="assetObj.categoryNumber"></layout-row>
+			<layout-row rowTitle="使用部门" :rowValue="assetObj.deptName"></layout-row>
+			<layout-row rowTitle="资产原值(元)" :rowValue="assetObj.amount"></layout-row>
+			<layout-row rowTitle="数量" :rowValue="assetObj.quantity"></layout-row>
+			<layout-row rowTitle="存放地点" :rowValue="assetObj.placeName"></layout-row>
+			<layout-row rowTitle="设备状态" :rowValue="assetObj.borrowStatus"></layout-row>
+			<layout-row rowTitle="登记人" :rowValue="assetObj.registrant"></layout-row>
+			<layout-row rowTitle="取得日期" :rowValue="assetObj.buildDate"></layout-row>
+			<layout-row rowTitle="资产用途" :rowValue="assetObj.purpose"></layout-row>
+			<layout-row rowTitle="规格型号" :rowValue="assetObj.specificationsModel"></layout-row>
 		</view>
 		<view v-if="show">
 			<view class="borrow-date" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false">
@@ -313,6 +168,7 @@
 	import { searchAsset,getAllPlace,borrowAsset,returnAsset } from "@/api/asset.js"
 	import cache from "@/utils/storage.js"
 	import { dateToString } from "@/common/js/core.js"
+	import LayoutRow from '@/component/LayoutRow.vue'
 	export default {
 		data() {
 			return {
@@ -334,11 +190,17 @@
 				show:false
 			};
 		},
+		components:{
+			LayoutRow
+		},
 		onLoad:function(option){
 			this.form.assetBarCode = option.number
-			this.initAssets(option.number)
+			// this.initAssets(option.number)
 			this.init()
 		},
+		onShow() {
+			this.initAssets(this.form.assetBarCode)
+		},
 		methods:{
 			showBor(){
 				this.borrowShow = true
@@ -373,14 +235,18 @@
 			},
 			init(){
 				this.placeList = []
+				// uni.showLoading({
+				// 	title: "加载中",
+				// 	mask: true,
+				// });
 				getAllPlace().then(res=>{
 					if(res.length!==0){
 						this.placeList.push(res)
 						this.form.borrowPlaceName = res[0].name?res[0].name:"请选择地点"
 					}
 				})
-				this.form.borrowDate = dateToString(new Date())
-				this.form.returnDate = dateToString(new Date())
+				this.form.borrowDate = dateToString(new Date(new Date().getTime() + 1000*60*10))
+				this.form.returnDate = dateToString(new Date(new Date().getTime() + 1000*60*15))
 				this.form.tel = cache.session.getJSON("phone")
 			},
 			initAssets(data){
@@ -415,9 +281,16 @@
 			},
 			//点去维修
 			toRepeat(){
-				console.log("111233")
+				// console.log("111233")
+				uni.navigateTo({
+					url:'/pages/fault/fault-report/fault-report?id='+this.form.assetBarCode
+				})
 			},
 			toBorrowAsset(){
+				// uni.showLoading({
+				// 	title: "正在借用中",
+				// 	mask: true,
+				// });
 				if(this.form.tel===""){
 					uni.showToast({
 						icon:"none",
@@ -447,6 +320,10 @@
 				})
 			},
 			toReturnAsset(){
+				// uni.showLoading({
+				// 	title: "正在归还中",
+				// 	mask: true,
+				// });
 				returnAsset(this.assetObj.barCode).then(res=>{
 					if(res.data.code===200 && res.data.msg==="归还成功"){
 						uni.showToast({

pages/fault/fault-handle/fault-handle.vue

@@ -0,0 +1,195 @@
+<template>
+	<view class="home">
+		<view class="device-info">
+			<i class="iconfont icon-shebei"></i>设备故障信息
+		</view>
+		<view class="info-area">
+			<u--form
+				labelPosition="left"
+				:model="model1"
+				ref="form1"
+				:labelWidth="100"
+				labelAlign="center"
+			>
+				<u-form-item
+					label="设备编码"
+					prop="assetBarCode"
+					borderBottom
+					ref="item2"
+				>
+					{{model1.assetBarCode}}
+				</u-form-item>
+				<u-form-item
+					label="上报时间"
+					prop="reportDate"
+					borderBottom
+					ref="item1"
+				>
+					{{model1.reportDate}}
+				</u-form-item>
+				<u-form-item
+					label="联系电话"
+					prop="tel"
+					borderBottom
+					ref="item2"
+				>
+					{{model1.tel}}
+				</u-form-item>
+				<u-form-item
+					label="处理状态"
+					prop="processState"
+					borderBottom
+					ref="item2"
+				>
+					{{model1.processState==='0'?'未处理':'已处理'}}
+				</u-form-item>
+			</u--form>
+		</view>
+		<view class="type-head">
+			<i class="iconfont icon-dingwei"></i>故障现象
+		</view>
+		<view class="type-area">
+			<u--textarea
+			border="none" 
+			v-model="model1.faultPhenomenon" 
+			autoHeight
+			disabled
+			maxlength="-1">
+			</u--textarea>
+		</view>
+		<view class="type-head">
+			<i class="iconfont icon-dingwei"></i>处理结果
+		</view>
+		<view class="type-area">
+			<u--textarea 
+			border="none" 
+			v-model="model1.processResult" 
+			placeholder="请输入处理结果" 
+			:disabled="model1.processState==='0'?false:true"
+			autoHeight
+			maxlength="-1"></u--textarea>
+		</view>
+		<view v-if="model1.processState==='0'?true:false">
+			<view class="type-head">
+				<i class="iconfont icon-dingwei"></i>设备状态反馈
+			</view>
+			<view class="type-area">
+				<u-radio-group
+					v-model="radiovalue1"
+					placement="row"
+				>
+					<u-radio
+					:customStyle="{margin: '8px 8px 8px 0' }"
+					v-for="(item, index) in radiolist1"
+					:key="index"
+					:label="item.name"
+					:name="item.name"
+					>
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</view>
+		<view class="btn-area" v-if="model1.processState==='0'?true:false">
+			<u-button color="#000" size="small" @click="toSaveProcess">保存</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getFaultDetail,handleFaultReport } from '@/api/asset.js'
+	export default {
+		data() {
+			return {
+				id:null,
+				model1:{
+					assetBarCode: "00170000488047",
+					createBy: null,
+					createTime: null,
+					faultPhenomenon: "aaaaaaa",
+					id: "1640988534091284485",
+					params:{},
+					processResult: null,
+					processState: "0",
+					remark: null,
+					reportDate: "2023-03-31 10:27:09",
+					searchValue: null,
+					tel: "15788998899",
+					updateBy: null,
+					updateTime: null,
+					userId: "1"
+				},
+				radiolist1: [
+					{
+						name: '正常',
+						disabled: false
+					},
+					{
+					  name: '报废',
+					  disabled: false
+					}
+				],
+				radiovalue1: '正常',
+			};
+		},
+		methods:{
+			init(id){
+				getFaultDetail(id).then(res=>{
+					this.model1 = res
+				})
+			},
+			toSaveProcess(){
+				// uni.showLoading({
+				// 	title: "正在保存中",
+				// 	mask: true,
+				// });
+				let fault = this.model1.processResult
+				if(fault==""){
+					uni.$u.toast("请填写故障处理结果")
+					return;
+				}
+				let data = {
+					tbFaultReportId:this.model1.id,
+					processResult:this.model1.faultPhenomenon,
+					feedbackStatus:this.radiovalue1==="正常"?1:0
+				}
+				handleFaultReport(data).then(res=>{
+					this.model1 = res
+				})
+			}
+		},
+		onLoad:function(option){
+			this.id = option.id
+			this.init(option.id)
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #eae9e9;
+}
+.home{
+	// padding: 20rpx 0;
+}
+.device-info,.type-head{
+	display: flex;
+	align-items: center;
+	padding:20rpx;
+	.iconfont{
+		font-size: 40rpx;
+		margin-right: 10rpx;
+	}
+}
+.info-area,.type-area{
+	background-color: #fff;
+}
+.type-area{
+	padding: 0 20rpx;
+	/deep/.u-textarea--disabled{
+		background-color: #fff !important;
+	}
+}
+.btn-area{
+	padding: 20rpx 20rpx 20rpx 500rpx;
+}
+</style>

pages/fault/fault-list/fault-list.vue

@@ -0,0 +1,88 @@
+<template>
+	<view class="home">
+		<!-- <view class="search-area" style="margin-bottom: 20rpx;">
+			<u-search 
+			placeholder="搜索设备" 
+			v-model="keyword" 
+			shape="square" 
+			:clearabled="true"
+			:show-action="true" 
+			action-text="搜索" 
+			:animation="true"
+			search-icon-color="#000"
+			color="#000"
+			placeholder-color="#5c5b5b"
+			></u-search>
+			
+		</view> -->
+		<u-empty
+			:show="dataList.length===0?true:false"
+			mode="list"
+			icon="http://cdn.uviewui.com/uview/empty/list.png"
+		>
+		</u-empty>
+		<view v-show="dataList.length===0?false:true">
+			<u-cell-group :border="true">
+				<u-cell  
+				title="设备" 
+				value="状态"
+				></u-cell>
+				<u-cell 
+				v-for="item in dataList" 
+				:key="item.id" 
+				:title="item.assetBarCode"
+				:titleStyle="{ color:`${item.processState==='0'?'#ca2121':'#000'}` }"
+				:value="item.processState==='0'?'待处理':'已处理'"
+				:label="`上报时间：${item.reportDate}`"
+				@click="toHandle(item.id)"
+				></u-cell>
+			</u-cell-group>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getFaultReport } from '@/api/asset.js'
+	export default {
+		data() {
+			return {
+				pageNum:1,
+				pageSize:10,
+				dataList:[],
+				keyword:"",
+				color:""
+			};
+		},
+		methods:{
+			init(){
+				getFaultReport().then(res=>{
+					this.dataList = res.data.rows
+				})
+			},
+			toHandle(id){
+				uni.navigateTo({
+					url:'/pages/fault/fault-handle/fault-handle?id='+id
+				})
+			}
+		},
+		onShow() {
+			this.init()
+		}
+	}
+</script>
+
+<style lang="scss">
+.home{
+	padding: 20rpx 20rpx 30rpx;
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+}
+/deep/ .u-cell-group__wrapper{
+	border-left: 1rpx solid #d6d7d9;
+	border-right: 1rpx solid #d6d7d9;
+}
+/deep/ .u-cell__label{
+	color: #000!important;
+}
+</style>

pages/fault/fault-report/fault-report.vue

@@ -86,6 +86,10 @@
 				})
 			},
 			toReportFault(){
+				// uni.showLoading({
+				// 	title: "正在上报中",
+				// 	mask: true,
+				// });
 				let data = {
 					"assetBarCode": this.model1.deviceNumber,
 					"faultPhenomenon": this.fault,

pages/home/home.vue

@@ -30,7 +30,7 @@
 				最新借用设备
 			</view>
 			<ul v-if="borList.length===0?false:true">
-				<li  v-for="item in borList" :key="item.id" class="notice-li"> 
+				<li  v-for="item in borList" :key="item.id" class="notice-li" @click="toDetail(item.assetBarCode)"> 
 					<text>设备编码：{{item.assetBarCode}}</text>
 					<text>{{handleDate(item.borrowDate)}}</text>
 				</li>
@@ -52,8 +52,8 @@
 </template>
 
 <script>
-	import { getInfo } from '@/api/user.js'
-	import cache from '@/utils/storage.js'
+	// import { getInfo } from '@/api/user.js'
+	// import cache from '@/utils/storage.js'
 	import { getNewInform } from '@/api/notice.js'
 	import { getBorrowList } from '@/api/asset.js'
 	export default {
@@ -77,18 +77,31 @@
 					})
 				}
 			},
-			init(){
-				getNewInform(4).then(res=>{
-					this.informList = res
-				})
-				getBorrowList({
-					pageNum:1,
-					pageSize:1,
-					status:0
-				}).then(res=>{
-					// console.log(res.data.rows)
-					this.borList = res.data.rows
-				})
+			initInfo(){
+				const that = this
+				uni.showLoading()
+				try{
+					getNewInform(4).then(res=>{
+						if(res instanceof Array){
+							that.informList = res
+							getBorrowList({
+								pageNum:1,
+								pageSize:1,
+								status:0
+							}).then(res=>{
+								if(res.data.rows){
+									that.borList = res.data.rows
+								}
+								uni.hideLoading()
+							})
+						}else{
+							uni.hideLoading()
+						}
+					})
+				}catch(err){
+					uni.hideLoading()
+				}
+				
 			},
 			toMine(){
 				uni.navigateTo({
@@ -106,11 +119,15 @@
 				})
 			},
 			toNotice(id){
-				// console.log(id)
 				uni.navigateTo({
 					url:'/pages/notice/notice?id='+id,
 				})
 			},
+			toDetail(bar){
+				uni.navigateTo({
+					url:'/pages/borrow/borrow?number='+bar,
+				})
+			},
 			handleDate(val){
 				let date = new Date(val)
 				let year = date.getFullYear()
@@ -120,20 +137,10 @@
 			}
 		},
 		onLoad:function(){
-			this.keyword = "",
-			getInfo().then(res=>{
-				if(res.data.code===200){
-					cache.session.setJSON('role',res.data.roles[0])
-					cache.session.setJSON('phone',res.data.user.phonenumber)
-					cache.session.setJSON('email',res.data.user.email)
-					cache.session.setJSON('nickName',res.data.user.nickName)
-					cache.session.setJSON('userName',res.data.user.userName)
-					cache.session.setJSON('userId',res.data.user.userId)
-				}
-			})
-			if(uni.getStorageSync('Admin-Token')){
-				this.init()
-			}
+			this.keyword = ""
+		},
+		onShow() {
+			this.initInfo()
 		}
 	}
 </script>

pages/login/login.vue

@@ -33,8 +33,9 @@
 </template>
 
 <script>
-	import {login} from "@/api/user.js"
+	import { login,getInfo } from "@/api/user.js"
 	import { setToken } from "@/utils/auth.js"
+	import cache from '@/utils/storage.js'
 	export default {
 		data() {
 			return {
@@ -51,12 +52,29 @@
 				this.pwdType = "text"
 			},
 			toLogin(){
-				login(this.form.account,this.form.password).then(res=>{
-					setToken(res.data.token)
-					uni.reLaunch({
-						url:'/pages/home/home'
+				uni.showLoading()
+				try{
+					login(this.form.account,this.form.password).then(res=>{
+						setToken(res.data.token)
+						getInfo().then(res=>{
+							if(res.data.code===200){
+								uni.hideLoading()
+								cache.session.setJSON('role',res.data.roles[0])
+								cache.session.setJSON('phone',res.data.user.phonenumber)
+								cache.session.setJSON('email',res.data.user.email)
+								cache.session.setJSON('nickName',res.data.user.nickName)
+								cache.session.setJSON('userName',res.data.user.userName)
+								cache.session.setJSON('userId',res.data.user.userId)
+								uni.reLaunch({
+									url:'/pages/home/home'
+								})
+							}
+						})
 					})
-				})
+				}catch(err){
+					uni.hideLoading()
+				}
+				
 			}
 		}
 	}

pages/menus/borrow-record/borrow-record.vue

@@ -1,17 +1,22 @@
 <template>
-	<view class="home">
-		<view class="list-area" v-for="item in dataList" :key="item.id" @click="toDetail(item.id,item.assetBarCode,item.isreturn)">
-			<u-cell :isLink="true">
-				<view slot="title" class="u-slot-title">
-					<i class="iconfont icon-shijian"></i>
-					<text>{{item.isreturn=="0"?"借用时间："+item.borrowDate:"归还时间："+item.actualReturnDate}}</text>
-				</view>
-				<view slot="label" class="u-slot-label">
-					<text class="list-name">设备：{{item.assetBarCode}}</text>
-					<text class="list-status">{{isReturn(item.isreturn)}}</text>
-				</view>
-			</u-cell>
-		</view>
+	<view>
+		<scroll-view 
+		style="height: 100vh;padding:20rpx 30rpx;box-sizing: border-box;" 
+		scroll-y="true"  
+		@scrolltolower="scroll">
+			<view class="list-area" v-for="item in dataList" :key="item.id" @click="toDetail(item.id,item.assetBarCode,item.isreturn)">
+				<u-cell :isLink="true">
+					<view slot="title" class="u-slot-title">
+						<i class="iconfont icon-shijian"></i>
+						<text>{{item.isreturn=="0"?"借用时间："+item.borrowDate:"归还时间："+item.actualReturnDate}}</text>
+					</view>
+					<view slot="label" class="u-slot-label" :style="{color:`${item.isreturn==='0'?'#439dea':'#000000'}`}">
+						<text class="list-name">设备：{{item.assetBarCode}}</text>
+						<text class="list-status">{{isReturn(item.isreturn)}}</text>
+					</view>
+				</u-cell>
+			</view>
+		</scroll-view>
 	</view>
 </template>
 
@@ -20,20 +25,37 @@
 	export default {
 		data() {
 			return {
-				dataList:[]
+				dataList:[],
+				isOver:false,
+				page:1,
 			};
 		},
 		methods:{
 			scroll(){
-				console.log(111)
+				if(this.isOver){
+					return;
+				}
+				this.init(this.page,false)
 			},
-			init(){
+			init(page,init){
+				if(init){
+					this.dataList=[]
+				}
 				getBorrowList({
-					pageNum:1,
+					pageNum: page,
 					pageSize:10
 				}).then(res=>{
-					console.log(res)
-					this.dataList = res.data.rows
+					res.data.rows.forEach(item=>{
+						this.dataList.push(item)
+					})
+					let num = Math.ceil(res.data.total/10)
+					console.log(num)
+					if(page == num){
+						this.isOver = true
+					}else{
+						this.isOver = false
+						this.page++
+					}
 				})
 			},
 			isReturn(val){
@@ -56,8 +78,8 @@
 				}
 			}
 		},
-		onLoad() {
-			this.init()
+		onShow() {
+			this.init(1,true)
 		}
 	}
 </script>

pages/menus/menu/menu.vue

@@ -9,7 +9,9 @@
 				<text class="basic-name">{{name}}</text>
 				<text class="basic-amount">借用中设备：{{amount}}</text>
 			</view>
-			<u-list>
+			<u-list 
+			:enableFlex="true"
+			>
 				<u-list-item>
 					<view class="menu-list" @click="toPersonInfo">
 						<i class="iconfont icon-ditu"></i>
@@ -28,8 +30,8 @@
 						<text>故障上报</text>
 					</view>
 				</u-list-item>
-				<u-list-item>
-					<view class="menu-list">
+				<u-list-item v-if="role==='admin'?true:false">
+					<view class="menu-list" @click="toHandleFault">
 						<i class="iconfont icon-baogaoguanli"></i>
 						<text>故障处理</text>
 					</view>
@@ -46,6 +48,12 @@
 						<text>关于我们</text>
 					</view>
 				</u-list-item>
+				<u-list-item>
+					<view class="menu-list" @click="toLogout">
+						<i class="iconfont icon-tuichu"></i>
+						<text>退出登录</text>
+					</view>
+				</u-list-item>
 			</u-list>
 		</view>
 	</view>
@@ -54,12 +62,14 @@
 <script>
 	import cache from '@/utils/storage.js'
 	import { sumBorrow } from '@/api/asset.js'
+	import { logout } from '@/api/user.js'
 	export default {
 		data() {
 			return {
 				src: 'https://tupian.qqw21.com/article/UploadPic/2021-1/20211722215735941.jpg',
 				name: cache.session.getJSON('nickName'),
-				amount:null
+				amount:null,
+				role:cache.session.getJSON('role')
 			};
 		},
 		methods:{
@@ -79,14 +89,41 @@
 				})
 			},
 			toRepeat(){
-				uni.scanCode({
-					scanType:['barCode'],
+				// uni.scanCode({
+				// 	scanType:['barCode'],
+				// 	success (res) {
+				// 		uni.navigateTo({
+				// 			url:'/pages/fault/fault-report/fault-report?id='+res.result
+				// 		})
+				// 	}
+				// })
+			},
+			toHandleFault(){
+				uni.navigateTo({
+					url:'/pages/fault/fault-list/fault-list'
+				})
+			},
+			toLogout(){
+				//#ifdef MP-WEIXIN 
+				wx.showModal({
+					title: '系统提示',
+					content: '是否确认退出登录？',
 					success (res) {
-						uni.navigateTo({
-							url:'/pages/fault/fault-report/fault-report?id='+res.result
-						})
+						if (res.confirm) {
+							logout().then(res=>{
+								if(res.data.code===200&&res.data.msg==="退出成功"){
+									uni.reLaunch({
+										url:'/pages/home/home'
+									})
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消')
+						}
 					}
 				})
+				//#endif
+				
 			}
 		},
 		onLoad() {

pages/return/return.vue

@@ -1,28 +1,51 @@
 <template>
 	<view class="home">
 		<view class="detail-area">
+			<layout-row rowTitle="条形码" :rowValue="form.assetBarCode"></layout-row>
+			<layout-row rowTitle="资产编号" :rowValue="tbAsset.number"></layout-row>
+			<layout-row rowTitle="资产名称" :rowValue="tbAsset.name"></layout-row>
+			<layout-row rowTitle="借用人" :rowValue="form.userId"></layout-row>
+			<layout-row rowTitle="借用人电话" :rowValue="form.tel"></layout-row>
+			<layout-row rowTitle="借用状态" :rowValue="form.isreturn==='1'?'已归还':''"></layout-row>
+			<layout-row rowTitle="借用地点" :rowValue="form.borrowPlaceName"></layout-row>
+			<layout-row rowTitle="借用时间" :rowValue="form.borrowDate"></layout-row>
+			<layout-row rowTitle="归还时间" :rowValue="form.actualReturnDate"></layout-row>
+			<layout-row rowTitle="备注" :rowValue="form.remark==''?'无':form.remark"></layout-row>
 		</view>
 	</view>
 </template>
 
 <script>
 	import { getReturnDetail } from '@/api/asset.js'
+	import LayoutRow from '@/component/LayoutRow.vue'
 	export default {
 		data() {
 			return {
-				id:""
+				id:"",
+				form:{},
+				tbAsset:{}
 			};
 		},
 		methods:{
 			init(id){
+				const that = this
 				getReturnDetail(id).then(res=>{
-					console.log(res)
+					if(res){
+						that.form = res
+						if(that.form.tbAsset){
+							that.tbAsset = that.form.tbAsset
+						}
+					}
+					
 				})
 			}
 		},
 		onLoad:function(option){
 			this.id = option.id
 			this.init(this.id)
+		},
+		components:{
+			LayoutRow
 		}
 	}
 </script>
@@ -34,5 +57,9 @@
 	flex-direction: column;
 	// height: 100vh;
 	box-sizing: border-box;
+	.detail-area{
+		border: 2rpx solid #000;
+		padding: 0 20rpx;
+	}
 }
 </style>

pages/search/search.vue

@@ -35,8 +35,6 @@
 				:title="item.name" 
 				:value="item.borrowStatus"
 				:label="item.barCode"
-				:title-style="{'color': '#000'}"
-				:value-style="{'color': '#5c5b5b'}"
 				@click="toBorrow(item.barCode)"
 				></u-cell>
 			</u-cell-group>
@@ -57,13 +55,16 @@
 		},
 		onLoad:function(option){
 			this.keyword = option.keyword
-			this.search(this.keyword)
 		},
 		onShow(){
 			this.search(this.keyword)
 		},
 		methods:{
 			search(val){
+				// uni.showLoading({
+				// 	title: "加载中",
+				// 	mask: true,
+				// });
 				searchAsset({numberOrName: val}).then(res=>{
 					if(res.length===0){
 						this.emptyShow = true

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

@@ -10,7 +10,9 @@
     "pages/menus/menu/menu",
     "pages/return/return",
     "pages/fault/fault-report/fault-report",
-    "pages/notice/notice"
+    "pages/notice/notice",
+    "pages/fault/fault-list/fault-list",
+    "pages/fault/fault-handle/fault-handle"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -256,7 +256,7 @@
 @font-face {
   font-family: "iconfont";
   /* Project id 3968184 */
-  src: url("//at.alicdn.com/t/c/font_3968184_1h1j5lpg1dk.woff2?t=1680144700686") format("woff2"), url("//at.alicdn.com/t/c/font_3968184_1h1j5lpg1dk.woff?t=1680144700686") format("woff"), url("//at.alicdn.com/t/c/font_3968184_1h1j5lpg1dk.ttf?t=1680144700686") format("truetype");
+  src: url("//at.alicdn.com/t/c/font_3968184_ktsc58pj9jo.woff2?t=1680488905338") format("woff2"), url("//at.alicdn.com/t/c/font_3968184_ktsc58pj9jo.woff?t=1680488905338") format("woff"), url("//at.alicdn.com/t/c/font_3968184_ktsc58pj9jo.ttf?t=1680488905338") format("truetype");
 }
 .iconfont {
   font-family: "iconfont" !important;
@@ -265,6 +265,9 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-tuichu:before {
+  content: "\e6bc";
+}
 .icon-liebiao:before {
   content: "\e600";
 }
@@ -348,4 +351,7 @@
   height: 25px;
   width: 100%;
 }
+uni-modal {
+  z-index: 19999 !important;
+}
 

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

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u--input/u--input"],{
 
 /***/ 255:
@@ -156,16 +157,23 @@ exports.default = _default;
 =======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--input/u--input"],{279:function(n,e,t){"use strict";t.r(e);var u=t(280),r=t(282);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},280:function(n,e,t){"use strict";t.r(e);var u=t(281);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"]}))},281: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},282:function(n,e,t){"use strict";t.r(e);var u=t(283),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},283: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(284)),i=function(){t.e("node-modules/uview-ui/components/u-input/u-input").then(function(){return resolve(t(404))}.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"])}}]);
 >>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--input/u--input"],{281:function(n,e,t){"use strict";t.r(e);var u=t(282),r=t(284);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},282:function(n,e,t){"use strict";t.r(e);var u=t(283);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"]}))},283: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},284:function(n,e,t){"use strict";t.r(e);var u=t(285),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},285: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(286)),i=function(){t.e("node-modules/uview-ui/components/u-input/u-input").then(function(){return resolve(t(429))}.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"])}}]);
+>>>>>>> 7591412109fe15bc2198b91d0788671e4ee587b8
 //# 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__){
 <<<<<<< HEAD
+<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(255))
 =======
             __webpack_require__('2')['createComponent'](__webpack_require__(279))
 >>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
+=======
+            __webpack_require__('2')['createComponent'](__webpack_require__(281))
+>>>>>>> 7591412109fe15bc2198b91d0788671e4ee587b8
         })
     },
     [['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,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u--text/u--text"],{
 
 /***/ 477:
@@ -142,12 +143,15 @@ exports.default = _default;
 =======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--text/u--text"],{477:function(e,n,t){"use strict";t.r(n);var u=t(478),r=t(480);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},478:function(e,n,t){"use strict";t.r(n);var u=t(479);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"]}))},479: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},480:function(e,n,t){"use strict";t.r(n);var u=t(481),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},481: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(482)),o=function(){Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(490))}.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"])}}]);
 >>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--text/u--text"],{526:function(e,n,t){"use strict";t.r(n);var u=t(527),r=t(529);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},527:function(e,n,t){"use strict";t.r(n);var u=t(528);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"]}))},528: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},529:function(e,n,t){"use strict";t.r(n);var u=t(530),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},530: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(531)),o=function(){Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(539))}.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"])}}]);
+>>>>>>> 7591412109fe15bc2198b91d0788671e4ee587b8
 //# 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__(477))
+            __webpack_require__('2')['createComponent'](__webpack_require__(526))
         })
     },
     [['node-modules/uview-ui/components/u--text/u--text-create-component']]

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
     "u--text": "/node-modules/uview-ui/components/u--text/u--text"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-line": "/node-modules/uview-ui/components/u-line/u-line"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
     "u-line": "/node-modules/uview-ui/components/u-line/u-line"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-list/u-list.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "u-overlay": "/node-modules/uview-ui/components/u-overlay/u-overlay",
     "u-transition": "/node-modules/uview-ui/components/u-transition/u-transition",
     "u-status-bar": "/node-modules/uview-ui/components/u-status-bar/u-status-bar",
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
     "u-safe-bottom": "/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-row/u-row.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"],{
 
 /***/ 469:
@@ -206,12 +207,15 @@ __webpack_require__.r(__webpack_exports__);
 =======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"],{469:function(e,n,t){"use strict";t.r(n);var u=t(470),r=t(472);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);t(475);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},470:function(e,n,t){"use strict";t.r(n);var u=t(471);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"]}))},471: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},472:function(e,n,t){"use strict";t.r(n);var u=t(473),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},473: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(474)),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"])},475:function(e,n,t){"use strict";t.r(n);var u=t(476),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},476:function(e,n,t){}}]);
 >>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"],{518:function(e,n,t){"use strict";t.r(n);var u=t(519),r=t(521);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);t(524);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},519:function(e,n,t){"use strict";t.r(n);var u=t(520);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"]}))},520: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},521:function(e,n,t){"use strict";t.r(n);var u=t(522),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},522: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(523)),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"])},524:function(e,n,t){"use strict";t.r(n);var u=t(525),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},525:function(e,n,t){}}]);
+>>>>>>> 7591412109fe15bc2198b91d0788671e4ee587b8
 //# 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__(469))
+            __webpack_require__('2')['createComponent'](__webpack_require__(518))
         })
     },
     [['node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom-create-component']]

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-search/u-search.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

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

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u-toolbar/u-toolbar"],{
 
 /***/ 443:
@@ -225,12 +226,15 @@ __webpack_require__.r(__webpack_exports__);
 =======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-toolbar/u-toolbar"],{443:function(n,e,t){"use strict";t.r(e);var r=t(444),u=t(446);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(449);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},444:function(n,e,t){"use strict";t.r(e);var r=t(445);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"]}))},445: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},446:function(n,e,t){"use strict";t.r(e);var r=t(447),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},447: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(448)),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"])},449:function(n,e,t){"use strict";t.r(e);var r=t(450),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},450:function(n,e,t){}}]);
 >>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-toolbar/u-toolbar"],{476:function(n,e,t){"use strict";t.r(e);var r=t(477),u=t(479);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(482);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},477:function(n,e,t){"use strict";t.r(e);var r=t(478);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"]}))},478: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},479:function(n,e,t){"use strict";t.r(e);var r=t(480),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},480: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(481)),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"])},482:function(n,e,t){"use strict";t.r(e);var r=t(483),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},483:function(n,e,t){}}]);
+>>>>>>> 7591412109fe15bc2198b91d0788671e4ee587b8
 //# 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__(443))
+            __webpack_require__('2')['createComponent'](__webpack_require__(476))
         })
     },
     [['node-modules/uview-ui/components/u-toolbar/u-toolbar-create-component']]

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

@@ -2,14 +2,13 @@
   "navigationBarTitleText": "设备信息",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-row": "/node-modules/uview-ui/components/u-row/u-row",
-    "u-col": "/node-modules/uview-ui/components/u-col/u-col",
     "u--form": "/node-modules/uview-ui/components/u--form/u--form",
     "u-form-item": "/node-modules/uview-ui/components/u-form-item/u-form-item",
     "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker",
     "u--input": "/node-modules/uview-ui/components/u--input/u--input",
     "u-datetime-picker": "/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker",
     "u-button": "/node-modules/uview-ui/components/u-button/u-button",
-    "u-toast": "/node-modules/uview-ui/components/u-toast/u-toast"
+    "u-toast": "/node-modules/uview-ui/components/u-toast/u-toast",
+    "layout-row": "/component/LayoutRow"
   }
 }

unpackage/dist/dev/mp-weixin/pages/logo/index.js

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/logo/index"],{
 
 /***/ 175:
@@ -212,4 +213,7 @@ __webpack_require__.r(__webpack_exports__);
 =======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/logo/index"],{184:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(185));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},185:function(n,e,t){"use strict";t.r(e);var r=t(186),u=t(188);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(190);var c,i=t(37),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"c7c34cb2",null,!1,r["components"],c);a.options.__file="pages/logo/index.vue",e["default"]=a.exports},186:function(n,e,t){"use strict";t.r(e);var r=t(187);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"]}))},187:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return c})),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,c=[];u._withStripped=!0},188:function(n,e,t){"use strict";t.r(e);var r=t(189),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},189:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{title:"Hello"}},onLoad:function(){},methods:{toLogin:function(){n.redirectTo({url:"/pages/login/login"})}}};e.default=t}).call(this,t(2)["default"])},190:function(n,e,t){"use strict";t.r(e);var r=t(191),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},191:function(n,e,t){}},[[184,"common/runtime","common/vendor"]]]);
 >>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/logo/index"],{176:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(177));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},177:function(n,e,t){"use strict";t.r(e);var r=t(178),u=t(180);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(182);var c,i=t(37),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"c7c34cb2",null,!1,r["components"],c);a.options.__file="pages/logo/index.vue",e["default"]=a.exports},178:function(n,e,t){"use strict";t.r(e);var r=t(179);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"]}))},179:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return c})),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,c=[];u._withStripped=!0},180:function(n,e,t){"use strict";t.r(e);var r=t(181),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},181:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{title:"Hello"}},onLoad:function(){},methods:{toLogin:function(){n.redirectTo({url:"/pages/login/login"})}}};e.default=t}).call(this,t(2)["default"])},182:function(n,e,t){"use strict";t.r(e);var r=t(183),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},183:function(n,e,t){}},[[176,"common/runtime","common/vendor"]]]);
+>>>>>>> 7591412109fe15bc2198b91d0788671e4ee587b8
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/logo/index.js.map

unpackage/dist/dev/mp-weixin/pages/menus/borrow-record/borrow-record.wxml

@@ -1 +1 @@
-<view class="home"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['toDetail',['$0','$1','$2'],[[['dataList','id',item.$orig.id,'id']],[['dataList','id',item.$orig.id,'assetBarCode']],[['dataList','id',item.$orig.id,'isreturn']]]]]]]}}" class="list-area" bindtap="__e"><u-cell vue-id="{{'2994abe7-1-'+__i0__}}" isLink="{{true}}" bind:__l="__l" vue-slots="{{['title','label']}}"><view class="u-slot-title" slot="title"><view class="iconfont icon-shijian _i"></view><text>{{item.$orig.isreturn=="0"?"借用时间："+item.$orig.borrowDate:"归还时间："+item.$orig.actualReturnDate}}</text></view><view class="u-slot-label" slot="label"><text class="list-name">{{"设备："+item.$orig.assetBarCode}}</text><text class="list-status">{{item.m0}}</text></view></u-cell></view></block></view>
+<view><scroll-view style="height:100vh;padding:20rpx 30rpx;box-sizing:border-box;" scroll-y="true" data-event-opts="{{[['scrolltolower',[['scroll',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['toDetail',['$0','$1','$2'],[[['dataList','id',item.$orig.id,'id']],[['dataList','id',item.$orig.id,'assetBarCode']],[['dataList','id',item.$orig.id,'isreturn']]]]]]]}}" class="list-area" bindtap="__e"><u-cell vue-id="{{'2994abe7-1-'+__i0__}}" isLink="{{true}}" bind:__l="__l" vue-slots="{{['title','label']}}"><view class="u-slot-title" slot="title"><view class="iconfont icon-shijian _i"></view><text>{{item.$orig.isreturn=="0"?"借用时间："+item.$orig.borrowDate:"归还时间："+item.$orig.actualReturnDate}}</text></view><view class="u-slot-label" style="{{'color:'+(''+(item.$orig.isreturn==='0'?'#439dea':'#000000'))+';'}}" slot="label"><text class="list-name">{{"设备："+item.$orig.assetBarCode}}</text><text class="list-status">{{item.m0}}</text></view></u-cell></view></block></scroll-view></view>

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

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "归还记录",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "layout-row": "/component/LayoutRow"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/return/return.wxml

@@ -1 +1 @@
-<view class="home"><view class="detail-area"></view></view>
+<view class="home"><view class="detail-area"><layout-row vue-id="1b857c00-1" rowTitle="条形码" rowValue="{{form.assetBarCode}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-2" rowTitle="资产编号" rowValue="{{tbAsset.number}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-3" rowTitle="资产名称" rowValue="{{tbAsset.name}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-4" rowTitle="借用人" rowValue="{{form.userId}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-5" rowTitle="借用人电话" rowValue="{{form.tel}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-6" rowTitle="借用状态" rowValue="{{form.isreturn==='1'?'已归还':''}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-7" rowTitle="借用地点" rowValue="{{form.borrowPlaceName}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-8" rowTitle="借用时间" rowValue="{{form.borrowDate}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-9" rowTitle="归还时间" rowValue="{{form.actualReturnDate}}" bind:__l="__l"></layout-row><layout-row vue-id="1b857c00-10" rowTitle="备注" rowValue="{{form.remark==''?'无':form.remark}}" bind:__l="__l"></layout-row></view></view>

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

@@ -1 +1 @@
-<view class="home data-v-4cedc0c6"><view class="search-area data-v-4cedc0c6" style="margin-bottom:20rpx;"><u-search vue-id="50cad900-1" placeholder="搜索设备" shape="square" clearabled="{{true}}" show-action="{{true}}" action-text="搜索" animation="{{true}}" search-icon-color="#000" color="#000" placeholder-color="#5c5b5b" value="{{keyword}}" data-event-opts="{{[['^search',[['search',['$0'],['keyword']]]],['^custom',[['search',['$0'],['keyword']]]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:search="__e" bind:custom="__e" bind:input="__e" class="data-v-4cedc0c6" bind:__l="__l"></u-search></view><u-empty vue-id="50cad900-2" show="{{emptyShow}}" mode="search" icon="http://cdn.uviewui.com/uview/empty/search.png" class="data-v-4cedc0c6" bind:__l="__l"></u-empty><view hidden="{{!(!emptyShow)}}" class="data-v-4cedc0c6"><u-cell-group vue-id="50cad900-3" border="{{true}}" class="data-v-4cedc0c6" bind:__l="__l" vue-slots="{{['default']}}"><u-cell vue-id="{{('50cad900-4')+','+('50cad900-3')}}" title="设备" value="状态" title-style="{{$root.a0}}" value-style="{{$root.a1}}" class="data-v-4cedc0c6" bind:__l="__l"></u-cell><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="barCode"><u-cell vue-id="{{('50cad900-5-'+__i0__)+','+('50cad900-3')}}" title="{{item.$orig.name}}" value="{{item.$orig.borrowStatus}}" label="{{item.$orig.barCode}}" title-style="{{item.a2}}" value-style="{{item.a3}}" data-event-opts="{{[['^click',[['toBorrow',['$0'],[[['dataList','barCode',item.$orig.barCode,'barCode']]]]]]]}}" bind:click="__e" class="data-v-4cedc0c6" bind:__l="__l"></u-cell></block></u-cell-group></view></view>
+<view class="home data-v-4cedc0c6"><view class="search-area data-v-4cedc0c6" style="margin-bottom:20rpx;"><u-search vue-id="50cad900-1" placeholder="搜索设备" shape="square" clearabled="{{true}}" show-action="{{true}}" action-text="搜索" animation="{{true}}" search-icon-color="#000" color="#000" placeholder-color="#5c5b5b" value="{{keyword}}" data-event-opts="{{[['^search',[['search',['$0'],['keyword']]]],['^custom',[['search',['$0'],['keyword']]]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:search="__e" bind:custom="__e" bind:input="__e" class="data-v-4cedc0c6" bind:__l="__l"></u-search></view><u-empty vue-id="50cad900-2" show="{{emptyShow}}" mode="search" icon="http://cdn.uviewui.com/uview/empty/search.png" class="data-v-4cedc0c6" bind:__l="__l"></u-empty><view hidden="{{!(!emptyShow)}}" class="data-v-4cedc0c6"><u-cell-group vue-id="50cad900-3" border="{{true}}" class="data-v-4cedc0c6" bind:__l="__l" vue-slots="{{['default']}}"><u-cell vue-id="{{('50cad900-4')+','+('50cad900-3')}}" title="设备" value="状态" title-style="{{$root.a0}}" value-style="{{$root.a1}}" class="data-v-4cedc0c6" bind:__l="__l"></u-cell><block wx:for="{{dataList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="barCode"><u-cell vue-id="{{('50cad900-5-'+__i0__)+','+('50cad900-3')}}" title="{{item.name}}" value="{{item.borrowStatus}}" label="{{item.barCode}}" data-event-opts="{{[['^click',[['toBorrow',['$0'],[[['dataList','barCode',item.barCode,'barCode']]]]]]]}}" bind:click="__e" class="data-v-4cedc0c6" bind:__l="__l"></u-cell></block></u-cell-group></view></view>

utils/request.js

@@ -11,6 +11,13 @@ fly.config.baseURL = baseUrl;
 
 fly.interceptors.request.use((config) => {
     // 在发送请求之前做些什么
+	// if(isLoading){
+	// 	console.log(isLoading,222)
+	// 	uni.showLoading({
+	// 		title: "加载中",
+	// 		mask: true,
+	// 	})
+	// }
 	const isToken = (config.headers || {}).isToken === false
 	if (getToken() && !isToken) {
 		config.headers['Authorization'] = `Bearer ${getToken()}`;
@@ -18,6 +25,13 @@ fly.interceptors.request.use((config) => {
     return config
 }, function(error) {
     // 对请求错误做些什么
+	// if(isLoading){
+	// 	uni.hideLoading();
+	// }
+	uni.showToast({
+		title: error,
+		icon:'none'
+	});
     return Promise.reject(error)
 })
 
@@ -29,13 +43,18 @@ fly.interceptors.response.use((res) => {
 	// 获取错误信息
 	const resmsg = errorCode[rescode] || msg || errorCode['default']
 	// 二进制数据则直接返回
+	// if(isLoading){
+	// 	uni.hideLoading();
+	// }
 	if(res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer'){
 	  return resmsg
 	}
 	if (rescode === 401) {
+		//#ifndef MP-WEIXIN
 		uni.showModal({
 			title: '系统提示',
-			content: '登录状态已过期，请重新登录',
+			content: '请先进行登录',
+			mask:true,
 			success: function (res) {
 				if (res.confirm) {
 					uni.reLaunch({
@@ -46,6 +65,23 @@ fly.interceptors.response.use((res) => {
 				}
 			}
 		});
+		//#endif
+		//#ifdef MP-WEIXIN
+		wx.showModal({
+		  title: '系统提示',
+		  content: '请先进行登录',
+		  mask:true,
+		  success (res) {
+		    if (res.confirm) {
+		      uni.reLaunch({
+		      	url:"/pages/logo/index"
+		      }) 
+		    } else if (res.cancel) {
+		      console.log('用户点击取消')
+		    }
+		  }
+		})
+		//#endif
 	} else if (rescode === 500) {
 		uni.showToast({
 			title: resmsg,