wuhongyu 5 anos atrás
pai
commit
8fd7b1be33

+ 148 - 150
src/layout/enterprise/context.vue

@@ -4,182 +4,180 @@
       <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> </el-col>
       <el-col :span="24">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-          <el-tab-pane label="我的订购" name="first">
-            <el-row style="padding: 0 20px;">
-              <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
-                <el-tab-pane label="发起交易" name="fgffadqdfa">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in faqilist" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="21"> </el-col>
-                          <el-col :span="3">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+          <el-row style="padding: 0 20px;">
+            <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
+              <el-tab-pane label="我的全部" name="fgrr">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in dinggou3" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.product_name }}</p>
-                            <p>营销人名称:{{ item.market_username }}</p>
-                            <p>购买人名称:{{ item.username }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">说明:{{ item.description }}</el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="jiaoyisuccess(item)">同意交易</el-link>
-                              <el-link :underline="false" @click="deteles(item)">删除</el-link>
-                            </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="deteles(item)">删除</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChangefaqi"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="totalfaqi"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange3"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="total3"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
 
-                <el-tab-pane label="交易中" name="fgrrsss">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in dinggou1" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="20"> </el-col>
-                          <el-col :span="4">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+              <el-tab-pane label="我的洽谈" name="fgffadqdfa">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in faqilist" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="21"> </el-col>
+                        <el-col :span="3">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.product_name }}</p>
-                            <p>营销人名称:{{ item.market_username }}</p>
-                            <p>购买人名称:{{ item.username }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">说明:{{ item.description }}</el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="deteles(item)">删除</el-link>
-                              <el-link :underline="false" @click="success(item)">审核通过</el-link>
-                              <el-link :underline="false" @click="shibai(item)">审核失败</el-link>
-                            </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="jiaoyisuccess(item)">同意交易</el-link>
+                            <el-link :underline="false" @click="deteles(item)">删除</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="total1"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChangefaqi"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="totalfaqi"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
 
-                <el-tab-pane label="交易完成" name="fgrraaa">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in dinggou2" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="20"> </el-col>
-                          <el-col :span="4">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+              <el-tab-pane label="我的意向" name="fgrrsss">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in dinggou1" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.product_name }}</p>
-                            <p>营销人名称:{{ item.market_username }}</p>
-                            <p>购买人名称:{{ item.username }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">说明:{{ item.description }}</el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="deteles(item)">删除</el-link>
-                            </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="deteles(item)">删除</el-link>
+                            <el-link :underline="false" @click="success(item)">审核通过</el-link>
+                            <el-link :underline="false" @click="shibai(item)">审核失败</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange2"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="total2"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="total1"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
 
-                <el-tab-pane label="交易取消" name="fgrr">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in dinggou3" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="20"> </el-col>
-                          <el-col :span="4">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+              <el-tab-pane label="我的交易" name="fgrraaa">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in dinggou2" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.product_name }}</p>
-                            <p>营销人名称:{{ item.market_username }}</p>
-                            <p>购买人名称:{{ item.username }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">说明:{{ item.description }}</el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="deteles(item)">删除</el-link>
-                            </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="deteles(item)">删除</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange3"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="total3"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
-              </el-tabs>
-            </el-row>
-          </el-tab-pane>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange2"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="total2"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
+            </el-tabs>
+          </el-row>
         </el-tabs>
       </el-col>
     </el-row>
@@ -270,7 +268,7 @@ export default {
   width: 96%;
   height: 41px;
   line-height: 35px;
-  border-bottom: 1px solid #e5e5e5;
+  // border-bottom: 1px solid #e5e5e5;
   position: relative;
   bottom: 1px;
   margin: 10px;

+ 1 - 1
src/layout/enterprise/contextfabu.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="contextfabu">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-          <el-tab-pane label="需求发布" name="first">
+          <el-tab-pane label="我的发布" name="first">
             <el-row class="demandForm">
               <el-form ref="form" :model="demandForm" label-width="80px">
                 <el-form-item label="产品类型">

+ 135 - 137
src/layout/enterprise/contextfabuxx.vue

@@ -4,162 +4,161 @@
       <el-col :span="24" class="leftTop"> <span>|</span> <span>我的发布</span> </el-col>
       <el-col :span="24">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-          <el-tab-pane label="我的需求" name="first">
-            <el-row style="padding: 0 20px;">
-              <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
-                <el-tab-pane label="审核成功" name="first">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in recruitData" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="21"> {{ item.name }} </el-col>
-                          <el-col :span="3">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+          <el-row style="padding: 0 20px;">
+            <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
+              <el-tab-pane label="审核成功" name="first">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in recruitData" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="21"> {{ item.name }} </el-col>
+                        <el-col :span="3">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fimage">
-                            <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
-                              <template v-if="index === 0">
-                                <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
-                              </template>
-                            </el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.name }}</p>
-                            <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-                            <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">最新申请:</el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <template v-if="index === 0">
+                              <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                            </template>
                           </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })">编辑</el-link
-                              ><br />
-                              <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
-                              <!-- <el-link :underline="false" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.name }}</p>
+                          <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
+                          <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">最新申请:</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })">编辑</el-link
+                            ><br />
+                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
+                            <!-- <el-link :underline="false" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
                               >查看申请</el-link
                             > -->
-                            </el-col>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="total"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
-                <el-tab-pane label="审核中信息" name="second">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in shenheList" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="21"> {{ item.name }} </el-col>
-                          <el-col :span="3">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="total"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="审核中信息" name="second">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in shenheList" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="21"> {{ item.name }} </el-col>
+                        <el-col :span="3">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fimage">
-                            <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
-                              <template v-if="index === 0">
-                                <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
-                              </template>
-                            </el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.name }}</p>
-                            <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-                            <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">最新申请:</el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <template v-if="index === 0">
+                              <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                            </template>
                           </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })">编辑</el-link
-                              ><br />
-                              <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
-                            </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.name }}</p>
+                          <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
+                          <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">最新申请:</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })">编辑</el-link
+                            ><br />
+                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange1"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="tatalstatus1"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
-                <el-tab-pane label="审核失败" name="thirth">
-                  <el-col :span="24" class="info">
-                    <el-col :span="24" v-for="(item, index) in successlist" :key="index">
-                      <el-col class="xqborder">
-                        <el-col :span="24" class="fbListTop">
-                          <el-col :span="21"> {{ item.name }} </el-col>
-                          <el-col :span="3">
-                            {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                          </el-col>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange1"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="tatalstatus1"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="审核失败" name="thirth">
+                <el-col :span="24" class="info">
+                  <el-col :span="24" v-for="(item, index) in successlist" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="21"> {{ item.name }} </el-col>
+                        <el-col :span="3">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
-                        <el-col :span="24" class="fbListCenter">
-                          <el-col :span="6" class="fimage">
-                            <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
-                              <template v-if="index === 0">
-                                <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
-                              </template>
-                            </el-col>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterC">
-                            <p class="textOver">产品:{{ item.name }}</p>
-                            <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-                            <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
-                          </el-col>
-                          <el-col :span="6" class="fbListCenterTwo">
-                            <el-col :span="24">最新申请:</el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <template v-if="index === 0">
+                              <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                            </template>
                           </el-col>
-                          <el-col :span="6" class="fbListCenterR">
-                            <el-col :span="24" class="bainji">
-                              <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
-                            </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.name }}</p>
+                          <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
+                          <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">最新申请:</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
                     </el-col>
                   </el-col>
-                  <el-col class="page" :span="24">
-                    <el-pagination
-                      @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange1"
-                      :current-page="currentPage"
-                      background
-                      layout="total,  prev, pager, next, jumper"
-                      :total="tatalstatus2"
-                      :page-size="pageSize"
-                    >
-                    </el-pagination>
-                  </el-col>
-                </el-tab-pane>
+                </el-col>
+                <el-col class="page" :span="24">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange1"
+                    :current-page="currentPage"
+                    background
+                    layout="total,  prev, pager, next, jumper"
+                    :total="tatalstatus2"
+                    :page-size="pageSize"
+                  >
+                  </el-pagination>
+                </el-col>
+              </el-tab-pane>
 
-                <!-- <el-tab-pane label="发起交易" name="fgffadqdfa">
+              <!-- <el-tab-pane label="发起交易" name="fgffadqdfa">
                   <el-col :span="24" class="info">
                     <el-col :span="24" v-for="(item, index) in faqilist" :key="index">
                       <el-col class="xqborder">
@@ -286,7 +285,7 @@
                     </el-pagination>
                   </el-col>
                 </el-tab-pane> -->
-                <!-- 
+              <!-- 
                 <el-tab-pane label="交易取消" name="fgrr">
                   <el-col :span="24" class="info">
                     <el-col :span="24" v-for="(item, index) in jiaoyilist" :key="index">
@@ -328,9 +327,8 @@
                     </el-pagination>
                   </el-col>
                 </el-tab-pane> -->
-              </el-tabs>
-            </el-row>
-          </el-tab-pane>
+            </el-tabs>
+          </el-row>
 
           <!-- <el-tab-pane label="我的供给" name="second">
             <el-row style="padding: 0 20px;">
@@ -586,7 +584,7 @@ export default {
   width: 96%;
   height: 41px;
   line-height: 35px;
-  border-bottom: 1px solid #e5e5e5;
+  // border-bottom: 1px solid #e5e5e5;
   position: relative;
   bottom: 1px;
   margin: 10px;

+ 1 - 1
src/layout/live/head.vue

@@ -10,7 +10,7 @@
             欢迎来到吉林省计算中心科技平台
           </p>
           <p class="username">
-            <span v-if="user.role"
+            <span v-if="user.uid"
               >{{ user.name }}
               <button type="button" class="logininfo" @click="zhuxiao">注销</button>
             </span>

+ 1 - 2
src/views/enterprise/enterprisedg.vue

@@ -100,10 +100,9 @@ export default {
       }
     },
     async jiaoyi3({ skip = 0, limit = 3, ...info } = {}) {
-      let status = 3;
       skip = this.skip;
       console.log();
-      const res = await this.transactionList({ skip, limit, status, ...info });
+      const res = await this.transactionList({ skip, limit, ...info });
       console.log(res);
       if (this.$checkRes(res)) {
         this.$set(this, `dinggou3`, res.data);