修改登录页与首页样式,优化搜索设备样式

common/iconfont/icon.scss

@@ -1,9 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3968184 */
-  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');
+  src: url('//at.alicdn.com/t/c/font_3968184_i2nyywbylyl.woff2?t=1681199314301') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3968184_i2nyywbylyl.woff?t=1681199314301') format('woff'),
+       url('//at.alicdn.com/t/c/font_3968184_i2nyywbylyl.ttf?t=1681199314301') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-icon-test:before {
+  content: "\e636";
+}
+
+.icon-duihuaxinxitianchong-green-copy:before {
+  content: "\10111";
+}
+
 .icon-tuichu:before {
   content: "\e6bc";
 }
@@ -26,6 +33,10 @@
   content: "\e604";
 }
 
+.icon-shebei-blue:before {
+  content: "\10110";
+}
+
 .icon-shebei:before {
   content: "\e62e";
 }
@@ -74,10 +85,6 @@
   content: "\e635";
 }
 
-.icon-camera:before {
-  content: "\e605";
-}
-
 .icon-search-2:before {
   content: "\e610";
 }
@@ -120,4 +127,4 @@
 
 .icon-qianbao:before {
   content: "\e667";
-}
+}

component/LayoutRow.vue

@@ -7,7 +7,11 @@
 				<view class="demo-layout">{{rowTitle?rowTitle:""}}</view>
 			</u-col>
 			<u-col span="8">
-				<view class="demo-layout">{{rowValue?rowValue:""}}</view>
+				<view class="demo-layout2" v-if="rowTitle==='设备状态'" :style="{color:`${rowValue==='可借出'?'#19be6b':rowValue==='已借出'?'#fa3534':'#ff9900'}`}">
+					<i class="iconfont icon-yuandian"></i>
+					<text>{{rowValue?rowValue:""}}</text>
+				</view>
+				<view class="demo-layout" v-else>{{rowValue?rowValue:""}}</view>
 			</u-col>
 		</u-row>
 	</view>
@@ -44,4 +48,11 @@
 		box-sizing: border-box;
 		// padding: 0 10rpx;
 	}
+	.demo-layout2 {
+		height: 25px;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		// padding: 0 10rpx;
+	}
 </style>

pages/home/home.vue

@@ -15,32 +15,35 @@
 			@search="search"
 			@custom="search"></u-search>
 		</view>
-		<view class="rule-area">
-			<view class="notice">
-				<i class="iconfont icon-a-shezhi2"></i>
-				<span>通知</span>
+		<view class="box">
+			<view class="rule-area">
+				<view class="notice">
+					<i class="iconfont icon-a-shezhi2"></i>
+					<span>通知</span>
+				</view>
+				<ul v-if="informList.length===0?false:true">
+					<li  v-for="item in informList" :key="item.noticeId" @click="toNotice(item.noticeId)"> 
+						<i class="iconfont icon-tongzhi"></i>
+						{{item.noticeTitle}}
+					</li>
+				</ul>
+				<view class="notice-li" v-else>暂无通知</view>
 			</view>
-			<ul v-if="informList.length===0?false:true">
-				<li  v-for="item in informList" :key="item.noticeId" @click="toNotice(item.noticeId)"> 
-					<!-- <i class="iconfont icon-yuandian"></i> -->
-					{{item.noticeTitle}}&nbsp;&nbsp;文本溢出文本溢出文本溢出文本溢出文本溢出
-				</li>
-			</ul>
-			<view class="notice-li" v-else>暂无通知</view>
-		</view>
-		<view class="rule-area" >
-			<view class="notice">
-				<i class="iconfont icon-a-shezhi2"></i>
-				<span>最新借用设备</span>				
-			</view>
-			<ul v-if="borList.length===0?false:true">
-				<li  v-for="item in borList" :key="item.id" class="notice-li" @click="toDetail(item.assetBarCode)"> 
-					<text>设备编码：{{item.assetBarCode}}</text>
-					<text>{{handleDate(item.borrowDate)}}</text>
-				</li>
-			</ul>
-			<view v-else>
-				暂无最新借用设备
+			<view class="rule-area" >
+				<view class="notice">
+					<i class="iconfont icon-a-shezhi2"></i>
+					<span>最新借用设备</span>				
+				</view>
+				<ul v-if="borList.length===0?false:true">
+					<li  v-for="item in borList" :key="item.id" class="notice-li" @click="toDetail(item.assetBarCode)"> 
+						<i class="iconfont icon-shebei"></i>
+						<text>设备编码：{{item.assetBarCode}}</text>
+						<text>{{handleDate(item.borrowDate)}}</text>
+					</li>
+				</ul>
+				<view v-else>
+					暂无最新借用设备
+				</view>
 			</view>
 		</view>
 		<view class="scan-area">
@@ -176,44 +179,59 @@
 		left: 16rpx;
 	}
 }
-.rule-area{
-	flex-shrink: 0;
+.box {
 	border-radius: 18rpx;
-	box-shadow:  0 2rpx 8rpx 0 rgba(0, 0, 0, 0.2), 0 2rpx 6rpx 0 rgba(0, 0, 0, 0.19);
-	padding: 16rpx;
-	.notice{
-		display: flex;
-		flex-direction: row;
-		font-size: 36rpx;
-		font-weight: bolder;
-		padding-bottom: 10rpx;
-		align-items: center;
-		border-bottom: 1px solid rgba(0, 0, 0, 0.3);
-		i {
-			margin-right: 10rpx;
+	.rule-area{
+		background-color: rgba(255, 255, 255, 0.6);
+		z-index: 2;
+		flex-shrink: 0;
+		border-radius: 18rpx;
+		box-shadow:  0 1rpx 8rpx 0 rgba(0, 0, 0, 0.2);
+		padding: 16rpx;
+		.notice{
+			display: flex;
+			flex-direction: row;
 			font-size: 36rpx;
-			color: orange;
+			font-weight: bolder;
+			padding-bottom: 10rpx;
+			align-items: center;
+			border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+			i {
+				margin-right: 10rpx;
+				font-size: 36rpx;
+				color: orange;
+			}
+		}
+		
+		li {
+			padding: 10rpx 0;
+			width: 100%;
+			overflow: hidden;  /*超出部分隐藏*/
+			white-space: nowrap;  /*禁止换行*/
+			text-overflow: ellipsis; /*省略号*/
+			display: flex;
+			align-items: center;
+			i {
+				padding-right: 10rpx;
+				color: #2979ff;
+			}
 		}
 	}
-	
-	li {
-		padding: 10rpx 0;
-		width: 100%;
-		overflow: hidden;  /*超出部分隐藏*/
-		white-space: nowrap;  /*禁止换行*/
-		text-overflow: ellipsis; /*省略号*/
-	}
-}
-.rule-area:nth-child(3) {
-	margin-top: 32rpx;
-	i {
-		color: #19be6b;
-	}
-	li {
-		display: flex;
-		justify-content: space-between;
+	.rule-area:nth-child(2) {
+		margin-top: 24rpx;
+		i {
+			color: #19be6b;
+		}
+		li {
+			display: flex;
+			justify-content: space-between;
+		}
+		li:first-child {
+			padding-top: 10rpx;
+		}
 	}
 }
+
 .borrow-area_bck{
 	flex-shrink: 0;
 	margin-bottom: 20rpx ;
@@ -252,6 +270,7 @@
 			font-size: 80rpx;
 			margin: 20rpx 0;
 		}
+		-webkit-box-reflect: below 10rpx -webkit-linear-gradient(transparent, transparent 75%, rgba(255, 255, 255, .3));
 	}
 	.scan-mine{
 		width: 80rpx;

pages/login/login.vue

@@ -4,9 +4,8 @@
 			<view class="text-area-content">
 				<view class="logoText">
 					<image class="logo" src="/static/logo/logo.png"></image>
-					<text class="text1">广州医科大</text>
+					<text class="text1">广州医科大学</text>
 				</view>
-				<view class="line"></view>
 				<text class="text2">实验室管理系统</text>
 			</view>
 			<view class="form-area">
@@ -121,21 +120,13 @@
 				height: 100rpx;
 				line-height: 100rpx;
 			}
+			margin-bottom: 20rpx;
+			-webkit-box-reflect: below -16% -webkit-linear-gradient(transparent, transparent 65%, rgba(255, 255, 255, .3));
 		}
 		.text2{
 			color: rgba(128, 128, 128, 1);
-			font-size: 30rpx;
-			line-height: 150%;
-		}
-		.line{
-			width: 354rpx;
-			height: 2rpx;
-			margin: auto;
-			color: $uni-text-color;
-			background-color: $uni-text-color-grey;
-			font-size: 32rpx;
+			font-size: 36rpx;
 			line-height: 150%;
-			text-align: center;
 		}
 	}
 	.form-area{
@@ -151,16 +142,16 @@
 			// line-height: 150%;
 			border: rgba(0, 0, 0, 0.3) solid 2rpx;
 			text-align: left;
-			box-sizing: border-box;
+			// box-sizing: border-box;
 			display: flex;
 			align-items: center;
+			margin-bottom: 10rpx;
 		}
 		.name-area{
 			border-radius: 20rpx 20rpx 0 0;
 		}
 		.pwd-area{
 			border-radius:0 0 20rpx 20rpx ;
-			border-top: 0;
 		}
 	}
 	

pages/search/search.vue

@@ -33,10 +33,15 @@
 				v-for="item in dataList" 
 				:key="item.barCode" 
 				:title="item.name" 
-				:value="item.borrowStatus"
 				:label="item.barCode"
 				@click="toBorrow(item.barCode)"
-				></u-cell>
+				>
+				<!-- :value="item.borrowStatus" :style="{color:`${item.isreturn==='0'?'#439dea':'#000000'}`}"-->
+				<view slot="value" class="u-slot-value">
+					<i class="iconfont icon-yuandian" :style="{color:`${item.borrowStatus==='可借出'?'#19be6b':item.borrowStatus==='已借出'?'#fa3534':'#ff9900'}`}"></i>
+					<text class="list-name" :style="{color:`${item.borrowStatus==='可借出'?'#19be6b':item.borrowStatus==='已借出'?'#fa3534':'#ff9900'}`}">{{item.borrowStatus}}</text>
+				</view>
+				</u-cell>
 			</u-cell-group>
 		</view>
 	</view>
@@ -96,6 +101,17 @@
 	flex-direction: column;
 	box-sizing: border-box;
 }
+.u-slot-value {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	i {
+		flex: 1
+	}
+	text {
+		flex: 4
+	}
+}
 /deep/ .u-cell-group__wrapper{
 	border-left: 1rpx solid #d6d7d9;
 	border-right: 1rpx solid #d6d7d9;

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_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");
+  src: url("//at.alicdn.com/t/c/font_3968184_i2nyywbylyl.woff2?t=1681199314301") format("woff2"), url("//at.alicdn.com/t/c/font_3968184_i2nyywbylyl.woff?t=1681199314301") format("woff"), url("//at.alicdn.com/t/c/font_3968184_i2nyywbylyl.ttf?t=1681199314301") format("truetype");
 }
 .iconfont {
   font-family: "iconfont" !important;
@@ -265,6 +265,12 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-icon-test:before {
+  content: "\e636";
+}
+.icon-duihuaxinxitianchong-green-copy:before {
+  content: "\10111";
+}
 .icon-tuichu:before {
   content: "\e6bc";
 }
@@ -274,6 +280,9 @@
 .icon-yuandian:before {
   content: "\e604";
 }
+.icon-shebei-blue:before {
+  content: "\10110";
+}
 .icon-shebei:before {
   content: "\e62e";
 }
@@ -310,9 +319,6 @@
 .icon-weixiu:before {
   content: "\e635";
 }
-.icon-camera:before {
-  content: "\e605";
-}
 .icon-search-2:before {
   content: "\e610";
 }

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

@@ -245,6 +245,9 @@ var _asset = __webpack_require__(/*! @/api/asset.js */ 171);
 //
 //
 //
+//
+//
+//
 // import { getInfo } from '@/api/user.js'
 // import cache from '@/utils/storage.js'
 var _default = {

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

@@ -48,13 +48,18 @@
   top: 20rpx;
   left: 16rpx;
 }
-.rule-area.data-v-92bb8f34 {
+.box.data-v-92bb8f34 {
+  border-radius: 18rpx;
+}
+.box .rule-area.data-v-92bb8f34 {
+  background-color: rgba(255, 255, 255, 0.6);
+  z-index: 2;
   flex-shrink: 0;
   border-radius: 18rpx;
-  box-shadow: 0 2rpx 8rpx 0 rgba(0, 0, 0, 0.2), 0 2rpx 6rpx 0 rgba(0, 0, 0, 0.19);
+  box-shadow: 0 1rpx 8rpx 0 rgba(0, 0, 0, 0.2);
   padding: 16rpx;
 }
-.rule-area .notice.data-v-92bb8f34 {
+.box .rule-area .notice.data-v-92bb8f34 {
   display: flex;
   flex-direction: row;
   font-size: 36rpx;
@@ -63,12 +68,12 @@
   align-items: center;
   border-bottom: 1px solid rgba(0, 0, 0, 0.3);
 }
-.rule-area .notice ._i.data-v-92bb8f34 {
+.box .rule-area .notice ._i.data-v-92bb8f34 {
   margin-right: 10rpx;
   font-size: 36rpx;
   color: orange;
 }
-.rule-area ._li.data-v-92bb8f34 {
+.box .rule-area ._li.data-v-92bb8f34 {
   padding: 10rpx 0;
   width: 100%;
   overflow: hidden;
@@ -77,17 +82,26 @@
   /*禁止换行*/
   text-overflow: ellipsis;
   /*省略号*/
+  display: flex;
+  align-items: center;
+}
+.box .rule-area ._li ._i.data-v-92bb8f34 {
+  padding-right: 10rpx;
+  color: #2979ff;
 }
-.rule-area.data-v-92bb8f34:nth-child(3) {
-  margin-top: 32rpx;
+.box .rule-area.data-v-92bb8f34:nth-child(2) {
+  margin-top: 24rpx;
 }
-.rule-area:nth-child(3) ._i.data-v-92bb8f34 {
+.box .rule-area:nth-child(2) ._i.data-v-92bb8f34 {
   color: #19be6b;
 }
-.rule-area:nth-child(3) ._li.data-v-92bb8f34 {
+.box .rule-area:nth-child(2) ._li.data-v-92bb8f34 {
   display: flex;
   justify-content: space-between;
 }
+.box .rule-area:nth-child(2) ._li.data-v-92bb8f34:first-child {
+  padding-top: 10rpx;
+}
 .borrow-area_bck.data-v-92bb8f34 {
   flex-shrink: 0;
   margin-bottom: 20rpx;
@@ -122,6 +136,7 @@
   text-align: center;
   flex-direction: column;
   font-size: 36rpx;
+  -webkit-box-reflect: below 10rpx -webkit-linear-gradient(transparent, transparent 75%, rgba(255, 255, 255, 0.3));
 }
 .scan-area .scan-code .iconfont.data-v-92bb8f34 {
   font-size: 80rpx;

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -210,7 +210,6 @@ var _storage = _interopRequireDefault(__webpack_require__(/*! @/utils/storage.js
 //
 //
 //
-//
 var _default = {
   data: function data() {
     return {

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

@@ -1 +1 @@
-<view class="content data-v-b237504c"><view class="text-area data-v-b237504c"><view class="text-area-content data-v-b237504c"><view class="logoText data-v-b237504c"><image class="logo data-v-b237504c" src="/static/logo/logo.png"></image><text class="text1 data-v-b237504c">广州医科大</text></view><view class="line data-v-b237504c"></view><text class="text2 data-v-b237504c">实验室管理系统</text></view><view class="form-area data-v-b237504c"><view class="form-area-content data-v-b237504c"><view class="name-area data-v-b237504c"><view class="iconfont icon-a-shezhi2 _i data-v-b237504c" style="margin-right:10rpx;"></view><u--input bind:input="__e" vue-id="35a7246c-1" clearable="{{true}}" placeholder="请输入工号" border="none" value="{{form.account}}" data-event-opts="{{[['^input',[['__set_model',['$0','account','$event',[]],['form']]]]]}}" class="data-v-b237504c" bind:__l="__l"></u--input></view><view class="pwd-area data-v-b237504c"><view class="iconfont icon-a-shezhi2 _i data-v-b237504c" style="margin-right:10rpx;"></view><u--input bind:input="__e" vue-id="35a7246c-2" border="none" placeholder="请输入密码" password="{{true}}" clearable="{{true}}" value="{{form.password}}" data-event-opts="{{[['^input',[['__set_model',['$0','password','$event',[]],['form']]]]]}}" class="data-v-b237504c" bind:__l="__l"></u--input></view></view></view><button data-event-opts="{{[['tap',[['toLogin',['$event']]]]]}}" class="form-area-btn data-v-b237504c" bindtap="__e">登 录</button></view><u-toast vue-id="35a7246c-3" data-ref="uToast" class="data-v-b237504c vue-ref" bind:__l="__l"></u-toast></view>
+<view class="content data-v-b237504c"><view class="text-area data-v-b237504c"><view class="text-area-content data-v-b237504c"><view class="logoText data-v-b237504c"><image class="logo data-v-b237504c" src="/static/logo/logo.png"></image><text class="text1 data-v-b237504c">广州医科大学</text></view><text class="text2 data-v-b237504c">实验室管理系统</text></view><view class="form-area data-v-b237504c"><view class="form-area-content data-v-b237504c"><view class="name-area data-v-b237504c"><view class="iconfont icon-a-shezhi2 _i data-v-b237504c" style="margin-right:10rpx;"></view><u--input bind:input="__e" vue-id="35a7246c-1" clearable="{{true}}" placeholder="请输入工号" border="none" value="{{form.account}}" data-event-opts="{{[['^input',[['__set_model',['$0','account','$event',[]],['form']]]]]}}" class="data-v-b237504c" bind:__l="__l"></u--input></view><view class="pwd-area data-v-b237504c"><view class="iconfont icon-a-shezhi2 _i data-v-b237504c" style="margin-right:10rpx;"></view><u--input bind:input="__e" vue-id="35a7246c-2" border="none" placeholder="请输入密码" password="{{true}}" clearable="{{true}}" value="{{form.password}}" data-event-opts="{{[['^input',[['__set_model',['$0','password','$event',[]],['form']]]]]}}" class="data-v-b237504c" bind:__l="__l"></u--input></view></view></view><button data-event-opts="{{[['tap',[['toLogin',['$event']]]]]}}" class="form-area-btn data-v-b237504c" bindtap="__e">登 录</button></view><u-toast vue-id="35a7246c-3" data-ref="uToast" class="data-v-b237504c vue-ref" bind:__l="__l"></u-toast></view>

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

@@ -41,6 +41,10 @@
   text-align: center;
   width: 80%;
 }
+.text-area-content .logoText.data-v-b237504c {
+  margin-bottom: 20rpx;
+  -webkit-box-reflect: below -16% -webkit-linear-gradient(transparent, transparent 65%, rgba(255, 255, 255, 0.3));
+}
 .text-area-content .logoText .logo.data-v-b237504c {
   height: 100rpx;
   width: 100rpx;
@@ -57,19 +61,9 @@
 }
 .text-area-content .text2.data-v-b237504c {
   color: gray;
-  font-size: 30rpx;
+  font-size: 36rpx;
   line-height: 150%;
 }
-.text-area-content .line.data-v-b237504c {
-  width: 354rpx;
-  height: 2rpx;
-  margin: auto;
-  color: #505050;
-  background-color: #999;
-  font-size: 32rpx;
-  line-height: 150%;
-  text-align: center;
-}
 .form-area.data-v-b237504c {
   margin-top: 80rpx;
   margin-bottom: 160rpx;
@@ -83,16 +77,15 @@
   font-size: 30rpx;
   border: rgba(0, 0, 0, 0.3) solid 2rpx;
   text-align: left;
-  box-sizing: border-box;
   display: flex;
   align-items: center;
+  margin-bottom: 10rpx;
 }
 .form-area .name-area.data-v-b237504c {
   border-radius: 20rpx 20rpx 0 0;
 }
 .form-area .pwd-area.data-v-b237504c {
   border-radius: 0 0 20rpx 20rpx;
-  border-top: 0;
 }
 .form-area-btn.data-v-b237504c {
   height: 100rpx;

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

@@ -235,6 +235,11 @@ var _asset = __webpack_require__(/*! @/api/asset.js */ 171);
 //
 //
 //
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {

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

@@ -30,6 +30,17 @@
   flex-direction: column;
   box-sizing: border-box;
 }
+.u-slot-value.data-v-4cedc0c6 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.u-slot-value ._i.data-v-4cedc0c6 {
+  flex: 1;
+}
+.u-slot-value text.data-v-4cedc0c6 {
+  flex: 4;
+}
 .data-v-4cedc0c6 .u-cell-group__wrapper {
   border-left: 1rpx solid #d6d7d9;
   border-right: 1rpx solid #d6d7d9;