From b614ca7766f989c6a366c9fc96eb34a8ec9b6d03 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Thu, 19 Oct 2023 14:41:57 +0800
Subject: [PATCH] submit

---
 App.vue                |  3 +++
 pages/borrow/index.vue | 13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/App.vue b/App.vue
index 501e575..7b0d7ea 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,9 @@
 			console.log('App Launch')
 		},
 		onShow: function() {
+      if (this.$route.query.uid){
+        uni.setStorageSync('uid',this.$route.query.uid)
+      }
 			console.log('App Show')
 		},
 		onHide: function() {
diff --git a/pages/borrow/index.vue b/pages/borrow/index.vue
index ec89b5e..0f15f2b 100644
--- a/pages/borrow/index.vue
+++ b/pages/borrow/index.vue
@@ -5,11 +5,11 @@
       <tm-images style="margin-top: 90rpx" :width="300" :src="info.goodsInfo.picUrl"></tm-images>
       <div style="display: flex;justify-content: center;align-items: center;margin-top: 90rpx">{{info.goodsInfo.goodsName}}</div>
       <div style="display: flex;justify-content: center;align-items: center;margin-top: 90rpx">借用人： {{userInfo.nickName}}</div>
-      <div style="margin-top: 400rpx;display: flex;flex-direction: column;align-items: center">
-        <tm-button @click="borrowMe" v-if="info.goodsInfo.currentPosition!==info.userName" style="margin-bottom: 100rpx" theme="bg-gradient-red-accent" :round="24" size="g">
+      <div style="margin-top: 200rpx;display: flex;flex-direction: column;align-items: center">
+        <tm-button @click="borrowMe" v-if="info.goodsInfo.currentPosition!==info.userName" style="margin-bottom: 100rpx"  :round="24" size="g">
           确认借用
         </tm-button>
-        <tm-button v-if="info.goodsInfo.status===1" @click="returnMe" theme="bg-gradient-red-accent" :round="24" size="g">确认归还</tm-button>
+        <tm-button v-if="info.goodsInfo.status===1" @click="returnMe"  :round="24" size="g">确认归还</tm-button>
       </div>
     </tm-sheet>
   </div>
@@ -33,7 +33,7 @@ export default {
   methods: {
    async borrowMe(){
       const data = {
-        "borrowInfoUid": "8b09da87-e4c4-4ad2-9518-2db84a8fc954"
+        "borrowInfoUid": uni.getStorageSync('uid')
       }
       const res= await borrowApi(data)
       if (res.code===200){
@@ -43,18 +43,17 @@ export default {
     },
   async  returnMe(){
       const data = {
-        "borrowInfoUid": "8b09da87-e4c4-4ad2-9518-2db84a8fc954"
+        "borrowInfoUid": uni.getStorageSync('uid')
       }
      const res= await returnApi(data)
     if (res.code===200){
       this.getData()
       this.$refs.toast.show({model:'success',label:'归还成功'})
     }
-    console.log(res,'returnMe')
     },
     async getData() {
       const data = {
-        "borrowInfoUid": "8b09da87-e4c4-4ad2-9518-2db84a8fc954"
+        "borrowInfoUid": uni.getStorageSync('uid')
       }
       const res = await getInfo(data)
       if (res.code === 200) {