From cea141782978dd9751e6b0513cf6fe5ea09b49a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 16 Feb 2023 16:58:21 +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/supply/index.js              |  8 ++++++++
 src/components/common/nav_footer.vue |  4 ++--
 src/router/index.js                  | 11 ++++++++++-
 src/views/login.vue                  |  1 +
 src/views/project/index.vue          |  2 +-
 src/views/supply/index.vue           |  4 ++--
 src/views/supply/supplyDetail.vue    | 16 +++++++++-------
 7 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/api/supply/index.js b/src/api/supply/index.js
index d46fd564..3cf39e53 100644
--- a/src/api/supply/index.js
+++ b/src/api/supply/index.js
@@ -8,3 +8,11 @@ export function supplyList(query) {
     params: query
   })
 }
+
+//个人供求
+export function supplyDetail(id) {
+  return request({
+    url: '/transaction/website/supplyDemand/id/'+id,
+    method: 'get',
+  })
+}
diff --git a/src/components/common/nav_footer.vue b/src/components/common/nav_footer.vue
index d8f9dacf..3e603e7a 100644
--- a/src/components/common/nav_footer.vue
+++ b/src/components/common/nav_footer.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="tb-toolbar-container">
-    <!--<router-link to="/index" class="tab" active-class="active" exact>
+    <router-link to="/index" class="tab" active-class="active" exact>
       <span class="icon"><van-icon name="wap-home-o" size="25" /></span>
       <p class="text">首页</p>
     </router-link>
@@ -11,7 +11,7 @@
     <router-link to="/user" class="tab" active-class="active">
       <span class="icon"><van-icon name="contact" size="25" /></span>
       <p class="text">我的</p>
-    </router-link>-->
+    </router-link>
 <!--    <router-link to="/addressBook" class="tab" active-class="active">-->
 <!--      <span class="icon"><van-icon name="orders-o" size="20" /></span>-->
 <!--      <p class="text">通讯录</p>-->
diff --git a/src/router/index.js b/src/router/index.js
index f94f3ef6..4157405c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,7 +23,7 @@ export const constantRoutes = [
     name: 'index',
     meta: {
       title: '主页',
-      keepAlive: true
+      keepAlive: true,
     },
     component: (resolve) => require(['@/views/index'], resolve)
   },
@@ -147,6 +147,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/supply/index'], resolve)
   },
+  {
+    path: '/supply/supplyDetail',
+    name: 'supplyDetail',
+    meta: {
+      title: '查看供求',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/supply/supplyDetail'], resolve)
+  },
   {
     path: '/interaction/index',
     name: 'interaction',
diff --git a/src/views/login.vue b/src/views/login.vue
index 9fd5d9d9..5b4d4ec2 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -118,6 +118,7 @@ export default {
   name: "login",
   data() {
     return {
+      showMessage:false,
       formData: {
         // username: "admin", //账号
         // password: "admin123", //密码
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 1720c8ca..79381333 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -19,7 +19,7 @@
 
     <van-list v-model="loading" :finished="finished" finished-text="没有更多了">
       <router-link :to="{path:'project/projectDetail',query:{id:item.id}}" v-for="(item,index) in infoList" :key="index">
-        <van-card :thumb="item.fileUrl?global.severApi+item.fileUrl:'../../static/images/zwtpxw.jpg'" >
+        <van-card :thumb="item.fileUrl?'/api'+item.fileUrl:'../../static/images/zwtpxw.jpg'" >
           <template #tags>
             <p class="title">【{{item.rollout}}】{{item.projectName}}</p>
             <p class="type">{{ item.projectShowStatus }}</p>
diff --git a/src/views/supply/index.vue b/src/views/supply/index.vue
index 1bad1d55..c0e1a842 100644
--- a/src/views/supply/index.vue
+++ b/src/views/supply/index.vue
@@ -17,7 +17,7 @@
           style="margin-top: 10px;"
           @load="getList"
         >
-          <van-cell icon="play" v-for="(item,index) in supplyList" :key="index" >
+          <van-cell icon="play" v-for="(item,index) in supplyList" :key="index" :to="{path:'/supply/supplyDetail',query:{id:item.id}}"  >
             <template #title>
               {{item.location}}
             </template>
@@ -36,7 +36,7 @@
           style="margin-top: 10px;"
           @load="getSecondList"
         >
-          <van-cell icon="play"  v-for="(item,index) in supplySecondList" :key="index">
+          <van-cell icon="play"  v-for="(item,index) in supplySecondList" :key="index" :to="{path:'/supply/supplyDetail',query:{id:item.id}}">
             <template #title>
               {{item.location}}
             </template>
diff --git a/src/views/supply/supplyDetail.vue b/src/views/supply/supplyDetail.vue
index 5ab4898a..ad96002c 100644
--- a/src/views/supply/supplyDetail.vue
+++ b/src/views/supply/supplyDetail.vue
@@ -7,7 +7,6 @@
       placeholder
       @click-left="onClickLeft"
     />
-    <p class="title">{{supplyDetails.projectName}}成交公示</p>
     <van-row>
       <van-col>项目名称：{{supplyDetails.projectName}}</van-col>
     </van-row>
@@ -15,19 +14,22 @@
       <van-col>项目地址：{{supplyDetails.location}}</van-col>
     </van-row>
     <van-row>
-      <van-col>姓名：{{supplyDetails.rollout}}</van-col>
+      <van-col>姓名：{{supplyDetails.realname}}</van-col>
     </van-row>
     <van-row>
-      <van-col>联系电话：{{supplyDetails.dealType}}</van-col>
+      <van-col>联系电话：{{supplyDetails.phone}}</van-col>
     </van-row>
     <van-row>
-      <van-col>项目详情：{{supplyDetails.dealTime}}</van-col>
+      <van-col>项目详情：{{supplyDetails.projectContent}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col><img :src="'/api'+supplyDetails.fileUrl" alt="" width="100%"></van-col>
     </van-row>
   </div>
 </template>
 
 <script>
-import { supplyDetails } from "@/api/supply/index";
+import { supplyDetail } from "@/api/supply/index";
 export default {
   name: "noticeDetail",
   data() {
@@ -43,9 +45,9 @@ export default {
     //成交公告集合
     getDetail(){
       console.log(this.$route.query.id)
-      supplyDetails(this.$route.query.id).then(response => {
+      supplyDetail(this.$route.query.id).then(response => {
         console.log(response)
-
+        this.supplyDetails = response.data
       });
     },