.

pages/borrow/borrow.vue

@@ -199,7 +199,7 @@
 			this.init()
 		},
 		onShow() {
-			this.initAssets(this.form.assetBarCode)
+			this.initAssets(this.form.assetBarCode,0,"加载中")
 		},
 		methods:{
 			showBor(){
@@ -249,28 +249,45 @@
 				this.form.returnDate = dateToString(new Date(new Date().getTime() + 1000*60*15))
 				this.form.tel = cache.session.getJSON("phone")
 			},
-			initAssets(data){
-				searchAsset({barCode: data}).then(res=>{
-					if(res.barCode===null){
-						this.$refs.uToast.show({
-							type: 'error',
-							icon: false,
-							message: "该设备不存在，即将返回上一页",
-							duration:1500
-						})
-						setTimeout(()=>{
-							uni.navigateBack({
-								delta:1
-							})
-						},1400)
-					}
-					if(res.meBorrow || res.borrowStatus ==="可借出"){
-						this.show = true;
-					}else{
-						this.show = false;
-					}
-					this.assetObj = res
+			initAssets(data,num,str){
+				uni.showLoading({
+					title:str,
+					icon:'none',
+					mask:true
 				})
+				try{
+					searchAsset({barCode: data}).then(res=>{
+						if(res.barCode===null){
+							uni.hideLoading()
+							this.$refs.uToast.show({
+								type: 'error',
+								icon: false,
+								message: "该设备不存在，即将返回上一页",
+								duration:1500
+							})
+							setTimeout(()=>{
+								uni.navigateBack({
+									delta:1
+								})
+							},1400)
+						}
+						if(res.meBorrow || res.borrowStatus ==="可借出"){
+							this.show = true;
+						}else{
+							this.show = false;
+						}
+						uni.hideLoading()
+						if(num===1){
+							uni.$u.toast('借用成功!')
+						}else if(num===2){
+							uni.$u.toast('归还成功!')
+						}
+						this.assetObj = res
+					})
+				}catch(err){
+					uni.hideLoading()
+				}
+				
 			},
 			showPlace(){
 				this.placeShow = true
@@ -287,18 +304,21 @@
 				})
 			},
 			toBorrowAsset(){
-				// uni.showLoading({
-				// 	title: "正在借用中",
-				// 	mask: true,
-				// });
+				uni.showLoading({
+					title: "正在借用中",
+					mask: true,
+				});
 				if(this.form.tel===""){
 					uni.showToast({
 						icon:"none",
-						title:"请输入正确的手机号"
+						title:"请输入正确的手机号",
+						mask:true
 					})
+					uni.hideLoading()
 					return;
 				}
 			  	if(!this.handleDate(this.form.borrowDate,this.form.returnDate)){
+					uni.hideLoading()
 					return;
 				}
 				
@@ -311,13 +331,20 @@
 				// 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:"借用成功！"
+				try{
+					borrowAsset(borrowDate,returnDate,data).then(res=>{
+						uni.hideLoading()
+						// uni.showToast({
+						// 	icon:"none",
+						// 	title:"借用成功！"
+						// })
+						// uni.$u.toast('借用成功！')
+						this.initAssets(res.assetBarCode,1,"正在借用中")
 					})
-					this.initAssets(res.assetBarCode)
-				})
+				}catch(err){
+					uni.hideLoading()
+				}
+				
 			},
 			toReturnAsset(){
 				// uni.showLoading({
@@ -328,9 +355,10 @@
 					if(res.data.code===200 && res.data.msg==="归还成功"){
 						uni.showToast({
 							icon:"none",
-							title:"归还成功！"
+							title:"归还成功！",
+							mask:true
 						})
-						this.initAssets(this.assetObj.barCode)
+						this.initAssets(this.assetObj.barCode,2,"正在归还中")
 					}
 				})
 			}

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

@@ -149,7 +149,7 @@
 				}
 				let data = {
 					tbFaultReportId:this.model1.id,
-					processResult:this.model1.faultPhenomenon,
+					processResult:this.model1.processResult,
 					feedbackStatus:this.radiovalue1==="正常"?1:0
 				}
 				handleFaultReport(data).then(res=>{

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

@@ -18,8 +18,9 @@
 		<u-empty
 			:show="dataList.length===0?true:false"
 			mode="list"
-			icon="http://cdn.uviewui.com/uview/empty/list.png"
+			:icon="require('@/static/images/list.png')"
 		>
+		<!-- http://cdn.uviewui.com/uview/empty/list.png -->
 		</u-empty>
 		<view v-show="dataList.length===0?false:true">
 			<u-cell-group :border="true">

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

@@ -62,7 +62,12 @@
 			};
 		},
 		methods:{
-			initAssets(data){
+			initAssets(data,str){
+				uni.showLoading({
+					title:str,
+					mask:true,
+					icon:'none'
+				})
 				searchAsset({barCode: data}).then(res=>{
 					if(res.barCode===null){
 						this.model1.deviceName = ""
@@ -82,39 +87,45 @@
 						this.model1.deviceName = res.name
 						this.model1.deviceNumber = res.barCode
 					}
-					
+					uni.hideLoading()
 				})
 			},
 			toReportFault(){
-				// uni.showLoading({
-				// 	title: "正在上报中",
-				// 	mask: true,
-				// });
+				uni.showLoading({
+					title: "正在上报中",
+					mask: true,
+					icon:'none'
+				});
 				let data = {
 					"assetBarCode": this.model1.deviceNumber,
 					"faultPhenomenon": this.fault,
 					"tel": cache.session.getJSON('phone')
 				}
 				reportFault(data).then(res=>{
-					uni.showModal({
-						title: '系统提示',
-						content: '故障上报成功，是否返回上一页',
-						success: function (res) {
-							if (res.confirm) {
-								uni.navigateBack({
-									delta:1
-								})
-							} else if (res.cancel) {
-								return;
+					uni.hideLoading()
+					if(res.faultPhenomenon!==""){
+						uni.showModal({
+							title: '系统提示',
+							content: '故障上报成功，是否返回上一页',
+							showCancel:false,
+							success: function (resp) {
+								if (resp.confirm) {
+									uni.navigateBack({
+										delta:1
+									})
+								} else if (resp.cancel) {
+									return;
+								}
 							}
-						}
-					});
+						});
+					}
+					
 				})
 			}
 		},
 		onLoad(option) {
 			this.id = option.id
-			this.initAssets(option.id)
+			this.initAssets(option.id,'正在加载中')
 		}
 	}
 </script>

pages/home/home.vue

@@ -79,7 +79,11 @@
 			},
 			initInfo(){
 				const that = this
-				uni.showLoading()
+				uni.showLoading({
+					title:"正在加载中",
+					icon:'none',
+					mask:true
+				})
 				try{
 					getNewInform(4).then(res=>{
 						if(res instanceof Array){
@@ -171,10 +175,7 @@
 	}
 }
 .rule-area{
-	// margin-bottom: 20rpx ;
 	flex-shrink: 0;
-	// height: 270rpx;
-	// border: 2rpx solid #000;
 	.notice-li{
 		display: flex;
 		flex-direction: row;

pages/login/login.vue

@@ -52,7 +52,11 @@
 				this.pwdType = "text"
 			},
 			toLogin(){
-				uni.showLoading()
+				uni.showLoading({
+					title:"正在登录中",
+					icon:'none',
+					mask:true
+				})
 				try{
 					login(this.form.account,this.form.password).then(res=>{
 						setToken(res.data.token)

pages/search/search.vue

@@ -18,7 +18,7 @@
 		<u-empty
 			:show="emptyShow"
 			mode="search"
-			icon="http://cdn.uviewui.com/uview/empty/search.png"
+			:icon="require('@/static/images/search.png')"
 		>
 		</u-empty>
 		<view v-show="!emptyShow">
@@ -61,18 +61,24 @@
 		},
 		methods:{
 			search(val){
-				// uni.showLoading({
-				// 	title: "加载中",
-				// 	mask: true,
-				// });
-				searchAsset({numberOrName: val}).then(res=>{
-					if(res.length===0){
-						this.emptyShow = true
-					}else{
-						this.emptyShow = false
-						this.dataList = res
-					}
+				uni.showLoading({
+					title: "正在加载中",
+					mask: true
 				})
+				try{
+					searchAsset({numberOrName: val}).then(res=>{
+						if(res.length===0){
+							this.emptyShow = true
+						}else{
+							this.emptyShow = false
+							this.dataList = res
+						}
+						uni.hideLoading()
+					})
+				}catch(err){
+					uni.hideLoading()
+				}
+				
 			},
 			toBorrow(val){
 				uni.navigateTo({

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

@@ -1,8 +1,6 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u--input/u--input"],{
 
-/***/ 255:
+/***/ 283:
 /*!********************************************************************************************************************************************************!*\
   !*** E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--input/u--input.vue ***!
   \********************************************************************************************************************************************************/
@@ -11,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_input_vue_vue_type_template_id_a39acff2___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--input.vue?vue&type=template&id=a39acff2& */ 256);
-/* harmony import */ var _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--input.vue?vue&type=script&lang=js& */ 258);
+/* harmony import */ var _u_input_vue_vue_type_template_id_a39acff2___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--input.vue?vue&type=template&id=a39acff2& */ 284);
+/* harmony import */ var _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--input.vue?vue&type=script&lang=js& */ 286);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 37);
 
@@ -41,7 +39,7 @@ component.options.__file = "node_modules/uview-ui/components/u--input/u--input.v
 
 /***/ }),
 
-/***/ 256:
+/***/ 284:
 /*!***************************************************************************************************************************************************************************************!*\
   !*** E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--input/u--input.vue?vue&type=template&id=a39acff2& ***!
   \***************************************************************************************************************************************************************************************/
@@ -50,7 +48,7 @@ component.options.__file = "node_modules/uview-ui/components/u--input/u--input.v
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_a39acff2___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=template&id=a39acff2& */ 257);
+/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_a39acff2___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=template&id=a39acff2& */ 285);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_a39acff2___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_a39acff2___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 257:
+/***/ 285:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--input/u--input.vue?vue&type=template&id=a39acff2& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -104,7 +102,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 258:
+/***/ 286:
 /*!*********************************************************************************************************************************************************************************!*\
   !*** E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--input/u--input.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************/
@@ -113,14 +111,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=script&lang=js& */ 259);
+/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=script&lang=js& */ 287);
 /* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 259:
+/***/ 287:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--input/u--input.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -135,10 +133,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _props = _interopRequireDefault(__webpack_require__(/*! ../u-input/props.js */ 260));
+var _props = _interopRequireDefault(__webpack_require__(/*! ../u-input/props.js */ 288));
 var uvInput = function uvInput() {
   __webpack_require__.e(/*! require.ensure | node-modules/uview-ui/components/u-input/u-input */ "node-modules/uview-ui/components/u-input/u-input").then((function () {
-    return resolve(__webpack_require__(/*! ../u-input/u-input.vue */ 396));
+    return resolve(__webpack_require__(/*! ../u-input/u-input.vue */ 431));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -154,26 +152,12 @@ 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
+            __webpack_require__('2')['createComponent'](__webpack_require__(283))
         })
     },
     [['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,8 +1,6 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["node-modules/uview-ui/components/u--text/u--text"],{
 
-/***/ 477:
+/***/ 528:
 /*!******************************************************************************************************************************************************!*\
   !*** E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--text/u--text.vue ***!
   \******************************************************************************************************************************************************/
@@ -11,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_text_vue_vue_type_template_id_1a602e2d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--text.vue?vue&type=template&id=1a602e2d& */ 478);
-/* harmony import */ var _u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--text.vue?vue&type=script&lang=js& */ 480);
+/* harmony import */ var _u_text_vue_vue_type_template_id_1a602e2d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--text.vue?vue&type=template&id=1a602e2d& */ 529);
+/* harmony import */ var _u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--text.vue?vue&type=script&lang=js& */ 531);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 37);
 
@@ -41,7 +39,7 @@ component.options.__file = "node_modules/uview-ui/components/u--text/u--text.vue
 
 /***/ }),
 
-/***/ 478:
+/***/ 529:
 /*!*************************************************************************************************************************************************************************************!*\
   !*** E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--text/u--text.vue?vue&type=template&id=1a602e2d& ***!
   \*************************************************************************************************************************************************************************************/
@@ -50,7 +48,7 @@ component.options.__file = "node_modules/uview-ui/components/u--text/u--text.vue
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_template_id_1a602e2d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--text.vue?vue&type=template&id=1a602e2d& */ 479);
+/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_template_id_1a602e2d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--text.vue?vue&type=template&id=1a602e2d& */ 530);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_template_id_1a602e2d___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_template_id_1a602e2d___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 479:
+/***/ 530:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--text/u--text.vue?vue&type=template&id=1a602e2d& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -90,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 480:
+/***/ 531:
 /*!*******************************************************************************************************************************************************************************!*\
   !*** E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--text/u--text.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************************************************************************************************/
@@ -99,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--text.vue?vue&type=script&lang=js& */ 481);
+/* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../../HBuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--text.vue?vue&type=script&lang=js& */ 532);
 /* harmony import */ var _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 481:
+/***/ 532:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/存放文件/驿站/工作目录/实验设备管理系统（广州医科大学生物医学工程学院）/lab-equipment-project/lab-equipment-mini-program/node_modules/uview-ui/components/u--text/u--text.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -121,10 +119,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _props = _interopRequireDefault(__webpack_require__(/*! ../u-text/props.js */ 482));
+var _props = _interopRequireDefault(__webpack_require__(/*! ../u-text/props.js */ 533));
 var uvText = function uvText() {
   Promise.all(/*! require.ensure | node-modules/uview-ui/components/u-text/u-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-text/u-text")]).then((function () {
-    return resolve(__webpack_require__(/*! ../u-text/u-text.vue */ 490));
+    return resolve(__webpack_require__(/*! ../u-text/u-text.vue */ 541));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -140,18 +138,12 @@ 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__(526))
+            __webpack_require__('2')['createComponent'](__webpack_require__(528))
         })
     },
     [['node-modules/uview-ui/components/u--text/u--text-create-component']]

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="{{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>
+<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="{{$root.m0}}" 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>

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,36 +1,30 @@
 {
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": false,
-    "postcss": false,
-    "minified": true,
-    "newFeature": true,
-    "bigPackageSizeSupport": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx73027efb5f40cd02",
-  "projectname": "lab-equipment-mini-program",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
+    "description": "项目配置文件。",
+    "packOptions": {
+        "ignore": [],
+        "include": []
     },
-    "conversation": {
-      "current": -1,
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": false,
+        "postcss": false,
+        "minified": true,
+        "newFeature": true,
+        "bigPackageSizeSupport": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "condition": false
     },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
+    "compileType": "miniprogram",
+    "libVersion": "2.30.4",
+    "appid": "wx1ca8ba3e0ec38457",
+    "projectname": "lab-equipment-mini-program",
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
-  }
 }

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -1,6 +1,6 @@
 {
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "lab-equipment-mini-program",
+    "projectname": "mp-weixin",
     "setting": {
         "compileHotReLoad": true
     }