From 2dfd195d153364c8fd603b36ea64dc665d6edf63 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 19 Nov 2024 11:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                           | 14 ++++++++++++++
 src/pages/login/index.vue                       |  1 +
 src/pages/new-purchase/accept/acceptDetails.vue |  7 +++++--
 src/pages/new-purchase/accept/conclusion.vue    | 12 +++++++++++-
 src/pages/new-purchase/accept/index.vue         |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..4fabe68
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,14 @@
+{
+    "i18n-ally.localesPaths": [
+        "src/uni_modules/uni-table/i18n",
+        "src/uni_modules/uni-calendar/components/uni-calendar/i18n",
+        "src/uni_modules/uni-countdown/components/uni-countdown/i18n",
+        "src/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n",
+        "src/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n",
+        "src/uni_modules/uni-fav/components/uni-fav/i18n",
+        "src/uni_modules/uni-load-more/components/uni-load-more/i18n",
+        "src/uni_modules/uni-pagination/components/uni-pagination/i18n",
+        "src/uni_modules/uni-popup/components/uni-popup/i18n",
+        "src/uni_modules/uni-search-bar/components/uni-search-bar/i18n"
+    ]
+}
\ No newline at end of file
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 0416d54..fc535a0 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -39,6 +39,7 @@ const loginForm = reactive({
 // 登录按钮
 const onHandleLogin = async () => {
     const res = await appLoginAPI(loginForm)
+	console.log(res)
     if (res.code === 200) {
         // 1.  获取 token 并存储
         memberStore.setToken(res.data.access_token)
diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue
index b055df7..6dfaea4 100644
--- a/src/pages/new-purchase/accept/acceptDetails.vue
+++ b/src/pages/new-purchase/accept/acceptDetails.vue
@@ -46,11 +46,11 @@
 <script setup>
 import { ref, reactive } from 'vue'
 import { getPurchaseInfo } from '../../../services/purchase.js';
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad,onShow } from '@dcloudio/uni-app'
 
 
 const searchValue = ref('')
-const id = ref('')
+const id = ref('') 
 const taskId = ref('')
 const statusList = ref(["2","12"])
 const tableList = ref([])
@@ -90,6 +90,9 @@ onLoad((options)=>{
 	taskId.value = options.taskId
 	getTableList()
 })
+onShow(()=>{
+	getTableList()
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/new-purchase/accept/conclusion.vue b/src/pages/new-purchase/accept/conclusion.vue
index 43eb920..a0ff619 100644
--- a/src/pages/new-purchase/accept/conclusion.vue
+++ b/src/pages/new-purchase/accept/conclusion.vue
@@ -58,9 +58,19 @@ const pass = () => {
 	let param = {
 		purchaseCheckDetailsList:[obj],
 		verifyPass:true
-	} 
+	}
+	console.log(param)
 	innerVerify(param).then(res => { 
 		console.log(res)
+		if(res.code==200){
+			uni.showToast({ title: '验证成功', icon: 'none' })
+			uni.navigateBack({
+				delta: 1 // 返回到已存在的页面
+			});
+		}else{
+			uni.showToast({ title: res.msg, icon: 'none' })
+		}
+		
 	}).catch(error => {
 		console.log(error) 
 	})  
diff --git a/src/pages/new-purchase/accept/index.vue b/src/pages/new-purchase/accept/index.vue
index e07329f..dc71f93 100644
--- a/src/pages/new-purchase/accept/index.vue
+++ b/src/pages/new-purchase/accept/index.vue
@@ -78,7 +78,7 @@ const getTableList = () => {
 	}
 	console.log(obj)
 	getPurchaseList(obj).then(res => { 
-		tableList.value = res.rows;
+		tableList.value = res.data.rows;
 		console.log(tableList.value)
 	}).catch(error => {
 		console.log(error)