故障上报

api/asset.js

@@ -16,10 +16,18 @@ export function returnAsset(barCode){
 	return fly.put(`/asset/borrow/return/${barCode}`).then(res=>res)
 }
 //获取借用设备记录
-export function borrowList(data){
+export function getBorrowList(data){
 	return fly.get('/asset/borrow/recordList',data).then(res=>res)
 }
+//获取已归还的记录详细
+export function getReturnDetail(id){
+	return fly.get(`/asset/borrow/record/${id}`).then(res=>res)
+}
 //统计借用设备记录
 export function sumBorrow(data){
 	return fly.get('/asset/borrow/recordCount',{status:data}).then(res=>res)
-}
+}
+//故障上报
+export function reportFault(data){
+	return fly.post('/asset/fault/save',data).then(res=>res)
+}

api/user.js

@@ -16,4 +16,19 @@ export function logout() {
     url: '/logout',
     method: 'post'
   })
-}
+}
+//修改用户信息
+export function saveUserInfo(data){
+	return fly.put('/system/user/profile',data).then(res=>res)
+}
+//修改用户密码
+export function savePassword(oldPwd,newPwd){
+	return fly.put('/system/user/profile/updatePwd',{
+		oldPassword:oldPwd,
+		newPassword:newPwd
+	}).then(res=>res)
+}
+
+// export function logout(){
+	
+// }

pages.json

@@ -74,7 +74,7 @@
             "path" : "pages/return/return",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "归还设备",
+                "navigationBarTitleText": "归还记录",
                 "enablePullDownRefresh": false
             }
             

pages/borrow/borrow.vue

@@ -305,6 +305,7 @@
 				<i class="iconfont icon-a-shezhi2"></i>
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -384,6 +385,19 @@
 			},
 			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{
@@ -421,7 +435,7 @@
 					"borrowPlaceName": this.form.borrowPlaceName,
 					"remark": this.form.remark
 				}
-				console.log(data,1)
+				// 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=>{

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

@@ -7,7 +7,6 @@
 			<u--form
 				labelPosition="left"
 				:model="model1"
-				:rules="rules"
 				ref="form1"
 				:labelWidth="100"
 				labelAlign="center"
@@ -42,12 +41,15 @@
 			maxlength="-1"></u--textarea>
 		</view>
 		<view class="btn-area">
-			<u-button color="#000" size="small">保存</u-button>
+			<u-button color="#000" size="small" @click="toReportFault">上报</u-button>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
+	import { searchAsset,reportFault } from "@/api/asset.js"
+	import cache from '@/utils/storage.js'
 	export default {
 		data() {
 			return {
@@ -55,26 +57,60 @@
 					deviceName: '',
 					deviceNumber: '',
 				},
-				rules: {
-					'deviceName': {
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					'deviceNumber': {
-						type: 'string',
-						max: 1,
-						required: true,
-						message: '请选择男或女',
-						trigger: ['blur', 'change']
-					},
-				},
-				fault:""
+				fault:"",
+				id:""
 			};
 		},
+		methods:{
+			initAssets(data){
+				searchAsset({barCode: data}).then(res=>{
+					if(res.barCode===null){
+						this.model1.deviceName = ""
+						this.model1.deviceNumber = this.id
+						this.$refs.uToast.show({
+							type: 'error',
+							icon: false,
+							message: "该设备不存在，即将返回上一页",
+							duration:1500
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						},1000)
+					}else{
+						this.model1.deviceName = res.name
+						this.model1.deviceNumber = res.barCode
+					}
+					
+				})
+			},
+			toReportFault(){
+				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;
+							}
+						}
+					});
+				})
+			}
+		},
 		onLoad(option) {
-			console.log(option.id)
+			this.id = option.id
+			this.initAssets(option.id)
 		}
 	}
 </script>

pages/home/home.vue

@@ -55,7 +55,7 @@
 	import { getInfo } from '@/api/user.js'
 	import cache from '@/utils/storage.js'
 	import { getNewInform } from '@/api/notice.js'
-	import { borrowList } from '@/api/asset.js'
+	import { getBorrowList } from '@/api/asset.js'
 	export default {
 		data() {
 			return {
@@ -81,7 +81,7 @@
 				getNewInform(4).then(res=>{
 					this.informList = res
 				})
-				borrowList({
+				getBorrowList({
 					pageNum:1,
 					pageSize:1,
 					status:0
@@ -100,7 +100,7 @@
 					scanType:['barCode'],
 					success (res) {
 						uni.navigateTo({
-							url:'/pages/fault/fault-report/fault-report?id='+res.result
+							url:'/pages/borrow/borrow?number='+res.result
 						})
 					}
 				})
@@ -128,6 +128,7 @@
 					cache.session.setJSON('email',res.data.user.email)
 					cache.session.setJSON('nickName',res.data.user.nickName)
 					cache.session.setJSON('userName',res.data.user.userName)
+					cache.session.setJSON('userId',res.data.user.userId)
 				}
 			})
 			if(uni.getStorageSync('Admin-Token')){
@@ -163,7 +164,7 @@
 	}
 }
 .rule-area{
-	margin-bottom: 20rpx ;
+	// margin-bottom: 20rpx ;
 	flex-shrink: 0;
 	// height: 270rpx;
 	// border: 2rpx solid #000;

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

@@ -1,14 +1,14 @@
 <template>
 	<view class="home">
-		<view class="list-area" v-for="item in dataList" :key="item.id">
+		<view class="list-area" v-for="item in dataList" :key="item.id" @click="toDetail(item.id,item.assetBarCode,item.isreturn)">
 			<u-cell :isLink="true">
 				<view slot="title" class="u-slot-title">
 					<i class="iconfont icon-shijian"></i>
-					<text>{{item.updateTime}}</text>
+					<text>{{item.isreturn=="0"?"借用时间："+item.borrowDate:"归还时间："+item.actualReturnDate}}</text>
 				</view>
 				<view slot="label" class="u-slot-label">
-					<text class="list-name">设备：{{item.name}}</text>
-					<text class="list-status">{{item.status | statusFilter}}</text>
+					<text class="list-name">设备：{{item.assetBarCode}}</text>
+					<text class="list-status">{{isReturn(item.isreturn)}}</text>
 				</view>
 			</u-cell>
 		</view>
@@ -16,95 +16,48 @@
 </template>
 
 <script>
+	import { getBorrowList } from '@/api/asset.js'
 	export default {
 		data() {
 			return {
-				name:"zzzzzssd78",
-				dataList:[
-					{
-						id:1,
-						name:"23242524",
-						status:0,
-						updateTime:"2022-2-2 18:20"
-					},
-					{
-						id:2,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:3,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:4,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:5,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:6,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:7,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:8,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:9,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					},
-					{
-						id:10,
-						name:"34dsvsdf2",
-						status:1,
-						updateTime:"2022-3-2 18:20"
-					}
-				]
+				dataList:[]
 			};
 		},
-		filters:{
-			statusFilter(val){
-				let status;
-				switch(val){
-					case 0: 
-						status = "借用中"
-						break;
-					case 1:
-						status = "已归还"
-						break;
-					default:
-						status = "请联系管理员"
-						break;
-				}
-				return status;
-			}
-		},
 		methods:{
 			scroll(){
 				console.log(111)
+			},
+			init(){
+				getBorrowList({
+					pageNum:1,
+					pageSize:10
+				}).then(res=>{
+					console.log(res)
+					this.dataList = res.data.rows
+				})
+			},
+			isReturn(val){
+				if(val=="0"){
+					return "未归还"
+				}else if(val=="1"){
+					return "已归还"
+				}
+			},
+			toDetail(id,bar,isreturn){
+				// 0 未还 1 已还
+				if(isreturn=="0"){
+					uni.navigateTo({
+						url:'/pages/borrow/borrow?number='+bar,
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/return/return?id='+id
+					})
+				}
 			}
+		},
+		onLoad() {
+			this.init()
 		}
 	}
 </script>

pages/menus/menu/menu.vue

@@ -7,7 +7,7 @@
 		<view class="menu-area z10">
 			<view class="basic-msg">
 				<text class="basic-name">{{name}}</text>
-				<text class="basic-amount">借用中设备:{{amount}}</text>
+				<text class="basic-amount">借用中设备：{{amount}}</text>
 			</view>
 			<u-list>
 				<u-list-item>
@@ -23,7 +23,7 @@
 					</view>
 				</u-list-item>
 				<u-list-item>
-					<view class="menu-list">
+					<view class="menu-list"  @click="toRepeat">
 						<i class="iconfont icon-a-shezhi2"></i>
 						<text>故障上报</text>
 					</view>
@@ -53,12 +53,13 @@
 
 <script>
 	import cache from '@/utils/storage.js'
+	import { sumBorrow } from '@/api/asset.js'
 	export default {
 		data() {
 			return {
 				src: 'https://tupian.qqw21.com/article/UploadPic/2021-1/20211722215735941.jpg',
 				name: cache.session.getJSON('nickName'),
-				amount:2
+				amount:null
 			};
 		},
 		methods:{
@@ -71,7 +72,25 @@
 				uni.navigateTo({
 					url:'/pages/menus/borrow-record/borrow-record'
 				})
+			},
+			init(){
+				sumBorrow(0).then(res=>{
+					this.amount = res
+				})
+			},
+			toRepeat(){
+				uni.scanCode({
+					scanType:['barCode'],
+					success (res) {
+						uni.navigateTo({
+							url:'/pages/fault/fault-report/fault-report?id='+res.result
+						})
+					}
+				})
 			}
+		},
+		onLoad() {
+			this.init()
 		}
 	}
 </script>

pages/menus/mine/mine.vue

@@ -92,18 +92,20 @@
 				</view>
 				<view class="pwd-btn">
 					<u-button size="small" @click="popupShow = false">取消</u-button>
-					<u-button color="#000" size="small" >确认</u-button>
+					<u-button color="#000" size="small" @click="changePwd">确认</u-button>
 				</view>
 			</view>
 		</u-popup>
 		<view class="btn-area">
-			<u-button color="#000" size="small">保存</u-button>
+			<!-- <u-button type="info"   size="small" @click="toLogout">退出登录</u-button> -->
+			<u-button color="#000" size="small" @click="save">保存</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import cache from '@/utils/storage.js'
+	import { getInfo,saveUserInfo,savePassword } from '@/api/user.js'
 	export default {
 		data() {
 			return {
@@ -115,6 +117,7 @@
 					pwd:""
 				},
 				popupShow:false,
+				userId:cache.session.getJSON('userId'),
 				rules:{
 					name:[
 						{
@@ -183,9 +186,9 @@
 							message: '密码只能包含字母或数字'
 						},
 						{
-							min: 8,
+							min: 6,
 							max: 16,
-							message: '长度在8-16个字符之间'
+							message: '长度在6-16个字符之间'
 						}
 					],
 					newpwd:[
@@ -204,9 +207,9 @@
 							message: '密码只能包含字母或数字'
 						},
 						{
-							min: 8,
+							min: 6,
 							max: 16,
-							message: '长度在8-16个字符之间'
+							message: '长度在6-16个字符之间'
 						}
 					],
 					surepwd:[
@@ -225,9 +228,9 @@
 							message: '密码只能包含字母或数字'
 						},
 						{
-							min: 8,
+							min: 6,
 							max: 16,
-							message: '长度在8-16个字符之间'
+							message: '长度在6-16个字符之间'
 						},
 						{
 							validator: (rule, value, callback) => {
@@ -244,6 +247,57 @@
 			};
 		},
 		methods:{
+			save(){
+				const that = this
+				this.$refs.Form1.validate().then(() => {
+					let data = {
+						email:this.form.email,
+						nickName:this.form.name,
+						phonenumber:this.form.phone,
+						userId:this.userId
+					}
+					saveUserInfo(data).then(res=>{
+						console.log(res)
+						if(res.data.code===200 && res.data.msg === "操作成功"){
+							that.initInfo()
+						}
+					})
+				}).catch(errors => {
+					uni.$u.toast(errors[0].message)
+				})
+			},
+			changePwd(){
+				this.$refs.Form2.validate().then(() => {
+					savePassword(this.pwdForm.oldpwd,this.pwdForm.newpwd).then(res=>{
+						console.log(res)
+					})
+				}).catch(errors => {
+					uni.$u.toast(errors[0].message)
+				})
+			},
+			toLogout(){
+				console.log("退出登录")
+			},
+			initInfo(){
+				const that = this
+				getInfo().then(res=>{
+					if(res.data.code===200){
+						cache.session.setJSON('role',res.data.roles[0])
+						cache.session.setJSON('phone',res.data.user.phonenumber)
+						cache.session.setJSON('email',res.data.user.email)
+						cache.session.setJSON('nickName',res.data.user.nickName)
+						cache.session.setJSON('userName',res.data.user.userName)
+						cache.session.setJSON('userId',res.data.user.userId)
+						that.form = {
+							name:res.data.user.nickName,
+							ID:res.data.user.userName,
+							phone:res.data.user.phonenumber,
+							email:res.data.user.email,
+							pwd:""
+						}
+					}
+				})
+			}
 		},
 		onReady() {
 			this.$refs.Form1.setRules(this.rules)
@@ -276,6 +330,10 @@
 	width: 300rpx;
 	bottom: 100rpx;
 	right: 50rpx;
+	// display: flex;
+	// /deep/.u-button{
+	// 	margin: 30rpx;
+	// }
 }
 .popup-area{
 	height: 700rpx;

pages/return/return.vue

@@ -1,19 +1,38 @@
 <template>
-	<view>
-		归还设备
+	<view class="home">
+		<view class="detail-area">
+		</view>
 	</view>
 </template>
 
 <script>
+	import { getReturnDetail } from '@/api/asset.js'
 	export default {
 		data() {
 			return {
-				
+				id:""
 			};
+		},
+		methods:{
+			init(id){
+				getReturnDetail(id).then(res=>{
+					console.log(res)
+				})
+			}
+		},
+		onLoad:function(option){
+			this.id = option.id
+			this.init(this.id)
 		}
 	}
 </script>
 
 <style lang="scss">
-
+.home{
+	padding: 20rpx;
+	display: flex;
+	flex-direction: column;
+	// height: 100vh;
+	box-sizing: border-box;
+}
 </style>

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

@@ -9,6 +9,7 @@
     "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker",
     "u--input": "/node-modules/uview-ui/components/u--input/u--input",
     "u-datetime-picker": "/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker",
-    "u-button": "/node-modules/uview-ui/components/u-button/u-button"
+    "u-button": "/node-modules/uview-ui/components/u-button/u-button",
+    "u-toast": "/node-modules/uview-ui/components/u-toast/u-toast"
   }
 }

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

@@ -49,7 +49,6 @@
   left: 16rpx;
 }
 .rule-area.data-v-92bb8f34 {
-  margin-bottom: 20rpx;
   flex-shrink: 0;
 }
 .rule-area .notice-li.data-v-92bb8f34 {

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

@@ -1 +1 @@
-<view class="home"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="list-area"><u-cell vue-id="{{'2994abe7-1-'+__i0__}}" isLink="{{true}}" bind:__l="__l" vue-slots="{{['title','label']}}"><view class="u-slot-title" slot="title"><view class="iconfont icon-shijian _i"></view><text>{{item.$orig.updateTime}}</text></view><view class="u-slot-label" slot="label"><text class="list-name">{{"设备："+item.$orig.name}}</text><text class="list-status">{{item.f0}}</text></view></u-cell></view></block></view>
+<view class="home"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['toDetail',['$0','$1','$2'],[[['dataList','id',item.$orig.id,'id']],[['dataList','id',item.$orig.id,'assetBarCode']],[['dataList','id',item.$orig.id,'isreturn']]]]]]]}}" class="list-area" bindtap="__e"><u-cell vue-id="{{'2994abe7-1-'+__i0__}}" isLink="{{true}}" bind:__l="__l" vue-slots="{{['title','label']}}"><view class="u-slot-title" slot="title"><view class="iconfont icon-shijian _i"></view><text>{{item.$orig.isreturn=="0"?"借用时间："+item.$orig.borrowDate:"归还时间："+item.$orig.actualReturnDate}}</text></view><view class="u-slot-label" slot="label"><text class="list-name">{{"设备："+item.$orig.assetBarCode}}</text><text class="list-status">{{item.m0}}</text></view></u-cell></view></block></view>

unpackage/dist/dev/mp-weixin/pages/menus/menu/menu.wxml

@@ -1 +1 @@
-<view class="mine-area"><view class="big-circle"></view><view class="avatar-area z10"><u-avatar vue-id="45e76d1b-1" src="{{src}}" size="80" shape="circle" bind:__l="__l"></u-avatar></view><view class="menu-area z10"><view class="basic-msg"><text class="basic-name">{{name}}</text><text class="basic-amount">{{"借用中设备:"+amount}}</text></view><u-list vue-id="45e76d1b-2" bind:__l="__l" vue-slots="{{['default']}}"><u-list-item vue-id="{{('45e76d1b-3')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['toPersonInfo',['$event']]]]]}}" class="menu-list" bindtap="__e"><view class="iconfont icon-ditu _i"></view><text>我的信息</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-4')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['toBorrowRecord',['$event']]]]]}}" class="menu-list" bindtap="__e"><view class="iconfont icon-qianbao _i"></view><text>借用记录</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-5')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-a-shezhi2 _i"></view><text>故障上报</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-6')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-baogaoguanli _i"></view><text>故障处理</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-7')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-dangewenjian _i"></view><text>使用指南</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-8')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-bangzhu _i"></view><text>关于我们</text></view></u-list-item></u-list></view></view>
+<view class="mine-area"><view class="big-circle"></view><view class="avatar-area z10"><u-avatar vue-id="45e76d1b-1" src="{{src}}" size="80" shape="circle" bind:__l="__l"></u-avatar></view><view class="menu-area z10"><view class="basic-msg"><text class="basic-name">{{name}}</text><text class="basic-amount">{{"借用中设备："+amount}}</text></view><u-list vue-id="45e76d1b-2" bind:__l="__l" vue-slots="{{['default']}}"><u-list-item vue-id="{{('45e76d1b-3')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['toPersonInfo',['$event']]]]]}}" class="menu-list" bindtap="__e"><view class="iconfont icon-ditu _i"></view><text>我的信息</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-4')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['toBorrowRecord',['$event']]]]]}}" class="menu-list" bindtap="__e"><view class="iconfont icon-qianbao _i"></view><text>借用记录</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-5')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['toRepeat',['$event']]]]]}}" class="menu-list" bindtap="__e"><view class="iconfont icon-a-shezhi2 _i"></view><text>故障上报</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-6')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-baogaoguanli _i"></view><text>故障处理</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-7')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-dangewenjian _i"></view><text>使用指南</text></view></u-list-item><u-list-item vue-id="{{('45e76d1b-8')+','+('45e76d1b-2')}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="menu-list"><view class="iconfont icon-bangzhu _i"></view><text>关于我们</text></view></u-list-item></u-list></view></view>

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

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/return/return"],{233:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(234));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},234:function(n,e,t){"use strict";t.r(e);var r=t(235),u=t(237);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var o,i=t(37),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],o);a.options.__file="pages/return/return.vue",e["default"]=a.exports},235:function(n,e,t){"use strict";t.r(e);var r=t(236);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"]}))},236:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},237:function(n,e,t){"use strict";t.r(e);var r=t(238),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},238:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}}};e.default=r}},[[233,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/return/return"],{160:function(n,t,e){"use strict";e.r(t);var r=e(554),u=e.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);t["default"]=u.a},233:function(n,t,e){"use strict";(function(n,t){var r=e(4);e(26);r(e(25));var u=r(e(234));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e(1)["default"],e(2)["createPage"])},234:function(n,t,e){"use strict";e.r(t);var r=e(235),u=e(237);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);e(160);var c,o=e(37),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],c);a.options.__file="pages/return/return.vue",t["default"]=a.exports},235:function(n,t,e){"use strict";e.r(t);var r=e(236);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},236:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return c})),e.d(t,"recyclableRender",(function(){return i})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},i=!1,c=[];u._withStripped=!0},237:function(n,t,e){"use strict";e.r(t);var r=e(238),u=e.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);t["default"]=u.a},238:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e(167),u={data:function(){return{id:""}},methods:{init:function(n){(0,r.getReturnDetail)(n).then((function(n){console.log(n)}))}},onLoad:function(n){this.id=n.id,this.init(this.id)}};t.default=u},554:function(n,t,e){}},[[233,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/return/return.js.map

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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "归还设备",
+  "navigationBarTitleText": "归还记录",
   "enablePullDownRefresh": false,
   "usingComponents": {}
 }

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

@@ -1 +1 @@
-<view>归还设备</view>
+<view class="home"><view class="detail-area"></view></view>