From 3a882d7bd644030bc4ed098a67bcff63bb96a266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 15 Mar 2023 15:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project/index.js            | 2 +-
 src/api/user/index.js               | 8 ++++++++
 src/views/interaction/index.vue     | 2 +-
 src/views/project/index.vue         | 3 ++-
 src/views/project/signUp.vue        | 6 +++---
 src/views/user/index.vue            | 2 +-
 src/views/user/supply/supplyAdd.vue | 4 ++--
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/api/project/index.js b/src/api/project/index.js
index b4254173..e4a2adf4 100644
--- a/src/api/project/index.js
+++ b/src/api/project/index.js
@@ -62,7 +62,7 @@ export function getMember(id){
 //提交报名
 export function submmitSignup (params) {
   return request({
-    url:'/transaction/signup',
+    url:'/transaction/signup/add',
     method: 'post',
     data: params
   })
diff --git a/src/api/user/index.js b/src/api/user/index.js
index 1aca1f4f..5fc7e2d9 100644
--- a/src/api/user/index.js
+++ b/src/api/user/index.js
@@ -129,6 +129,14 @@ export function selectDemand(id){
   })
 }
 
+//个人供求
+export function supplyDetail(id) {
+  return request({
+    url: '/transaction/website/supplyDemand/id/'+id,
+    method: 'get',
+  })
+}
+
 //删除供求
 export function deleteSupply(id){
   return request({
diff --git a/src/views/interaction/index.vue b/src/views/interaction/index.vue
index 8ddce9d2..31bc809d 100644
--- a/src/views/interaction/index.vue
+++ b/src/views/interaction/index.vue
@@ -14,7 +14,7 @@
       style="margin-top: 10px;"
       @load="getList()"
     >
-      <van-cell v-for="(item,index) in interactionList" :key="index">
+      <van-cell v-for="(item,index) in interactionList" v-if="item.reply" :key="index">
         <template #title>
           <van-icon name="../../static/images/icon/questions.png" size="18" style="top: 5px;margin-right: 5px;"/>
           {{item.content}}
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index cc43b2a9..572aa216 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -118,7 +118,7 @@ export default {
     this.getDicts("project_type").then(response => {
       console.log(response)
       response.data.map(item => {
-        this.projectTypeOption.push({ value:item.dictCode, text: item.dictLabel});
+        this.projectTypeOption.push({ value:item.dictValue, text: item.dictLabel});
       });
     });
     getDeptList().then(response => {
@@ -165,6 +165,7 @@ export default {
       this.loading = false;
     },
     getList(){
+      console.log(this.value1)
       let queryDatas = {
         deptId: this.activeId,
         projectNumber:this.value1,
diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index 3a63af51..94dbe751 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -46,7 +46,7 @@
           :rules="[{ required: true, message: '请填写会员账号' }]"
         />
         <van-field
-          v-model="bankCardName"
+          v-model="bankAddress"
           name="bankCardName"
           label="开户银行"
           placeholder="开户银行"
@@ -110,7 +110,7 @@ export default {
       projectId:this.$route.query.projectId,
       deposit:this.$route.query.deposit,
       projectName:this.$route.query.projectName,
-      bankCardName:"",
+      bankAddress:"",
       bankCardNum:"",
       idCardNum:"",
       phone:"",
@@ -130,7 +130,7 @@ export default {
         getMember(response.user.userId).then(res => {
           this.nickName = res.data.realname
           this.idCardNum = res.data.idCardNum
-          this.bankCardName = res.data.bankCardName
+          this.bankAddress = res.data.bankAddress
           this.bankCardNum = res.data.bankCardNum
           this.phone = res.data.phone
           this.memberId = res.data.id
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 14576993..68bbfba0 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -41,7 +41,7 @@ export default {
   methods: {
     loginOut(){
       logout().then(response => {
-        window.location.href = '/login';
+        this.$router.push({name:'index'})
       });
     },
     getInfo(){
diff --git a/src/views/user/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue
index 03b39bbc..6eac89e0 100644
--- a/src/views/user/supply/supplyAdd.vue
+++ b/src/views/user/supply/supplyAdd.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getMember , userDemand , updateDemand , selectDemand , base64Attach , showImg , deleteUserImg} from "@/api/user/index";
+import { getMember , userDemand , updateDemand , selectDemand , base64Attach , showImg , deleteUserImg ,supplyDetail} from "@/api/user/index";
 import { getInfo } from "@/api/login/index";
 import {Dialog} from "vant";
 export default {
@@ -124,7 +124,7 @@ export default {
       });
     },
     getInteraction(){
-      selectDemand(this.$route.query.id).then(response => {
+      supplyDetail(this.$route.query.id).then(response => {
         this.form.projectName = response.data.projectName;
         this.form.location = response.data.location;
         this.form.projectContent = response.data.projectContent;