:art: 买卖确认列表更新, :memo: 持仓页面文字调整

src/service/buyOrSell/index.js

@@ -1,8 +1,8 @@
 import axios from "@/utils/axios";
 
 // 获取买入确认列表
-export function getBuyConfList() {
-  return axios.get(`/myCenter/unconfirmedTradeOrder/buy`);
+export function getBuyConfList(params) {
+  return axios.post(`/myCenter/unconfirmedTradeOrder/buy`, params);
 }
 
 // 买家上传支付凭证
@@ -11,22 +11,21 @@ export function uploadImg(params) {
 }
 
 // 获取卖出确认列表
-export function getSellConfList() {
-  return axios.get(`/myCenter/unconfirmedTradeOrder/sell`);
+export function getSellConfList(params) {
+  return axios.post(`/myCenter/unconfirmedTradeOrder/sell`, params);
 }
 
-
 // 买家确认交易单
 export function buyerConf(orderId) {
-  return axios.get(`/myCenter/confirmedTradeOrderForBuyer?orderId=${orderId}`)
+  return axios.get(`/myCenter/confirmedTradeOrderForBuyer?orderId=${orderId}`);
 }
 
 // 卖家确认交易单
 export function sellerConf(orderId) {
-  return axios.get(`/myCenter/confirmedTradeOrderForSeller?orderId=${orderId}`)
+  return axios.get(`/myCenter/confirmedTradeOrderForSeller?orderId=${orderId}`);
 }
 
 // 根据交易单id获取上传凭证
 export function getImg(orderId) {
-  return axios.get(`/myCenter/download/${orderId}`)
-}
+  return axios.get(`/myCenter/download/${orderId}`);
+}

src/service/userManage/index.js

@@ -2,7 +2,7 @@ import axios from "../../utils/axios";
 
 // 分页查询 用户表
 export function pageUserList(params) {
-  return axios.get(
+  return axios.post(
     `/userInfo/pageUserInfo`,
     params
   );

src/views/buyOrSell/BuyConfList.vue

@@ -51,11 +51,11 @@ const getList = async () => {
         }
         // 列表值叠加
         buyConfList.value = buyConfList.value.concat(
-            data.data
+            data.data.records
         );
 
-        buyConfListTotal.value = data.data.length;
-        if (buyConfList.value.length === data.data.length) {
+        buyConfListTotal.value = data.data.total;
+        if (buyConfList.value.length === data.data.total) {
             finished.value = true;
         }
         loading.value = false;

src/views/buyOrSell/SellConfList.vue

@@ -52,12 +52,11 @@ const getList = async () => {
         }
         // 列表值叠加
         sellConfList.value = sellConfList.value.concat(
-            data.data
+            data.data.records
         );
 
-
-        sellConfListTotal.value = data.data.length;
-        if (sellConfList.value.length === data.data.length) {
+        sellConfListTotal.value = data.data.total;
+        if (sellConfList.value.length === data.data.total) {
             finished.value = true;
         }
         loading.value = false;

src/views/position/PositionIndex.vue

@@ -16,7 +16,6 @@
                                     持仓情况</span>
                             </div>
                         </div>
-
                     </div>
                     <img class="pic1" src="../../assets/device/line.png" />
                     <!-- 股价/盈亏 -->
@@ -56,7 +55,7 @@
                             <div class="flex-row justify-between bd3">
                                 <div class="flex-col outer2"></div>
                                 <span class="flex-col txt2">
-                                    交易历史</span>
+                                    挂单历史</span>
                             </div>
                         </div>
                         <!-- 菜单，搜索 -->
@@ -75,12 +74,12 @@
                     </div>
                 </div>
 
-                <!-- 历史交易列表 -->
+                <!-- 挂单历史列表 -->
                 <div class="positionBox2 flex-col justify-between">
                     <div class="section1 flex-col">
                         <div class="outer1 flex-col o-plr-15">
                             <div v-if="hisLength === 0">
-                                <van-empty image="search" description="暂无交易历史" />
+                                <van-empty image="search" description="暂无挂单历史" />
                             </div>
                             <div v-else>
                                 <!-- <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了"
@@ -88,10 +87,10 @@
                                     <div v-for="item in orderHisList" :key="item.id">
                                         <van-card>
                                             <template #title>
-                                                <span class="word13">交易数量：{{ item.entrustNumber }} 股</span>
+                                                <span class="word13">挂单数量：{{ item.entrustNumber }} 股 &nbsp;&nbsp;&nbsp;&nbsp;</span>
                                             </template>
                                             <template #desc>
-                                                <span class="word11">创建时间：{{ item.createTime }}</span>
+                                                <span class="word11">&nbsp;&nbsp;&nbsp;&nbsp;创建时间：{{ item.createTime }}</span>
                                             </template>
                                             <template #tags>
                                                 <div v-if="item.type === '1'">交易类型：<van-tag type="success">买入</van-tag>
@@ -104,17 +103,17 @@
                                                 <!-- <div>
                   交易状态：<van-tag plain round type="danger">{{ showStatusText(item.status) }}</van-tag>
                 </div> -->
-                                                <div v-if="item.status === '0'">交易状态：<van-tag plain round
+                                                <div v-if="item.status === '0'">挂单状态：<van-tag plain round
                                                         type="danger">过期</van-tag></div>
-                                                <div v-else-if="item.status === '1'">交易状态：<van-tag plain round
-                                                        type="success">生效</van-tag></div>
-                                                <div v-else-if="item.status === '2'">交易状态：<van-tag plain
+                                                <div v-else-if="item.status === '1'">挂单状态：<van-tag plain round
+                                                        type="success">匹配中</van-tag></div>
+                                                <div v-else-if="item.status === '2'">挂单状态：<van-tag plain
                                                         round>撤单</van-tag></div>
-                                                <div v-else-if="item.status === '3'">交易状态：<van-tag plain round
-                                                        type="primary">全部成交</van-tag></div>
-                                                <div v-else-if="item.status === '4'">交易状态：<van-tag plain round
-                                                        type="warning">部分成交</van-tag></div>
-                                                <div v-else>交易状态：<van-tag plain round>未知状态</van-tag></div>
+                                                <div v-else-if="item.status === '3'">挂单状态：<van-tag plain round
+                                                        type="primary">匹配成功</van-tag></div>
+                                                <div v-else-if="item.status === '4'">挂单状态：<van-tag plain round
+                                                    color="#7232dd">部分匹配成功</van-tag></div>
+                                                <div v-else>挂单状态：<van-tag plain round>未知状态</van-tag></div>
                                             </template>
                                             <template #price>
                                                 <span class="txt9">每股单价

src/views/taskMessage/TaskAccountList.vue

@@ -137,7 +137,6 @@ export default {
         // const reviewedClk = () => {
         //     isClkReview.value = true;
         //     searchParams.statusType = "1";
-
         //     searchGetList();
         // };
         const user = getLoginUser();

src/views/trading/TradingIndex.vue

@@ -63,7 +63,6 @@
           <van-col span="8">{{ item.userAnonymousName }}</van-col>
           <van-col span="8">{{ item.entrustNumber }}</van-col>
           <van-col span="8">{{ item.price }}</van-col>
-
         </van-row>
       </div>
 
@@ -120,11 +119,6 @@
     <div style="height: 40px;"></div>
     <!-- 分割线 -->
     <img class="pic1" src="../../assets/trading/line.png" />
-    <!-- 交易历史记录 -->
-    <!-- <van-cell-group inset>
-      <van-cell title="交易历史记录" icon="underway-o" is-link to="transactionHistory"/>
-    </van-cell-group> -->
-
 
 
     <div style="height: 100px;"></div>