.

api/asset.js

@@ -8,6 +8,18 @@ export function getAllPlace() {
 	return fly.get('/asset/place/all').then(res=>res)
 }
 //借用设备
-export function borrowAsset(data) {
-	return fly.post('/asset/borrow/save',data).then(res=>res)
+export function borrowAsset(borrowDate,returnDate,data) {
+	return fly.post(`/asset/borrow/save/${borrowDate}/${returnDate}`,data).then(res=>res)
+}
+//归还设备
+export function returnAsset(barCode){
+	return fly.put(`/asset/borrow/return/${barCode}`).then(res=>res)
+}
+//获取借用设备记录
+export function borrowList(data){
+	return fly.get('/asset/borrow/recordList',data).then(res=>res)
+}
+//统计借用设备记录
+export function sumBorrow(data){
+	return fly.get('/asset/borrow/recordCount',{status:data}).then(res=>res)
 }

api/notice.js

@@ -0,0 +1,13 @@
+import fly from '@/utils/request.js'
+
+export function getNewInform(data){
+	return fly.get('/system/notice/newInform',{number:data}).then(res=>res)
+}
+
+export function getNewNotice(){
+	return fly.get('/system/notice/newNotice',{number:data}).then(res=>res)
+}
+
+export function getNoticeDetail(id){
+	return fly.get(`/system/notice/${id}`).then(res=>res)
+}

common/iconfont/icon.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3968184 */
-  src: url('//at.alicdn.com/t/c/font_3968184_zbhpejgnhg.woff2?t=1679638223208') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3968184_zbhpejgnhg.woff?t=1679638223208') format('woff'),
-       url('//at.alicdn.com/t/c/font_3968184_zbhpejgnhg.ttf?t=1679638223208') format('truetype');
+  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');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-liebiao:before {
+  content: "\e600";
+}
+
+.icon-yuandian:before {
+  content: "\e604";
+}
+
 .icon-shebei:before {
   content: "\e62e";
 }

main.js

@@ -1,10 +1,6 @@
 import App from './App'
 import uView from "uview-ui";
-import * as filters from '@/utils/filter.js'
 
-Object.keys(filters).forEach(key => {
-	Vue.filter(key, filters[key])
-})
 Vue.use(uView);
 
 

pages.json

@@ -25,16 +25,16 @@
             }
             
         },
-		
-        {
-            "path" : "pages/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "搜索设备",
-                "enablePullDownRefresh": false
-            }
-            
-        },
+		{
+		    "path" : "pages/search/search",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "搜索设备",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+        
 		{
 		    "path" : "pages/borrow/borrow",
 		    "style" :                                                                                    
@@ -88,6 +88,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/notice/notice",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "通知",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/borrow/borrow.vue

@@ -104,6 +104,18 @@
 					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">
@@ -148,90 +160,156 @@
 				</u-row>
 			</view>
 		</view>
-		<view class="borrow-date" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false">
-			<u--form
-				labelPosition="left"
-				:model="form"
-				ref="Form1"
-				:labelWidth="110"
-				labelAlign="left">
-				<u-form-item
-					label="借用地点"
-					prop="borrowPlaceName"
-					borderBottom>
-					<text @click="showPlace" style="font-size: 30rpx;width: 100%;height: 100%;">{{form.borrowPlaceName}}</text>
-					<u-picker
-					:show="placeShow" 
-					:columns="placeList"
-					title="请选择地点"
-					keyName="name"
-					@cancel="placeShow = false"
-					@confirm="selectPlace"></u-picker>
-				</u-form-item>
-				<u-form-item
-					label="联系电话"
-					prop="tel"
-					borderBottom>
-					<u--input
-					v-model="form.tel"
-					border="none" placeholder="请输入联系电话">
-					</u--input>
-				</u-form-item>
-				<u-form-item
-					label="借用日期"
-					prop="borrowDate"
-					borderBottom>
-					<text @click="showBor" style="font-size: 30rpx;">{{form.borrowDate}}</text>
-					<u-datetime-picker
-					:show="borrowShow"
-					v-model="borrowValue"
-					mode="datetime"
-					@confirm="changeDate"
-					@cancel="borrowShow = false"
-					></u-datetime-picker>
-				</u-form-item>
-				<u-form-item
-					label="归还日期"
-					prop="returnDate"
-					borderBottom>
-					<text 
-					@click="showRet" 
-					style="font-size: 30rpx;">
-					{{form.returnDate}}
-					</text>
-					<u-datetime-picker
-					:show="returnShow"
-					v-model="returnValue"
-					mode="datetime"
-					@confirm="returnChange"
-					@cancel="returnShow = false"
-					></u-datetime-picker>
-				</u-form-item>
-				<u-form-item
-					label="备注"
-					prop="remark"
-					borderBottom>
-					<u--input
-					v-model="form.remark"
-					border="none"
-					placeholder="请输入备注"
-					>
-					</u--input>
-				</u-form-item>
-			</u--form>
-		</view>
-		<view class="btn-area">
-			<u-button text="借用" color="#000" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false" @click="toBorrowAsset">借用</u-button>
-			<u-button text="归还" color="#000" v-else-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?false:true:true">归还</u-button>
-		</view>
-		<view class="repair-btn" @click="toRepeat">
-			<i class="iconfont icon-a-shezhi2"></i>
+		<view v-if="show">
+			<view class="borrow-date" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false">
+				<u--form
+					labelPosition="left"
+					:model="form"
+					ref="Form1"
+					:labelWidth="110"
+					labelAlign="left">
+					<u-form-item
+						label="借用地点"
+						prop="borrowPlaceName"
+						borderBottom>
+						<text @click="showPlace" style="font-size: 30rpx;width: 100%;height: 100%;">{{form.borrowPlaceName}}</text>
+						<u-picker
+						:show="placeShow" 
+						:columns="placeList"
+						title="请选择地点"
+						keyName="name"
+						@cancel="placeShow = false"
+						@confirm="selectPlace"></u-picker>
+					</u-form-item>
+					<u-form-item
+						label="联系电话"
+						prop="tel"
+						borderBottom>
+						<u--input
+						v-model="form.tel"
+						border="none" placeholder="请输入联系电话">
+						</u--input>
+					</u-form-item>
+					<u-form-item
+						label="借用日期"
+						prop="borrowDate"
+						borderBottom>
+						<text @click="showBor" style="font-size: 30rpx;">{{form.borrowDate}}</text>
+						<u-datetime-picker
+						:show="borrowShow"
+						v-model="borrowValue"
+						mode="datetime"
+						@confirm="changeDate"
+						@cancel="borrowShow = false"
+						></u-datetime-picker>
+					</u-form-item>
+					<u-form-item
+						label="归还日期"
+						prop="returnDate"
+						borderBottom>
+						<text 
+						@click="showRet" 
+						style="font-size: 30rpx;">
+						{{form.returnDate}}
+						</text>
+						<u-datetime-picker
+						:show="returnShow"
+						v-model="returnValue"
+						mode="datetime"
+						@confirm="returnChange"
+						@cancel="returnShow = false"
+						></u-datetime-picker>
+					</u-form-item>
+					<u-form-item
+						label="备注"
+						prop="remark"
+						borderBottom>
+						<u--input
+						v-model="form.remark"
+						border="none"
+						placeholder="请输入备注"
+						>
+						</u--input>
+					</u-form-item>
+				</u--form>
+			</view>
+			<view class="borrow-date" v-else-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?false:true:true">
+				<u--form
+					labelPosition="left"
+					:model="assetObj"
+					ref="resF"
+					:labelWidth="110"
+					labelAlign="left">
+					<u-form-item
+						label="借用人工号"
+						prop="borrowUserName"
+						borderBottom>
+						<text 
+						style="font-size: 30rpx;">
+						{{assetObj.borrowUserName?assetObj.borrowUserName:""}}
+						</text>
+					</u-form-item>
+					<u-form-item
+						label="借用地点"
+						prop="borrowPlaceName"
+						borderBottom>
+						<text 
+						style="font-size: 30rpx;">
+						{{assetObj.placeName?assetObj.placeName:""}}
+						</text>
+					</u-form-item>
+					<u-form-item
+						label="联系电话"
+						prop="tel"
+						borderBottom>
+						<text 
+						style="font-size: 30rpx">
+						{{assetObj.tel?assetObj.tel:""}}
+						</text>
+					</u-form-item>
+					<u-form-item
+						label="借用日期"
+						prop="borrowDate"
+						borderBottom>
+						<text 
+						style="font-size: 30rpx;">
+						{{assetObj.borrowDate?assetObj.borrowDate:""}}
+						</text>
+					</u-form-item>
+					<u-form-item
+						label="归还日期"
+						prop="returnDate"
+						borderBottom>
+						<text 
+						style="font-size: 30rpx;">
+						{{assetObj.returnDate?assetObj.returnDate:""}}
+						</text>
+					</u-form-item>
+					<u-form-item
+						label="备注"
+						prop="remark"
+						borderBottom>
+						<text style="font-size: 30rpx;">
+						{{assetObj.remark?assetObj.remark:"无"}}
+						</text>
+						</u--input>
+					</u-form-item>
+				</u--form>
+			</view>
+			<text style="font-size: 24rpx;">归还时间以实际归还时间为准</text>
+			<view class="btn-area">
+				<u-button text="借用" color="#000" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false" @click="toBorrowAsset">借用</u-button>
+				<u-button text="归还" color="#000" v-else-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?false:true:true" @click="toReturnAsset">归还</u-button>
+			</view>
+			<view class="repair-btn" @click="toRepeat">
+				<i class="iconfont icon-a-shezhi2"></i>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { searchAsset,getAllPlace,borrowAsset } from "@/api/asset.js"
+	import { searchAsset,getAllPlace,borrowAsset,returnAsset } from "@/api/asset.js"
 	import cache from "@/utils/storage.js"
 	import { dateToString } from "@/common/js/core.js"
 	export default {
@@ -241,7 +319,6 @@
 				borrowValue:Number(new Date()),
 				returnShow:false,
 				returnValue:Number(new Date()),
-				status:1,
 				assetObj:{},
 				form:{
 					borrowDate:dateToString(new Date()),
@@ -252,7 +329,8 @@
 					assetBarCode:""
 				},
 				placeShow: false,
-				placeList: []
+				placeList: [],
+				show:false
 			};
 		},
 		onLoad:function(option){
@@ -306,7 +384,11 @@
 			},
 			initAssets(data){
 				searchAsset({barCode: data}).then(res=>{
-					console.log(res)
+					if(res.meBorrow || res.borrowStatus ==="可借出"){
+						this.show = true;
+					}else{
+						this.show = false;
+					}
 					this.assetObj = res
 				})
 			},
@@ -333,13 +415,33 @@
 					return;
 				}
 				
-				borrowAsset(this.form).then(res=>{
+				let data = {
+					"tel": this.form.tel,
+					"assetBarCode": this.assetObj.barCode,
+					"borrowPlaceName": this.form.borrowPlaceName,
+					"remark": this.form.remark
+				}
+				console.log(data,1)
+				let returnDate = new Date(this.form.returnDate).getTime()
+				let borrowDate = new Date(this.form.borrowDate).getTime()
+				borrowAsset(borrowDate,returnDate,data).then(res=>{
 					uni.showToast({
 						icon:"none",
 						title:"借用成功！"
 					})
 					this.initAssets(res.assetBarCode)
 				})
+			},
+			toReturnAsset(){
+				returnAsset(this.assetObj.barCode).then(res=>{
+					if(res.data.code===200 && res.data.msg==="归还成功"){
+						uni.showToast({
+							icon:"none",
+							title:"归还成功！"
+						})
+						this.initAssets(this.assetObj.barCode)
+					}
+				})
 			}
 		}
 	}

pages/home/home.vue

@@ -16,10 +16,28 @@
 			@custom="search"></u-search>
 		</view>
 		<view class="rule-area">
-			公告
+			<view class="notice-li">通知</view>
+			<ul v-if="informList.length===0?false:true">
+				<li  v-for="item in informList" :key="item.noticeId" class="notice-li" @click="toNotice(item.noticeId)"> 
+					<i class="iconfont icon-yuandian"></i>
+					{{item.noticeTitle}}
+				</li>
+			</ul>
+			<view class="notice-li" v-else>暂无通知</view>
 		</view>
-		<view class="borrow-area">
-			借用设备
+		<view class="borrow-area" >
+			<view class="notice-li">
+				最新借用设备
+			</view>
+			<ul v-if="borList.length===0?false:true">
+				<li  v-for="item in borList" :key="item.id" class="notice-li"> 
+					<text>设备编码：{{item.assetBarCode}}</text>
+					<text>{{handleDate(item.borrowDate)}}</text>
+				</li>
+			</ul>
+			<view v-else>
+				暂无最新借用设备
+			</view>
 		</view>
 		<view class="scan-area">
 			<view class="scan-code" @click="toScan">
@@ -36,10 +54,14 @@
 <script>
 	import { getInfo } from '@/api/user.js'
 	import cache from '@/utils/storage.js'
+	import { getNewInform } from '@/api/notice.js'
+	import { borrowList } from '@/api/asset.js'
 	export default {
 		data() {
 			return {
-				keyword:""
+				keyword:"",
+				informList:[],
+				borList:[]
 			}
 		},
 		methods: {
@@ -55,6 +77,19 @@
 					})
 				}
 			},
+			init(){
+				getNewInform(4).then(res=>{
+					this.informList = res
+				})
+				borrowList({
+					pageNum:1,
+					pageSize:1,
+					status:0
+				}).then(res=>{
+					// console.log(res.data.rows)
+					this.borList = res.data.rows
+				})
+			},
 			toMine(){
 				uni.navigateTo({
 					url:'/pages/menus/menu/menu',
@@ -64,23 +99,30 @@
 				uni.scanCode({
 					scanType:['barCode'],
 					success (res) {
-						// console.log(res.result)
 						uni.navigateTo({
 							url:'/pages/fault/fault-report/fault-report?id='+res.result
 						})
 					}
 				})
-				// uni.navigateTo({
-				// 	url:'/pages/fault/fault-report/fault-report?id='+1
-				// })
+			},
+			toNotice(id){
+				// console.log(id)
+				uni.navigateTo({
+					url:'/pages/notice/notice?id='+id,
+				})
+			},
+			handleDate(val){
+				let date = new Date(val)
+				let year = date.getFullYear()
+				let month = date.getMonth()+1
+				let day = date.getDate()
+				return year+"-"+month+"-"+day;
 			}
 		},
-		onShow:function(){
+		onLoad:function(){
 			this.keyword = "",
 			getInfo().then(res=>{
 				if(res.data.code===200){
-					// console.log(res.data)
-					// cache.session.setJSON('userinfo',res.data.user)
 					cache.session.setJSON('role',res.data.roles[0])
 					cache.session.setJSON('phone',res.data.user.phonenumber)
 					cache.session.setJSON('email',res.data.user.email)
@@ -88,6 +130,9 @@
 					cache.session.setJSON('userName',res.data.user.userName)
 				}
 			})
+			if(uni.getStorageSync('Admin-Token')){
+				this.init()
+			}
 		}
 	}
 </script>
@@ -120,18 +165,30 @@
 .rule-area{
 	margin-bottom: 20rpx ;
 	flex-shrink: 0;
-	height: 270rpx;
-	border: 2rpx solid #000;
+	// height: 270rpx;
+	// border: 2rpx solid #000;
+	.notice-li{
+		display: flex;
+		flex-direction: row;
+		line-height: 200%;
+	}
 }
 .borrow-area{
 	flex-shrink: 0;
 	margin-bottom: 20rpx ;
 	height: 120rpx;
-	border: 2rpx solid #000;
+	.notice-li{
+		line-height: 200%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+	// border: 2rpx solid #000;
 }
 .scan-area{
 	flex-shrink: 1;
 	height: 100%;
+	// max-height: 750rpx;
 	position: relative;
 	.scan-code{
 		width: 280rpx;

pages/menus/mine/mine.vue

@@ -21,10 +21,7 @@
 					label="工号"
 					prop="ID"
 					borderBottom>	
-					<u--input
-					v-model="form.ID"
-					border="none">
-					</u--input>
+					{{form.ID}}
 				</u-form-item>
 				<u-form-item
 					label="手机号"
@@ -127,14 +124,6 @@
 							trigger: ['blur']
 						}
 					],
-					ID:[
-						{
-							required: true,
-							message: '请输入工号',
-							// blur和change事件触发检验
-							trigger: ['blur']
-						}
-					],
 					phone:[
 						{
 							message: '请输入手机号',

pages/notice/notice.vue

@@ -0,0 +1,58 @@
+<template>
+	<view class="home">
+		<view class="title">
+			{{info.noticeTitle}}
+		</view>
+		<text class="time">创建时间：{{info.createTime}}</text>
+		<rich-text :nodes="info.noticeContent" style="text-indent: 2em;" class="content"></rich-text>
+	</view>
+</template>
+
+<script>
+	import { getNoticeDetail } from '@/api/notice.js'
+	export default {
+		data() {
+			return {
+				info:{},
+				id:null
+			};
+		},
+		onLoad:function(option){
+			this.id = option.id
+			console.log(this.id)
+			this.init()
+		},
+		methods:{
+			init(){
+				getNoticeDetail(this.id).then(res=>{
+					this.info = res
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.home{
+	padding:0 30rpx 30rpx;
+	.title{
+		color: rgba(80, 80, 80, 1);
+		font-size: 40rpx;
+		line-height: 300%;
+		text-align: center;
+	}
+	.time{
+		color: rgba(80, 80, 80, 1);
+		font-size: 28rpx;
+		line-height: 200%;
+		text-align: left;
+	}
+	.content{
+		color: rgba(102, 102, 102, 1);
+		font-size: 30rpx;
+		line-height: 190%;
+		text-align: left;
+		text-indent: 2em;
+	}
+}
+</style>

pages/search/search.vue

@@ -59,6 +59,9 @@
 			this.keyword = option.keyword
 			this.search(this.keyword)
 		},
+		onShow(){
+			this.search(this.keyword)
+		},
 		methods:{
 			search(val){
 				searchAsset({numberOrName: val}).then(res=>{

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

@@ -9,7 +9,8 @@
     "pages/menus/borrow-record/borrow-record",
     "pages/menus/menu/menu",
     "pages/return/return",
-    "pages/fault/fault-report/fault-report"
+    "pages/fault/fault-report/fault-report",
+    "pages/notice/notice"
   ],
   "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_zbhpejgnhg.woff2?t=1679638223208") format("woff2"), url("//at.alicdn.com/t/c/font_3968184_zbhpejgnhg.woff?t=1679638223208") format("woff"), url("//at.alicdn.com/t/c/font_3968184_zbhpejgnhg.ttf?t=1679638223208") format("truetype");
+  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");
 }
 .iconfont {
   font-family: "iconfont" !important;
@@ -265,6 +265,12 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-liebiao:before {
+  content: "\e600";
+}
+.icon-yuandian:before {
+  content: "\e604";
+}
 .icon-shebei:before {
   content: "\e62e";
 }

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

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u--input/u--input"],{
 
 /***/ 255:
@@ -152,12 +153,19 @@ 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
 //# 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
             __webpack_require__('2')['createComponent'](__webpack_require__(255))
+=======
+            __webpack_require__('2')['createComponent'](__webpack_require__(279))
+>>>>>>> c19d1458f852bffeb356fd5b408a4cb24d148495
         })
     },
     [['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,3 +1,4 @@
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u--text/u--text"],{
 
 /***/ 477:
@@ -138,6 +139,9 @@ 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
 //# 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',

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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom"],{
 
 /***/ 469:
@@ -202,6 +203,9 @@ __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
 //# 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',

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,3 +1,4 @@
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u-toolbar/u-toolbar"],{
 
 /***/ 443:
@@ -221,6 +222,9 @@ __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
 //# 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',

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

@@ -51,14 +51,22 @@
 .rule-area.data-v-92bb8f34 {
   margin-bottom: 20rpx;
   flex-shrink: 0;
-  height: 270rpx;
-  border: 2rpx solid #000;
+}
+.rule-area .notice-li.data-v-92bb8f34 {
+  display: flex;
+  flex-direction: row;
+  line-height: 200%;
 }
 .borrow-area.data-v-92bb8f34 {
   flex-shrink: 0;
   margin-bottom: 20rpx;
   height: 120rpx;
-  border: 2rpx solid #000;
+}
+.borrow-area .notice-li.data-v-92bb8f34 {
+  line-height: 200%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
 }
 .scan-area.data-v-92bb8f34 {
   flex-shrink: 1;

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

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/logo/index"],{
 
 /***/ 175:
@@ -208,4 +209,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ })
 
 },[[175,"common/runtime","common/vendor"]]]);
+=======
+(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
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/logo/index.js.map