From 62cae81c844f2b58d510627504aee4f8845d7aa3 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 29 Nov 2023 09:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E9=80=89=E4=B9=A6API?=
 =?UTF-8?q?=E5=80=9F=E9=98=85/=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library-activity/src/utils/api.js             |  3 ++
 .../src/views/myAddress/addAddress.vue        | 18 ++++++++---
 .../src/views/myAddress/myAddress.vue         | 31 +++++++++++++++++--
 .../src/views/myLending/myLending.vue         | 25 ++++++++++-----
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/library-activity/src/utils/api.js b/library-activity/src/utils/api.js
index adc2890..2fbb6ad 100644
--- a/library-activity/src/utils/api.js
+++ b/library-activity/src/utils/api.js
@@ -28,6 +28,9 @@ API.MYADDRESS = '/myAddress'
 //编辑我的收货地址
 API.EDITMYADDRESS = '/editMyAddress'
 
+// 删除我的收货地址
+API.DELETEMYADDRESS = '/deleteMyAddress'
+
 // 我得订单
 API.MYORDER =  '/myOrder'
 
diff --git a/library-activity/src/views/myAddress/addAddress.vue b/library-activity/src/views/myAddress/addAddress.vue
index a55e84d..271d1b5 100644
--- a/library-activity/src/views/myAddress/addAddress.vue
+++ b/library-activity/src/views/myAddress/addAddress.vue
@@ -79,6 +79,7 @@
 <script>
 import { reactive, getCurrentInstance, toRefs, onMounted } from 'vue'
 import { areaList } from '@vant/area-data'
+import { Toast } from 'vant'
 export default {
 	name: 'AddAddress',
 	setup() {
@@ -97,7 +98,6 @@ export default {
     onMounted(() => {
       data.addressType = proxy.$route.query.type
       data.currentAddress = JSON.parse(proxy.$route.query.currentAddress) 
-      console.log(data.currentAddress)
       if(data.currentAddress){
         data.name = data.currentAddress.name
         data.phone = data.currentAddress.phone
@@ -122,19 +122,27 @@ export default {
       }else{
         param.id = data.currentAddress.id
       }
-      console.log(param)
+      param.isDefault = param.isDefault === false ? 0 : 1
       proxy.$http
 		  	    .post(proxy.$API.EDITMYADDRESS,
 		  			param,
             { 
               headers: {
-                  'Content-Type': 'application/x-www-form-urlencoded'
+                'Content-Type': 'application/x-www-form-urlencoded'
               }
             }
 		  	   )
 		  	.then(res => {
-          data.detailBook = res.data.book
-          data.showDetial = true
+          if(res.errCode === 0){
+            if(data.addressType==='add'){
+              Toast('新增地址成功')
+            }else{
+              Toast('编辑地址成功')
+            }
+            setTimeout(()=>{
+              proxy.$router.push({ path: '/myAddress'})
+            },1000)
+          }
 		  	})
 		  	.catch((res) => {
 		  		console.log(res)
diff --git a/library-activity/src/views/myAddress/myAddress.vue b/library-activity/src/views/myAddress/myAddress.vue
index 6a45f72..7cade75 100644
--- a/library-activity/src/views/myAddress/myAddress.vue
+++ b/library-activity/src/views/myAddress/myAddress.vue
@@ -23,7 +23,7 @@
           </div>
           <div class="setting-handle" v-if="isSetting">
             <span :class="item.isDefault == 1 ? 'active' :''">默认地址</span>
-            <span>删除</span>
+            <span @click="deleteMyAddress(item.id)">删除</span>
           </div>
           <span v-if="item.isDefault == 1" class="mr-flag">默认</span>
         </div>
@@ -37,6 +37,8 @@
 
 <script>
 import { reactive, onMounted, getCurrentInstance, toRefs } from 'vue'
+import { Toast } from 'vant'
+
 export default {
 	name: 'MyAddress',
 	setup() {
@@ -78,11 +80,36 @@ export default {
 				})
 		}
 
+    let deleteMyAddress = (id) => {
+			proxy.$http
+				.post(
+					proxy.$API.DELETEMYADDRESS,
+					{
+						id: id,
+					},
+					{
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+						},
+					}
+				)
+				.then((res) => {
+					if(res.errCode === 0){
+            Toast('删除地址成功')
+            getMyAddress()
+          }
+				})
+				.catch((res) => {
+					console.log(res)
+				})
+		}
+
 		return {
 			...toRefs(data),
 			toBack,
       toAddOrEdit,
-      getMyAddress
+      getMyAddress,
+      deleteMyAddress
 		}
 	},
 }
diff --git a/library-activity/src/views/myLending/myLending.vue b/library-activity/src/views/myLending/myLending.vue
index b2bfd80..2cafd2a 100644
--- a/library-activity/src/views/myLending/myLending.vue
+++ b/library-activity/src/views/myLending/myLending.vue
@@ -5,7 +5,7 @@
 			<p>我的借阅</p>
 		</div>
 		<div class="order-main">
-			<van-tabs v-model:active="active" swipeable>
+			<van-tabs v-model:active="active" swipeable @click-tab="onClickTab">
 				<van-tab v-for="item in tabTitle" :title="item.name">
 					<div>
             <div class="order-item">
@@ -57,6 +57,7 @@ export default {
 		let data = reactive({
 			tabCur: 1,
 			active: 0,
+      borrowingList:[],
 			tabTitle: [
 				{
 					value: '0',
@@ -77,11 +78,16 @@ export default {
       }
 		})
 		onMounted(() => {
-      console.log(proxy.$route.query.tabActive)
       data.active = JSON.parse(proxy.$route.query.tabActive)
-      getMyBorrowing()
+      if(data.active){
+        getMyBorrowing()
+      }
     })
-
+    let onClickTab = (item) => {
+      data.active = item.name
+      data.orderList = []
+      getMyBorrowing()
+    }
     let getMyBorrowing = () => {
 			let param = {
         openid: 'ocHu-sysUQ6-xb9knAJ5mATqCOJE',
@@ -94,9 +100,11 @@ export default {
 					params: param,
 				})
 				.then((res) => {
-            console.log(res)
-            data.orderStatus = res.data.myAddress.status
-            data.orderNum = res.data.myAddress.num
+          if(res.data.length !== 0){
+            data.borrowingList = res.data
+          }else{
+            data.borrowingList = []
+          }
 				})
 				.catch((res) => {
 					console.log(res)
@@ -108,7 +116,8 @@ export default {
 		return {
 			...toRefs(data),
 			toBack,
-      getMyBorrowing
+      getMyBorrowing,
+      onClickTab
 		}
 	},
 }